commander 2.0.0 → 2.1.0

package/index.js

@@ -431,11 +431,16 @@ Command.prototype.executeSubCommand = function(argv, args, unknown) {
 Command.prototype.normalize = function(args){
   var ret = []
     , arg
+    , lastOpt
     , index;
 
   for (var i = 0, len = args.length; i < len; ++i) {
     arg = args[i];
-    if (arg.length > 1 && '-' == arg[0] && '-' != arg[1]) {
+    i > 0 && (lastOpt = this.optionFor(args[i-1]));
+    
+    if (lastOpt && lastOpt.required) {
+     	ret.push(arg);
+    } else if (arg.length > 1 && '-' == arg[0] && '-' != arg[1]) {
       arg.slice(1).split('').forEach(function(c){
         ret.push('-' + c);
       });
@@ -544,7 +549,6 @@ Command.prototype.parseOptions = function(argv){
       if (option.required) {
         arg = argv[++i];
         if (null == arg) return this.optionMissingArgument(option);
-        if ('-' == arg[0] && '-' != arg) return this.optionMissingArgument(option, arg);
         this.emit(option.name(), arg);
       // optional arg
       } else if (option.optional) {

package/package.json

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

package/History.md

@@ -1,179 +0,0 @@
-
-2.0.0 / 2013-07-18 
-==================
-
- * remove input methods (.prompt, .confirm, etc)
-
-1.3.2 / 2013-07-18 
-==================
-
- * add support for sub-commands to co-exist with the original command
-
-1.3.1 / 2013-07-18 
-==================
-
- * add quick .runningCommand hack so you can opt-out of other logic when running a sub command
-
-1.3.0 / 2013-07-09 
-==================
-
- * add EACCES error handling
- * fix sub-command --help
-
-1.2.0 / 2013-06-13 
-==================
-
- * allow "-" hyphen as an option argument
- * support for RegExp coercion
-
-1.1.1 / 2012-11-20 
-==================
-
-  * add more sub-command padding
-  * fix .usage() when args are present. Closes #106
-
-1.1.0 / 2012-11-16 
-==================
-
-  * add git-style executable subcommand support. Closes #94
-
-1.0.5 / 2012-10-09 
-==================
-
-  * fix `--name` clobbering. Closes #92
-  * fix examples/help. Closes #89
-
-1.0.4 / 2012-09-03 
-==================
-
-  * add `outputHelp()` method.
-
-1.0.3 / 2012-08-30 
-==================
-
-  * remove invalid .version() defaulting
-
-1.0.2 / 2012-08-24 
-==================
-
-  * add `--foo=bar` support [arv]
-  * fix password on node 0.8.8. Make backward compatible with 0.6 [focusaurus]
-
-1.0.1 / 2012-08-03 
-==================
-
-  * fix issue #56
-  * fix tty.setRawMode(mode) was moved to tty.ReadStream#setRawMode() (i.e. process.stdin.setRawMode())
-
-1.0.0 / 2012-07-05 
-==================
-
-  * add support for optional option descriptions
-  * add defaulting of `.version()` to package.json's version
-
-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 
-==================
-
-  * Added travis support
-  * Fixed: line-buffered input automatically trimmed. Closes #31
-
-0.4.1 / 2011-11-18 
-==================
-
-  * Removed listening for "close" on --help
-
-0.4.0 / 2011-11-15 
-==================
-
-  * Added support for `--`. Closes #24
-
-0.3.3 / 2011-11-14 
-==================
-
-  * Fixed: wait for close event when writing help info [Jerry Hamlet]
-
-0.3.2 / 2011-11-01 
-==================
-
-  * Fixed long flag definitions with values [felixge]
-
-0.3.1 / 2011-10-31 
-==================
-
-  * Changed `--version` short flag to `-V` from `-v`
-  * Changed `.version()` so it's configurable [felixge]
-
-0.3.0 / 2011-10-31 
-==================
-
-  * Added support for long flags only. Closes #18
-
-0.2.1 / 2011-10-24 
-==================
-
-  * "node": ">= 0.4.x < 0.7.0". Closes #20
-
-0.2.0 / 2011-09-26 
-==================
-
-  * Allow for defaults that are not just boolean. Default peassignment only occurs for --no-*, optional, and required arguments. [Jim Isaacs]
-
-0.1.0 / 2011-08-24 
-==================
-
-  * Added support for custom `--help` output
-
-0.0.5 / 2011-08-18 
-==================
-
-  * Changed: when the user enters nothing prompt for password again
-  * Fixed issue with passwords beginning with numbers [NuckChorris]
-
-0.0.4 / 2011-08-15 
-==================
-
-  * Fixed `Commander#args`
-
-0.0.3 / 2011-08-15 
-==================
-
-  * Added default option value support
-
-0.0.2 / 2011-08-15 
-==================
-
-  * Added mask support to `Command#password(str[, mask], fn)`
-  * Added `Command#password(str, fn)`
-
-0.0.1 / 2010-01-03
-==================
-
-  * Initial release