:fix: fixed some bugs

Author: zyao89

micro-app.deploy.config.js

@@ -9,8 +9,8 @@ module.exports = {
     },
     message: 'AUTO TEST',
     user: {
-        name: '',
-        email: '',
+        name: 'Zyao89',
+        email: '[email protected]',
     },
     dest: 'test/gitinfo',
     // cname: 'www.2o3t.cn',

package.json

@@ -35,13 +35,11 @@
     },
     "devDependencies": {
         "@micro-app/cli": "^0.3.0-alpha.3",
+        "@micro-app/shared-utils": "^0.1.13",
         "@types/jest": "^24.0.25",
         "babel-eslint": "^10.0.3",
         "eslint": "^5.16.0",
         "eslint-config-2o3t": "^1.1.17",
         "jest": "^24.9.0"
-    },
-    "dependencies": {
-        "@micro-app/shared-utils": "^0.1.11"
     }
 }

src/commands/deploy/index.js

@@ -2,14 +2,14 @@
 
 module.exports = function(api, opts = {}) {
 
-    const chalk = require('chalk');
+    const { chalk } = require('@micro-app/shared-utils');
 
     api.registerCommand('deploy', {
         description: 'sync commit status.',
         usage: 'micro-app deploy [options]',
         options: {
             '-': 'deploy last commit',
-            '--type': '部署方式类型. (default: github)',
+            '--type': '部署方式类型. (default: git)',
             '--message': 'git commit message.',
             '--name': 'git commit user name.',
             '--email': 'git commit user email.',
@@ -60,30 +60,30 @@ Config:
             return;
         }
 
-        // default: github
+        const deployCmds = [
+            {
+                type: 'git',
+                run: require('../git'),
+            },
+        ].concat(api.applyPluginHooks('addCommandDeployType', []) || []);
+
+        // default: git
         args.type = args.type || 'git';
 
         let chain = Promise.resolve();
 
         chain = chain.then(() => api.applyPluginHooks('beforeCommandDeploy', { args, config: deployConfig }));
 
         const type = args.type;
-        switch (type) {
-            case 'git':
-            case 'github':
-            {
-                const gitCMD = require('../git');
-                chain = chain.then(() => gitCMD(api, args, deployConfig));
-                break;
-            }
-            default:
-                chain = chain.then(() => {
-                    logger.warn('[Deploy]', `Not Found type: ${type}!`);
-                    // TODO others type
-                });
-                break;
+        const allCmds = deployCmds.filter(item => item.type === type);
+        if (allCmds.length > 0) {
+            allCmds.forEach(item => {
+                const run = item.run;
+                chain = chain.then(() => run(api, args, deployConfig));
+            });
+        } else {
+            chain = chain.then(() => logger.warn('[Deploy]', `Not Found type: ${type}!`));
         }
-
         chain = chain.then(() => api.applyPluginHooks('afterCommandDeploy', { args, config: deployConfig }));
 
         return chain;

src/commands/git/utils.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const { logger, execa } = require('@micro-app/shared-utils');
+const { logger, execa, shell } = require('@micro-app/shared-utils');
 
 const TIMEOUT = 1000 * 60 * 3;
 
@@ -24,13 +24,11 @@ function execGit(args, options = {}) {
 }
 
 function execGitSync(args, options = {}) {
-    try {
-        const { stdout, exitCode } = execa.sync('git', args, Object.assign({ stdio: 'ignore', timeout: TIMEOUT }, options));
-        return exitCode === 0 ? (stdout || '').trim() : '';
-    } catch (error) {
-        logger.warn('[execGitSync]', error.message);
-        return '';
-    }
+    const cmd = [ 'git' ].concat(args).join(' ');
+    const { stdout, code, stderr } = shell.exec(cmd, Object.assign({ stdio: 'ignore', timeout: TIMEOUT, silent: true }, options));
+    if (code === 0) { return (stdout || '').trim(); }
+    logger.warn('[execGitSync]', stderr || stdout);
+    return '';
 }
 
 function getCurrBranch() {

src/methods/index.js

@@ -15,5 +15,9 @@ module.exports = function registerMethods(api, opts = {}) {
         description: '发布消息二次编辑事件',
     });
 
-    // TODO others type
+    // others type
+    api.registerMethod('addCommandDeployType', {
+        type: api.API_TYPE.ADD,
+        description: '添加其它类型的发布事件',
+    });
 };