fix cherry-picked conflict in index.js

yargs · Feb 14, 2016 · 4284145 · 4284145
1 parent 92e9dc6
commit 4284145
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/index.js b/index.js
@@ -71,7 +71,7 @@ function Argv (processArgs, cwd) {
 
     var arrayOptions = [
       'array', 'boolean', 'string', 'requiresArg',
-      'count', 'requiresArg', 'count', 'normalize'
+      'count', 'requiresArg', 'count', 'normalize', 'number'
     ]
 
     var objectOptions = [
@@ -132,6 +132,11 @@ function Argv (processArgs, cwd) {
     return self
   }
 
+  self.number = function (numbers) {
+    options.numbers.push.apply(options.number, [].concat(numbers))
+    return self
+  }
+
   self.choices = function (key, values) {
     if (typeof key === 'object') {
       Object.keys(key).forEach(function (k) {

diff --git a/lib/usage.js b/lib/usage.js
@@ -200,6 +200,7 @@ module.exports = function (yargs, y18n) {
         if (~options.string.indexOf(key)) type = '[' + __('string') + ']'
         if (~options.normalize.indexOf(key)) type = '[' + __('string') + ']'
         if (~options.array.indexOf(key)) type = '[' + __('array') + ']'
+        if (~options.number.indexOf(key)) type = '[' + __('number') + ']'
 
         var extra = [
           type,
@@ -290,6 +291,7 @@ module.exports = function (yargs, y18n) {
         if (~options.string.indexOf(alias)) yargs.string(key)
         if (~options.normalize.indexOf(alias)) yargs.normalize(key)
         if (~options.array.indexOf(alias)) yargs.array(key)
+        if (~options.number.indexOf(alias)) yargs.number(key)
       })
     })
   }

diff --git a/test/yargs.js b/test/yargs.js
@@ -234,6 +234,7 @@ describe('yargs dsl tests', function () {
         requiresArg: [],
         count: [],
         normalize: [],
+        number: [],
         config: {},
         envPrefix: undefined,
         global: ['help'],