yargs 3.5.0 → 3.5.4

package/completion.sh.hbs

@@ -0,0 +1,22 @@
+###-begin-{{app_name}}-completions-###
+#
+# yargs command completion script
+#
+# Installation: {{app_path}} completion >> ~/.bashrc
+#    or {{app_path}} completion >> ~/.bash_profile on OSX.
+#
+_yargs_completions()
+{
+    local cur_word args type_list
+
+    cur_word="${COMP_WORDS[COMP_CWORD]}"
+    args=$(printf "%s " "${COMP_WORDS[@]}")
+
+    # ask yargs to generate completions.
+    type_list=`{{app_path}} --get-yargs-completions $args`
+
+    COMPREPLY=( $(compgen -W "${type_list}" -- ${cur_word}) )
+    return 0
+}
+complete -F _yargs_completions {{app_name}}
+###-end-{{app_name}}-completions-###

package/index.js

@@ -5,8 +5,7 @@ var assert = require('assert'),
   Usage = require('./lib/usage'),
   Validation = require('./lib/validation');
 
-var inst = Argv(process.argv.slice(2));
-sigletonify(inst);
+Argv(process.argv.slice(2));
 
 var exports = module.exports = Argv;
 function Argv (processArgs, cwd) {
@@ -360,8 +359,6 @@ function Argv (processArgs, cwd) {
         // a function can be provided
         if (fn) completion.registerFunction(fn);
 
-        if (!self.parsed) parseArgs(processArgs); // run parser, if it has not already been executed.
-
         return self;
     };
 
@@ -481,8 +478,12 @@ function rebase (base, dir) {
 */
 function sigletonify(inst) {
     Object.keys(inst).forEach(function (key) {
-        Argv[key] = typeof inst[key] == 'function'
-            ? inst[key].bind(inst)
-            : inst[key];
+        if (key === 'argv') {
+          Argv.__defineGetter__(key, inst.__lookupGetter__(key));
+        } else {
+          Argv[key] = typeof inst[key] == 'function'
+              ? inst[key].bind(inst)
+              : inst[key];
+        }
     });
 }

package/lib/completion.js

@@ -15,11 +15,6 @@ module.exports = function (yargs, usage) {
       previous = process.argv.slice(process.argv.indexOf('--' + self.completionKey) + 1),
       argv = yargs.parse(previous);
 
-      fs.writeFileSync('./foo.txt', JSON.stringify({
-        previous: previous,
-        current: current
-      }), 'utf-8');
-
     // a custom completion function can be provided
     // to completion().
     if (completionFunction) {

package/lib/usage.js

@@ -34,14 +34,10 @@ module.exports = function (yargs) {
                 f(msg);
             });
         } else {
-            if (showHelpOnFail) {
-                yargs.showHelp("error");
-            }
+            if (showHelpOnFail) yargs.showHelp("error");
             if (msg) console.error(msg);
             if (failMessage) {
-                if (msg) {
-                    console.error("");
-                }
+                if (msg) console.error("");
                 console.error(failMessage);
             }
             if (yargs.getExitProcess()){

package/lib/validation.js

@@ -9,7 +9,7 @@ module.exports = function (yargs, usage) {
         var demanded = yargs.getDemanded();
 
         if (demanded._ && argv._.length < demanded._.count) {
-            if (demanded._.msg) {
+            if (demanded._.msg !== undefined) {
                 usage.fail(demanded._.msg);
             } else {
                 usage.fail('Not enough non-option arguments: got '

package/package.json

@@ -1,11 +1,12 @@
 {
   "name": "yargs",
-  "version": "3.5.0",
+  "version": "3.5.4",
   "description": "Light-weight option parsing with an argv hash. No optstrings attached.",
   "main": "./index.js",
   "files": [
     "index.js",
     "lib",
+    "completion.sh.hbs",
     "LICENSE"
   ],
   "dependencies": {
@@ -58,6 +59,11 @@
     "url": "http://CodeTunnel.com"
   },
   "contributors": [
+    {
+      "name": "Benjamin Coe",
+      "email": "ben@npmjs.com",
+      "url": "https://github.com/bcoe"
+    },
     {
       "name": "Chris Needham",
       "email": "chris@chrisneedham.com",