yargs 3.26.0 → 3.27.0

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 ## Change Log
 
+### v3.26.0 (2015/09/25 2:14 +00:00)
+
+- [#263](https://github.com/bcoe/yargs/pull/263) document count() and option() object keys (@nexdrew)
+- [#259](https://github.com/bcoe/yargs/pull/259) remove util in readme (@38elements)
+- [#258](https://github.com/bcoe/yargs/pull/258) node v4 builds, update deps (@nexdrew)
+- [#257](https://github.com/bcoe/yargs/pull/257) fix spelling errors (@dkoleary88)
+
 ### v3.25.0 (2015/09/13 7:38 -07:00)
 
 - [#254](https://github.com/bcoe/yargs/pull/254) adds Japanese translation (@oti)

package/README.md

@@ -721,6 +721,7 @@ Locales currently supported:
 * **fr:** French.
 * **ja:** Japanese.
 * **pt:** Portuguese.
+* **zh:** Chinese.
 * **pirate:** American Pirate.
 
 To submit a new translation for yargs:

package/index.js

@@ -511,13 +511,16 @@ function Argv (processArgs, cwd) {
       return
     }
 
+    var helpOrVersion = false
     Object.keys(argv).forEach(function (key) {
       if (key === helpOpt && argv[key]) {
+        helpOrVersion = true
         self.showHelp('log')
         if (exitProcess) {
           process.exit(0)
         }
       } else if (key === versionOpt && argv[key]) {
+        helpOrVersion = true
         usage.showVersion()
         if (exitProcess) {
           process.exit(0)
@@ -525,18 +528,22 @@ 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]) {
-      validation.nonOptionCount(argv)
-      validation.missingArgumentValue(argv)
-      validation.requiredArguments(argv)
-      if (strict) validation.unknownArguments(argv, aliases)
-      validation.customChecks(argv, aliases)
-      validation.limitedChoices(argv)
-      validation.implications(argv)
+    // If the help or version options where used and exitProcess is false,
+    // we won't run validations
+    if (!helpOrVersion) {
+      if (parsed.error) throw parsed.error
+
+      // if we're executed via bash completion, don't
+      // bother with validation.
+      if (!argv[completion.completionKey]) {
+        validation.nonOptionCount(argv)
+        validation.missingArgumentValue(argv)
+        validation.requiredArguments(argv)
+        if (strict) validation.unknownArguments(argv, aliases)
+        validation.customChecks(argv, aliases)
+        validation.limitedChoices(argv)
+        validation.implications(argv)
+      }
     }
 
     setPlaceholderKeys(argv)

package/lib/usage.js

@@ -28,17 +28,22 @@ module.exports = function (yargs, y18n) {
     return self
   }
 
+  var failureOutput = false
   self.fail = function (msg) {
     if (fails.length) {
       fails.forEach(function (f) {
         f(msg)
       })
     } else {
-      if (showHelpOnFail) yargs.showHelp('error')
-      if (msg) console.error(msg)
-      if (failMessage) {
-        if (msg) console.error('')
-        console.error(failMessage)
+      // don't output failure message more than once
+      if (!failureOutput) {
+        failureOutput = true
+        if (showHelpOnFail) yargs.showHelp('error')
+        if (msg) console.error(msg)
+        if (failMessage) {
+          if (msg) console.error('')
+          console.error(failMessage)
+        }
       }
       if (yargs.getExitProcess()) {
         process.exit(1)

package/locales/zh.json

@@ -0,0 +1,36 @@
+{
+  "Commands:": "命令：",
+  "Options:": "选项：",
+  "Examples:": "示例：",
+  "boolean": "boolean",
+  "count": "count",
+  "string": "string",
+  "array": "array",
+  "required": "required",
+  "default:": "默认值:",
+  "choices:": "可选值:",
+  "generated-value": "生成的值",
+  "Not enough non-option arguments: got %s, need at least %s": "缺少 non-option 参数：传入了 %s 个, 至少需要 %s 个",
+  "Too many non-option arguments: got %s, maximum of %s": "non-option 参数过多：传入了 %s 个, 最大允许 %s 个",
+  "Missing argument value: %s": {
+    "one": "没有给此选项指定值：%s",
+    "other": "没有给这些选项指定值：%s"
+  },
+  "Missing required argument: %s": {
+    "one": "缺少必须的选项：%s",
+    "other": "缺少这些必须的选项：%s"
+  },
+  "Unknown argument: %s": {
+    "one": "无法识别的选项：%s",
+    "other": "无法识别这些选项：%s"
+  },
+  "Invalid values:": "无效的选项值：",
+  "Argument: %s, Given: %s, Choices: %s": "选项名称: %s, 传入的值: %s, 可选的值：%s",
+  "Argument check failed: %s": "选项值验证失败：%s",
+  "Implications failed:": "缺少依赖的选项：",
+  "Not enough arguments following: %s": "没有提供足够的值给此选项：%s",
+  "Invalid JSON config file: %s": "无效的 JSON 配置文件：%s",
+  "Path to JSON config file": "JSON 配置文件的路径",
+  "Show help": "显示帮助信息",
+  "Show version number": "显示版本号"
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yargs",
-  "version": "3.26.0",
+  "version": "3.27.0",
   "description": "Light-weight option parsing with an argv hash. No optstrings attached.",
   "main": "./index.js",
   "files": [