commander 1.1.1 → 1.2.0

package/History.md

@@ -1,4 +1,10 @@
 
+1.2.0 / 2013-06-13 
+==================
+
+ * allow "-" hyphen as an option argument
+ * support for RegExp coercion
+
 1.1.1 / 2012-11-20 
 ==================
 

package/Readme.md

@@ -185,6 +185,12 @@ program.prompt('Birthdate: ', Date, function(date){
 });
 ```
 
+```js
+program.prompt('Email: ', /^.+@.+\..+$/, function(email){
+  console.log('email: %j', email);
+});
+```
+
 ## .password(msg[, mask], fn)
 
 Prompt for password without echoing:

package/index.js

@@ -543,12 +543,12 @@ Command.prototype.parseOptions = function(argv){
       if (option.required) {
         arg = argv[++i];
         if (null == arg) return this.optionMissingArgument(option);
-        if ('-' == arg[0]) return this.optionMissingArgument(option, arg);
+        if ('-' == arg[0] && '-' != arg) return this.optionMissingArgument(option, arg);
         this.emit(option.name(), arg);
       // optional arg
       } else if (option.optional) {
         arg = argv[i+1];
-        if (null == arg || '-' == arg[0]) {
+        if (null == arg || ('-' == arg[0] && '-' != arg)) {
           arg = null;
         } else {
           ++i;
@@ -811,6 +811,25 @@ Command.prototype.promptForDate = function(str, fn){
   });
 };
 
+
+/**
+ * Prompt for a `Regular Expression`.
+ *
+ * @param {String} str
+ * @param {Object} pattern regular expression object to test
+ * @param {Function} fn
+ * @api private
+ */
+
+Command.prototype.promptForRegexp = function(str, pattern, fn){
+  var self = this;
+  this.promptSingleLine(str, function parseRegexp(val){
+    if(!pattern.test(val)) return self.promptSingleLine(str + '(regular expression mismatch) ', parseRegexp);
+    fn(val);
+  });
+};
+
+
 /**
  * Single-line prompt.
  *
@@ -820,7 +839,10 @@ Command.prototype.promptForDate = function(str, fn){
  */
 
 Command.prototype.promptSingleLine = function(str, fn){
-  if ('function' == typeof arguments[2]) {
+  // determine if the 2nd argument is a regular expression
+  if (arguments[1].global !== undefined && arguments[1].multiline !== undefined) {
+    return this.promptForRegexp(str, arguments[1], arguments[2]);
+  } else if ('function' == typeof arguments[2]) {
     return this['promptFor' + (fn.name || fn)](str, arguments[2]);
   }
 
@@ -879,7 +901,6 @@ Command.prototype.promptMultiLine = function(str, fn){
 
 Command.prototype.prompt = function(str, fn){
   var self = this;
-
   if ('string' == typeof str) {
     if (/ $/.test(str)) return this.promptSingleLine.apply(this, arguments);
     this.promptMultiLine(str, fn);

package/package.json

@@ -1,10 +1,10 @@
 {
     "name": "commander"
-  , "version": "1.1.1"
+  , "version": "1.2.0"
   , "description": "the complete solution for node.js command-line programs"
   , "keywords": ["command", "option", "parser", "prompt", "stdin"]
   , "author": "TJ Holowaychuk <tj@vision-media.ca>"
-  , "repository": { "type": "git", "url": "https://github.com/visionmedia/commander.js.git" }  
+  , "repository": { "type": "git", "url": "https://github.com/visionmedia/commander.js.git" }
   , "dependencies": { "keypress": "0.1.x"}
   , "devDependencies": { "should": ">= 0.0.1" }
   , "scripts": { "test": "make test" }

package/.npmignore

@@ -1,4 +0,0 @@
-support
-test
-examples
-*.sock

package/.travis.yml

@@ -1,4 +0,0 @@
-language: node_js
-node_js:
-  - 0.4
-  - 0.6

package/Makefile

@@ -1,7 +0,0 @@
-
-TESTS = $(shell find test/test.*.js)
-
-test:
-	@./test/run $(TESTS)
-
-.PHONY: test