feat(cli): defer to package dependency if both global/local install

Closes #4

README.md

@@ -10,7 +10,7 @@ riw ("`react-intl` workflow") is a set of command-line tools and a library to he
 
 This project is not associated with the `react-intl` project.
 
-The word "riw" seems to be Welsh for slope or hill, and rhymes with the English word "drew".
+The word "riw" seems to be Welsh for _slope_ or _hill_, and rhymes with the English word _drew_.
 
 There's an example repository, [`riw-example`](https://github.com/avaragado/riw-example), showing (in its commit history) how to migrate a simple React app with hard-coded strings to `react-intl`, and then how to use riw with it.
 
@@ -19,7 +19,7 @@ There's an example repository, [`riw-example`](https://github.com/avaragado/riw-
 
 - riw doesn't perform any automated text translation or interface with any translators or translation services. It tells you which messages need translating, lets you update its translations database with the translations once you have them, and produces shippable, `react-intl`-compatible JSON files for each locale you want to support.
 
-- riw doesn't provide a mechanism for generating unique `react-intl` message descriptor ids. How you define these depends on your app's requirements. However, it does let you identify any duplicate ids. ([See the FAQ](doc/faq.md) for a possible naming scheme.)
+- riw doesn't provide a mechanism for generating unique `react-intl` message descriptor ids. How you define these depends on your app's requirements. However, it does let you identify any duplicate ids. ([See the FAQ](doc/faq.md) for a possible naming scheme to help avoid duplicates.)
 
 - riw doesn't import the generated JSON locale files into your app or plug them into `react-intl`'s `IntlProvider`. You implement this behaviour yourself.
 
@@ -40,13 +40,14 @@ riw assumes you're familiar with `react-intl`, and that your app already uses a
    }
    ```
 1. `yarn run riw db init` – initialise empty db at `src/locale/riw-db.json`
-1. `yarn run riw app translate` – outputs `src/locale/[locale].json` and `src/locale/TODO-untranslated.json` (might need to add a `.babelrc` in your app)
+1. `yarn run riw app translate` – outputs `src/locale/[locale].json` and `src/locale/TODO-untranslated.json` (you might need to add a `.babelrc` in your app)
 1. Update your app to import strings from `src/locale/[locale].json` for each target locale, and plug them into `react-intl`'s `IntlProvider` at the appropriate time.
 1. LOOP:
 1. Translate everything in the `TODO-untranslated.json` file. Meanwhile, keep developing your app in the usual way.
 1. `yarn run riw db import TODO-with-translations.json` if you have a file of them in the right format, or
 1. `yarn run riw db update <opts...>` to update the db string by string.
 1. `yarn run riw app translate`
+1. Test and (maybe) ship.
 1. Go to LOOP.
 
 Check everything into source control. There are no temporary files.

doc/tutorial.md

@@ -56,7 +56,7 @@ Let's look at each of these in turn.
 
 ### ➊ Install riw
 
-You can install riw as a package dependency or globally.
+You can install riw as a package dependency or globally, or both.
 
 ```bash
 $ yarn add --dev riw   # or yarn global add riw
@@ -68,16 +68,23 @@ or
 $ npm install --save-dev riw   # use npm -g for global
 ```
 
-If installed globally, `riw` does NOT defer to a local package dependency if there is one. These instructions assume you've installed riw as a package dependency.
-
 Installing riw gives you a script for use from the command line, and a [library for use programmatically](./library.md).
 
-The script is installed at `node_modules/.bin/riw`.  Users of `yarn` can run the script easily:
+When installed as a package dependency, users of `yarn` can run the script easily:
 
 ```bash
-$ yarn run riw
+$ yarn run riw help
 ```
 
+When installed globally, you can run `riw` directly:
+
+```bash
+$ riw help
+```
+
+If installed both globally and as a package dependency, running `riw` directly will run the package dependency. These instructions assume you can run `riw` directly.
+
+
 ### ➋ Define your riw configuration settings
 
 riw has a small number of [configuration settings](./config.md), and you can store them in one of several locations:
@@ -115,7 +122,7 @@ $ riw print-config
 }
 ```
 
-Relative paths in your configuration settings are treated as relative to the `rootDir` output by `riw print-config`.
+Relative paths in your configuration settings are treated as relative to the `rootDir` output by `riw print-config` (usually the directory containing `package.json`).
 
 The most likely settings you'll want to override are:
 
@@ -155,7 +162,7 @@ Depending on the size of your app, this might take some time to complete. This c
    - If no match is found, it's added to the TODO file.
 1. Reports all the results.
 
-(If you see an "unexpected token" error with a stack trace on running `riw app translate`, you might need to add a `.babelrc` file. [See the FAQ](./faq.md).)
+(If you see an "unexpected token" error on running `riw app translate`, you might need to add a `.babelrc` file. [See the FAQ](./faq.md).)
 
 Here's some example output:
 

flow-typed/npm/babel-cli_vx.x.x.js

@@ -1,5 +1,5 @@
-// flow-typed signature: 7d849cdb4b364b1c958375acccf2cf3c
-// flow-typed version: <<STUB>>/babel-cli_v^6.24.0/flow_v0.42.0
+// flow-typed signature: ed1401511f27b3995515cc0137e75902
+// flow-typed version: <<STUB>>/babel-cli_v^6.24.0/flow_v0.43.0
 
 /**
  * This is an autogenerated libdef stub for:

flow-typed/npm/babel-core_vx.x.x.js

@@ -1,5 +1,5 @@
-// flow-typed signature: 618de834b2dc29cb3524980de4a785b7
-// flow-typed version: <<STUB>>/babel-core_v^6.24.0/flow_v0.42.0
+// flow-typed signature: 36f7d5e9de62ec6533f3d1668060a5e0
+// flow-typed version: <<STUB>>/babel-core_v^6.24.0/flow_v0.43.0
 
 /**
  * This is an autogenerated libdef stub for:

flow-typed/npm/babel-eslint_vx.x.x.js

@@ -1,5 +1,5 @@
-// flow-typed signature: 8572281a1e762e212615d34f9d8b0638
-// flow-typed version: <<STUB>>/babel-eslint_v^7.2.1/flow_v0.42.0
+// flow-typed signature: 743e80cdbc020f20b680e9125460683f
+// flow-typed version: <<STUB>>/babel-eslint_v^7.2.1/flow_v0.43.0
 
 /**
  * This is an autogenerated libdef stub for:

flow-typed/npm/babel-jest_vx.x.x.js

@@ -1,5 +1,5 @@
-// flow-typed signature: a64f0ce14b98975fe9ca133bd36d6893
-// flow-typed version: <<STUB>>/babel-jest_v^19.0.0/flow_v0.42.0
+// flow-typed signature: 71591a897e9fca2a6b850c5d1a4b1f86
+// flow-typed version: <<STUB>>/babel-jest_v^19.0.0/flow_v0.43.0
 
 /**
  * This is an autogenerated libdef stub for:

flow-typed/npm/babel-plugin-react-intl_vx.x.x.js

@@ -1,5 +1,5 @@
-// flow-typed signature: e73b99a7599c68043f7fbfe67b071127
-// flow-typed version: <<STUB>>/babel-plugin-react-intl_v^2.3.1/flow_v0.42.0
+// flow-typed signature: d6050d6db4a532767b0c8b5e5f3d4e9c
+// flow-typed version: <<STUB>>/babel-plugin-react-intl_v^2.3.1/flow_v0.43.0
 
 /**
  * This is an autogenerated libdef stub for:

flow-typed/npm/babel-plugin-transform-es2015-modules-commonjs_vx.x.x.js

@@ -1,5 +1,5 @@
-// flow-typed signature: 27fce3237a111f108f27bf9de1d84c3b
-// flow-typed version: <<STUB>>/babel-plugin-transform-es2015-modules-commonjs_v^6.24.0/flow_v0.42.0
+// flow-typed signature: d1148c28bd012ce74df054c8fa2aaa5d
+// flow-typed version: <<STUB>>/babel-plugin-transform-es2015-modules-commonjs_v^6.24.0/flow_v0.43.0
 
 /**
  * This is an autogenerated libdef stub for:

flow-typed/npm/babel-plugin-transform-flow-strip-types_vx.x.x.js

@@ -1,5 +1,5 @@
-// flow-typed signature: e855abd2ed4bfd505cdf68b6704f2d77
-// flow-typed version: <<STUB>>/babel-plugin-transform-flow-strip-types_v^6.22.0/flow_v0.42.0
+// flow-typed signature: 793a24f25052d0bbcd1e2ee20aad31ac
+// flow-typed version: <<STUB>>/babel-plugin-transform-flow-strip-types_v^6.22.0/flow_v0.43.0
 
 /**
  * This is an autogenerated libdef stub for:

flow-typed/npm/babel-plugin-transform-object-rest-spread_vx.x.x.js

@@ -1,5 +1,5 @@
-// flow-typed signature: 193398c91c12e0da7d0c64670de40ec5
-// flow-typed version: <<STUB>>/babel-plugin-transform-object-rest-spread_v^6.23.0/flow_v0.42.0
+// flow-typed signature: 804081aadf2587d1597dedb65953b4c8
+// flow-typed version: <<STUB>>/babel-plugin-transform-object-rest-spread_v^6.23.0/flow_v0.43.0
 
 /**
  * This is an autogenerated libdef stub for:

flow-typed/npm/babel-plugin-transform-runtime_vx.x.x.js

@@ -1,5 +1,5 @@
-// flow-typed signature: 419c89d695665968fac7f6c8f0e67eb3
-// flow-typed version: <<STUB>>/babel-plugin-transform-runtime_v^6.23.0/flow_v0.42.0
+// flow-typed signature: ebf360ca3ca954090d4d50b079f96a19
+// flow-typed version: <<STUB>>/babel-plugin-transform-runtime_v^6.23.0/flow_v0.43.0
 
 /**
  * This is an autogenerated libdef stub for:

flow-typed/npm/babel-polyfill_vx.x.x.js

@@ -1,5 +1,5 @@
-// flow-typed signature: 81fc1253b811ace77143aa0b251c7e62
-// flow-typed version: <<STUB>>/babel-polyfill_v^6.23.0/flow_v0.42.0
+// flow-typed signature: 88c1c404e8a429d4a8726f42e95b0bc0
+// flow-typed version: <<STUB>>/babel-polyfill_v^6.23.0/flow_v0.43.0
 
 /**
  * This is an autogenerated libdef stub for:

flow-typed/npm/babel-preset-env_vx.x.x.js

@@ -1,5 +1,5 @@
-// flow-typed signature: 9e7ce823508b6a8566c465d6036faa7b
-// flow-typed version: <<STUB>>/babel-preset-env_v^1.3.2/flow_v0.42.0
+// flow-typed signature: 04d8a379137a6ca5f200a654bfc0b064
+// flow-typed version: <<STUB>>/babel-preset-env_v^1.3.2/flow_v0.43.0
 
 /**
  * This is an autogenerated libdef stub for:

flow-typed/npm/babel-runtime_vx.x.x.js

@@ -1,5 +1,5 @@
-// flow-typed signature: 5977d83fab1b805f8b82638782f647e3
-// flow-typed version: <<STUB>>/babel-runtime_v^6.23.0/flow_v0.42.0
+// flow-typed signature: bf7292e17e0da2c7a9a11257278c64c4
+// flow-typed version: <<STUB>>/babel-runtime_v^6.23.0/flow_v0.43.0
 
 /**
  * This is an autogenerated libdef stub for:

flow-typed/npm/concurrently_vx.x.x.js

@@ -1,5 +1,5 @@
-// flow-typed signature: 7d2dbc3e59e9954e8c7719d162a6af19
-// flow-typed version: <<STUB>>/concurrently_v^3.4.0/flow_v0.42.0
+// flow-typed signature: a7dcd7bb082126a9ec143703e39a5592
+// flow-typed version: <<STUB>>/concurrently_v^3.4.0/flow_v0.43.0
 
 /**
  * This is an autogenerated libdef stub for:

flow-typed/npm/eslint-config-airbnb_vx.x.x.js

@@ -1,5 +1,5 @@
-// flow-typed signature: 4a64c2ee58dc3dd1bd3facdbbc7cd5de
-// flow-typed version: <<STUB>>/eslint-config-airbnb_v^14.1.0/flow_v0.42.0
+// flow-typed signature: c5dd07bd4e1e109f5cb5386d0ab16e21
+// flow-typed version: <<STUB>>/eslint-config-airbnb_v^14.1.0/flow_v0.43.0
 
 /**
  * This is an autogenerated libdef stub for:

flow-typed/npm/eslint-plugin-flowtype_vx.x.x.js

@@ -1,5 +1,5 @@
-// flow-typed signature: fc3fc729dcec925198f4e66b48750ba8
-// flow-typed version: <<STUB>>/eslint-plugin-flowtype_v^2.30.4/flow_v0.42.0
+// flow-typed signature: 3318a1b919ec2fa17aca99b4ec46fc38
+// flow-typed version: <<STUB>>/eslint-plugin-flowtype_v^2.30.4/flow_v0.43.0
 
 /**
  * This is an autogenerated libdef stub for:

flow-typed/npm/eslint-plugin-import_vx.x.x.js

@@ -1,5 +1,5 @@
-// flow-typed signature: 6aa72b267b236a84ef1428e7844f0925
-// flow-typed version: <<STUB>>/eslint-plugin-import_v^2.2.0/flow_v0.42.0
+// flow-typed signature: 07f7a987d1c87deb4f730a58815c149d
+// flow-typed version: <<STUB>>/eslint-plugin-import_v^2.2.0/flow_v0.43.0
 
 /**
  * This is an autogenerated libdef stub for:

flow-typed/npm/eslint-plugin-jest_vx.x.x.js

@@ -1,5 +1,5 @@
-// flow-typed signature: aee0ee26c71489b73597d33b1da68273
-// flow-typed version: <<STUB>>/eslint-plugin-jest_v^19.0.1/flow_v0.42.0
+// flow-typed signature: 2ae5e22cca3d0005e5b3d681fababc51
+// flow-typed version: <<STUB>>/eslint-plugin-jest_v^19.0.1/flow_v0.43.0
 
 /**
  * This is an autogenerated libdef stub for:

flow-typed/npm/eslint-plugin-jsx-a11y_vx.x.x.js

@@ -1,5 +1,5 @@
-// flow-typed signature: e24d7ec837b23f24131144aea80db077
-// flow-typed version: <<STUB>>/eslint-plugin-jsx-a11y_v^4.0.0/flow_v0.42.0
+// flow-typed signature: e05881329a4d6a055d61693665407201
+// flow-typed version: <<STUB>>/eslint-plugin-jsx-a11y_v^4.0.0/flow_v0.43.0
 
 /**
  * This is an autogenerated libdef stub for:

flow-typed/npm/eslint-plugin-react_vx.x.x.js

@@ -1,5 +1,5 @@
-// flow-typed signature: 7e445ccb42a17d652635190d95adddc0
-// flow-typed version: <<STUB>>/eslint-plugin-react_v^6.10.3/flow_v0.42.0
+// flow-typed signature: 9d353721490edb1fa7239086b878352c
+// flow-typed version: <<STUB>>/eslint-plugin-react_v^6.10.3/flow_v0.43.0
 
 /**
  * This is an autogenerated libdef stub for:

flow-typed/npm/eslint_vx.x.x.js

@@ -1,5 +1,5 @@
-// flow-typed signature: 946a9d5cd6410dc3b111ad9afb570aac
-// flow-typed version: <<STUB>>/eslint_v^3.19.0/flow_v0.42.0
+// flow-typed signature: 294aaa23cd045d5c35f0fdc5bfd28b4e
+// flow-typed version: <<STUB>>/eslint_v^3.19.0/flow_v0.43.0
 
 /**
  * This is an autogenerated libdef stub for:

flow-typed/npm/fallback-cli_vx.x.x.js

@@ -0,0 +1,45 @@
+// flow-typed signature: 960518ae92626bd77a40cdd1dec800c0
+// flow-typed version: <<STUB>>/fallback-cli_v^2.0.2/flow_v0.43.0
+
+/**
+ * This is an autogenerated libdef stub for:
+ *
+ *   'fallback-cli'
+ *
+ * Fill this stub out by replacing all the `any` types.
+ *
+ * Once filled out, we encourage you to share your work with the 
+ * community by sending a pull request to: 
+ * https://github.com/flowtype/flow-typed
+ */
+
+declare module 'fallback-cli' {
+  declare module.exports: any;
+}
+
+/**
+ * We include stubs for each file inside this npm package in case you need to
+ * require those files directly. Feel free to delete any files that aren't
+ * needed.
+ */
+declare module 'fallback-cli/default-runner' {
+  declare module.exports: any;
+}
+
+declare module 'fallback-cli/normalize-args' {
+  declare module.exports: any;
+}
+
+// Filename aliases
+declare module 'fallback-cli/default-runner.js' {
+  declare module.exports: $Exports<'fallback-cli/default-runner'>;
+}
+declare module 'fallback-cli/index' {
+  declare module.exports: $Exports<'fallback-cli'>;
+}
+declare module 'fallback-cli/index.js' {
+  declare module.exports: $Exports<'fallback-cli'>;
+}
+declare module 'fallback-cli/normalize-args.js' {
+  declare module.exports: $Exports<'fallback-cli/normalize-args'>;
+}

flow-typed/npm/find-up_vx.x.x.js

@@ -1,5 +1,5 @@
-// flow-typed signature: b8b9296e6d8d1b1cfceba633433974b2
-// flow-typed version: <<STUB>>/find-up_v^2.1.0/flow_v0.42.0
+// flow-typed signature: d033716a7f5ebb0b856ba38ef2f08f8e
+// flow-typed version: <<STUB>>/find-up_v^2.1.0/flow_v0.43.0
 
 /**
  * This is an autogenerated libdef stub for:

flow-typed/npm/flow-copy-source_vx.x.x.js

@@ -1,5 +1,5 @@
-// flow-typed signature: 051a890ccba6f3ac23b3efa90a1206c7
-// flow-typed version: <<STUB>>/flow-copy-source_v^1.1.0/flow_v0.42.0
+// flow-typed signature: 1ef608c679f8d74d7f2ec7ad467cb5ff
+// flow-typed version: <<STUB>>/flow-copy-source_v^1.1.0/flow_v0.43.0
 
 /**
  * This is an autogenerated libdef stub for:

flow-typed/npm/flow-coverage-report_vx.x.x.js

@@ -1,5 +1,5 @@
-// flow-typed signature: 123e917a8638011e7a64ddb691ab6501
-// flow-typed version: <<STUB>>/flow-coverage-report_v^0.3.0/flow_v0.42.0
+// flow-typed signature: a8f517e4dd8f90b3955de9a4beeb6411
+// flow-typed version: <<STUB>>/flow-coverage-report_v^0.3.0/flow_v0.43.0
 
 /**
  * This is an autogenerated libdef stub for:

flow-typed/npm/flow-typed_vx.x.x.js

@@ -1,5 +1,5 @@
-// flow-typed signature: db575f34958efc4c94f56b8dfbce1e6e
-// flow-typed version: <<STUB>>/flow-typed_v^2.0.0/flow_v0.42.0
+// flow-typed signature: 806f44f9be8f8a70d639d88eeab13ba7
+// flow-typed version: <<STUB>>/flow-typed_v^2.0.0/flow_v0.43.0
 
 /**
  * This is an autogenerated libdef stub for:

flow-typed/npm/glob_vx.x.x.js

@@ -1,5 +1,5 @@
-// flow-typed signature: 0093cb33cb6d512c3d885a6142a96a34
-// flow-typed version: <<STUB>>/glob_v^7.1.1/flow_v0.42.0
+// flow-typed signature: 91441b745ffe6b6563790220cf0b7f21
+// flow-typed version: <<STUB>>/glob_v^7.1.1/flow_v0.43.0
 
 /**
  * This is an autogenerated libdef stub for:

flow-typed/npm/mock-fs_vx.x.x.js

@@ -1,5 +1,5 @@
-// flow-typed signature: 18fab0a61f79575dd9ee78fdfa8613dc
-// flow-typed version: <<STUB>>/mock-fs_v^4.2.0/flow_v0.42.0
+// flow-typed signature: 0340cb219ba03bf65cb13d1d7f886f50
+// flow-typed version: <<STUB>>/mock-fs_v^4.2.0/flow_v0.43.0
 
 /**
  * This is an autogenerated libdef stub for:

flow-typed/npm/nps_vx.x.x.js

@@ -1,5 +1,5 @@
-// flow-typed signature: fc6060456acae85a7dfced41ef939b74
-// flow-typed version: <<STUB>>/nps_v^5.0.5/flow_v0.42.0
+// flow-typed signature: 680862344586adb2e38bb24fde2a28f5
+// flow-typed version: <<STUB>>/nps_v^5.0.5/flow_v0.43.0
 
 /**
  * This is an autogenerated libdef stub for:

flow-typed/npm/ora_vx.x.x.js

@@ -1,5 +1,5 @@
-// flow-typed signature: 2296ab3e94b809b772172fec05171b88
-// flow-typed version: <<STUB>>/ora_v^1.2.0/flow_v0.42.0
+// flow-typed signature: 3dcc96654668b8883ff6312536604c38
+// flow-typed version: <<STUB>>/ora_v^1.2.0/flow_v0.43.0
 
 /**
  * This is an autogenerated libdef stub for:

flow-typed/npm/outdent_vx.x.x.js

@@ -1,5 +1,5 @@
-// flow-typed signature: e0df8b720013794eb37f38fe72fc2fef
-// flow-typed version: <<STUB>>/outdent_v^0.3.0/flow_v0.42.0
+// flow-typed signature: 31041e6fcba9eb3fd986ef268460c328
+// flow-typed version: <<STUB>>/outdent_v^0.3.0/flow_v0.43.0
 
 /**
  * This is an autogenerated libdef stub for:

flow-typed/npm/ramda_vx.x.x.js

@@ -1,5 +1,5 @@
-// flow-typed signature: 1b0fd38e4f7800d6900c17784b1ab63a
-// flow-typed version: <<STUB>>/ramda_v^0.23.0/flow_v0.42.0
+// flow-typed signature: ec4efc0987c975dae10a30af01bef7ea
+// flow-typed version: <<STUB>>/ramda_v^0.23.0/flow_v0.43.0
 
 /**
  * This is an autogenerated libdef stub for:

flow-typed/npm/rimraf_vx.x.x.js

@@ -1,5 +1,5 @@
-// flow-typed signature: 4ec35b2341463f8d43cf2c122732c032
-// flow-typed version: <<STUB>>/rimraf_v^2.6.1/flow_v0.42.0
+// flow-typed signature: 037358386065a9822dc62ed593b874a1
+// flow-typed version: <<STUB>>/rimraf_v^2.6.1/flow_v0.43.0
 
 /**
  * This is an autogenerated libdef stub for:

flow-typed/npm/standard-version_vx.x.x.js

@@ -1,5 +1,5 @@
-// flow-typed signature: 12037aecf6de78a9b360027cd2edcbb8
-// flow-typed version: <<STUB>>/standard-version_v^4.0.0/flow_v0.42.0
+// flow-typed signature: 2bfd482bc062ade29d000649525f2d84
+// flow-typed version: <<STUB>>/standard-version_v^4.0.0/flow_v0.43.0
 
 /**
  * This is an autogenerated libdef stub for: