fix(lib): 同步cli.js与ykit.common.js

Author: yuhaoju

lib/cli.js

@@ -1,14 +1,13 @@
 'use strict';
 
 require('./global');
+var version = require('../package.json').version;
+var optimist = require('optimist');
+var rightPad = require('right-pad');
 
 var Manager = require('./modules/manager.js');
 
-var helpTitle = function helpTitle() {
-    info();
-    info('===================== YKit ' + packageJSON.version + ' ====================');
-    info();
-};
+var helpTitle = '\n===================== YKit ' + version + ' ====================\n';
 
 var initOptions = function initOptions(cmd) {
     if (cmd.setOptions) {
@@ -24,46 +23,46 @@ var initOptions = function initOptions(cmd) {
 };
 
 var cli = module.exports = {
-    run: function run(cmdName) {
-        if (cmdName === '-v' || cmdName === '--version') {
-            log(packageJSON.version);
+    run: function run(option) {
+        if (option === '-v' || option === '--version') {
+            log(version);
             return;
-        } else if (cmdName === '-h' || cmdName === '--help') {
+        } else if (option === '-h' || option === '--help' || !option) {
             cli.help();
             return;
         }
 
-        var project = Manager.getProject(process.cwd()),
-            cmd = project.commands.filter(function (item) {
-            return item.name == cmdName;
+        var project = Manager.getProject(process.cwd());
+        var command = project.commands.filter(function (command) {
+            return command.name == option;
         })[0];
-        if (!cmd) {
-            error('请确认是否存在 ' + cmdName + ' 命令');
+        if (!command) {
+            error('请确认是否存在 ' + option + ' 命令');
             return;
         }
-        cmd = cmd.module;
-        var options = initOptions(cmd);
+        var module = command.module;
+        var options = initOptions(module);
         if (options.h || options.help) {
-            helpTitle();
-            info('命令:', cmdName);
-            info('说明:', cmd.usage || '');
+            info(helpTitle);
+            info('命令:', option);
+            info('说明:', module.usage || '');
             info();
             optimist.showHelp();
             info(' 如果需要帮助, 请使用 ykit {命令名} --help ');
         } else {
-            cmd.run.call({ project: project }, options);
+            module.run.call({ project: project }, options);
         }
     },
     help: function help() {
-        helpTitle();
+        info(helpTitle);
         Manager.getProject(process.cwd()).commands.forEach(function (command) {
             info(' ' + rightPad(command.name, 15) + ' # ' + (command.module.usage || ''));
         });
         info();
-        info('可用的全局配置有:', (Manager.readRC().configs || []).map(function (item) {
+        info(' 可用的全局配置有:', (Manager.readRC().configs || []).map(function (item) {
             return item.name.substring(12);
         }).join(', '));
         info();
-        info(' 如果需要帮助, 请使用 ykit {命令名} --help ');
+        info(' 如果需要帮助, 请使用 ykit {命令名} --help\n');
     }
 };

lib/config/initTmpl/ykit.common.js

@@ -1,4 +1,6 @@
-exports.config = function() {
+"use strict";
+
+exports.config = function () {
     // 项目资源入口
     this.setExports([
         // './scripts/index.js',
@@ -12,18 +14,16 @@ exports.config = function() {
 
     // sync到开发机配置
     this.setSync({
-        host : "192.168.237.71",
+        host: "192.168.237.71",
         path: "/home/q/www/qunarzz.com/#_name"
     });
 
     // 自定义命令
-    this.setCommands([
-        {
-            name: '#_name_cmd',
-            module: {
-                usage: '项目自定义命令',
-                run: function () {}
-            }
+    this.setCommands([{
+        name: '#_name_cmd',
+        module: {
+            usage: '项目自定义命令',
+            run: function run() {}
         }
-    ]);
-};
+    }]);
+};