yargs 3.14.0 → 3.15.0

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## Change Log
 
+### v3.15.0 (2015/07/06 06:01 +00:00)
+- [#197](https://github.com/bcoe/yargs/pull/197) tweaks to how errors bubble up from parser.js (@bcoe)
+- [#193](https://github.com/bcoe/yargs/pull/193) upgraded nyc, reporting now happens by default (@bcoe)
+
 ### v3.14.0 (2015/06/28 02:12 +00:00)
 
 - [#192](https://github.com/bcoe/yargs/pull/192) standard style nits (@bcoe)

package/index.js

@@ -476,6 +476,8 @@ function Argv (processArgs, cwd) {
       }
     })
 
+    if (parsed.error) throw parsed.error
+
     // if we're executed via bash completion, don't
     // bother with validation.
     if (!argv[completion.completionKey]) {

package/lib/parser.js

@@ -9,6 +9,8 @@ function increment (orig) {
 
 module.exports = function (args, opts) {
   if (!opts) opts = {}
+
+  var error = null
   var flags = { arrays: {}, bools: {}, strings: {}, counts: {}, normalize: {}, configs: {} }
 
   ;[].concat(opts['array']).filter(Boolean).forEach(function (key) {
@@ -232,7 +234,7 @@ module.exports = function (args, opts) {
   function eatNargs (i, key, args) {
     var toEat = checkAllAliases(key, opts.narg)
 
-    if (args.length - (i + 1) < toEat) throw Error('not enough arguments following: ' + key)
+    if (args.length - (i + 1) < toEat) error = Error('not enough arguments following: ' + key)
 
     for (var ii = i + 1; ii < (toEat + i + 1); ii++) {
       setArg(key, args[ii])
@@ -331,7 +333,7 @@ module.exports = function (args, opts) {
             }
           })
         } catch (ex) {
-          throw Error('invalid json config file: ' + configPath)
+          if (argv[configKey]) error = Error('invalid json config file: ' + configPath)
         }
       }
     })
@@ -443,6 +445,7 @@ module.exports = function (args, opts) {
   return {
     argv: argv,
     aliases: aliases,
+    error: error,
     newAliases: newAliases
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yargs",
-  "version": "3.14.0",
+  "version": "3.15.0",
   "description": "Light-weight option parsing with an argv hash. No optstrings attached.",
   "main": "./index.js",
   "files": [
@@ -20,11 +20,11 @@
     "coveralls": "^2.11.2",
     "hashish": "0.0.4",
     "mocha": "^2.2.1",
-    "nyc": "^2.2.1",
+    "nyc": "^3.0.0",
     "standard": "^4.4.0"
   },
   "scripts": {
-    "test": "standard && nyc mocha --check-leaks && nyc report",
+    "test": "standard && nyc mocha --check-leaks",
     "coverage": "nyc report --reporter=text-lcov | coveralls"
   },
   "repository": {