From 67dbed7e72a152122c45663b69231e78b32490e8 Mon Sep 17 00:00:00 2001
From: "Kent C. Dodds" <kent@doddsfamily.us>
Date: Thu, 9 Feb 2017 14:30:44 -0700
Subject: [PATCH] fix(cli): improve handling of forwarding args/flags

**What**: This migrates us from `commander` and `omelette` to `yargs`
and in the process changes how we handle forwarding of arguments and
flags. We no longer just arbitrarily forward arguments to every script.
Also instead of comma separated scripts, they're simply separated by a
space. If you want to pass args/flags to a script, then you put it in
quotes.

**Why**: Makes this more predicatble. Also `yargs` is more powerful in
general anyway.

**How**: Magic... Will comment inline...
---
 .all-contributorsrc                           |   9 +
 README.md                                     |  79 +++----
 cli-test/__snapshots__/cli.test.js.snap       |  41 ++--
 cli-test/cli.test.js                          |  10 +-
 cli-test/fixtures/package-scripts.js          |   2 +
 cli-test/run-nps.js                           |   4 +-
 other/ERRORS_AND_WARNINGS.md                  |  10 +-
 other/EXAMPLES.md                             |   1 -
 package-scripts.js                            |  21 +-
 package.json                                  |   8 +-
 src/__mocks__/console.js                      |   7 +
 src/__mocks__/find-up.js                      |   8 +
 src/__mocks__/get-logger.js                   |  16 ++
 src/__mocks__/readline-sync.js                |   8 +
 src/bin-utils/autocomplete-get-scripts.js     |  42 ++++
 .../autocomplete-get-scripts.test.js          |  77 +++++++
 src/bin-utils/autocomplete/index.js           |  37 ----
 src/bin-utils/autocomplete/index.test.js      |  67 ------
 src/bin-utils/index.js                        |  33 +--
 src/bin-utils/index.test.js                   |  37 +---
 src/bin-utils/parser.js                       | 197 ++++++++++++++++++
 src/bin-utils/parser.test.js                  | 186 +++++++++++++++++
 src/bin/nps.js                                | 135 ++----------
 src/get-logger.js                             |  18 +-
 src/get-logger.test.js                        |  71 ++++---
 src/index.js                                  |  37 ++--
 src/index.test.js                             |  22 +-
 test/jest.src.config.json                     |   1 +
 yarn.lock                                     |  44 ++--
 29 files changed, 752 insertions(+), 476 deletions(-)
 create mode 100644 src/__mocks__/console.js
 create mode 100644 src/__mocks__/find-up.js
 create mode 100644 src/__mocks__/get-logger.js
 create mode 100644 src/__mocks__/readline-sync.js
 create mode 100644 src/bin-utils/autocomplete-get-scripts.js
 create mode 100644 src/bin-utils/autocomplete-get-scripts.test.js
 delete mode 100644 src/bin-utils/autocomplete/index.js
 delete mode 100644 src/bin-utils/autocomplete/index.test.js
 create mode 100644 src/bin-utils/parser.js
 create mode 100644 src/bin-utils/parser.test.js
 mode change 100644 => 100755 src/bin/nps.js

diff --git a/.all-contributorsrc b/.all-contributorsrc
index 65d0870..470df5b 100644
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -228,6 +228,15 @@
       "contributions": [
         "bug"
       ]
+    },
+    {
+      "login": "addityasingh",
+      "name": "Aditya Pratap Singh",
+      "avatar_url": "https://avatars.githubusercontent.com/u/5351262?v=3",
+      "profile": "http://blog.adityapsingh.com",
+      "contributions": [
+        "review"
+      ]
     }
   ]
 }
diff --git a/README.md b/README.md
index 489d3db..1b46890 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ All the benefits of npm scripts without the cost of a bloated package.json and l
 [![downloads][downloads-badge]][npm-stat]
 [![MIT License][license-badge]][LICENSE]
 
-[![All Contributors](https://img.shields.io/badge/all_contributors-22-orange.svg?style=flat-square)](#contributors)
+[![All Contributors](https://img.shields.io/badge/all_contributors-23-orange.svg?style=flat-square)](#contributors)
 [![PRs Welcome][prs-badge]][prs]
 [![Donate][donate-badge]][donate]
 [![Code of Conduct][coc-badge]][coc]
@@ -58,6 +58,7 @@ module.exports = {
     },
     // learn more about concurrently here: https://npm.im/concurrently
     validate: 'concurrently "nps lint" "nps test" "nps build"',
+    // concurrently script too verbose for your liking? Check out other/EXAMPLES.md!
   },
 }
 ```
@@ -81,27 +82,41 @@ scripts:
 ```
 
 To use `p-s`, it's recommended that you either install it globally (`npm i -g p-s`) or add `./node_modules/bin` to your
-`$PATH` (be careful that you know what you're doing when doing this).
+`$PATH` (be careful that you know what you're doing when doing this, find out how [here](https://youtu.be/2WZ5iS_3Jgs)).
 
 Then you can run:
 
 ```console
-nps --help
+nps help
 ```
 
 Which will output:
 
 ```console
-  Usage: nps [options]
-
-  Options:
-
-    -h, --help                                  output usage information
-    -V, --version                               output the version number
-    -s, --silent                                Silent nps output
-    -c, --config <filepath>                     Config file to use (defaults to nearest package-scripts.yml or package-scripts.js)
-    -l, --log-level <level>                     The log level to use (error, warn, info [default])
-    -r, --require <module>                      Module to preload
+Usage: nps [options] <script>...
+
+Commands:
+  init        automatically migrate from npm scripts to p-s
+  completion  generate bash completion script
+
+Options:
+  --config, -c     Config file to use (defaults to nearest package-scripts.yml
+                   or package-scripts.js)
+                     [default: "<path-to-your-project>/package-scripts.js"]
+  --silent, -s     Silent nps output                  [boolean] [default: false]
+  --log-level, -l  The log level to use
+                   [choices: "error", "warn", "info", "debug"] [default: "info"]
+  --require, -r    Module to preload
+  -h, --help       Show help                                           [boolean]
+  -v, --version    Show version number                                 [boolean]
+
+Examples:
+  nps.js test build                         Runs the `test` script then the
+                                            `build` script
+  nps.js "test --cover" "build --prod"      Runs the `test` script and forwards
+                                            the "--cover" flag then the `build`
+                                            script and forwards the "--prod"
+                                            flag
 
 Available scripts (camel or kebab case accepted)
 
@@ -179,14 +194,7 @@ npm install --global p-s
 
 From here you can use `p-s` on the command line via one of the installed aliases: `nps` or `p-s`.
 
-If you do this, you may also be interested in installing the shell autocompletion script. Do so by running:
-
-```
-nps completion <optionally-your-bash-profile-file>
-```
-
-The bash profile file defaults to `~/.bash_profile` for bash and `~/.zshrc` for zsh. Special thanks to the
-[`omelette`][omelette] package for making this so easy.
+If you do this, you may also be interested in installing the shell autocompletion script. See more about this below.
 
 ## Getting started
 
@@ -222,13 +230,12 @@ As indicated above, this will migrate your npm scripts to package-scripts.
 
 ##### completion
 
-Installs autocompletion functionality into your default bash or zsh configuration. You can override the default by
-providing a specific file:
-
 ```console
-nps completion ~/.bashrc
+nps completion >> <your-bash-profile-file>
 ```
 
+Normally `<your-bash-profile-file>` will be `~/.bash_profile`, `~/.bashrc`, or `~/.zshrc`.
+
 Note: you should probably only do this if you have the package installed globally. In that case you should probably also
 normally use the `nps` alias rather than `p-s` because it's easier to type.
 
@@ -266,32 +273,33 @@ Specify the log level to use
 You can specify a module which will be loaded before the config file is loaded. This allows you to preload for example
 babel-register so you can use all babel presets you like.
 
-##### args
+##### scripts
 
-You can pass additional arguments to the script(s) that are being spawned:
+To run a script, you simply provide the name of the script like so:
 
 ```console
-nps lint --fix # --fix will be passed on to the lint script
+nps cover
 ```
 
-##### scripts
-
-To run a script, you simply provide the name of the script like so:
+And you can run multiple scripts in series by simply adding more space-separated arguments.
 
 ```console
-nps cover
+nps cover check-coverage
 ```
 
-And you can run multiple scripts in series by providing a comma-separated list:
+And you can pass arguments to scripts by putting the scripts in quotes:
 
 ```console
-nps cover,check-coverage
+nps "test --cover" check-coverage
 ```
 
 That's all for the CLI.
 
 ### package-scripts.js
 
+> Remember, this file is JavaScript, so you can write functions to make things more simple!
+> See other/EXAMPLES.md for examples of cool things you can do with this.
+
 `nps` expects to your `package-scripts.js` file to `module.exports` an object with the following properties:
 
 #### scripts
@@ -410,7 +418,7 @@ Thanks goes to these people ([emoji key][emojis]):
 | :---: | :---: | :---: | :---: | :---: | :---: | :---: |
 | [<img src="https://avatars.githubusercontent.com/u/1972567?v=3" width="100px;"/><br /><sub>Tommy</sub>](http://www.tommyleunen.com)<br />[🐛](https://github.com/kentcdodds/p-s/issues?q=author%3Atleunen) [💻](https://github.com/kentcdodds/p-s/commits?author=tleunen) [⚠️](https://github.com/kentcdodds/p-s/commits?author=tleunen) 👀 | [<img src="https://avatars.githubusercontent.com/u/509946?v=3" width="100px;"/><br /><sub>Jayson Harshbarger</sub>](http://www.hypercubed.com)<br />💡 👀 | [<img src="https://avatars.githubusercontent.com/u/1355481?v=3" width="100px;"/><br /><sub>JD Isaacks</sub>](http://www.jisaacks.com)<br />[💻](https://github.com/kentcdodds/p-s/commits?author=jisaacks) [⚠️](https://github.com/kentcdodds/p-s/commits?author=jisaacks) | [<img src="https://avatars.githubusercontent.com/u/924465?v=3" width="100px;"/><br /><sub>Christopher Hiller</sub>](https://boneskull.com)<br />👀 | [<img src="https://avatars.githubusercontent.com/u/1834413?v=3" width="100px;"/><br /><sub>Robin Malfait</sub>](https://robinmalfait.com)<br />💡 | [<img src="https://avatars.githubusercontent.com/u/622118?v=3" width="100px;"/><br /><sub>Eric McCormick</sub>](https://ericmccormick.io)<br />👀 [📖](https://github.com/kentcdodds/p-s/commits?author=edm00se) | [<img src="https://avatars.githubusercontent.com/u/1913805?v=3" width="100px;"/><br /><sub>Sam Verschueren</sub>](https://twitter.com/SamVerschueren)<br />👀 |
 | [<img src="https://avatars.githubusercontent.com/u/1155589?v=3" width="100px;"/><br /><sub>Sorin Muntean</sub>](https://github.com/sxn)<br />[💻](https://github.com/kentcdodds/p-s/commits?author=sxn) [⚠️](https://github.com/kentcdodds/p-s/commits?author=sxn) [📖](https://github.com/kentcdodds/p-s/commits?author=sxn) | [<img src="https://avatars.githubusercontent.com/u/1970063?v=3" width="100px;"/><br /><sub>Keith Gunn</sub>](https://github.com/gunnx)<br />[🐛](https://github.com/kentcdodds/p-s/issues?q=author%3Agunnx) [💻](https://github.com/kentcdodds/p-s/commits?author=gunnx) [⚠️](https://github.com/kentcdodds/p-s/commits?author=gunnx) | [<img src="https://avatars.githubusercontent.com/u/1019478?v=3" width="100px;"/><br /><sub>Joe Martella</sub>](http://martellaj.github.io)<br />[🐛](https://github.com/kentcdodds/p-s/issues?q=author%3Amartellaj) [💻](https://github.com/kentcdodds/p-s/commits?author=martellaj) [⚠️](https://github.com/kentcdodds/p-s/commits?author=martellaj) | [<img src="https://avatars.githubusercontent.com/u/1887854?v=3" width="100px;"/><br /><sub>Martin Segado</sub>](https://github.com/msegado)<br />[📖](https://github.com/kentcdodds/p-s/commits?author=msegado) | [<img src="https://avatars.githubusercontent.com/u/36491?v=3" width="100px;"/><br /><sub>Bram Borggreve</sub>](http://colmena.io/)<br />[🐛](https://github.com/kentcdodds/p-s/issues?q=author%3Abeeman) [💻](https://github.com/kentcdodds/p-s/commits?author=beeman) | [<img src="https://avatars.githubusercontent.com/u/86454?v=3" width="100px;"/><br /><sub>Elijah Manor</sub>](http://elijahmanor.com)<br />📹 | [<img src="https://avatars.githubusercontent.com/u/10691183?v=3" width="100px;"/><br /><sub>Ragu Ramaswamy</sub>](https://github.com/rrag)<br />[💻](https://github.com/kentcdodds/p-s/commits?author=rrag) [⚠️](https://github.com/kentcdodds/p-s/commits?author=rrag) |
-| [<img src="https://avatars.githubusercontent.com/u/2915616?v=3" width="100px;"/><br /><sub>Erik Fox</sub>](http://www.erikfox.co/)<br />[🐛](https://github.com/kentcdodds/p-s/issues?q=author%3Aerikfox) |
+| [<img src="https://avatars.githubusercontent.com/u/2915616?v=3" width="100px;"/><br /><sub>Erik Fox</sub>](http://www.erikfox.co/)<br />[🐛](https://github.com/kentcdodds/p-s/issues?q=author%3Aerikfox) | [<img src="https://avatars.githubusercontent.com/u/5351262?v=3" width="100px;"/><br /><sub>Aditya Pratap Singh</sub>](http://blog.adityapsingh.com)<br />👀 |
 <!-- ALL-CONTRIBUTORS-LIST:END -->
 
 This project follows the [all-contributors][all-contributors] specification.
@@ -455,4 +463,3 @@ MIT
 [scripty]: https://npmjs.com/package/scripty
 [npm scripts]: https://docs.npmjs.com/misc/scripts
 [video]: http://kcd.im/p-s-video
-[omelette]: https://npmjs.com/package/omelette
diff --git a/cli-test/__snapshots__/cli.test.js.snap b/cli-test/__snapshots__/cli.test.js.snap
index 50a6fa8..13fe840 100644
--- a/cli-test/__snapshots__/cli.test.js.snap
+++ b/cli-test/__snapshots__/cli.test.js.snap
@@ -1,7 +1,18 @@
+exports[`test with --get-yargs-completions 1`] = `
+Object {
+  "stderr": "",
+  "stdout": "like
+lint
+lint.sub.thing
+lint.sub.hiddenThing
+",
+}
+`;
+
 exports[`test with --require 1`] = `
 Object {
   "stderr": "",
-  "stdout": "nps executing: echo \"log\"
+  "stdout": "nps executing: echo \"log\"
 log
 ",
 }
@@ -17,7 +28,7 @@ Object {
 
 exports[`test with a missing config 1`] = `
 Object {
-  "stderr": "Unable to find JS config at \"./something-that-does-not-exist.js\". Attempted to require as \"<projectRootDir>/cli-test/fixtures/something-that-does-not-exist.js\" https://github.com/kentcdodds/p-s/blob/v0.0.0-semantically-released/other/ERRORS_AND_WARNINGS.md#unable-to-find-config
+  "stderr": "Unable to find JS config at \"./something-that-does-not-exist.js\". Attempted to require as \"<projectRootDir>/cli-test/fixtures/something-that-does-not-exist.js\" https://github.com/kentcdodds/p-s/blob/v0.0.0-semantically-released/other/ERRORS_AND_WARNINGS.md#unable-to-find-config
 ",
   "stdout": "",
 }
@@ -26,32 +37,8 @@ Object {
 exports[`test with config with default script 1`] = `
 Object {
   "stderr": "",
-  "stdout": "nps executing: echo \"default script\"
+  "stdout": "nps executing: echo \"default script\"
 default script
 ",
 }
 `;
-
-exports[`test without arguments 1`] = `
-Object {
-  "stderr": "",
-  "stdout": "
-  Usage: nps [options]
-
-  Options:
-
-    -h, --help               output usage information
-    -V, --version            output the version number
-    -s, --silent             Silent nps output
-    -c, --config <filepath>  Config file to use (defaults to nearest package-scripts.yml or package-scripts.js)
-    -l, --log-level <level>  The log level to use (error, warn, info [default])
-    -r, --require <module>   Module to preload
-
-Available scripts (camel or kebab case accepted)
-
-test - echo \"test script\"
-lint - echo \"lint.default\"
-lint.sub.thing - this is a description - echo \"deeply nested thing\"
-",
-}
-`;
diff --git a/cli-test/cli.test.js b/cli-test/cli.test.js
index e05279c..58321fa 100644
--- a/cli-test/cli.test.js
+++ b/cli-test/cli.test.js
@@ -3,11 +3,6 @@ import runNPS from './run-nps'
 
 const fixturesPath = resolve(__dirname, './fixtures')
 
-test(
-  'without arguments',
-  () => snapshot(),
-)
-
 test(
   'with config with default script',
   () => snapshot('-c ./package-scripts-with-default.js'),
@@ -28,6 +23,11 @@ test(
   () => snapshot('--config ./es6-package-scripts.js --require babel-register log'),
 )
 
+test(
+  'with --get-yargs-completions',
+  () => snapshot('--config ./package-scripts.js --get-yargs-completions li'),
+)
+
 function snapshot(args) {
   return runNPS(fixturesPath, args).then(results => {
     const snapshottableResults = relativizePaths(results)
diff --git a/cli-test/fixtures/package-scripts.js b/cli-test/fixtures/package-scripts.js
index 567e810..0cfcf87 100644
--- a/cli-test/fixtures/package-scripts.js
+++ b/cli-test/fixtures/package-scripts.js
@@ -1,6 +1,8 @@
 module.exports = {
   scripts: {
     test: 'echo "test script"',
+    like: 'echo "I like you"',
+    let: 'things',
     lint: {
       default: 'echo "lint.default"',
       sub: {
diff --git a/cli-test/run-nps.js b/cli-test/run-nps.js
index 02db59f..39983e4 100644
--- a/cli-test/run-nps.js
+++ b/cli-test/run-nps.js
@@ -21,7 +21,9 @@ function runNPS(cwd, args = '') {
     let stdout = ''
     let stderr = ''
     const command = `node ${NPS_PATH} ${args}`
-    const child = spawn(command, {cwd})
+    const env = Object.assign({}, process.env)
+    delete env.FORCE_COLOR
+    const child = spawn(command, {cwd, env})
 
     child.on('error', error => {
       reject(error)
diff --git a/other/ERRORS_AND_WARNINGS.md b/other/ERRORS_AND_WARNINGS.md
index f39404b..55bad0d 100644
--- a/other/ERRORS_AND_WARNINGS.md
+++ b/other/ERRORS_AND_WARNINGS.md
@@ -30,7 +30,7 @@ This happens when you use the `--require` flag and the module you specify cannot
 
 ## Failed with exit code
 
-This means that one of the scripts p-s tried to run resulted in a non-zero exit code (a failing exit code)
+This means that one of the scripts `p-s` tried to run resulted in a non-zero exit code (a failing exit code)
 
 ### To Fix:
 
@@ -53,3 +53,11 @@ Your `package-scripts.js`, `package-scripts.yml`, or whatever you specified as t
 ### To Fix:
 
 Make sure that your config is an object or a function that returns an object.
+
+## Invalid flags
+
+This happens if you pass flags to `p-s` that are not valid (like `p-s --invalid-flag-name`). This most often happens when you're trying to forward arguments to a script like: `p-s build --fast`
+
+### To Fix:
+
+Make sure you put your scripts and the relevant arguments in quotes: `p-s "build --fast"`
diff --git a/other/EXAMPLES.md b/other/EXAMPLES.md
index 5f61232..f68a32d 100644
--- a/other/EXAMPLES.md
+++ b/other/EXAMPLES.md
@@ -69,7 +69,6 @@ module.exports = {
 }
 
 function concurrent(scripts) {
-  process.env.FORCE_COLOR = true // this is necessary until https://github.com/kimmobrunfeldt/concurrently/issues/86
   const names = scripts.join(',')
   const quotedScripts = `"nps ${scripts.join('" "nps ')}"`
   return `concurrently --prefix "[{name}]" --names "${names}" ${quotedScripts}`
diff --git a/package-scripts.js b/package-scripts.js
index c02a7f3..9f6facf 100644
--- a/package-scripts.js
+++ b/package-scripts.js
@@ -1,6 +1,12 @@
 const transpile = 'babel --copy-files --out-dir dist --ignore *.test.js,fixtures src'
 const cleanDist = 'rimraf dist'
-const validate = ['build.andValidate', 'test', 'lint']
+// const npsBin = 'babel-node src/bin/nps.js'
+const npsBin = 'nps'
+const validate = [
+  'build.andValidate',
+  'test',
+  'lint',
+]
 
 module.exports = {
   scripts: {
@@ -8,6 +14,7 @@ module.exports = {
       description: 'This uses commitizen to help us generate beautifully formatted commit messages',
       script: 'git-cz',
     },
+    temp: 'sleep 8; exit 0',
     test: {
       default: 'jest --config=test/jest.src.config.json --coverage',
       watch: 'jest --config=test/jest.src.config.json --watch',
@@ -26,7 +33,7 @@ module.exports = {
       },
       andValidate: {
         description: 'Runs the normal build first, then validates the CLI',
-        script: 'nps build,test.cli',
+        script: 'nps build && nps test.cli',
       },
     },
     lint: {
@@ -60,8 +67,12 @@ module.exports = {
 }
 
 function concurrent(scripts) {
-  process.env.FORCE_COLOR = true // this is required until https://github.com/kimmobrunfeldt/concurrently/issues/86
   const names = scripts.join(',')
-  const quotedScripts = `"nps ${scripts.join('" "nps ')}"`
-  return `concurrently --prefix "[{name}]" --names "${names}" ${quotedScripts}`
+  const quotedScripts = `"${npsBin} ${scripts.join(`" "${npsBin} `)}"`
+  const colors = [
+    ['bgBlue.bold'],
+    ['bgMagenta.bold'],
+    ['bgGreen.bold'],
+  ]
+  return `concurrently --prefix-colors "${colors.join(',')}" --prefix "[{name}]" --names "${names}" ${quotedScripts}`
 }
diff --git a/package.json b/package.json
index 72236c3..113106b 100644
--- a/package.json
+++ b/package.json
@@ -23,17 +23,15 @@
   "dependencies": {
     "arrify": "^1.0.1",
     "chalk": "^1.1.3",
-    "commander": "^2.9.0",
     "find-up": "^2.1.0",
     "js-yaml": "^3.7.0",
     "lodash": "^4.17.4",
     "manage-path": "^2.0.0",
-    "omelette": "^0.3.1",
     "prefix-matches": "^0.0.9",
     "readline-sync": "^1.4.6",
-    "shell-escape": "^0.2.0",
     "spawn-command-with-kill": "^1.0.0",
-    "type-detect": "^4.0.0"
+    "type-detect": "^4.0.0",
+    "yargs": "^6.6.0"
   },
   "devDependencies": {
     "all-contributors-cli": "^3.1.0",
@@ -47,7 +45,7 @@
     "cli-tester": "^2.0.0",
     "codecov": "^1.0.1",
     "commitizen": "^2.9.5",
-    "concurrently": "^3.1.0",
+    "concurrently": "^3.3.0",
     "condition-node-version": "^1.3.0",
     "cross-env": "^3.1.4",
     "cz-conventional-changelog": "^1.2.0",
diff --git a/src/__mocks__/console.js b/src/__mocks__/console.js
new file mode 100644
index 0000000..3f35d8b
--- /dev/null
+++ b/src/__mocks__/console.js
@@ -0,0 +1,7 @@
+const console = require.requireActual('console')
+
+module.exports = Object.assign({}, console, {
+  error: jest.fn(),
+  warn: jest.fn(),
+  info: jest.fn(),
+})
diff --git a/src/__mocks__/find-up.js b/src/__mocks__/find-up.js
new file mode 100644
index 0000000..afc9f69
--- /dev/null
+++ b/src/__mocks__/find-up.js
@@ -0,0 +1,8 @@
+const defaultSyncReturn = 'path/to/package-scripts.js'
+
+const mock = {}
+
+module.exports = {
+  sync: jest.fn(() => (mock.hasOwnProperty('syncReturn') ? mock.syncReturn : defaultSyncReturn)),
+  mock,
+}
diff --git a/src/__mocks__/get-logger.js b/src/__mocks__/get-logger.js
new file mode 100644
index 0000000..27574bf
--- /dev/null
+++ b/src/__mocks__/get-logger.js
@@ -0,0 +1,16 @@
+const mock = {
+  error: jest.fn(),
+  warn: jest.fn(),
+  info: jest.fn(),
+}
+
+const getLogLevel = jest.fn(() => 'info')
+
+module.exports = () => mock
+Object.assign(module.exports, {mock, getLogLevel, clearAll})
+
+function clearAll() {
+  mock.error.mockClear()
+  mock.warn.mockClear()
+  mock.info.mockClear()
+}
diff --git a/src/__mocks__/readline-sync.js b/src/__mocks__/readline-sync.js
new file mode 100644
index 0000000..963deea
--- /dev/null
+++ b/src/__mocks__/readline-sync.js
@@ -0,0 +1,8 @@
+const mock = {}
+
+module.exports = {
+  keyInYN: jest.fn(() => {
+    return Boolean(mock.keyInYNReturn)
+  }),
+  mock,
+}
diff --git a/src/bin-utils/autocomplete-get-scripts.js b/src/bin-utils/autocomplete-get-scripts.js
new file mode 100644
index 0000000..84a1aed
--- /dev/null
+++ b/src/bin-utils/autocomplete-get-scripts.js
@@ -0,0 +1,42 @@
+import {includes, kebabCase, camelCase, isPlainObject, startsWith} from 'lodash'
+
+const excludedKeys = ['default', 'script', 'description', 'hiddenFromHelp']
+
+export default getScripts
+
+function getScripts(objWithScripts, prefix = '') {
+  const [prefixToMatch, ...remainingToMatch] = prefix.split('.')
+  return Object.keys(objWithScripts).reduce((acc, key) => {
+    /* eslint complexity:0 */
+    const kebabKey = kebabCase(key)
+    const camelKey = camelCase(key)
+    const startsWithKey = startsWith(key, prefixToMatch)
+    const startsWithKebab = startsWith(kebabKey, prefixToMatch)
+    const startsWithCamel = startsWith(camelKey, prefixToMatch)
+    const startMatches = startsWithKey || startsWithKebab || startsWithCamel
+    if (!startMatches || includes(excludedKeys, key)) {
+      return acc
+    }
+    const value = objWithScripts[key]
+
+    // default to kebab-case
+    // eslint-disable-next-line
+    const keyToPush = !isKebab(prefixToMatch) ? camelKey : kebabKey
+
+    if (isPlainObject(value)) {
+      if ((value.default || value.script) && !remainingToMatch.length) {
+        acc.push(keyToPush)
+      }
+      const subscripts = getScripts(value, remainingToMatch.join('.'))
+        .map(scriptName => `${keyToPush}.${scriptName}`)
+      acc = [...acc, ...subscripts]
+    } else if (!remainingToMatch.length) {
+      acc.push(keyToPush)
+    }
+    return acc
+  }, [])
+}
+
+function isKebab(str) {
+  return includes(str, '-')
+}
diff --git a/src/bin-utils/autocomplete-get-scripts.test.js b/src/bin-utils/autocomplete-get-scripts.test.js
new file mode 100644
index 0000000..fd2ab8b
--- /dev/null
+++ b/src/bin-utils/autocomplete-get-scripts.test.js
@@ -0,0 +1,77 @@
+import getScripts from './autocomplete-get-scripts'
+
+const stubConfig = {
+  scripts: {
+    build: {default: {script: 'build'}, watch: 'build.watch', main: {umd: 'build.main.umd', default: 'build.main'}},
+    lint: {default: {script: 'lint', description: 'lint things'}, watch: 'lint.watch'},
+    like: 'echo "I like you"',
+    test: 'test',
+    camelCase: 'camelCase',
+    cover: {description: 'this is a description', script: 'this is the script'},
+  },
+}
+
+const tests = [
+  [
+    [{like: '', lint: 'thing', build: 'nope'}, 'l'],
+    ['like', 'lint'],
+  ],
+  [
+    [{like: '', lint: 'thing', build: 'nope'}, 'b'],
+    ['build'],
+  ],
+  [
+    [{like: {default: 'everything'}, lint: 'thing', build: 'nope'}, 'li'],
+    ['like', 'lint'],
+  ],
+  [
+    [{like: {things: 'everything'}, lint: 'thing', build: 'nope'}, 'li'],
+    ['like.things', 'lint'],
+  ],
+  [
+    [{like: {things: 'everything', otherThings: {default: {script: 'echo hi'}}}, lint: 'thing', build: 'nope'}, 'li'],
+    ['like.things', 'like.otherThings', 'lint'],
+  ],
+  [
+    [stubConfig.scripts],
+    [
+      'build', 'build.watch', 'build.main', 'build.main.umd',
+      'lint', 'lint.watch', 'like',
+      'test', 'camelCase', 'cover',
+    ],
+  ],
+  [
+    [stubConfig.scripts, 'l'],
+    ['lint', 'lint.watch', 'like'],
+  ],
+  [
+    [stubConfig.scripts, 'b.m'],
+    ['build.main', 'build.main.umd'],
+  ],
+  [
+    [stubConfig.scripts, 'b.m.u'],
+    ['build.main.umd'],
+  ],
+  [
+    [stubConfig.scripts, 'b.m.us'],
+    [],
+  ],
+  [
+    [stubConfig.scripts, 'build.main.umd'],
+    ['build.main.umd'],
+  ],
+  [
+    [stubConfig.scripts, 'camel-c'],
+    ['camel-case'],
+  ],
+  [
+    [{lint: {say: 'hi'}, linter: {say: {allo: 'hallo'}}}, 'lin.s.a'],
+    ['linter.say.allo'],
+  ],
+]
+
+tests.forEach(([input, output], index) => {
+  test(String(index), () => {
+    expect(getScripts(...input)).toEqual(output)
+  })
+})
diff --git a/src/bin-utils/autocomplete/index.js b/src/bin-utils/autocomplete/index.js
deleted file mode 100644
index 514505d..0000000
--- a/src/bin-utils/autocomplete/index.js
+++ /dev/null
@@ -1,37 +0,0 @@
-/* eslint no-invalid-this:"off" */
-import omelette from 'omelette'
-import {includes, isPlainObject, kebabCase} from 'lodash'
-
-const complete = omelette('nps <script>')
-
-export {autocomplete as default, install}
-
-function autocomplete(config = {}) {
-  complete.on('script', onScript)
-  complete.init()
-
-  function onScript() {
-    this.reply(getScripts(config.scripts)) // eslint-disable-line babel/no-invalid-this
-  }
-}
-
-function install(destination) {
-  complete.setupShellInitFile(destination)
-}
-
-function getScripts(scriptsObject, prefix = '', allScripts = []) {
-  const excludedKeys = ['default', 'script', 'description']
-  return Object.keys(scriptsObject).reduce((acc, key) => {
-    if (includes(excludedKeys, key)) {
-      return acc
-    }
-    const value = scriptsObject[key]
-    const kebabKey = kebabCase(key)
-    const deepKey = prefix ? `${prefix}.${kebabKey}` : kebabKey
-    acc.push(deepKey)
-    if (isPlainObject(value)) {
-      getScripts(value, deepKey, acc)
-    }
-    return acc
-  }, allScripts)
-}
diff --git a/src/bin-utils/autocomplete/index.test.js b/src/bin-utils/autocomplete/index.test.js
deleted file mode 100644
index 82fa8c8..0000000
--- a/src/bin-utils/autocomplete/index.test.js
+++ /dev/null
@@ -1,67 +0,0 @@
-/* eslint global-require:0, import/newline-after-import:0 */
-import {spy} from 'sinon'
-
-test('inits omelette', () => {
-  const {autocomplete, mockInit} = getAutocomplete()
-  autocomplete()
-  expect(mockInit.calledOnce)
-})
-
-test('calls this.reply with the available scripts', () => {
-  const stubConfig = {
-    scripts: {
-      build: {default: {script: 'build'}, watch: 'build.watch', main: {umd: 'build.main.umd', default: 'build.main'}},
-      lint: {default: {script: 'lint', description: 'lint things'}, watch: 'lint.watch'},
-      test: 'test',
-      camelCase: 'camelCase',
-      cover: {description: 'this is a description', script: 'this is the script'},
-    },
-  }
-  const expectedReplyArgs = [
-    'build', 'build.watch', 'build.main', 'build.main.umd',
-    'lint', 'lint.watch',
-    'test', 'camel-case', 'cover',
-  ]
-  const {autocomplete, getReplyArgs} = getAutocomplete()
-  autocomplete(stubConfig)
-  const actualReplyArgs = getReplyArgs()
-  expect(actualReplyArgs).toEqual(expectedReplyArgs)
-})
-
-test('install calls setupShellInitFile with the given destination', () => {
-  const {install, mockSetupShellInitFile} = getInstall()
-  const destination = '~/.my_bash_profile'
-  install(destination)
-  const [actualDestination] = mockSetupShellInitFile.firstCall.args
-  expect(mockSetupShellInitFile.calledOnce)
-  expect(actualDestination).toBe(destination)
-})
-
-function getAutocomplete() {
-  const mockOn = spy()
-  const mockInit = spy()
-  jest.resetModules()
-  jest.mock('omelette', () => () => {
-    return {on: mockOn, init: mockInit}
-  })
-  const autocomplete = require('./index').default
-  return {autocomplete, getReplyArgs, mockInit}
-
-  function getReplyArgs() {
-    const [, replier] = mockOn.firstCall.args
-    const reply = spy()
-    const context = {reply}
-    replier.call(context)
-    return reply.firstCall.args[0]
-  }
-}
-
-function getInstall() {
-  const mockSetupShellInitFile = spy()
-  jest.resetModules()
-  jest.mock('omelette', () => () => {
-    return {setupShellInitFile: mockSetupShellInitFile}
-  })
-  const {install} = require('./index')
-  return {install, mockSetupShellInitFile}
-}
diff --git a/src/bin-utils/index.js b/src/bin-utils/index.js
index b97df1d..5700ed5 100644
--- a/src/bin-utils/index.js
+++ b/src/bin-utils/index.js
@@ -1,15 +1,12 @@
 import {resolve} from 'path'
 import {readFileSync} from 'fs'
-import {remove, includes, isPlainObject, isUndefined, isEmpty, isFunction} from 'lodash'
+import {includes, isPlainObject, isUndefined, isFunction} from 'lodash'
 import typeOf from 'type-detect'
-import shellEscape from 'shell-escape'
 import chalk from 'chalk'
 import {safeLoad} from 'js-yaml'
-
 import getLogger from '../get-logger'
 import {resolveScriptObjectToScript} from '../resolve-script-object-to-string'
 import initialize from './initialize'
-import autocomplete, {install as installAutocomplete} from './autocomplete'
 
 const log = getLogger()
 
@@ -71,7 +68,7 @@ function loadConfig(configPath, input) {
 }
 
 export {
-  getScriptsAndArgs, initialize, help, autocomplete, installAutocomplete,
+  initialize, help,
   getModuleRequirePath, preloadModule, loadConfig,
 }
 
@@ -93,32 +90,6 @@ function loadYAMLConfig(configPath) {
   }
 }
 
-function getScriptsAndArgs(program) {
-  let scripts = []
-  let args = ''
-  const {rawArgs} = program
-  if (!isEmpty(program.args)) {
-    const [scriptsString] = program.args
-    scripts = scriptsString.split(',')
-    remove(rawArgs, arg => arg === scriptsString)
-    args = getArgs(program.args.slice(1), rawArgs, scripts)
-  }
-  return {scripts, args}
-}
-
-function getArgs(args, rawArgs, scripts) {
-  const allArgs = rawArgs.slice(2)
-  const psArgs = ['-c', '--config', '-r', '--require']
-  const psFlags = ['-s', '--silent']
-  const cleanedArgs = remove(allArgs, (item, index, array) => {
-    const isArgOrFlag = includes(psArgs, item) || includes(psFlags, item)
-    const isArgValue = includes(psArgs, array[index - 1])
-    const isInScripts = includes(scripts, item)
-    return !isArgOrFlag && !isArgValue && !isInScripts
-  })
-  return shellEscape(cleanedArgs)
-}
-
 /**
  * Determines the proper require path for a module. If the path starts with `.` then it is resolved with process.cwd()
  * @param  {String} moduleName The module path
diff --git a/src/bin-utils/index.test.js b/src/bin-utils/index.test.js
index 223f159..cb76103 100644
--- a/src/bin-utils/index.test.js
+++ b/src/bin-utils/index.test.js
@@ -2,42 +2,7 @@
 import path from 'path'
 import chalk from 'chalk'
 import {spy} from 'sinon'
-import {getScriptsAndArgs, help, preloadModule, loadConfig} from './index'
-
-test('getScriptsAndArgs: gets scripts', () => {
-  const {scripts} = getScriptsAndArgs({
-    args: ['boo'],
-    rawArgs: ['node', 'p-s', 'boo'],
-  })
-  expect(scripts).toEqual(['boo'])
-})
-
-test('getScriptsAndArgs: gets scripts in series', () => {
-  const {scripts, args} = getScriptsAndArgs({
-    args: ['boo,bar'],
-    rawArgs: ['node', 'p-s', 'boo,bar'],
-  })
-  expect(scripts).toEqual(['boo', 'bar'])
-  expect(args).toEqual('')
-})
-
-test('getScriptsAndArgs: passes args to scripts', () => {
-  const {args, scripts} = getScriptsAndArgs({
-    args: ['boo'],
-    rawArgs: ['node', 'p-s', 'boo', '--watch', '--verbose'],
-  })
-  expect(scripts).toEqual(['boo'])
-  expect(args).toBe('--watch --verbose')
-})
-
-test('getScriptsAndArgs: returns empty scripts and args if no args', () => {
-  const {args, scripts} = getScriptsAndArgs({
-    args: [],
-    rawArgs: ['node', 'p-s'],
-  })
-  expect(scripts.length).toBe(0)
-  expect(args).toBe('')
-})
+import {help, preloadModule, loadConfig} from './index'
 
 test('preloadModule: resolves a relative path', () => {
   // this is relative to process.cwd() I think...
diff --git a/src/bin-utils/parser.js b/src/bin-utils/parser.js
new file mode 100644
index 0000000..90137cb
--- /dev/null
+++ b/src/bin-utils/parser.js
@@ -0,0 +1,197 @@
+import findUp from 'find-up'
+import yargs from 'yargs/yargs'
+import chalk from 'chalk'
+import {keyInYN} from 'readline-sync'
+import {includes, isEqual} from 'lodash'
+import getLogger from '../get-logger'
+import {preloadModule, loadConfig, initialize, help} from '../bin-utils'
+import getCompletionScripts from './autocomplete-get-scripts'
+
+const log = getLogger()
+export default parse
+
+function parse(rawArgv) {
+  let commandExecuted = false
+
+  const configOption = {
+    describe: 'Config file to use (defaults to nearest package-scripts.yml or package-scripts.js)',
+    alias: 'c',
+    default: getPSConfigFilepath(),
+  }
+
+  const baseOptions = {
+    config: configOption,
+    silent: {
+      describe: 'Silent nps output',
+      alias: 's',
+      type: 'boolean',
+      default: false,
+    },
+    'log-level': {
+      describe: 'The log level to use',
+      choices: ['error', 'warn', 'info', 'debug'],
+      alias: 'l',
+      default: 'info',
+    },
+    require: {
+      describe: 'Module to preload',
+      alias: 'r',
+      default: undefined,
+    },
+  }
+
+  const yargsInstance = yargs(rawArgv)
+
+  const parser = yargsInstance
+    .usage('Usage: $0 [options] <script>...')
+    .example('$0 test build', 'Runs the `test` script then the `build` script')
+    .example(
+      '$0 "test --cover" "build --prod"',
+      'Runs the `test` script and forwards the "--cover" flag then the `build` script and forwards the "--prod" flag',
+    )
+    .help(false)
+    .alias('h', 'help')
+    .version()
+    .alias('v', 'version')
+    .options(baseOptions)
+    .command(...getInitCommand())
+    .completion('completion', completionHandler)
+    .exitProcess(shouldExitProcess())
+
+  const parsedArgv = parser.parse(rawArgv)
+
+  if (commandExecuted) {
+    return undefined
+  }
+
+  const invalidFlags = getInvalidFlags()
+  if (invalidFlags.length) {
+    log.error({
+      message: chalk.red(
+        `You provided one or more invalid flags: ${invalidFlags.join(', ')}\n` +
+        'Did you forget to put your command in quotes?',
+      ),
+      ref: 'invalid-flags',
+    })
+    throw new Error(`invalid flag(s) passed: ${invalidFlags}`)
+  }
+
+  const psConfig = getPSConfig(parsedArgv)
+
+  if (!psConfig) {
+    return undefined
+  }
+
+  if (showHelp(parsedArgv._)) {
+    return undefined
+  }
+
+  return {argv: parsedArgv, psConfig}
+
+
+  // util functions
+
+
+  function showHelp(specifiedScripts) {
+    if (parsedArgv.help) {
+      // if --help was specified, then yargs will show the default help
+      log.info(help(psConfig))
+      return true
+    }
+    const hasDefaultScript = Boolean(psConfig.scripts.default)
+    const noScriptSpecifiedAndNoDefault = !specifiedScripts.length && !hasDefaultScript
+    const hasHelpScript = Boolean(psConfig.scripts.help)
+    const commandIsHelp = isEqual(specifiedScripts, ['help']) && !hasHelpScript
+    if (commandIsHelp || noScriptSpecifiedAndNoDefault) {
+      parser.showHelp('log')
+      log.info(help(psConfig))
+      return true
+    }
+    return false
+  }
+
+  function getInitCommand() {
+    const command = 'init'
+    const description = 'automatically migrate from npm scripts to p-s'
+    return [command, description, getConfig, onInit]
+
+    function getConfig(initYargs) {
+      return initYargs
+        .usage('Usage: $0 init [options]')
+        .options({
+          config: configOption,
+          type: {
+            describe: 'The type of config to generate',
+            choices: ['js', 'yml'],
+            default: 'js',
+          },
+        })
+    }
+
+    function onInit(initArgv) {
+      commandExecuted = true
+      const path = getPSConfigFilepath(initArgv)
+      const fileExists = Boolean(findUp.sync(path))
+      if (fileExists) {
+        if (!keyInYN(chalk.yellow(`Do you want to overwrite your existing config file?`))) {
+          log.info(chalk.yellow(`Exiting. Please specify a different config file to use on init.`))
+          return
+        }
+      }
+      const {packageScriptsPath} = initialize(initArgv.type)
+      log.info(`Your scripts have been saved at ${chalk.green(packageScriptsPath)}`)
+      log.info(chalk.gray(
+        'Check out your scripts in there. Go ahead and update them and add descriptions to the ones that need it',
+      ))
+      log.info(chalk.gray('Your package.json scripts have also been updated. Run `npm start help` for help'))
+      log.info(chalk.gray(
+        'You may also want to install the package globally and installing autocomplete script. You can do so by running\n' +
+        '  npm install --global p-s\n' +
+        '  nps completion >> <your-bash-profile-file>',
+      ))
+    }
+  }
+
+  /* istanbul ignore next */
+  function completionHandler(currentInput, currentArgv) {
+    commandExecuted = true
+    const {scripts} = getPSConfig(currentArgv) || {}
+    if (scripts) {
+      return getCompletionScripts(scripts, currentInput)
+    }
+    return []
+  }
+
+  function getInvalidFlags() {
+    const customFlags = Object.keys(yargsInstance.getOptions().default)
+    const allowedFlags = [...customFlags, 'v', 'version', 'h', 'help', '$0', '_']
+    return Object.keys(parsedArgv).filter(key => !includes(allowedFlags, key))
+  }
+
+  function getPSConfigFilepath({config} = {}) {
+    if (config) {
+      return config
+    }
+    return findUp.sync('package-scripts.js') || findUp.sync('package-scripts.yml')
+  }
+}
+
+
+function getPSConfig(parsedArgv) {
+  if (parsedArgv.require) {
+    preloadModule(parsedArgv.require)
+  }
+  const configFilepath = parsedArgv.config
+  if (!configFilepath) {
+    log.warn({
+      message: chalk.yellow('Unable to find a config file and none was specified.'),
+      ref: 'unable-to-find-config',
+    })
+    return undefined
+  }
+  return loadConfig(configFilepath, parsedArgv._)
+}
+
+function shouldExitProcess(rawArgv) {
+  return !(isEqual(rawArgv, ['-h']) || isEqual(rawArgv, ['--help']))
+}
diff --git a/src/bin-utils/parser.test.js b/src/bin-utils/parser.test.js
new file mode 100644
index 0000000..15a3133
--- /dev/null
+++ b/src/bin-utils/parser.test.js
@@ -0,0 +1,186 @@
+/* eslint import/namespace:0 */
+import mockFindUp from 'find-up'
+import mockReadLine from 'readline-sync'
+import * as mockBinUtils from '../bin-utils'
+import mockGetLogger from '../get-logger'
+import parse from './parser'
+
+jest.mock('console')
+jest.mock('../get-logger')
+jest.mock('../bin-utils', () => {
+  const defaultPsConfig = {scripts: {}, options: {}, isMock: true}
+  const mockUtils = {
+    preloadModule: jest.fn(),
+    loadConfig: jest.fn(() => {
+      const {psConfig: config} = mockUtils.mock
+      if (typeof config !== 'undefined') {
+        mockUtils.mock.psConfig = undefined
+        return config
+      }
+      return defaultPsConfig
+    }),
+    initialize: jest.fn(() => {
+      return {
+        packageScriptsPath: '/path/to/package-scripts.js',
+        packageJsonPath: '/path/to/package.json',
+      }
+    }),
+    help: jest.fn(),
+    clearAll,
+    mock: {},
+  }
+
+  return mockUtils
+
+  function clearAll() {
+    Object.keys(mockUtils).forEach(key => {
+      mockUtils[key].mock && mockUtils[key].mockClear()
+    })
+  }
+})
+
+jest.mock('yargs/lib/usage', () => {
+  const usage = require.requireActual('yargs/lib/usage')
+  function mockUsage(...args) {
+    const actualUsage = usage(...args)
+    return Object.assign(actualUsage, {
+      showVersion: jest.fn(),
+    })
+  }
+  return mockUsage
+})
+
+jest.mock('yargs/yargs', () => {
+  const yargs = require.requireActual('yargs/yargs')
+
+  return mockYargs
+
+  function mockYargs(...args) {
+    const realArgv = yargs(...args)
+    const mockArgv = Object.assign(realArgv, {
+      showHelp: jest.fn(),
+      exit: jest.fn(),
+    })
+    return mockArgv
+  }
+})
+
+const valid = [
+  '',
+  '--help',
+  '-h',
+  '--version',
+  '-v',
+  '--silent',
+  '-s',
+  '--config foo',
+  '-c foo',
+  '--log-level info',
+  '-l warn',
+  '--require hey',
+  '-r sup',
+]
+
+const invalid = [
+  '--foo bar',
+  '--baz',
+  '-b',
+]
+
+beforeEach(() => {
+  jest.resetModules()
+  mockGetLogger.clearAll()
+  mockBinUtils.clearAll()
+  mockReadLine.keyInYN.mockClear()
+})
+
+valid.forEach(argvString => {
+  test(`${argvString} is valid`, () => {
+    expect(() => parse(argvString)).not.toThrow()
+  })
+})
+
+invalid.forEach(argvString => {
+  test(`${argvString} is invalid`, () => {
+    expect(() => parse(argvString)).toThrow(/invalid flag\(s\) passed/)
+    expect(mockGetLogger.mock.error).toHaveBeenCalledTimes(1)
+    expect(mockGetLogger.mock.error).toHaveBeenCalledWith(expect.objectContaining({
+      message: expect.stringMatching('invalid flag'),
+      ref: 'invalid-flags',
+    }))
+  })
+})
+
+test('happy path', () => {
+  const {argv, psConfig} = parse('"build --fast"')
+  expect(mockBinUtils.loadConfig).toHaveBeenCalledTimes(1)
+  expect(psConfig.isMock).toBe(true)
+  expect(argv).toMatchObject({_: ['build --fast']})
+})
+
+test('no psConfig found', () => {
+  mockBinUtils.mock.psConfig = null
+  expect(parse('"build --fast"')).toBe(undefined)
+})
+
+test('no config filepath found', () => {
+  mockFindUp.mock.syncReturn = undefined
+  expect(parse('"build --fast"')).toBe(undefined)
+  expect(mockGetLogger.mock.warn).toHaveBeenCalledTimes(1)
+  expect(mockGetLogger.mock.warn).toHaveBeenCalledWith(expect.objectContaining({
+    message: expect.stringMatching(/find.*config file/i),
+    ref: 'unable-to-find-config',
+  }))
+  delete mockFindUp.mock.syncReturn
+})
+
+test('init with an existing config will prompt for overriding which will do nothing if `no` is the response', () => {
+  mockReadLine.mock.keyInYNReturn = false
+  mockFindUp.mock.syncReturn = '/some/path/to/things'
+
+  const result = parse('init --config foo.js')
+  expect(result).toBe(undefined)
+  expect(mockReadLine.keyInYN).toHaveBeenCalledTimes(1)
+  expect(mockReadLine.keyInYN).toHaveBeenCalledWith(expect.stringMatching(/overwrite.*file/))
+  expect(mockGetLogger.mock.info).toHaveBeenCalledTimes(1)
+  expect(mockGetLogger.mock.info).toHaveBeenCalledWith(expect.stringMatching(/Exiting.*different/))
+
+  delete mockReadLine.mock.keyInYNReturn
+  delete mockFindUp.mock.syncReturn
+})
+
+test('init with an existing config will prompt for overriding which will initialize if `yes` is the response', () => {
+  mockReadLine.mock.keyInYNReturn = true
+  mockFindUp.mock.syncReturn = '/some/path/to/things'
+
+  const result = parse('init foo.js')
+  expect(result).toBe(undefined)
+  expect(mockGetLogger.mock.info).toHaveBeenCalledWith(expect.stringMatching(/saved/))
+
+  delete mockReadLine.mock.keyInYNReturn
+  delete mockFindUp.mock.syncReturn
+})
+
+test('init without an existing config will initialize package-scripts.js', () => {
+  mockFindUp.mock.syncReturn = null
+  const result = parse('init')
+  expect(result).toBe(undefined)
+  expect(mockReadLine.keyInYN).toHaveBeenCalledTimes(0)
+  expect(mockGetLogger.mock.info).toHaveBeenCalledWith(expect.stringMatching(/saved/))
+
+  delete mockReadLine.mock.keyInYNReturn
+  delete mockFindUp.mock.syncReturn
+})
+
+test('if there is a help script in the psConfig, does not show the help', () => {
+  mockBinUtils.mock.psConfig = {scripts: {help: 'hi'}}
+  expect(parse('help')).not.toBe(undefined)
+  expect(mockGetLogger.mock.info).toHaveBeenCalledTimes(0)
+})
+
+// https://github.com/yargs/yargs/issues/782
+// we can't test this functionality reasonably with unit tests
+// test('prompts for completions when --get-yargs-completions is specified', () => {
+//   const result = expect(parse('--get-yargs-completions f'))
+//   console.log(result)
+// })
diff --git a/src/bin/nps.js b/src/bin/nps.js
old mode 100644
new mode 100755
index 9976da2..b2b2859
--- a/src/bin/nps.js
+++ b/src/bin/nps.js
@@ -1,131 +1,30 @@
 #!/usr/bin/env node
-/* eslint no-process-exit: "off" */
-import findUp from 'find-up'
-import {merge, includes, indexOf} from 'lodash'
-import program from 'commander'
-import chalk from 'chalk'
-import {keyInYN} from 'readline-sync'
-import runPackageScript from '../index'
-import {
-  getScriptsAndArgs, initialize, autocomplete, installAutocomplete,
-  help, preloadModule, loadConfig,
-} from '../bin-utils'
-import getLogger from '../get-logger'
 
-const {version} = require('../../package.json')
+import {merge} from 'lodash'
+import getLogger, {getLogLevel} from '../get-logger'
+import runPackageScript from '../index'
+import parse from '../bin-utils/parser'
 
-const log = getLogger()
 const FAIL_CODE = 1
-let shouldRun = true
-const shouldAutocomplete = includes(process.argv, '--compbash')
-
-program
-  .version(version)
-  .allowUnknownOption()
-  .option('-s, --silent', 'Silent nps output')
-  .option('-c, --config <filepath>', 'Config file to use (defaults to nearest package-scripts.yml or package-scripts.js)')
-  .option('-l, --log-level <level>', 'The log level to use (error, warn, info [default])')
-  .option('-r, --require <module>', 'Module to preload')
-  .on('init', onInit)
-  .on('completion', onRequestToInstallCompletion)
-  .on('--help', onHelp)
-  .parse(process.argv)
+const {argv, psConfig} = parse(process.argv.slice(2)) || {}
 
-const scriptsAndArgs = getScriptsAndArgs(program)
-
-if (shouldAutocomplete) {
-  autocomplete(getPSConfig())
-} else if (shouldRun) {
-  const psConfig = getPSConfig()
-  const hasDefaultScript = !!psConfig.scripts.default
-  const hasHelpScript = !!psConfig.scripts.help
-  const scriptIsHelp = scriptsAndArgs.scripts[0] === 'help'
-  const scriptSpecified = scriptsAndArgs.scripts.length >= 1
-  if (!hasDefaultScript && !scriptSpecified) {
-    program.outputHelp()
-  } else if (!hasHelpScript && scriptIsHelp) { // eslint-disable-line no-negated-condition
-    program.outputHelp()
-  } else {
-    loadAndRun(psConfig)
-  }
-}
-
-function loadAndRun(psConfig) {
+if (argv && psConfig) {
   runPackageScript({
     scriptConfig: psConfig.scripts,
-    scripts: scriptsAndArgs.scripts,
-    args: scriptsAndArgs.args,
+    scripts: argv._,
     options: merge(psConfig.options, {
-      silent: program.silent,
-      logLevel: program.logLevel,
+      silent: argv.silent,
+      logLevel: argv.logLevel,
     }),
-  }).catch(error => {
+  }).then(() => {
+    // make this explicit
+    // because sometimes we can't explain
+    // everything about life that confuses us...
+    process.exitCode = 0
+  }, error => {
+    const logLevel = getLogLevel({silent: argv.silent, logLevel: argv.logLevel})
+    const log = getLogger(logLevel)
     log.error(error)
     process.exitCode = error.code || FAIL_CODE
   })
 }
-
-function getPSConfig() {
-  if (program.require) {
-    preloadModule(program.require)
-  }
-  const configFilepath = getPSConfigFilepath()
-  if (!configFilepath) {
-    log.warn(chalk.yellow('Unable to find a config file and none was specified.'))
-    return {scripts: {}} // empty config
-  }
-  const config = loadConfig(configFilepath, scriptsAndArgs)
-  if (!config) {
-    process.exit(FAIL_CODE)
-  }
-  return config
-}
-
-function getPSConfigFilepath() {
-  return program.config || findUp.sync('package-scripts.js') || findUp.sync('package-scripts.yml')
-}
-
-function onInit() {
-  if (getPSConfigFilepath()) {
-    if (!keyInYN(chalk.yellow(`Do you want to overwrite your existing config file?`))) {
-      process.exit(FAIL_CODE)
-    }
-  }
-  shouldRun = false
-  const {packageScriptsPath} = initialize(getConfigType())
-  log.info(`Your scripts have been saved at ${chalk.green(packageScriptsPath)}`)
-  log.info(chalk.gray(
-    'Check out your scripts in there. Go ahead and update them and add descriptions to the ones that need it',
-  ))
-  log.info(chalk.gray('Your package.json scripts have also been updated. Run `npm start help` for help'))
-  log.info(chalk.gray(
-    'You may also want to install the package globally and installing autocomplete script. You can do so by running\n' +
-    '  npm install --global p-s\n' +
-    '  nps completion <optionally-your-bash-profile-file>\n' +
-    'The bash profile file defaults to ~/.bash_profile for bash and ~/.zshrc for zsh',
-  ))
-}
-
-function getConfigType() {
-  return includes(process.argv, '--type') ? process.argv[indexOf(process.argv, '--type') + 1] : 'js'
-}
-
-function onHelp() {
-  shouldRun = false
-  log.info(help(getPSConfig()))
-}
-
-function onRequestToInstallCompletion() {
-  shouldRun = false
-  const [,,, destination] = process.argv
-  if (destination) {
-    log.info(`Installing p-s autocomplete into ${destination}`)
-  } else {
-    log.info('Installing p-s autocomplete into the default for your current terminal')
-  }
-  log.info(
-    `You're going to need to either resource that file, or open a new instance of ` +
-    'the terminal to get autocomplete to start working',
-  )
-  installAutocomplete(destination)
-}
diff --git a/src/get-logger.js b/src/get-logger.js
index d0885bd..148d1c4 100644
--- a/src/get-logger.js
+++ b/src/get-logger.js
@@ -1,16 +1,21 @@
 import console from 'console'
 import arrify from 'arrify'
-import {isPlainObject} from 'lodash'
+import {isPlainObject, includes} from 'lodash'
 
 const {version} = require('../package.json')
 
 const shouldLog = {
-  error: getShouldLogFn('error'),
-  warn: getShouldLogFn('warn', 'error'),
-  info: getShouldLogFn('info', 'warn', 'error'),
+  // fn called         logLevels
+  info: getShouldLogFn('', 'debug', 'info'),
+  warn: getShouldLogFn('', 'debug', 'info', 'warn'),
+  error: getShouldLogFn('', 'debug', 'info', 'warn', 'error'),
 }
 
+// eslint-disable-next-line func-style
+const getLogLevel = ({silent, logLevel}) => (silent ? 'disable' : logLevel)
+
 export default getLogger
+export {getLogLevel}
 
 function getLogger(logLevel) {
   return {
@@ -21,7 +26,7 @@ function getLogger(logLevel) {
 
   function getLogFn(name) {
     return function logFn(...args) {
-      if (shouldLog[name](logLevel || process.env.LOG_LEVEL)) {
+      if (shouldLog[name](process.env.LOG_LEVEL || logLevel)) {
         const message = getMessage(...args)
         console[name](...message) // eslint-disable-line no-console
       }
@@ -47,9 +52,8 @@ function getLink(ref) {
 }
 
 function getShouldLogFn(...acceptableValues) {
-  acceptableValues = ['', 'debug', ...acceptableValues]
   return function shouldLogWithLevel(logLevel = '') {
     logLevel = logLevel.toLowerCase()
-    return !logLevel || acceptableValues.some(v => logLevel === v)
+    return !logLevel || includes(acceptableValues, logLevel)
   }
 }
diff --git a/src/get-logger.test.js b/src/get-logger.test.js
index f86de40..eb64ca1 100644
--- a/src/get-logger.test.js
+++ b/src/get-logger.test.js
@@ -1,75 +1,80 @@
 /* eslint import/newline-after-import:0 global-require:0 */
-import {spy} from 'sinon'
+import console from 'console'
+import getLogger, {getLogLevel} from './get-logger'
+
+jest.mock('console')
+
+beforeEach(() => {
+  delete process.env.LOG_LEVEL
+  Object.keys(console).forEach(fn => {
+    console[fn].mock && console[fn].mockClear()
+  })
+})
 
 test('allows you to log errors', () => {
-  const {log, console: {error}} = setup()
+  const log = getLogger()
   log.error('hello', 'world')
-  expect(error.calledOnce)
-  expect(error.calledWith('hello', 'world'))
+  expect(console.error).toHaveBeenCalledTimes(1)
+  expect(console.error).toHaveBeenCalledWith('hello', 'world')
 })
 
 test('allows you to log warnings', () => {
-  const {log, console: {warn}} = setup()
+  const log = getLogger()
   log.warn('hello', 'world')
-  expect(warn.calledOnce)
-  expect(warn.calledWith('hello', 'world'))
+  expect(console.warn).toHaveBeenCalledTimes(1)
+  expect(console.warn).toHaveBeenCalledWith('hello', 'world')
 })
 
 test('allows you to log warnings/errors with a ref', () => {
-  const {log, console: {warn}} = setup()
+  const log = getLogger()
   const message = [`Han Solo is Kylo Ren's dad`, '😱']
   log.warn({
     message,
     ref: 'han-solo',
   }, 'this is extra', 'stuff')
-  expect(warn.calledOnce)
-  expect(warn.calledWith(
+  expect(console.warn).toHaveBeenCalledTimes(1)
+  expect(console.warn).toHaveBeenCalledWith(
     ...message,
     'https://github.com/kentcdodds/p-s/blob/v0.0.0-semantically-released/other/ERRORS_AND_WARNINGS.md#han-solo',
     'this is extra',
     'stuff',
-  ))
+  )
 })
 
 test('allows you to disable warnings', () => {
   const {LOG_LEVEL} = process.env
   process.env.LOG_LEVEL = 'disable'
-  const {log, console: {warn}} = setup()
+  const log = getLogger()
   log.warn('hi')
-  expect(warn.called).toBe(false)
+  expect(console.warn).not.toHaveBeenCalled()
   process.env.LOG_LEVEL = LOG_LEVEL
 })
 
 test('allows you to disable errors', () => {
   const {LOG_LEVEL} = process.env
   process.env.LOG_LEVEL = 'disable'
-  const {log, console: {error}} = setup()
+  const log = getLogger()
   log.error('hi')
-  expect(error.called).toBe(false)
+  expect(console.error).not.toHaveBeenCalled()
   process.env.LOG_LEVEL = LOG_LEVEL
 })
 
 test('allows you to specify a logLevel of your own for errors/warnings/info', () => {
   const logLevel = 'info'
-  const {log, console: {info}} = setup({logLevel})
+  const log = getLogger(logLevel)
   log.info('sup')
-  expect(info.calledOnce)
-  expect(info.calledWith('sup'))
+  expect(console.info).toHaveBeenCalledTimes(1)
+  expect(console.info).toHaveBeenCalledWith('sup')
 })
 
-function setup({mockConsole, logLevel} = {}) {
-  mockConsole = getConsoleStub(mockConsole)
-  jest.resetModules()
-  jest.mock('console', () => mockConsole)
-  const getLogger = require('./get-logger').default
-  return {console: mockConsole, log: getLogger(logLevel)}
-}
+test('getLogLevel: returns disable if silent', () => {
+  expect(getLogLevel({silent: true})).toBe('disable')
+})
 
-function getConsoleStub(overrides = {}) {
-  return {
-    error: spy(),
-    warn: spy(),
-    info: spy(),
-    ...overrides,
-  }
-}
+test('getLogLevel: returns the log level if not silent', () => {
+  expect(getLogLevel({logLevel: 'info'})).toBe('info')
+})
+
+test('getLogLevel: returns undefined if no logLevel and no silent', () => {
+  expect(getLogLevel({})).toBe(undefined)
+})
diff --git a/src/index.js b/src/index.js
index be95e3d..528ac5e 100644
--- a/src/index.js
+++ b/src/index.js
@@ -6,48 +6,49 @@ import managePath from 'manage-path'
 import arrify from 'arrify'
 import getScriptToRun from './get-script-to-run'
 import getScriptsFromConfig from './get-scripts-from-config'
-import getLogger from './get-logger'
+import getLogger, {getLogLevel} from './get-logger'
 
 const NON_ERROR = 0
 
 export default runPackageScripts
 
-function runPackageScripts({scriptConfig, scripts, args, options = {}}) {
+function runPackageScripts({scriptConfig, scripts, options = {}}) {
   if (scripts.length === 0) {
     scripts = ['default']
   }
   const scriptNames = arrify(scripts)
 
-  return scriptNames.reduce((res, scriptName) => {
+  return scriptNames.reduce((res, input) => {
     return res.then(() => (
-      runPackageScript({scriptConfig, options, scriptName, args})
+      runPackageScript({scriptConfig, options, input})
     ))
   }, Promise.resolve())
 }
 
 
-function runPackageScript({scriptConfig, options, scriptName, args}) {
-  const scripts = getScriptsFromConfig(scriptConfig, scriptName)
-  const script = getScriptToRun(scripts, scriptName)
+function runPackageScript({scriptConfig, options, input}) {
+  const [scriptPrefix, ...args] = input.split(' ')
+  const scripts = getScriptsFromConfig(scriptConfig, scriptPrefix)
+  const script = getScriptToRun(scripts, scriptPrefix)
   if (!isString(script)) {
     return Promise.reject({
       message: chalk.red(
-        `Scripts must resolve to strings. There is no script that can be resolved from "${scriptName}"`,
+        `Scripts must resolve to strings. There is no script that can be resolved from "${scriptPrefix}"`,
       ),
       ref: 'missing-script',
     })
   }
-  const command = [script, args].join(' ').trim()
+  const command = [script, ...args].join(' ').trim()
   const log = getLogger(getLogLevel(options))
   log.info(chalk.gray('nps executing: ') + chalk.green(command))
   let child
-  const promise = new Promise((resolve, reject) => {
+  return new Promise((resolve, reject) => {
     child = spawn(command, {stdio: 'inherit', env: getEnv()})
 
     child.on('error', error => {
       reject({
         message: chalk.red(
-          `The script called "${scriptName}" which runs "${command}" emitted an error`,
+          `The script called "${scriptPrefix}" which runs "${command}" emitted an error`,
         ),
         ref: 'emitted-an-error',
         error,
@@ -60,7 +61,7 @@ function runPackageScript({scriptConfig, options, scriptName, args}) {
       } else {
         reject({
           message: chalk.red(
-            `The script called "${scriptName}" which runs "${command}" failed with exit code ${code}`,
+            `The script called "${scriptPrefix}" which runs "${command}" failed with exit code ${code}`,
           ),
           ref: 'failed-with-exit-code',
           code,
@@ -68,18 +69,6 @@ function runPackageScript({scriptConfig, options, scriptName, args}) {
       }
     })
   })
-
-  return promise
-}
-
-function getLogLevel({silent, logLevel}) {
-  if (logLevel) {
-    return logLevel
-  } else if (silent) {
-    return 'disable'
-  } else {
-    return undefined
-  }
 }
 
 function getEnv() {
diff --git a/src/index.test.js b/src/index.test.js
index 2f88b24..628c7f5 100644
--- a/src/index.test.js
+++ b/src/index.test.js
@@ -60,25 +60,14 @@ test('options: logLevel sets the log level', () => {
   })
 })
 
-test('passes on additional arguments', () => {
-  const lintCommand = 'eslint'
-  const argsToPassOn = 'src/ scripts/'
-  return testSpawnCall({lint: lintCommand}, 'lint', {}, argsToPassOn).then(({command}) => {
-    expect(command).toBe(`${lintCommand} ${argsToPassOn}`)
-  })
-})
-
 test('runs scripts serially if given an array of input', () => {
   const lintCommand = 'eslint'
   const buildCommand = 'babel'
-  const args = 'src/ scripts/'
-  const resolveSpy = spy(Promise, 'resolve')
   const {runPackageScript, mockSpawnStubSpy} = setup()
-  const scripts = ['lint', 'build']
+  const scripts = ['lint src/ scripts/', 'build src/ scripts/']
   const scriptConfig = {build: buildCommand, lint: lintCommand}
   const options = {}
-  runPackageScript({scriptConfig, scripts, args, options}).then(() => {
-    expect(resolveSpy.calledOnce)
+  runPackageScript({scriptConfig, scripts, options}).then(() => {
     expect(mockSpawnStubSpy.calledTwice)
     const [command1] = mockSpawnStubSpy.firstCall.args
     const [command2] = mockSpawnStubSpy.secondCall.args
@@ -168,12 +157,12 @@ test('an error from the child process logs an error', () => {
 // util functions
 
 function testSpawnCallWithDefaults(options) {
-  return testSpawnCall(undefined, undefined, options, undefined)
+  return testSpawnCall(undefined, undefined, options)
 }
-function testSpawnCall(scriptConfig = {build: 'webpack'}, scripts = 'build', psOptions, args) {
+function testSpawnCall(scriptConfig = {build: 'webpack'}, scripts = 'build', psOptions) {
   /* eslint max-params:[2, 6] */ // TODO: refactor
   const {runPackageScript, mockSpawnStubSpy, ...otherRet} = setup()
-  return runPackageScript({scriptConfig, options: psOptions, scripts, args})
+  return runPackageScript({scriptConfig, options: psOptions, scripts})
     .then(result => {
       expect(mockSpawnStubSpy.calledOnce)
       const [command, options] = mockSpawnStubSpy.firstCall.args
@@ -195,6 +184,7 @@ function setup(mockSpawnStubSpy) {
   const spawnStub = () => ({on: onSpy, kill: killSpy}) // eslint-disable-line func-style
   const infoSpy = spy()
   const mockGetLogger = spy(() => ({info: infoSpy}))
+  mockGetLogger.getLogLevel = () => 'info'
   mockSpawnStubSpy = mockSpawnStubSpy || spy(spawnStub)
   jest.resetModules()
   jest.mock('spawn-command-with-kill', () => mockSpawnStubSpy)
diff --git a/test/jest.src.config.json b/test/jest.src.config.json
index da65fff..1dd2bbd 100644
--- a/test/jest.src.config.json
+++ b/test/jest.src.config.json
@@ -3,6 +3,7 @@
     "<rootDir>/src"
   ],
   "testEnvironment": "jest-environment-node",
+  "coveragePathIgnorePatterns": ["/node_modules/", "/fixtures/", "/helpers/"],
   "coverageThreshold": {
     "global": {
       "branches": 100,
diff --git a/yarn.lock b/yarn.lock
index c4f9db5..47b2509 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -145,8 +145,8 @@ append-transform@^0.4.0:
     default-require-extensions "^1.0.0"
 
 aproba@^1.0.3:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.1.0.tgz#4d8f047a318604e18e3c06a0e52230d3d19f147b"
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.1.1.tgz#95d3600f07710aa0e9298c726ad5ecf2eacbabab"
 
 are-we-there-yet@~1.0.0:
   version "1.0.6"
@@ -936,10 +936,6 @@ block-stream@*:
   dependencies:
     inherits "~2.0.0"
 
-bluebird@2.9.6:
-  version "2.9.6"
-  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-2.9.6.tgz#1fc3a6b1685267dc121b5ec89b32ce069d81ab7d"
-
 bluebird@3.4.7, bluebird@^3.4.1, bluebird@^3.4.6:
   version "3.4.7"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.4.7.tgz#f72d760be09b7f76d08ed8fae98b289a8d05fab3"
@@ -1311,17 +1307,17 @@ concat-stream@^1.4.6, concat-stream@^1.4.7, concat-stream@^1.5.2:
     readable-stream "^2.2.2"
     typedarray "^0.0.6"
 
-concurrently@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/concurrently/-/concurrently-3.1.0.tgz#dc5ef0459090012604756668894c04b434ef90d1"
+concurrently@^3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/concurrently/-/concurrently-3.3.0.tgz#d8eb7a9765fdf0b28d12220dc058e14d03c7dd4f"
   dependencies:
-    bluebird "2.9.6"
     chalk "0.5.1"
     commander "2.6.0"
+    date-fns "^1.23.0"
     lodash "^4.5.1"
-    moment "^2.11.2"
     rx "2.3.24"
-    spawn-default-shell "^1.1.0"
+    spawn-command "^0.0.2-1"
+    supports-color "^3.2.3"
     tree-kill "^1.1.0"
 
 condition-node-version@^1.3.0:
@@ -1494,6 +1490,10 @@ dashdash@^1.12.0:
   dependencies:
     assert-plus "^1.0.0"
 
+date-fns@^1.23.0:
+  version "1.27.2"
+  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-1.27.2.tgz#ce82f420bc028356cc661fc55c0494a56a990c9c"
+
 date-now@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b"
@@ -2174,7 +2174,7 @@ from@~0:
 
 fs-exists-sync@^0.1.0:
   version "0.1.0"
-  resolved "https://registry.yarnpkg.com/fs-exists-sync/-/fs-exists-sync-0.1.0.tgz#982d6893af918e72d08dec9e8673ff2b5a8d6add"
+  resolved "http://registry.npmjs.org/fs-exists-sync/-/fs-exists-sync-0.1.0.tgz#982d6893af918e72d08dec9e8673ff2b5a8d6add"
 
 fs-extra@^1.0.0:
   version "1.0.0"
@@ -3491,10 +3491,6 @@ minimist@1.2.0, minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0:
   dependencies:
     minimist "0.0.8"
 
-moment@^2.11.2:
-  version "2.17.1"
-  resolved "https://registry.yarnpkg.com/moment/-/moment-2.17.1.tgz#fed9506063f36b10f066c8b59a144d7faebe1d82"
-
 ms@0.7.1:
   version "0.7.1"
   resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.1.tgz#9cd13c03adbff25b65effde7ce864ee952017098"
@@ -3742,7 +3738,7 @@ object.omit@^2.0.0:
     for-own "^0.1.4"
     is-extendable "^0.1.1"
 
-omelette@0.3.1, omelette@^0.3.1:
+omelette@0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/omelette/-/omelette-0.3.1.tgz#73e26defe0cfd7e93497db60da758bec201087b6"
 
@@ -4508,7 +4504,7 @@ sha.js@^2.3.6:
   dependencies:
     inherits "^2.0.1"
 
-shell-escape@0.2.0, shell-escape@^0.2.0:
+shell-escape@0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/shell-escape/-/shell-escape-0.2.0.tgz#68fd025eb0490b4f567a027f0bf22480b5f84133"
 
@@ -4596,10 +4592,6 @@ spawn-command@^0.0.2-1:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/spawn-command/-/spawn-command-0.0.2.tgz#9544e1a43ca045f8531aac1a48cb29bdae62338e"
 
-spawn-default-shell@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/spawn-default-shell/-/spawn-default-shell-1.1.0.tgz#095439d44c4b7c0aff56a53929fbaab87878e7c6"
-
 spawn-sync@^1.0.15:
   version "1.0.15"
   resolved "https://registry.yarnpkg.com/spawn-sync/-/spawn-sync-1.0.15.tgz#b00799557eb7fb0c8376c29d44e8a1ea67e57476"
@@ -4752,7 +4744,7 @@ supports-color@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
 
-supports-color@^3.1.0, supports-color@^3.1.2:
+supports-color@^3.1.0, supports-color@^3.1.2, supports-color@^3.2.3:
   version "3.2.3"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6"
   dependencies:
@@ -4946,7 +4938,7 @@ uid-number@~0.0.6:
 
 unc-path-regex@^0.1.0:
   version "0.1.2"
-  resolved "http://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa"
+  resolved "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa"
 
 underscore.string@~2.2.0rc:
   version "2.2.1"
@@ -5200,7 +5192,7 @@ yargs@^4.7.0:
     y18n "^3.2.1"
     yargs-parser "^2.4.1"
 
-yargs@^6.3.0:
+yargs@^6.3.0, yargs@^6.6.0:
   version "6.6.0"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-6.6.0.tgz#782ec21ef403345f830a808ca3d513af56065208"
   dependencies: