fixes nodeman

nanha · Mar 31, 2012 · aa05212 · aa05212
1 parent f4a6ce8
commit aa05212
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 40 deletions.
diff --git a/deps/nodeman/bin/nodeman b/deps/nodeman/bin/nodeman
@@ -14,16 +14,25 @@ var colors = require('colors'),
     path = require('path'),
     fs = require('fs');
 
+/**
+ * console.error && process exit
+ */
+function abort(str) {
+    console.log('\033[2J');
+    console.error(str.toString().red);
+    process.exit(1);
+}
+
 /**
  * usage
  */
 var usage = ''
   + '\n'
   + '  Usage: nodeman [module_name]\n'.yellow
   + '\n'
-  + '  Options:\n'
-  + '    -b, --builtin           show module_name list\n'
-  + '    -h, --help              output help information\n'
+  + '  Options:\n'.cyan
+  + '    -b, --builtin           show module_name list\n'.cyan
+  + '    -h, --help              output help information\n'.cyan
   ;
 
 /**
@@ -45,8 +54,7 @@ while (args.length) {
             break;
         case '-b':
         case '--builtin':
-            nodeman.builtin();
-            return;
+            return nodeman.builtin();
             break;
         default:
             moduleName = arg;
@@ -56,36 +64,3 @@ while (args.length) {
             break;
     }
 }
-
-/**
- * builtin list
- *
- * @return void
- */
-function builtin() {
-    var docs = path.resolve(__dirname, '..', 'docs');
-    fs.readdir(docs, function(err, files) {
-        if (err) throw new Error(err);
-
-        var __builtin__ = [];
-        files.forEach(function(file) {
-            if (!/_doc/.test(file)) return;
-
-            __builtin__.push(file.replace(/_doc.js/g, ''));
-        });
-
-        //console.log('\033[2J');
-        console.log('    Current embed moduleName list'.red);
-        console.log('    --------------------------------');
-        console.log();
-        console.log('    ' + __builtin__.join(', '));
-        console.log();
-    });
-}
-/**
- * console.error && process exit
- */
-function abort(str) {
-    console.error(str);
-    process.exit(1);
-}
diff --git a/deps/nodeman/lib/nodeman.js b/deps/nodeman/lib/nodeman.js
@@ -55,7 +55,10 @@ function builtin() {
         console.log('    Current embed moduleName list'.red);
         console.log('    --------------------------------');
         console.log();
-        console.log('    ' + __builtin__.join(', '));
+        console.log('    usage: nodeman [moduleName]'.yellow);
+        console.log();
+        console.log('    ' + __builtin__.join(', ').cyan);
+        console.log();
         console.log();
     });
 }

diff --git a/deps/nodeman/package.json b/deps/nodeman/package.json
@@ -3,7 +3,7 @@
   "name": "nodeman",
   "description": "Executable Node.js User's Colorful Manual for Command-line.",
   "homepage": "http://nodeqa.com",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "repository": {
     "type": "git",
     "url": "git://github.com/nanha/nodeman.git"