commander 0.4.2 → 0.5.2

package/History.md

@@ -1,4 +1,32 @@
 
+0.6.1 / 2012-06-01 
+==================
+
+  * Added: append (yes or no) on confirmation
+  * Added: allow node.js v0.7.x
+
+0.6.0 / 2012-04-10 
+==================
+
+  * Added `.prompt(obj, callback)` support. Closes #49
+  * Added default support to .choose(). Closes #41
+  * Fixed the choice example
+
+0.5.1 / 2011-12-20 
+==================
+
+  * Fixed `password()` for recent nodes. Closes #36
+
+0.5.0 / 2011-12-04 
+==================
+
+  * Added sub-command option support [itay]
+
+0.4.3 / 2011-12-04 
+==================
+
+  * Fixed custom help ordering. Closes #32
+
 0.4.2 / 2011-11-24 
 ==================
 

package/Readme.md

@@ -1,4 +1,3 @@
-
 # Commander.js
 
   The complete solution for [node.js](http://nodejs.org) command-line interfaces, inspired by Ruby's [commander](https://github.com/visionmedia/commander).
@@ -50,7 +49,7 @@ console.log('  - %s cheese', program.cheese);
 
    Options:
 
-     -v, --version        output the version number
+     -V, --version        output the version number
      -p, --peppers        Add peppers
      -P, --pineapple      Add pineappe
      -b, --bbq            Add bbq sauce
@@ -142,7 +141,7 @@ Usage: custom-help [options]
 Options:
 
   -h, --help     output usage information
-  -v, --version  output the version number
+  -V, --version  output the version number
   -f, --foo      enable some foo
   -b, --bar      enable some bar
   -B, --baz      enable some baz

package/lib/commander.js

@@ -199,12 +199,36 @@ Command.prototype.parseExpectedArgs = function(args){
 
 Command.prototype.action = function(fn){
   var self = this;
-  this.parent.on(this.name, function(args){
+  this.parent.on(this.name, function(args, unknown){    
+    // Parse any so-far unknown options
+    unknown = unknown || [];
+    var parsed = self.parseOptions(unknown);
+    
+    // Output help if necessary
+    outputHelpIfNecessary(self, parsed.unknown);
+    
+    // If there are still any unknown options, then we simply 
+    // die, unless someone asked for help, in which case we give it
+    // to them, and then we die.
+    if (parsed.unknown.length > 0) {      
+      self.unknownOption(parsed.unknown[0]);
+    }
+    
     self.args.forEach(function(arg, i){
       if (arg.required && null == args[i]) {
         self.missingArgument(arg.name);
       }
     });
+    
+    // Always append ourselves to the end of the arguments,
+    // to make sure we match the number of arguments the user
+    // expects
+    if (self.args.length) {
+      args[self.args.length] = self;
+    } else {
+      args.push(self);
+    }
+    
     fn.apply(this, args);
   });
   return this;
@@ -320,8 +344,9 @@ Command.prototype.parse = function(argv){
   if (!this.name) this.name = basename(argv[1]);
 
   // process argv
-  this.args = this.parseOptions(this.normalize(argv));
-  return this.parseArgs(this.args);
+  var parsed = this.parseOptions(this.normalize(argv.slice(2)));
+  this.args = parsed.args;
+  return this.parseArgs(this.args, parsed.unknown);
 };
 
 /**
@@ -363,7 +388,7 @@ Command.prototype.normalize = function(args){
  * @api private
  */
 
-Command.prototype.parseArgs = function(args){
+Command.prototype.parseArgs = function(args, unknown){
   var cmds = this.commands
     , len = cmds.length
     , name;
@@ -371,10 +396,18 @@ Command.prototype.parseArgs = function(args){
   if (args.length) {
     name = args[0];
     if (this.listeners(name).length) {
-      this.emit(args.shift(), args);
+      this.emit(args.shift(), args, unknown);
     } else {
       this.emit('*', args);
     }
+  } else {
+    outputHelpIfNecessary(this, unknown);
+    
+    // If there were no args and we have unknown options,
+    // then they are extraneous and we need to error.
+    if (unknown.length > 0) {      
+      this.unknownOption(unknown[0]);
+    }
   }
 
   return this;
@@ -407,12 +440,13 @@ Command.prototype.optionFor = function(arg){
 
 Command.prototype.parseOptions = function(argv){
   var args = []
-    , argv = argv.slice(2)
     , len = argv.length
     , literal
     , option
     , arg;
 
+  var unknownOptions = [];
+
   // parse options
   for (var i = 0; i < len; ++i) {
     arg = argv[i];
@@ -457,14 +491,22 @@ Command.prototype.parseOptions = function(argv){
     
     // looks like an option
     if (arg.length > 1 && '-' == arg[0]) {
-      this.unknownOption(arg);
+      unknownOptions.push(arg);
+      
+      // If the next argument looks like it might be
+      // an argument for this option, we pass it on.
+      // If it isn't, then it'll simply be ignored
+      if (argv[i+1] && '-' != argv[i+1][0]) {
+        unknownOptions.push(argv[++i]);
+      }
+      continue;
     }
     
     // arg
     args.push(arg);
   }
-
-  return args;
+  
+  return { args: args, unknown: unknownOptions };
 };
 
 /**
@@ -561,11 +603,19 @@ Command.prototype.description = function(str){
  */
 
 Command.prototype.usage = function(str){
+  var args = this.args.map(function(arg){
+    return arg.required
+      ? '<' + arg.name + '>'
+      : '[' + arg.name + ']';
+  });
+
   var usage = '[options'
     + (this.commands.length ? '] [command' : '')
-    + ']';
+    + ']'
+    + (this.args.length ? ' ' + args : '');
   if (0 == arguments.length) return this._usage || usage;
   this._usage = str;
+
   return this;
 };
 
@@ -591,10 +641,14 @@ Command.prototype.largestOptionLength = function(){
 
 Command.prototype.optionHelp = function(){
   var width = this.largestOptionLength();
-  return this.options.map(function(option){
-    return pad(option.flags, width)
-      + '  ' + option.description;
-  }).join('\n');
+  
+  // Prepend the help information
+  return [pad('-h, --help', width) + '  ' + 'output usage information']
+    .concat(this.options.map(function(option){
+      return pad(option.flags, width)
+        + '  ' + option.description;
+      }))
+    .join('\n');
 };
 
 /**
@@ -616,7 +670,11 @@ Command.prototype.commandHelp = function(){
           ? '<' + arg.name + '>'
           : '[' + arg.name + ']';
       }).join(' ');
-      return cmd.name + ' ' + args
+
+      return cmd.name 
+        + (cmd.options.length 
+          ? ' [options]'
+          : '') + ' ' + args
         + (cmd.description()
           ? '\n' + cmd.description()
           : '');
@@ -654,9 +712,10 @@ Command.prototype.helpInformation = function(){
  */
 
 Command.prototype.promptForNumber = function(str, fn){
-  this.promptSingleLine(str, function(val){
+  var self = this;
+  this.promptSingleLine(str, function parseNumber(val){
     val = Number(val);
-    if (isNaN(val)) return program.promptForNumber(str + '(must be a number) ', fn);
+    if (isNaN(val)) return self.promptSingleLine(str + '(must be a number) ', parseNumber);
     fn(val);
   });
 };
@@ -671,9 +730,9 @@ Command.prototype.promptForNumber = function(str, fn){
 
 Command.prototype.promptForDate = function(str, fn){
   var self = this;
-  this.promptSingleLine(str, function(val){
+  this.promptSingleLine(str, function parseDate(val){
     val = new Date(val);
-    if (isNaN(val.getTime())) return self.promptForDate(str + '(must be a date) ', fn);
+    if (isNaN(val.getTime())) return self.promptSingleLine(str + '(must be a date) ', parseDate);
     fn(val);
   });
 };
@@ -707,15 +766,15 @@ Command.prototype.promptSingleLine = function(str, fn){
  */
 
 Command.prototype.promptMultiLine = function(str, fn){
-  var buf = '';
+  var buf = [];
   console.log(str);
   process.stdin.setEncoding('utf8');
   process.stdin.on('data', function(val){
-    if ('\n' == val) {
+    if ('\n' == val || '\r\n' == val) {
       process.stdin.removeAllListeners('data');
-      fn(buf);
+      fn(buf.join('\n'));
     } else {
-      buf += val;
+      buf.push(val.trimRight());
     }
   }).resume();
 };
@@ -739,14 +798,34 @@ Command.prototype.promptMultiLine = function(str, fn){
  *       console.log('description was "%s"', desc.trim());
  *     });
  *
- * @param {String} str
+ * @param {String|Object} str
  * @param {Function} fn
  * @api public
  */
 
 Command.prototype.prompt = function(str, fn){
-  if (/ $/.test(str)) return this.promptSingleLine.apply(this, arguments);
-  this.promptMultiLine(str, fn);
+  var self = this;
+
+  if ('string' == typeof str) {
+    if (/ $/.test(str)) return this.promptSingleLine.apply(this, arguments);
+    this.promptMultiLine(str, fn);
+  } else {
+    var keys = Object.keys(str)
+      , obj = {};
+
+    function next() {
+      var key = keys.shift()
+        , label = str[key];
+
+      if (!key) return fn(obj);
+      self.prompt(label, function(val){
+        obj[key] = val;
+        next();
+      });
+    }
+
+    next();
+  }
 };
 
 /**
@@ -783,6 +862,7 @@ Command.prototype.password = function(str, mask, fn){
     mask = '';
   }
 
+  process.stdin.resume();
   tty.setRawMode(true);
   process.stdout.write(str);
 
@@ -823,11 +903,12 @@ Command.prototype.password = function(str, mask, fn){
  */
 
 
-Command.prototype.confirm = function(str, fn){
+Command.prototype.confirm = function(str, fn, verbose){
   var self = this;
   this.prompt(str, function(ok){
     if (!ok.trim()) {
-      return self.confirm(str, fn);
+      if (!verbose) str += '(yes or no) ';
+      return self.confirm(str, fn, true);
     }
     fn(parseBool(ok));
   });
@@ -847,20 +928,33 @@ Command.prototype.confirm = function(str, fn){
  *      });
  *
  * @param {Array} list
+ * @param {Number|Function} index or fn
  * @param {Function} fn
  * @api public
  */
 
-Command.prototype.choose = function(list, fn){
-  var self = this;
+Command.prototype.choose = function(list, index, fn){
+  var self = this
+    , hasDefault = 'number' == typeof index;
+
+  if (!hasDefault) {
+    fn = index;
+    index = null;
+  }
 
   list.forEach(function(item, i){
-    console.log('  %d) %s', i + 1, item);
+    if (hasDefault && i == index) {
+      console.log('* %d) %s', i + 1, item);
+    } else {
+      console.log('  %d) %s', i + 1, item);
+    }
   });
 
   function again() {
     self.prompt('  : ', function(val){
       val = parseInt(val, 10) - 1;
+      if (hasDefault && isNaN(val)) val = index;
+
       if (null == list[val]) {
         again();
       } else {
@@ -913,12 +1007,20 @@ function pad(str, width) {
 }
 
 /**
- * Default -h, --help option.
+ * Output help information if necessary
+ *
+ * @param {Command} command to output help for
+ * @param {Array} array of options to search for -h or --help
+ * @api private
  */
 
-exports.option('-h, --help', 'output usage information');
-exports.on('help', function(){
-  exports.emit('--help');
-  process.stdout.write(this.helpInformation());
-  process.exit(0);
-});
+function outputHelpIfNecessary(cmd, options) {
+  options = options || [];
+  for (var i = 0; i < options.length; i++) {
+    if (options[i] == '--help' || options[i] == '-h') {
+      process.stdout.write(cmd.helpInformation());
+      cmd.emit('--help');
+      process.exit(0);
+    }
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "commander"
-  , "version": "0.4.2"
+  , "version": "0.5.2"
   , "description": "the complete solution for node.js command-line programs"
   , "keywords": ["command", "option", "parser", "prompt", "stdin"]
   , "author": "TJ Holowaychuk <tj@vision-media.ca>"
@@ -9,5 +9,5 @@
   , "devDependencies": { "should": ">= 0.0.1" }
   , "scripts": { "test": "make test" }
   , "main": "index"
-  , "engines": { "node": ">= 0.4.x < 0.7.0" }
+  , "engines": { "node": ">= 0.4.x" }
 }

package/.gitignore

@@ -1,3 +0,0 @@
-.DS_Store
-node_modules
-*.sock

package/examples/choice

@@ -1,15 +0,0 @@
-#!/usr/bin/env node
-
-/**
- * Module dependencies.
- */
-
-var program = require('../');
-
-var list = ['tobi', 'loki', 'jane', 'manny', 'luna'];
-
-console.log('Choose the coolest pet:');
-program.choose(list, function(i){
-  console.log('you chose %d "%s"', i, list[i]);
-  process.stdin.destroy();
-});

package/examples/coercion

@@ -1,33 +0,0 @@
-#!/usr/bin/env node
-
-/**
- * Module dependencies.
- */
-
-var program = require('../');
-
-function range(val) {
-  return val.split('..').map(Number);
-}
-
-function list(val) {
-  return val.split(',');
-}
-
-program
-  .version('0.0.1')
-  .usage('test')
-  .option('-i, --integer <n>', 'An integer argument', parseInt)
-  .option('-f, --float <n>', 'A float argument', parseFloat)
-  .option('-r, --range <a>..<b>', 'A range', range)
-  .option('-l, --list <items>', 'A list', list)
-  .option('-o, --optional [value]', 'An optional value')
-  .parse(process.argv);
-
-console.log(' int: %j', program.integer);
-console.log(' float: %j', program.float);
-console.log(' optional: %j', program.optional);
-program.range = program.range || [];
-console.log(' range: %j..%j', program.range[0], program.range[1]);
-console.log(' list: %j', program.list);
-console.log(' args: %j', program.args);

package/examples/confirm

@@ -1,12 +0,0 @@
-#!/usr/bin/env node
-
-/**
- * Module dependencies.
- */
-
-var program = require('../');
-
-program.confirm('continue? ', function(ok){
-  console.log(' got %j', ok);
-  process.stdin.destroy();
-});

package/examples/custom-help

@@ -1,32 +0,0 @@
-#!/usr/bin/env node
-
-/**
- * Module dependencies.
- */
-
-var program = require('../');
-
-function list(val) {
-  return val.split(',').map(Number);
-}
-
-program
-  .version('0.0.1')
-  .option('-f, --foo', 'enable some foo')
-  .option('-b, --bar', 'enable some bar')
-  .option('-B, --baz', 'enable some baz');
-
-// must be before .parse() since
-// node's emit() is immediate
-
-program.on('--help', function(){
-  console.log('  Examples:');
-  console.log('');
-  console.log('    $ custom-help --help');
-  console.log('    $ custom-help -h');
-  console.log('');
-});
-
-program.parse(process.argv);
-
-console.log('stuff');

package/examples/defaults

@@ -1,22 +0,0 @@
-#!/usr/bin/env node
-
-/**
- * Module dependencies.
- */
-
-var program = require('../');
-
-function list(val) {
-  return val.split(',').map(Number);
-}
-
-program
-  .version('0.0.1')
-  .option('-t, --template-engine [engine]', 'Add template [engine] support', 'jade')
-  .option('-c, --cheese [type]', 'Add the specified type of cheese [marble]', 'marble')
-  .option('-l, --list [items]', 'Specify list items defaulting to 1,2,3', list, [1,2,3])
-  .parse(process.argv);
-
-console.log('  - %s template engine', program.templateEngine);
-console.log('  - %s cheese', program.cheese);
-console.log('  - %j', program.list);

package/examples/deploy

@@ -1,38 +0,0 @@
-#!/usr/bin/env node
-
-/**
- * Module dependencies.
- */
-
-var program = require('../');
-
-program
-  .version('0.0.1')
-  .option('-C, --chdir <path>', 'change the working directory')
-  .option('-c, --config <path>', 'set config path. defaults to ./deploy.conf')
-  .option('-T, --no-tests', 'ignore test hook')
-
-program
-  .command('setup [env]')
-  .description('run setup commands for all envs')
-  .action(function(env){
-    env = env || 'all';
-    console.log('setup for %s env(s)', env);
-  });
-
-program
-  .command('exec <cmd>')
-  .description('execute the given remote cmd')
-  .action(function(cmd){
-    console.log('exec "%s"', cmd);
-  });
-
-program
-  .command('*')
-  .action(function(env){
-    console.log('deploying "%s"', env);
-  });
-
-program.parse(process.argv);
-
-

package/examples/express

@@ -1,18 +0,0 @@
-#!/usr/bin/env node
-
-/**
- * Module dependencies.
- */
-
-var program = require('../');
-
-program
-  .version('0.0.1')
-  .option('-s, --sessions', 'add session support')
-  .option('-t, --template <engine>', 'specify template engine (jade|ejs) [jade]', 'jade')
-  .option('-c, --css <engine>', 'specify stylesheet engine (stylus|sass|less) [css]', 'css')
-  .parse(process.argv);
-
-console.log(' - sessions %j', program.sessions);
-console.log(' - template %j', program.template);
-console.log(' - css %j', program.css);

package/examples/input

@@ -1,24 +0,0 @@
-#!/usr/bin/env node
-
-/**
- * Module dependencies.
- */
-
-var program = require('../');
-
-program.prompt('Username: ', function(name){
-  console.log('hi %s\n', name);
-
-  program.prompt('Description:', function(desc){
-    console.log('description was "%s"', desc.trim());
-
-    program.prompt('Age: ', Number, function(age){
-      console.log('age: %j\n', age);
-
-      program.prompt('Birthdate: ', Date, function(date){
-        console.log('date: %s\n', date);
-        process.stdin.destroy();
-      });
-    });
-  });
-});

package/examples/password

@@ -1,18 +0,0 @@
-#!/usr/bin/env node
-
-/**
- * Module dependencies.
- */
-
-var program = require('../');
-
-program.password('Password: ', function(pass){
-  console.log('got "%s"', pass);
-  program.password('Password: ', '*', function(pass){
-    console.log('got "%s"', pass);
-    program.password('Password: ', '-', function(pass){
-      console.log('got "%s"', pass);
-      process.stdin.destroy();
-    });
-  });
-});

package/examples/pizza

@@ -1,28 +0,0 @@
-#!/usr/bin/env node
-
-/**
- * Module dependencies.
- */
-
-var program = require('../');
-
-program
-  .version('0.0.1')
-  .option('-p, --peppers', 'Add peppers')
-  .option('-P, --pineapple', 'Add pineapple')
-  .option('-b, --bbq', 'Add bbq sauce')
-  .option('-c, --cheese <type>', 'Add the specified type of cheese [marble]')
-  .option('-C, --no-cheese', 'You do not want any cheese')
-  .parse(process.argv);
-
-console.log('you ordered a pizza with:');
-if (program.peppers) console.log('  - peppers');
-if (program.pineappe) console.log('  - pineapple');
-if (program.bbq) console.log('  - bbq');
-
-var cheese = true === program.cheese
-  ? 'marble'
-  : program.cheese || 'no';
-
-console.log('  - %s cheese', cheese);
-console.log(program.args);

package/test/run

@@ -1,16 +0,0 @@
-#!/bin/sh
-
-export NODE_ENV=test
-
-echo
-for file in $@; do
-  printf "\033[90m   ${file#test/}\033[0m "
-  node $file 2> /tmp/stderr && echo "\033[36m✓\033[0m"
-  code=$?
-  if test $code -ne 0; then
-    echo "\033[31m✖\033[0m"
-    cat /tmp/stderr >&2
-    exit $code
-  fi
-done
-echo

package/test/test.literal.args.js

@@ -1,16 +0,0 @@
-/**
- * Module dependencies.
- */
-
-var program = require('../')
-  , should = require('should');
-
-program
-  .version('0.0.1')
-  .option('-f, --foo', 'add some foo')
-  .option('-b, --bar', 'add some bar');
-
-program.parse(['node', 'test', '--foo', '--', '--bar', 'baz']);
-program.foo.should.be.true;
-should.equal(undefined, program.bar);
-program.args.should.eql(['--bar', 'baz']);

package/test/test.options.args.optional.given.js

@@ -1,13 +0,0 @@
-/**
- * Module dependencies.
- */
-
-var program = require('../')
-  , should = require('should');
-
-program
-  .version('0.0.1')
-  .option('-c, --cheese [type]', 'optionally specify the type of cheese');
-
-program.parse(['node', 'test', '--cheese', 'feta']);
-program.cheese.should.equal('feta');

package/test/test.options.args.optional.js

@@ -1,13 +0,0 @@
-/**
- * Module dependencies.
- */
-
-var program = require('../')
-  , should = require('should');
-
-program
-  .version('0.0.1')
-  .option('-c, --cheese [type]', 'optionally specify the type of cheese');
-
-program.parse(['node', 'test', '--cheese']);
-program.cheese.should.be.true;

package/test/test.options.bool.js

@@ -1,16 +0,0 @@
-
-/**
- * Module dependencies.
- */
-
-var program = require('../')
-  , should = require('should');
-
-program
-  .version('0.0.1')
-  .option('-p, --pepper', 'add pepper')
-  .option('-c, --no-cheese', 'remove cheese');
-
-program.parse(['node', 'test', '--pepper']);
-program.pepper.should.be.true;
-program.cheese.should.be.true;

package/test/test.options.bool.no.js

@@ -1,15 +0,0 @@
-/**
- * Module dependencies.
- */
-
-var program = require('../')
-  , should = require('should');
-
-program
-  .version('0.0.1')
-  .option('-p, --pepper', 'add pepper')
-  .option('-c|--no-cheese', 'remove cheese');
-
-program.parse(['node', 'test', '--no-cheese']);
-should.equal(undefined, program.pepper);
-program.cheese.should.be.false;

package/test/test.options.bool.small.combined.js

@@ -1,15 +0,0 @@
-/**
- * Module dependencies.
- */
-
-var program = require('../')
-  , should = require('should');
-
-program
-  .version('0.0.1')
-  .option('-p, --pepper', 'add pepper')
-  .option('-c, --no-cheese', 'remove cheese');
-
-program.parse(['node', 'test', '-pc']);
-program.pepper.should.be.true;
-program.cheese.should.be.false;

package/test/test.options.bool.small.js

@@ -1,15 +0,0 @@
-/**
- * Module dependencies.
- */
-
-var program = require('../')
-  , should = require('should');
-
-program
-  .version('0.0.1')
-  .option('-p, --pepper', 'add pepper')
-  .option('-c, --no-cheese', 'remove cheese');
-
-program.parse(['node', 'test', '-p', '-c']);
-program.pepper.should.be.true;
-program.cheese.should.be.false;

package/test/test.options.camelcase.js

@@ -1,27 +0,0 @@
-/**
- * Module dependencies.
- */
-
-var program = require('../')
-  , should = require('should');
-
-function parseRange(str) {
-  return str.split('..').map(Number);
-}
-
-program
-  .version('0.0.1')
-  .option('-i, --my-int <n>', 'pass an int', parseInt)
-  .option('-n, --my-num <n>', 'pass a number', Number)
-  .option('-f, --my-fLOAT <n>', 'pass a float', parseFloat)
-  .option('-m, --my-very-long-float <n>', 'pass a float', parseFloat)
-  .option('-u, --my-URL-count <n>', 'pass a float', parseFloat)
-  .option('-r, --my-long-range <a..b>', 'pass a range', parseRange);
-
-program.parse('node test -i 5.5 -f 5.5 -m 6.5 -u 7.5 -n 15.99 -r 1..5'.split(' '));
-program.myInt.should.equal(5);
-program.myNum.should.equal(15.99);
-program.myFLOAT.should.equal(5.5);
-program.myVeryLongFloat.should.equal(6.5);
-program.myURLCount.should.equal(7.5);
-program.myLongRange.should.eql([1,5]);

package/test/test.options.coercion.js

@@ -1,23 +0,0 @@
-/**
- * Module dependencies.
- */
-
-var program = require('../')
-  , should = require('should');
-
-function parseRange(str) {
-  return str.split('..').map(Number);
-}
-
-program
-  .version('0.0.1')
-  .option('-i, --int <n>', 'pass an int', parseInt)
-  .option('-n, --num <n>', 'pass a number', Number)
-  .option('-f, --float <n>', 'pass a float', parseFloat)
-  .option('-r, --range <a..b>', 'pass a range', parseRange);
-
-program.parse('node test -i 5.5 -f 5.5 -n 15.99 -r 1..5'.split(' '));
-program.int.should.equal(5);
-program.num.should.equal(15.99);
-program.float.should.equal(5.5);
-program.range.should.eql([1,5]);

package/test/test.options.defaults.given.js

@@ -1,23 +0,0 @@
-/**
- * Module dependencies.
- */
-
-var program = require('../')
-  , should = require('should');
-
-program
-  .version('0.0.1')
-  .option('-a, --anchovies', 'Add anchovies?')
-  .option('-o, --onions', 'Add onions?', true)
-  .option('-v, --olives', 'Add olives? Sorry we only have black.', 'black')
-  .option('-s, --no-sauce', 'Uh… okay')
-  .option('-r, --crust <type>', 'What kind of crust would you like?', 'hand-tossed')
-  .option('-c, --cheese [type]', 'optionally specify the type of cheese', 'mozzarella');
-
-program.parse(['node', 'test', '--anchovies', '--onions', '--olives', '--no-sauce', '--crust', 'thin', '--cheese', 'wensleydale']);
-program.should.have.property('anchovies', true);
-program.should.have.property('onions', true);
-program.should.have.property('olives', 'black');
-program.should.have.property('sauce', false);
-program.should.have.property('crust', 'thin');
-program.should.have.property('cheese', 'wensleydale');

package/test/test.options.defaults.js

@@ -1,23 +0,0 @@
-/**
- * Module dependencies.
- */
-
-var program = require('../')
-  , should = require('should');
-
-program
-  .version('0.0.1')
-  .option('-a, --anchovies', 'Add anchovies?')
-  .option('-o, --onions', 'Add onions?', true)
-  .option('-v, --olives', 'Add olives? Sorry we only have black.', 'black')
-  .option('-s, --no-sauce', 'Uh… okay')
-  .option('-r, --crust <type>', 'What kind of crust would you like?', 'hand-tossed')
-  .option('-c, --cheese [type]', 'optionally specify the type of cheese', 'mozzarella');
-
-program.parse(['node', 'test']);
-program.should.not.have.property('anchovies');
-program.should.not.have.property('onions');
-program.should.not.have.property('olives');
-program.should.have.property('sauce', true);
-program.should.have.property('crust', 'hand-tossed');
-program.should.have.property('cheese', 'mozzarella');

package/test/test.options.large-only-with-value.js

@@ -1,13 +0,0 @@
-/**
- * Module dependencies.
- */
-
-var program = require('../')
-  , should = require('should');
-
-program
-  .version('0.0.1')
-  .option('--longflag [value]', 'A long only flag with a value');
-
-program.parse(['node', 'test', '--longflag', 'something']);
-program.longflag.should.equal('something');

package/test/test.options.large-only.js

@@ -1,13 +0,0 @@
-/**
- * Module dependencies.
- */
-
-var program = require('../')
-  , should = require('should');
-
-program
-  .version('0.0.1')
-  .option('--verbose', 'do stuff');
-
-program.parse(['node', 'test', '--verbose']);
-program.verbose.should.be.true;