yargs 1.2.6 → 1.3.3

package/README.md

@@ -1,7 +1,7 @@
 yargs
 ========
 
-Yargs be a node.js library fer hearties tryin' ter parse optstrings against their will where even the boo box be not enough to coerce them. This here module is fer scallywags lookin' ter plunder all the sunken -shipz of their --treasures thru program usage but be tired of optstrings disincling to acquiesce to yer requests.
+Yargs be a node.js library fer hearties tryin' ter parse optstrings.
 
 With yargs, ye be havin' a map that leads straight to yer treasure! Treasure of course, being a simple option hash.
 
@@ -11,12 +11,12 @@ With yargs, ye be havin' a map that leads straight to yer treasure! Treasure of
 
 > ~~NOTE: Yargs is a fork of [optimist](https://github.com/substack/node-optimist) by [substack (James Halliday)](https://github.com/substack). It is obvious that substack is stretched pretty thin maintaining over 300 modules on npm at the time of this writing. So rather than complain in the project issue tracker I thought I'd just pick up the torch and maintain a proper fork. Currently the project is totally backward compatible with optimist but this may change in the future (if it does I will update this notice to inform you of this). For now though, enjoy optimist with about 5 months worth of fixes and updates rolled in, most of them pulled from optimist's own [stale pull requests](https://github.com/substack/node-optimist/pulls).~~
 
-> UPDATE: Yargs is now the official successor to optimist. Please feel free to submit issues and pull requests. While I personally don't have the time to pour over all the issues and fix all of them on a regular basis, I'm more than happy to look over pull requests, test them, and merge them in. If you'd like to contribute and don't know where to start, have a look at [the issue list](https://github.com/chevex/yargs/issues) :)
+> UPDATE: Yargs is now the official successor to optimist. Please feel free to submit issues and pull requests. While I personally don't have the time to pore over all the issues and fix all of them on a regular basis, I'm more than happy to look over pull requests, test them, and merge them in. If you'd like to contribute and don't know where to start, have a look at [the issue list](https://github.com/chevex/yargs/issues) :)
 
 examples
 ========
 
-With yargs, the options be just a hash! No optstrings be attached.
+With yargs, the options be just a hash!
 -------------------------------------------------------------------
 
 xup.js:
@@ -43,7 +43,7 @@ else {
 
 ![Joe was one optimistic pirate.](http://i.imgur.com/4WFGVJ9.png)
 
-But don' walk the plank jus' yet! Ther' be more! Ye can do short options:
+But don't walk the plank just yet! There be more! You can do short options:
 -------------------------------------------------
  
 short.js:
@@ -59,7 +59,7 @@ console.log('(%d,%d)', argv.x, argv.y);
     $ ./short.js -x 10 -y 21
     (10,21)
 
-And gold doubooleans, both long an' short (an' grouped!):
+And booleans, both long, short, and even grouped:
 ----------------------------------
 
 bool.js:
@@ -110,7 +110,7 @@ console.log(argv._);
     (0.54,1.12)
     [ 'me hearties', 'yo', 'ho' ]
 
-Yargs even counts yer gold doubooleans!
+Yargs even counts your booleans!
 ----------------------------------------------------------------------
 
 count.js
@@ -151,7 +151,7 @@ DEBUG("Extra chatty mode");
     Showing semi-important stuff too
     Extra chatty mode
 
-Tell yer friends how ter use yer options and make demands from yer enemies.
+Tell users how to use yer options and make demands.
 -------------------------------------------------
 
 divide.js:
@@ -238,7 +238,7 @@ console.log(argv.x + argv.y);
     $ ./default_hash.js -y 7
     17
 
-And if ye really want ter get all descriptive about it...
+And if you really want to get all descriptive about it...
 ---------------------------------------------------------
 
 boolean_single.js
@@ -278,7 +278,7 @@ console.dir(argv._);
     [ true, false, true ]
     [ 'one', 'two', 'three' ]
 
-Yargs is here ter help ye...
+Yargs is here to help you...
 ---------------------------
 
 Ye can describe parameters fer help messages and set aliases. Yargs figures
@@ -372,8 +372,12 @@ Set `argv[key]` to `value` if no option was specified on `process.argv`.
 
 Optionally `.default()` can take an object that maps keys to default values.
 
-.demand(key, [msg])
-------------
+.demand(key, [msg | boolean])
+-----------------------------
+.require(key, [msg | boolean])
+------------------------------
+.required(key, [msg | boolean])
+-------------------------------
 
 If `key` is a string, show the usage information and exit if `key` wasn't
 specified in `process.argv`.
@@ -383,9 +387,12 @@ up in `argv._`.
 
 If `key` is an Array, demand each element.
 
-If `msg` is supplied, it will be printed when the argument is missing,
+If a `msg` string is given, it will be printed when the argument is missing,
 instead of the standard error message. This is especially helpful for the non-option arguments in `argv._`.
 
+If a `boolean` value is given, it controls whether the option is demanded;
+this is useful when using `.options()` to specify command line parameters.
+
 .requiresArg(key)
 -----------------
 
@@ -496,10 +503,14 @@ Format usage output to wrap at `columns` many columns.
 Any command-line argument given that is not demanded, or does not have a
 corresponding description, will be reported as an error.
 
-.help()
--------
+.help([option, [description]])
+------------------------------
+
+Add an option (e.g., `--help`) that displays the usage string and exits the
+process. If present, the `description` parameter customises the description of
+the help option in the usage string.
 
-Return the generated usage string.
+If invoked without parameters, `.help` returns the generated usage string.
 
 Example:
 
@@ -511,6 +522,43 @@ console.log(yargs.help());
 
 Later on, ```argv``` can be retrived with ```yargs.argv```
 
+.version(version, option, [description])
+----------------------------------------
+
+Add an option (e.g., `--version`) that displays the version number (given by the
+`version` parameter) and exits the process. If present, the `description`
+parameter customises the description of the version option in the usage string.
+
+.showHelpOnFail(enable, [message])
+----------------------------------
+
+By default, yargs outputs a usage string if any error is detected. Use the
+`.showHelpOnFail` method to customize this behaviour. if `enable` is `false`,
+the usage string is not output. If the `message` parameter is present, this
+message is output after the error message.
+
+line_count.js
+
+````javascript
+#!/usr/bin/env node
+var argv = require('yargs')
+    .usage('Count the lines in a file.\nUsage: $0')
+    .demand('f')
+    .alias('f', 'file')
+    .describe('f', 'Load a file')
+    .showHelpOnFail(false, "Specify --help for available options")
+    .argv;
+
+// etc.
+````
+
+***
+
+    $ node line_count.js --file
+    Missing argument value: f
+
+    Specify --help for available options
+
 .showHelp(fn=console.error)
 ---------------------------
 

package/example/help.js

@@ -0,0 +1,27 @@
+var yargs = require('../index');
+
+var argv = yargs
+  .usage('This is my awesome program\n\nUsage: $0 [options]')
+  .help('help').alias('help', 'h')
+  .version('1.0.1', 'version').alias('version', 'V')
+  .options({
+    input: {
+      alias: 'i',
+      description: "<filename> Input file name",
+      requiresArg: true,
+      required: true
+    },
+    output: {
+      alias: 'o',
+      description: "<filename> output file name",
+      requiresArg: true,
+      required: true
+    }
+  })
+  .argv;
+
+console.log('Inspecting options');
+console.dir(argv);
+
+console.log("input:", argv.input);
+console.log("output:", argv.output);

package/example/usage-options.js

@@ -4,12 +4,12 @@ var argv = yargs.usage('This is my awesome program', {
   'about': {
     description: 'Provide some details about the author of this program',
     required: true,
-    short: 'a',
+    alias: 'a',
   },
   'info': {
     description: 'Provide some information about the node.js agains!!!!!!',
     boolean: true,
-    short: 'i'
+    alias: 'i'
   }
 }).argv;
 

package/index.js

@@ -110,7 +110,7 @@ function Argv (processArgs, cwd) {
     };
     
     var demanded = {};
-    self.demand = function (keys, msg) {
+    self.demand = self.required = self.require = function (keys, msg) {
         if (typeof keys == 'number') {
             if (!demanded._) demanded._ = { count: 0, msg: null };
             demanded._.count += keys;
@@ -122,7 +122,12 @@ function Argv (processArgs, cwd) {
             });
         }
         else {
-            demanded[keys] = { msg: msg };
+            if (typeof msg === 'string') {
+                demanded[keys] = { msg: msg };
+            }
+            else if (msg === true || typeof msg === 'undefined') {
+                demanded[keys] = { msg: null };
+            }
         }
         
         return self;
@@ -171,8 +176,16 @@ function Argv (processArgs, cwd) {
                 f(msg);
             });
         } else {
-            self.showHelp();
+            if (showHelpOnFail) {
+                self.showHelp();
+            }
             if (msg) console.error(msg);
+            if (failMessage) {
+                if (msg) {
+                    console.error("");
+                }
+                console.error(failMessage);
+            }
             process.exit(1);
         }
     }
@@ -210,7 +223,12 @@ function Argv (processArgs, cwd) {
         }
         else {
             if (opt.alias) self.alias(key, opt.alias);
-            if (opt.demand) self.demand(key, opt.demand);
+
+            var demand = opt.demand || opt.required || opt.require;
+            if (demand) {
+                self.demand(key, demand);
+            }
+
             if (typeof opt.default !== 'undefined') {
                 self.default(key, opt.default);
             }
@@ -226,7 +244,7 @@ function Argv (processArgs, cwd) {
             if (opt.count || opt.type === 'count') {
                 self.count(key);
             }
-            
+
             var desc = opt.describe || opt.description || opt.desc;
             if (desc) {
                 self.describe(key, desc);
@@ -236,10 +254,10 @@ function Argv (processArgs, cwd) {
                 self.requiresArg(key);
             }
         }
-        
+
         return self;
     };
-    
+
     var wrap = null;
     self.wrap = function (cols) {
         wrap = cols;
@@ -257,8 +275,44 @@ function Argv (processArgs, cwd) {
         fn(self.help());
         return self;
     };
-    
+
+    var version = null;
+    var versionOpt = null;
+    self.version = function (ver, opt, msg) {
+        version = ver;
+        versionOpt = opt;
+        self.describe(opt, msg || 'Show version number');
+        return self;
+    };
+
+    var helpOpt = null;
+    self.addHelpOpt = function (opt, msg) {
+        helpOpt = opt;
+        self.describe(opt, msg || 'Show help');
+        return self;
+    };
+
+    var failMessage = null;
+    var showHelpOnFail = true;
+    self.showHelpOnFail = function (enabled, message) {
+        if (typeof enabled === 'string') {
+            enabled = true;
+            message = enabled;
+        }
+        else if (typeof enabled === 'undefined') {
+            enabled = true;
+        }
+        failMessage = message;
+        showHelpOnFail = enabled;
+        return self;
+    };
+
+
     self.help = function () {
+        if (arguments.length > 0) {
+            return self.addHelpOpt.apply(self, arguments);
+        }
+
         var keys = Object.keys(
             Object.keys(descriptions)
             .concat(Object.keys(demanded))
@@ -297,9 +351,12 @@ function Argv (processArgs, cwd) {
             help.unshift(usage.replace(/\$0/g, self.$0), '');
         }
 
+        var aliasKeys = (Object.keys(options.alias) || [])
+            .concat(Object.keys(self.parsed.newAliases) || []);
+
         keys = keys.filter(function(key) {
-            return Object.keys(options.alias).every(function(alias) {
-                return -1 == options.alias[alias].indexOf(key);
+            return !self.parsed.newAliases[key] && aliasKeys.every(function(alias) {
+                return -1 == (options.alias[alias] || []).indexOf(key);
             });
         });
         var switches = keys.reduce(function (acc, key) {
@@ -397,6 +454,19 @@ function Argv (processArgs, cwd) {
 
         argv.$0 = self.$0;
 
+        self.parsed = parsed;
+
+        Object.keys(argv).forEach(function(key) {
+            if (key === helpOpt) {
+                self.showHelp(console.log);
+                process.exit(0);
+            }
+            else if (key === versionOpt) {
+                process.stdout.write(version);
+                process.exit(0);
+            }
+        });
+
         if (demanded._ && argv._.length < demanded._.count) {
             if (demanded._.msg) {
                 fail(demanded._.msg);
@@ -454,8 +524,8 @@ function Argv (processArgs, cwd) {
 
             var aliases = {};
 
-            Object.keys(options.alias).forEach(function (key) {
-                options.alias[key].forEach(function (alias) {
+            Object.keys(parsed.aliases).forEach(function (key) {
+                parsed.aliases[key].forEach(function (alias) {
                     aliases[alias] = key;
                 });
             });

package/lib/minimist.js

@@ -32,13 +32,17 @@ module.exports = function (args, opts) {
         }).join('');
     }
 
-    var aliases = {};
+    var aliases = {},
+        newAliases = {};
+
     Object.keys(opts.alias || {}).forEach(function (key) {
         aliases[key] = [].concat(opts.alias[key]);
         // For "--option-name", also set argv.optionName
         aliases[key].concat(key).forEach(function (x) {
             if (/-/.test(x)) {
-                aliases[key].push(toCamelCase(x));
+                var c = toCamelCase(x);
+                aliases[key].push(c);
+                newAliases[c] = true;
             }
         });
         aliases[key].forEach(function (x) {
@@ -52,7 +56,13 @@ module.exports = function (args, opts) {
 
     Object.keys(defaults || {}).forEach(function (key) {
         if (/-/.test(key) && !opts.alias[key]) {
-            aliases[key] = (aliases[key] || []).concat(toCamelCase(key));
+            var c = toCamelCase(key);
+            aliases[key] = aliases[key] || [];
+            // don't allow the same key to be added multiple times.
+            if (aliases[key].indexOf(c) === -1) {
+                aliases[key] = (aliases[key] || []).concat(c);
+                newAliases[c] = true;
+            }
         }
         (aliases[key] || []).forEach(function (alias) {
             defaults[alias] = defaults[key];
@@ -65,7 +75,6 @@ module.exports = function (args, opts) {
     });
 
     var notFlags = [];
-
     if (args.indexOf('--') !== -1) {
         notFlags = args.slice(args.indexOf('--')+1);
         args = args.slice(0, args.indexOf('--'));
@@ -73,7 +82,9 @@ module.exports = function (args, opts) {
 
     function setArg (key, val) {
         if (/-/.test(key) && !(aliases[key] && aliases[key].length)) {
-            aliases[key] = [toCamelCase(key)];
+            var c = toCamelCase(key);
+            aliases[key] = [c];
+            newAliases[c] = true;
         }
 
         var value = !flags.strings[key] && isNumber(val) ? Number(val) : val;
@@ -228,7 +239,8 @@ module.exports = function (args, opts) {
 
     return {
         argv: argv,
-        aliases: aliases
+        aliases: aliases,
+        newAliases: newAliases
     };
 };
 

package/package.json

@@ -1,11 +1,9 @@
 {
   "name": "yargs",
-  "version": "1.2.6",
+  "version": "1.3.3",
   "description": "Light-weight option parsing with an argv hash. No optstrings attached.",
   "main": "./index.js",
-  "dependencies": {
-    "minimist": "^0.1.0"
-  },
+  "dependencies": {},
   "devDependencies": {
     "hashish": "*",
     "mocha": "*",
@@ -32,6 +30,22 @@
     "email": "Alex.Ford@CodeTunnel.com",
     "url": "http://CodeTunnel.com"
   },
+  "contributors": [
+    {
+      "name": "Chris Needham",
+      "email": "chris@chrisneedham.com",
+      "url": "http://chrisneedham.com"
+    },
+    {
+      "name": "James Nylen",
+      "email": "jnylen@gmail.com",
+      "url": "https://github.com/nylen"
+    },
+    {
+      "name": "Benjamin Horsleben",
+      "url": "https://github.com/fizker"
+    }
+  ],
   "license": "MIT/X11",
   "engine": {
     "node": ">=0.4"

package/test/parse.js

@@ -15,7 +15,7 @@ describe('parse', function () {
         parse.should.have.property('bool', true);
         parse.should.have.property('_').with.length(0);
     });
-        
+
     it('should place bare options in the _ array', function () {
         var parse = yargs.parse(['foo', 'bar', 'baz']);
         parse.should.have.property('_').and.deep.equal(['foo','bar','baz']);
@@ -38,7 +38,7 @@ describe('parse', function () {
         parse.should.have.property('s', 'meow');
         parse.should.have.property('_').with.length(0);
     });
-     
+
     it('should set the value of a single short option to the next supplied value', function () {
         var parse = yargs.parse(['-h', 'localhost']);
         parse.should.have.property('h', 'localhost');
@@ -85,7 +85,7 @@ describe('parse', function () {
         parse.should.have.property('h', 'localhost');
         parse.should.have.property('_').and.deep.equal(['script.js']);
     });
-     
+
     it('should still set values appropriately if a mix of short and long options are specified', function () {
         var parse = yargs.parse(['-h', 'localhost', '--port', '555']);
         parse.should.have.property('h', 'localhost');
@@ -98,13 +98,13 @@ describe('parse', function () {
         parse.should.have.property('moo', false);
         parse.should.have.property('_').with.length(0);
     });
-     
+
     it('should group values into an array if the same option is specified multiple times', function () {
         var parse = yargs.parse(['-v', 'a', '-v', 'b', '-v', 'c' ]);
         parse.should.have.property('v').and.deep.equal(['a','b','c']);
         parse.should.have.property('_').with.length(0);
     });
-     
+
     it('should still set values appropriately if we supply a comprehensive list of various types of options', function () {
         var parse = yargs.parse([
             '--name=meowmers', 'bare', '-cats', 'woo',
@@ -352,4 +352,38 @@ describe('parse', function () {
         parsed.should.have.property('other', 'false');
     });
 
+    // regression, see https://github.com/chevex/yargs/issues/63
+    it('should not add the same key to argv multiple times, when creating camel-case aliases', function() {
+      var yargs = require('../')(['--health-check=banana', '--second-key', 'apple', '-t=blarg'])
+          .options('h', {
+            alias: 'health-check',
+            description: 'health check',
+            default: 'apple'
+          })
+          .options('second-key', {
+            alias: 's',
+            description: 'second key',
+            default: 'banana'
+          })
+          .options('third-key', {
+            alias: 't',
+            description: 'third key',
+            default: 'third'
+          })
+
+      // before this fix, yargs failed parsing
+      // one but not all forms of an arg.
+      yargs.argv.secondKey.should.eql('apple');
+      yargs.argv.s.should.eql('apple');
+      yargs.argv['second-key'].should.eql('apple');
+
+      yargs.argv.healthCheck.should.eql('banana');
+      yargs.argv.h.should.eql('banana');
+      yargs.argv['health-check'].should.eql('banana');
+
+      yargs.argv.thirdKey.should.eql('blarg');
+      yargs.argv.t.should.eql('blarg');
+      yargs.argv['third-key'].should.eql('blarg');
+    });
+
 });

package/test/parse_camelCase.js

@@ -3,14 +3,18 @@ var should = require('chai').should(),
 
 describe('parse', function () {
 
-    describe('dashes and camelCase', function () {
+    function runTests (yargs, strict) {
 
-        it('should provide options with dashes as camelCase properties', function () {
-            var result = yargs()
-                .parse([ '--some-option' ]);
+        if (!strict) {
+            // Skip this test in strict mode because this option is not specified
+            it('should provide options with dashes as camelCase properties', function () {
+                var result = yargs()
+                    .parse([ '--some-option' ]);
 
-            result.should.have.property('someOption').that.is.a('boolean').and.is.true;
-        });
+                result.should.have.property('some-option').that.is.a('boolean').and.is.true;
+                result.should.have.property('someOption' ).that.is.a('boolean').and.is.true;
+            });
+        }
 
         it('should provide count options with dashes as camelCase properties', function () {
             var result = yargs()
@@ -20,7 +24,8 @@ describe('parse', function () {
                 })
                 .parse([ '--some-option', '--some-option', '--some-option' ]);
 
-            result.should.have.property('someOption', 3);
+            result.should.have.property('some-option', 3);
+            result.should.have.property('someOption' , 3);
         });
 
         it('should provide options with dashes and aliases as camelCase properties', function () {
@@ -31,7 +36,8 @@ describe('parse', function () {
                 })
                 .parse([ '--some-option' ]);
 
-            result.should.have.property('someOption').that.is.a('boolean').and.is.true;
+            result.should.have.property('some-option').that.is.a('boolean').and.is.true;
+            result.should.have.property('someOption' ).that.is.a('boolean').and.is.true;
         });
 
         it('should provide defaults of options with dashes as camelCase properties', function() {
@@ -42,7 +48,8 @@ describe('parse', function () {
                 })
                 .parse([ ]);
 
-            result.should.have.property('someOption', 'asdf');
+            result.should.have.property('some-option', 'asdf');
+            result.should.have.property('someOption' , 'asdf');
         });
 
         it('should provide aliases of options with dashes as camelCase properties', function() {
@@ -55,6 +62,8 @@ describe('parse', function () {
                 .parse([ ]);
 
             result.should.have.property('o', 'asdf');
+            result.should.have.property('some-option', 'asdf');
+            result.should.have.property('someOption' , 'asdf');
         });
 
         it('should provide aliases of options with dashes as camelCase properties', function() {
@@ -66,7 +75,9 @@ describe('parse', function () {
                 })
                 .parse([ ]);
 
-            result.should.have.property('someOption', 'asdf');
+            result.should.have.property('o', 'asdf');
+            result.should.have.property('some-option', 'asdf');
+            result.should.have.property('someOption' , 'asdf');
         });
 
         it('should provide aliases with dashes as camelCase properties', function() {
@@ -77,7 +88,41 @@ describe('parse', function () {
                 })
                 .parse([ '--some-option', 'val' ]);
 
-            result.should.have.property('someOption').that.is.a('string').and.equals('val');
+            result.should.have.property('o'          ).that.is.a('string').and.equals('val');
+            result.should.have.property('some-option').that.is.a('string').and.equals('val');
+            result.should.have.property('someOption' ).that.is.a('string').and.equals('val');
+        });
+
+    }
+
+    describe('dashes and camelCase', function () {
+        runTests(function() {
+            return yargs();
+        });
+    });
+
+    describe('dashes and camelCase (strict)', function () {
+        runTests(function() {
+            // Special handling for failure messages, because normally a
+            // failure calls process.exit(1);
+            return yargs().strict().fail(function(msg) {
+                throw new Error(msg);
+            });
+        }, true);
+
+        // See https://github.com/chevex/yargs/issues/31
+
+        it('should not fail when options with defaults are missing', function () {
+            var result = yargs()
+                .fail(function(msg) {
+                    throw new Error(msg);
+                })
+                .option('some-option', {
+                    describe : 'some option',
+                    default  : 80
+                })
+                .strict()
+                .parse([ ]);
         });
     });
 

package/test/usage.js

@@ -4,62 +4,89 @@ var should = require('chai').should(),
 
 describe('usage', function () {
 
-    it ('should show an error along with the missing arguments on demand fail', function () {
-        var r = checkUsage(function () {
-            return yargs('-x 10 -z 20'.split(' '))
-                .usage('Usage: $0 -x NUM -y NUM')
-                .demand(['x','y'])
-                .argv;
+    describe('demand options', function () {
+        describe('using .demand()', function () {
+            it ('should show an error along with the missing arguments on demand fail', function () {
+                var r = checkUsage(function () {
+                    return yargs('-x 10 -z 20'.split(' '))
+                        .usage('Usage: $0 -x NUM -y NUM')
+                        .demand(['x','y'])
+                        .argv;
+                });
+                r.result.should.have.property('x', 10);
+                r.result.should.have.property('z', 20);
+                r.result.should.have.property('_').with.length(0);
+                r.errors.join('\n').split(/\n+/).should.deep.equal([
+                    'Usage: ./usage -x NUM -y NUM',
+                    'Options:',
+                    '  -x  [required]',
+                    '  -y  [required]',
+                    'Missing required arguments: y'
+                ]);
+                r.logs.should.have.length(0);
+                r.exit.should.be.ok;
+            });
+
+            describe('using .require()', function() {
+                it ('should show an error along with the missing arguments on demand fail', function () {
+                    var r = checkUsage(function () {
+                        return yargs('-x 10 -z 20'.split(' '))
+                            .usage('Usage: $0 -x NUM -y NUM')
+                            .require(['x','y'])
+                            .argv;
+                    });
+                    r.result.should.have.property('x', 10);
+                    r.result.should.have.property('z', 20);
+                    r.result.should.have.property('_').with.length(0);
+                    r.errors.join('\n').split(/\n+/).should.deep.equal([
+                        'Usage: ./usage -x NUM -y NUM',
+                        'Options:',
+                        '  -x  [required]',
+                        '  -y  [required]',
+                        'Missing required arguments: y'
+                    ]);
+                    r.logs.should.have.length(0);
+                    r.exit.should.be.ok;
+                });
+            });
         });
-        r.result.should.have.property('x', 10);
-        r.result.should.have.property('z', 20);
-        r.result.should.have.property('_').with.length(0);
-        r.errors.join('\n').split(/\n+/).should.deep.equal([
-            'Usage: ./usage -x NUM -y NUM',
-            'Options:',
-            '  -x  [required]',
-            '  -y  [required]',
-            'Missing required arguments: y'
-        ]);
-        r.logs.should.have.length(0);
-        r.exit.should.be.ok;
-    });
 
-    it('should show an error along with a custom message on demand fail', function () {
-        var r = checkUsage(function () {
-            return yargs('-z 20'.split(' '))
-                .usage('Usage: $0 -x NUM -y NUM')
-                .demand(['x','y'], 'x and y are both required to multiply all the things')
-                .argv;
+        it('should show an error along with a custom message on demand fail', function () {
+            var r = checkUsage(function () {
+                return yargs('-z 20'.split(' '))
+                    .usage('Usage: $0 -x NUM -y NUM')
+                    .demand(['x','y'], 'x and y are both required to multiply all the things')
+                    .argv;
+            });
+            r.result.should.have.property('z', 20);
+            r.result.should.have.property('_').with.length(0);
+            r.errors.join('\n').split(/\n+/).should.deep.equal([
+                'Usage: ./usage -x NUM -y NUM',
+                'Options:',
+                '  -x  [required]',
+                '  -y  [required]',
+                'Missing required arguments: x, y',
+                'x and y are both required to multiply all the things'
+            ]);
+            r.logs.should.have.length(0);
+            r.exit.should.be.ok;
         });
-        r.result.should.have.property('z', 20);
-        r.result.should.have.property('_').with.length(0);
-        r.errors.join('\n').split(/\n+/).should.deep.equal([
-            'Usage: ./usage -x NUM -y NUM',
-            'Options:',
-            '  -x  [required]',
-            '  -y  [required]',
-            'Missing required arguments: x, y',
-            'x and y are both required to multiply all the things'
-        ]);
-        r.logs.should.have.length(0);
-        r.exit.should.be.ok;
-    });
 
-    it('should return valid values when demand passes', function () {
-        var r = checkUsage(function () {
-            return yargs('-x 10 -y 20'.split(' '))
-                .usage('Usage: $0 -x NUM -y NUM')
-                .demand(['x','y'])
-                .argv;
+        it('should return valid values when demand passes', function () {
+            var r = checkUsage(function () {
+                return yargs('-x 10 -y 20'.split(' '))
+                    .usage('Usage: $0 -x NUM -y NUM')
+                    .demand(['x','y'])
+                    .argv;
+            });
+            r.should.have.property('result');
+            r.result.should.have.property('x', 10);
+            r.result.should.have.property('y', 20)
+            r.result.should.have.property('_').with.length(0);
+            r.should.have.property('errors').with.length(0);
+            r.should.have.property('logs').with.length(0);
+            r.should.have.property('exit', false);
         });
-        r.should.have.property('result');
-        r.result.should.have.property('x', 10);
-        r.result.should.have.property('y', 20)
-        r.result.should.have.property('_').with.length(0);
-        r.should.have.property('errors').with.length(0);
-        r.should.have.property('logs').with.length(0);
-        r.should.have.property('exit', false);
     });
 
     it('should return valid values when check passes', function () {
@@ -532,6 +559,171 @@ describe('usage', function () {
         ]);
     });
 
+    describe('demand option with boolean flag', function () {
+        describe('with demand option', function () {
+            it('should report missing required arguments', function () {
+                var r = checkUsage(function () {
+                    return yargs('-y 10 -z 20'.split(' '))
+                        .usage('Usage: $0 -x NUM [-y NUM]')
+                        .options({
+                            'x': { description: 'an option',      demand: true  },
+                            'y': { description: 'another option', demand: false }
+                        })
+                        .argv;
+                });
+                r.result.should.have.property('y', 10);
+                r.result.should.have.property('z', 20);
+                r.result.should.have.property('_').with.length(0);
+                r.errors.join('\n').split(/\n/).should.deep.equal([
+                    'Usage: ./usage -x NUM [-y NUM]',
+                    '',
+                    'Options:',
+                    '  -x  an option       [required]',
+                    '  -y  another option',
+                    '',
+                    'Missing required arguments: x'
+                ]);
+                r.logs.should.have.length(0);
+                r.exit.should.be.ok;
+            });
+        });
+
+        describe('with required option', function () {
+            it('should report missing required arguments', function () {
+                var r = checkUsage(function () {
+                    return yargs('-y 10 -z 20'.split(' '))
+                        .usage('Usage: $0 -x NUM [-y NUM]')
+                        .options({
+                            'x': { description: 'an option',      required: true  },
+                            'y': { description: 'another option', required: false }
+                        })
+                        .argv;
+                });
+                r.result.should.have.property('y', 10);
+                r.result.should.have.property('z', 20);
+                r.result.should.have.property('_').with.length(0);
+                r.errors.join('\n').split(/\n/).should.deep.equal([
+                    'Usage: ./usage -x NUM [-y NUM]',
+                    '',
+                    'Options:',
+                    '  -x  an option       [required]',
+                    '  -y  another option',
+                    '',
+                    'Missing required arguments: x'
+                ]);
+                r.logs.should.have.length(0);
+                r.exit.should.be.ok;
+            });
+        });
+
+        it('should not report missing required arguments when given an alias', function () {
+            var r = checkUsage(function () {
+                return yargs('-w 10'.split(' '))
+                    .usage('Usage: $0 --width NUM [--height NUM]')
+                    .options({
+                        'width':  { description: 'Width',  alias: 'w', demand: true  },
+                        'height': { description: 'Height', alias: 'h', demand: false }
+                    })
+                    .argv;
+            });
+            r.result.should.have.property('w', 10);
+            r.result.should.have.property('_').with.length(0);
+            r.should.have.property('errors').with.length(0);
+            r.logs.should.have.length(0);
+        });
+    });
+
+    describe('help option', function () {
+        it('should display usage', function () {
+            var r = checkUsage(function () {
+                return yargs(['--help'])
+                    .demand(['y'])
+                    .help('help')
+                    .argv;
+            });
+            r.should.have.property('result');
+            r.result.should.have.property('_').with.length(0);
+            r.should.have.property('errors');
+            r.should.have.property('logs').with.length(1);
+            r.should.have.property('exit').and.be.ok;
+            r.logs.join('\n').split(/\n+/).should.deep.equal([
+                'Options:',
+                '  --help  Show help',
+                '  -y                 [required]',
+                ''
+            ]);
+        });
+
+        it('should not show both dashed and camelCase aliases', function () {
+            var r = checkUsage(function () {
+                return yargs(['--help'])
+                    .usage('Usage: $0 options')
+                    .help('help')
+                    .describe('some-opt', 'Some option')
+                    .default('some-opt', 2)
+                    .argv;
+            });
+            r.should.have.property('result');
+            r.result.should.have.property('_').with.length(0);
+            r.should.have.property('exit').and.be.ok;
+            r.should.have.property('errors').with.length(0);
+            r.should.have.property('logs');
+            r.logs.join('\n').split(/\n+/).should.deep.equal([
+                'Usage: ./usage options',
+                'Options:',
+                '  --help      Show help  ',
+                '  --some-opt  Some option  [default: 2]',
+                ''
+            ]);
+        });
+    });
+
+    describe('version option', function () {
+        it('should display version', function () {
+            var r = checkUsage(function () {
+                return yargs(['--version'])
+                    .version('1.0.1', 'version', 'Show version number')
+                    .argv;
+            });
+            r.should.have.property('result');
+            r.result.should.have.property('_').with.length(0);
+            r.should.have.property('errors');
+            r.should.have.property('logs').with.length(1);
+            r.should.have.property('exit').and.be.ok;
+            r.logs.join('\n').split(/\n+/).should.deep.equal([
+                '1.0.1'
+            ]);
+        });
+    });
+
+    describe('showHelpOnFail', function () {
+        it('should display user supplied message', function () {
+            var opts = {
+                foo: { desc: 'foo option', alias: 'f' },
+                bar: { desc: 'bar option', alias: 'b' }
+            };
+
+            var r = checkUsage(function () {
+                return yargs(['--foo'])
+                    .usage('Usage: $0 [options]')
+                    .options(opts)
+                    .demand(['foo', 'bar'])
+                    .showHelpOnFail(false, "Specify --help for available options")
+                    .argv;
+            });
+            r.should.have.property('result');
+            r.result.should.have.property('_').with.length(0);
+            r.should.have.property('errors');
+            r.should.have.property('logs').with.length(0);
+            r.should.have.property('exit').and.be.ok;
+            r.errors.join('\n').split(/\n/).should.deep.equal([
+                'Missing required arguments: bar',
+                '',
+                'Specify --help for available options'
+            ]);
+        });
+    });
+
     it('should succeed when rebase', function () {
         yargs.rebase('/home/chevex', '/home/chevex/foo/bar/baz').should.equal('./foo/bar/baz');
         yargs.rebase('/home/chevex/foo/bar/baz', '/home/chevex').should.equal('../../..');
@@ -545,10 +737,12 @@ describe('usage', function () {
         process._exit = process.exit;
         process._env = process.env;
         process._argv = process.argv;
+        process.stdout._write = process.stdout.write;
 
         process.exit = function () { exit = true };
         process.env = Hash.merge(process.env, { _ : 'node' });
         process.argv = [ './usage' ];
+        process.stdout.write = function (msg) { logs.push(msg) };
 
         var errors = [];
         var logs = [];
@@ -563,6 +757,7 @@ describe('usage', function () {
         process.exit = process._exit;
         process.env = process._env;
         process.argv = process._argv;
+        process.stdout.write = process.stdout._write;
 
         console.error = console._error;
         console.log = console._log;