commander 2.8.0 → 2.8.1

package/History.md

@@ -1,4 +1,11 @@
 
+2.8.1 / 2015-04-22
+==================
+
+ * Back out `support multiline description` Close #396 #397
+
+
+
 2.8.0 / 2015-04-07
 ==================
 

package/Readme.md

@@ -200,8 +200,7 @@ You can enable `--harmony` option in two ways:
      -p, --peppers        Add peppers
      -P, --pineapple      Add pineapple
      -b, --bbq            Add bbq sauce
-     -c, --cheese <type>  Add the specified type
-                          of cheese [marble]
+     -c, --cheese <type>  Add the specified type of cheese [marble]
      -C, --no-cheese      You do not want any cheese
 
 ```

package/index.js

@@ -911,7 +911,7 @@ Command.prototype.optionHelp = function() {
   // Prepend the help information
   return [pad('-h, --help', width) + '  ' + 'output usage information']
     .concat(this.options.map(function(option) {
-      return pad(option.flags, width) + '  ' + offset(option.description, width + 2);
+      return pad(option.flags, width) + '  ' + option.description;
       }))
     .join('\n');
 };
@@ -955,7 +955,7 @@ Command.prototype.commandHelp = function() {
     , '  Commands:'
     , ''
     , commands.map(function(cmd) {
-      return pad(cmd[0], width) + '  ' + offset(cmd[1], width + 2);
+      return pad(cmd[0], width) + '  ' + cmd[1];
     }).join('\n').replace(/^/gm, '    ')
     , ''
   ].join('\n');
@@ -983,7 +983,7 @@ Command.prototype.helpInformation = function() {
   }
   var usage = [
     ''
-    ,'  Usage: ' + cmdName + ' ' + offset(this.usage(), 9)
+    ,'  Usage: ' + cmdName + ' ' + this.usage()
     , ''
   ];
 
@@ -1056,23 +1056,6 @@ function pad(str, width) {
   return str + Array(len + 1).join(' ');
 }
 
-/**
- * Prepend to each line of `str` spaced string of `offset` length.
- *
- * @param {String} str
- * @param {Number} offset
- * @param {Boolean} skipFirstLine
- * @return {String}
- * @api private
- */
-function offset(str, offset, skipFirstLine) {
-  var res = String(str || '').replace(/^/gm, pad('', offset));
-  if (!skipFirstLine) {
-    res = res.replace(/^\s+/, '');
-  }
-  return res;
-}
-
 /**
  * Output help information if necessary
  *
@@ -1087,9 +1070,6 @@ function outputHelpIfNecessary(cmd, options) {
     if (options[i] == '--help' || options[i] == '-h') {
       cmd.outputHelp();
       process.exit(0);
-
-      // used for test flow only
-      options.splice(i, 1);
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "commander",
-  "version": "2.8.0",
+  "version": "2.8.1",
   "description": "the complete solution for node.js command-line programs",
   "keywords": [
     "command",
@@ -15,7 +15,7 @@
   },
   "devDependencies": {
     "should": ">= 0.0.1",
-    "sinon": ">= 1.13.0"
+    "sinon": ">= 1.14.1"
   },
   "scripts": {
     "test": "make test"