Spit out all usages when --long is set

1 files changed, 23 insertions, 1 deletions

diff --git a/lib/help.js b/lib/help.js
index cc0a3c5a1..cb7b7a458 100644
--- a/lib/help.js
+++ b/lib/help.js
@@ -54,9 +54,11 @@ function help (args, cb) {
       ( ["\nUsage: npm <command>"
         , ""
         , "where <command> is one of:"
-        , "    "+wrap(Object.keys(npm.commands))
+        , npm.config.get("long") ? usages()
+          : "    " + wrap(Object.keys(npm.commands))
         , ""
         , "npm <cmd> -h     quick help on <cmd>"
+        , "npm -l           display full usage info"
         , "npm faq          commonly asked questions"
         , "npm help <term>  search for help on <term>"
         , "npm help npm     involved overview"
@@ -69,6 +71,26 @@ function help (args, cb) {
   })
 }
 
+function usages () {
+  // return a string of <cmd>: <usage>
+  var maxLen = 0
+  return Object.keys(npm.commands).filter(function (c) {
+    return c === npm.deref(c)
+  }).reduce(function (set, c) {
+    set.push([c, npm.commands[c].usage || ""])
+    maxLen = Math.max(maxLen, c.length)
+    return set
+  }, []).map(function (item) {
+    var c = item[0]
+      , usage = item[1]
+    return "\n    " + c + (new Array(maxLen - c.length + 2).join(" "))
+         + (usage.split("\n")
+            .join("\n" + (new Array(maxLen + 6).join(" "))))
+  }).join("\n")
+  return out
+}
+
+
 function wrap (arr) {
   var out = ['']
     , l = 0