:fix: 修复bug

Author: zyao89

package.json

@@ -1,6 +1,6 @@
 {
     "name": "@micro-app/plugin-deploy",
-    "version": "0.0.1",
+    "version": "0.0.3",
     "description": "[Plugin] auto deploy plugin.",
     "main": "src/index.js",
     "scripts": {

src/commands/deploy/index.js

@@ -13,15 +13,12 @@ module.exports = function(api, opts = {}) {
             '--message': 'git commit message.',
             '--name': 'git commit user name.',
             '--email': 'git commit user email.',
-            '--hooks': 'git commit hooks.',
             '--config <config>': '指定配置文件路径, 相对于根路径. 默认为根目录下的: "micro-app.deploy.config.js"',
         },
         details: `
 Examples:
     ${chalk.gray('# deploy')}
     micro-app deploy
-    ${chalk.gray('# git hooks')}
-    micro-app deploy --hooks
     ${chalk.gray('# config file')}
     micro-app deploy --config micro-app.deploy.config.js
 

src/commands/git/index.js

@@ -3,7 +3,7 @@
 const path = require('path');
 const { fs, _, chalk, Env } = require('@micro-app/shared-utils');
 const CONSTANTS = require('../../constants');
-const { execGit, execGitSync, getCurrBranch, getGitBranch, getGitUser } = require('./utils');
+const { execGit, execGitSync, getCurrBranch, getGitBranch, getGitUser, getCommitHash } = require('./utils');
 
 function createCNAMEFile({ deployConfig, deployDir }) {
     const cname = deployConfig.cname;
@@ -61,16 +61,6 @@ function gitPush(api, { args, deployConfig, deployDir, gitURL, gitBranch, commit
     return chain;
 }
 
-function getCommitHash(api, { currBranch, isHooks }) {
-    let commitHash = '';
-    if (isHooks) {
-        commitHash = execGitSync([ 'rev-parse', '--verify', 'HEAD' ]);
-    } else {
-        commitHash = execGitSync([ 'rev-parse', `origin/${currBranch}` ]);
-    }
-    return commitHash;
-}
-
 function getGitMessage(api, { deployConfig, commitHash }) {
     let gitMessage = deployConfig.message && ` | ${deployConfig.message}` || '';
     if (!gitMessage) {
@@ -138,8 +128,7 @@ module.exports = async function deployCommit(api, args, deployConfigs) {
         logger.throw('Sorry, this script requires git');
     }
 
-    const isHooks = args.hooks;
-
+    // TODO 迁移到外部，且不中断
     return Promise.all(deployConfigs.map(async (deployConfig, index) => {
 
         const gitURL = deployConfig.url || '';
@@ -156,7 +145,7 @@ module.exports = async function deployCommit(api, args, deployConfigs) {
 
         const currBranch = getCurrBranch(deployConfig);
 
-        const commitHash = getCommitHash(api, { currBranch, isHooks });
+        const commitHash = getCommitHash();
         if (_.isEmpty(commitHash)) {
             logger.warn('Not Found commit Hash!');
             return;

src/commands/git/utils.js

@@ -7,6 +7,7 @@ const TIMEOUT = 1000 * 60 * 3;
 module.exports = {
     execGit,
     execGitSync,
+    getCommitHash,
     getCurrBranch,
     getGitBranch,
     getGitUser,
@@ -27,10 +28,15 @@ function execGitSync(args, options = {}) {
     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);
+    logger.warn('[execGitSync]', cmd, stderr || stdout);
     return '';
 }
 
+function getCommitHash() {
+    const commitHash = execGitSync([ 'rev-parse', '--verify', 'HEAD' ]);
+    return commitHash;
+}
+
 function getCurrBranch(deployConfig) {
     if (deployConfig && deployConfig.baseBranch) {
         return deployConfig.baseBranch;

src/index.js

@@ -2,7 +2,7 @@
 
 module.exports = function DeployCommand(api, opts = {}) {
 
-    api.assertVersion('>=0.2.2');
+    api.assertVersion('>=0.3.0');
 
     // methods
     require('./methods')(api, opts);
@@ -13,5 +13,5 @@ module.exports = function DeployCommand(api, opts = {}) {
 };
 
 module.exports.configuration = {
-    description: '强制发布更新当前提交信息到指定 git 中命令行',
+    description: '自动发布更新命令行',
 };