right-alignment of wrapped extra params

yargs · May 16, 2011 · b72bacf · b72bacf
1 parent 2b980bf
commit b72bacf
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 9 deletions.
diff --git a/examples/line_count_wrap.js b/examples/line_count_wrap.js
@@ -9,8 +9,10 @@ var argv = require('optimist')
         + " Required even. So you'd better specify it."
     )
     .alias('b', 'base')
-    .describe('b', 'Numeric base to display the final output in.')
+    .describe('b', 'Numeric base to display the number of lines in')
     .default('b', 10)
+    .describe('x', 'Super-secret optional parameter which is secret')
+    .default('x', '')
     .argv
 ;
 

diff --git a/index.js b/index.js
@@ -260,23 +260,34 @@ function Argv (args, cwd) {
             }
 
             var prelude = '  ' + kswitch + spadding;
-            var body = [
-                desc,
+            var extra = [
                 type,
-                wrap
-                    ? '\n' + new Array(prelude.length + 3).join(' ')
-                    : null
-                ,
                 demanded[key]
                     ? '[required]'
                     : null
                 ,
-                defaults[key]
+                defaults[key] !== undefined
                     ? '[default: ' + JSON.stringify(defaults[key]) + ']'
                     : null
                 ,
             ].filter(Boolean).join('  ');
 
+            var body = [ desc, extra ].filter(Boolean).join('  ');
+
+            if (wrap) {
+                var dlines = desc.split('\n');
+                var dlen = dlines.slice(-1)[0].length
+                    + (dlines.length === 1 ? prelude.length : 0)
+
+                body = desc + (dlen + extra.length > wrap - 2
+                    ? '\n'
+                        + new Array(wrap - extra.length + 1).join(' ')
+                        + extra
+                    : new Array(wrap - extra.length - dlen + 1).join(' ')
+                        + extra
+                );
+            }
+
             help.push(prelude + body);
         });
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name" : "optimist",
-    "version" : "0.2.2",
+    "version" : "0.2.3",
     "description" : "Light-weight option parsing with an argv hash. No optstrings attached.",
     "main" : "./index.js",
     "directories" : {