🎨 重构为异步操作.

zyao89 · zyao89 · commit f5b3938b4efb · 2019-09-25T01:49:18.000+08:00
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@micro-app/plugin-deploy-command",
-    "version": "0.0.1",
+    "version": "0.0.3",
     "description": "[Plugin] auto deploy command plugin.",
     "main": "src/index.js",
     "scripts": {
diff --git a/src/deployCommit.js b/src/deployCommit.js
@@ -5,19 +5,21 @@ const path = require('path');
 const chalk = require('chalk');
 const fs = require('fs');
 
-module.exports = function deployCommit(api, isHooks, deployConfig) {
+module.exports = function deployCommit(api, args, deployConfig) {
     const logger = api.logger;
-    const microAppConfig = api.self;
-    const micros = api.micros;
-    const microsConfig = api.microsConfig;
-    const currentNodeModules = microAppConfig.nodeModules;
-    const currentPkgInfo = microAppConfig.package;
+    const root = api.root;
+    // const micros = api.micros;
+    // const microsConfig = api.microsConfig;
+    // const currentNodeModules = microAppConfig.nodeModules;
+    // const currentPkgInfo = microAppConfig.package;
+
+    api.applyPluginHooks('beforeCommandDeploy', { args, config: deployConfig });
 
-    api.applyPluginHooks('beforeCommandDeploy', { isHooks, logger, deployConfig, microsConfig });
+    const isHooks = args.hooks;
 
     const gitURL = deployConfig.git || '';
     if (!gitURL || typeof gitURL !== 'string') {
-        logger.logo(`${chalk.yellow('need "deploy.git: \'ssh://...\'" in "micro-app.config.js"')}`);
+        logger.warn('Need "deploy.git: \'ssh://...\'" in "micro-app.config.js"');
         return;
     }
     const gitPath = gitURL.replace(/^git\+/ig, '').split('#')[0];
@@ -51,7 +53,7 @@ module.exports = function deployCommit(api, isHooks, deployConfig) {
     }
 
     if (!commitHash || typeof commitHash !== 'string') {
-        logger.logo(`${chalk.yellow('Not Found commit Hash!')}`);
+        logger.warn('Not Found commit Hash!');
         return;
     }
 
@@ -62,88 +64,118 @@ module.exports = function deployCommit(api, isHooks, deployConfig) {
         }
     }
 
-    const gitRoot = path.resolve(microAppConfig.root, '.git');
+    const gitRoot = path.resolve(root, '.git');
     if (fs.statSync(gitRoot).isDirectory()) {
         const deployDir = path.resolve(gitRoot, 'micro-deploy');
         if (fs.existsSync(deployDir)) {
             shelljs.rm('-rf', deployDir);
         }
         fs.mkdirSync(deployDir);
+
         if (fs.statSync(deployDir).isDirectory()) {
-            const execStr = `git clone "${gitPath}" -b ${gitBranch} "${deployDir}"`;
-            logger.logo(`Deploy: ${chalk.blueBright(gitPath)}`);
-            logger.logo(`Branch: ${chalk.blueBright(gitBranch)}`);
-            logger.logo(`Hash: ${chalk.blueBright(commitHash)}`);
-            logger.logo(`Name: ${chalk.blueBright(gitUser.name)}`);
-            logger.logo(`Email: ${chalk.blueBright(gitUser.email)}`);
-            const result = shelljs.exec(execStr, { silent: true });
-            if (result.code) {
-                logger.logo(`${result.code}: ${chalk.yellow(result.stderr.trim().split('\n').reverse()[0])}`);
-            } else {
-                const pkg = require(path.resolve(deployDir, 'package.json')) || {};
-                const { dependencies = {}, devDependencies = {} } = pkg;
-                const deps = Object.assign({}, dependencies, devDependencies);
-
-                const MICRO_APP_CONFIG_NAME = microAppConfig.packageName;
-                if (deps[MICRO_APP_CONFIG_NAME]) {
-                    const gitp = deps[MICRO_APP_CONFIG_NAME];
-                    // update
-                    const ngitp = gitp.replace(/#[-_\d\w]+$/igm, `#${commitHash}`);
-
-                    if (gitp === ngitp) {
-                        // not change
-                        shelljs.rm('-rf', deployDir);
-                        logger.logo(chalk.yellow('NOT MODIFIED!'));
-                        return;
-                    }
-                    if (ngitp) {
-                        if (dependencies[MICRO_APP_CONFIG_NAME]) {
-                            dependencies[MICRO_APP_CONFIG_NAME] = ngitp;
-                        }
-                        if (devDependencies[MICRO_APP_CONFIG_NAME]) {
-                            devDependencies[MICRO_APP_CONFIG_NAME] = ngitp;
-                        }
-                        fs.writeFileSync(path.resolve(deployDir, 'package.json'), JSON.stringify(pkg, null, 4), 'utf8');
+            return runDeploy(api, args, deployConfig, { deployDir, gitPath, gitBranch, commitHash, gitUser, currBranch, gitMessage }).then(() => {
+                if (fs.existsSync(deployDir)) {
+                    shelljs.rm('-rf', deployDir);
+                }
 
-                        // git config
-                        if (gitUser.name && typeof gitUser.name === 'string') {
-                            shelljs.exec(`git config user.name ${gitUser.name}`, { silent: true, cwd: deployDir });
-                        }
-                        if (gitUser.email && typeof gitUser.email === 'string') {
-                            shelljs.exec(`git config user.email ${gitUser.email}`, { silent: true, cwd: deployDir });
-                        }
-                        // commit + push
-                        const { message } = api.applyPluginHooks('modifyCommandDeployMessage', {
-                            message: `:package: auto deploy ${MICRO_APP_CONFIG_NAME} - ${currBranch} - ${commitHash.substr(0, 8)}${gitMessage}`,
-                            branch: currBranch,
-                            gitMessage,
-                            commitHash,
-                            name: MICRO_APP_CONFIG_NAME,
-                        });
-                        const spinner = logger.spinner('Auto Deploy...');
-                        spinner.start();
-                        const { code } = shelljs.exec(`git commit -a -m "${message}"`, { cwd: deployDir });
-                        if (code === 0) {
-                            const { code } = shelljs.exec('git push', { cwd: deployDir });
-                            if (code === 0) {
-                                shelljs.rm('-rf', deployDir);
-                                spinner.succeed(chalk.green('Success !'));
-                                return;
-                            }
-                        }
-                        spinner.fail(chalk.red('Fail !'));
-                    }
+                api.applyPluginHooks('afterCommandDeploy', { args, config: deployConfig });
+            }).catch(() => {
+                if (fs.existsSync(deployDir)) {
+                    shelljs.rm('-rf', deployDir);
                 }
-            }
-        }
+                logger.error('Fail! Check your config, please');
 
-        if (fs.existsSync(deployDir)) {
-            shelljs.rm('-rf', deployDir);
+                api.applyPluginHooks('afterCommandDeploy', { args, config: deployConfig });
+            });
         }
-        logger.logo(chalk.redBright('Fail! Check your config, please'));
-    } else {
-        logger.logo(`${chalk.yellow('not found git')}`);
     }
 
-    api.applyPluginHooks('afterCommandDeploy', { isHooks, logger, deployConfig, microsConfig });
+    logger.warn('Not Found git');
+
+    api.applyPluginHooks('afterCommandDeploy', { args, config: deployConfig });
 };
+
+
+function runDeploy(api, args, deployConfig, { deployDir, gitPath, gitBranch, commitHash, gitUser, currBranch, gitMessage }) {
+    const logger = api.logger;
+    const microAppConfig = api.self;
+
+    const execStr = `git clone "${gitPath}" -b ${gitBranch} "${deployDir}"`;
+    logger.logo(`Deploy: ${chalk.blueBright(gitPath)}`);
+    logger.logo(`Branch: ${chalk.blueBright(gitBranch)}`);
+    logger.logo(`Hash: ${chalk.blueBright(commitHash)}`);
+    logger.logo(`Name: ${chalk.blueBright(gitUser.name)}`);
+    logger.logo(`Email: ${chalk.blueBright(gitUser.email)}`);
+    const result = shelljs.exec(execStr, { silent: true });
+    if (result.code) {
+        logger.logo(`${result.code}: ${chalk.yellow(result.stderr.trim().split('\n').reverse()[0])}`);
+    } else {
+        const pkg = require(path.resolve(deployDir, 'package.json')) || {};
+        const { dependencies = {}, devDependencies = {} } = pkg;
+        const deps = Object.assign({}, dependencies, devDependencies);
+
+        const MICRO_APP_CONFIG_NAME = microAppConfig.packageName;
+        if (deps[MICRO_APP_CONFIG_NAME]) {
+            const gitp = deps[MICRO_APP_CONFIG_NAME];
+            // update
+            const ngitp = gitp.replace(/#[-_\d\w]+$/igm, `#${commitHash}`);
+
+            if (gitp === ngitp) {
+                // not change
+                logger.warn('NOT MODIFIED!');
+                return Promise.resolve();
+            }
+            if (ngitp) {
+                if (dependencies[MICRO_APP_CONFIG_NAME]) {
+                    dependencies[MICRO_APP_CONFIG_NAME] = ngitp;
+                }
+                if (devDependencies[MICRO_APP_CONFIG_NAME]) {
+                    devDependencies[MICRO_APP_CONFIG_NAME] = ngitp;
+                }
+                fs.writeFileSync(path.resolve(deployDir, 'package.json'), JSON.stringify(pkg, null, 4), 'utf8');
+
+                // git config
+                if (gitUser.name && typeof gitUser.name === 'string') {
+                    shelljs.exec(`git config user.name ${gitUser.name}`, { silent: true, cwd: deployDir });
+                }
+                if (gitUser.email && typeof gitUser.email === 'string') {
+                    shelljs.exec(`git config user.email ${gitUser.email}`, { silent: true, cwd: deployDir });
+                }
+                // commit + push
+                const { message } = api.applyPluginHooks('modifyCommandDeployMessage', {
+                    args, config: deployConfig,
+                    message: `:package: auto deploy ${MICRO_APP_CONFIG_NAME} - ${currBranch} - ${commitHash.substr(0, 8)}${gitMessage}`,
+                    branch: currBranch,
+                    gitMessage,
+                    commitHash,
+                    name: MICRO_APP_CONFIG_NAME,
+                });
+
+                if (!message) {
+                    logger.error('modifyCommandDeployMessage() must be retrun { message } !!!');
+                    return Promise.reject();
+                }
+
+                return new Promise((resolve, reject) => {
+                    const spinner = logger.spinner('Auto Deploy...');
+                    spinner.start();
+                    shelljs.exec(`git commit -a -m "${message}"`, { cwd: deployDir }, function(code, stdout, stderr) {
+                        if (code === 0) {
+                            shelljs.exec('git push', { cwd: deployDir }, function(code, stdout, stderr) {
+                                if (code === 0) {
+                                    spinner.succeed(chalk.green('Success !'));
+                                    return resolve();
+                                }
+                                spinner.fail(chalk.red('Fail !') + stderr);
+                                return reject(stderr);
+                            });
+                        }
+                        spinner.fail(chalk.red('Fail !') + stderr);
+                        return reject(stderr);
+                    });
+                });
+            }
+        }
+    }
+    return Promise.resolve();
+}
diff --git a/src/index.js b/src/index.js
@@ -2,25 +2,17 @@
 
 module.exports = function DeployCommand(api, opts = {}) {
 
+    api.assertVersion('>=0.1.5');
+
     const path = require('path');
     const chalk = require('chalk');
     const tryRequire = require('try-require');
 
     // commands
     require('./commands/version')(api);
 
-    api.registerMethod('beforeCommandDeploy', {
-        type: api.API_TYPE.EVENT,
-        description: '发布前事件',
-    });
-    api.registerMethod('afterCommandDeploy', {
-        type: api.API_TYPE.EVENT,
-        description: '发布后事件',
-    });
-    api.registerMethod('modifyCommandDeployMessage', {
-        type: api.API_TYPE.MODIFY,
-        description: '发布消息二次编辑事件',
-    });
+    // methods
+    require('./methods')(api, opts);
 
     // start
     api.registerCommand('deploy', {
@@ -29,7 +21,7 @@ module.exports = function DeployCommand(api, opts = {}) {
         options: {
             '-': 'deploy last commit',
             '--hooks': 'git commit hooks.',
-            '-c <config>': '指定配置文件路径, 相对于根路径. (默认为根目录下的: "micro-app.deploy.config.js")',
+            '--config <config>': '指定配置文件路径, 相对于根路径. 默认为根目录下的: "micro-app.deploy.config.js"',
         },
         details: `
 Examples:
@@ -38,18 +30,18 @@ Examples:
     ${chalk.gray('# git hooks')}
     micro-app deploy --hooks
     ${chalk.gray('# config file')}
-    micro-app deploy -c micro-app.deploy.config.js
+    micro-app deploy --config micro-app.deploy.config.js
 
 Config:
     {
-        git: '',
+        git: '', ${chalk.gray('// git 地址')}
         ${chalk.gray('branch: \'\',')}
-        branch: {
+        branch: {  ${chalk.gray('// git branch')}
             name: '',
             extends: true,
         },
-        message: '',
-        user: {
+        message: '', ${chalk.gray('// git commit message')}
+        user: { ${chalk.gray('// git user info')}
             name: '',
             email: '',
         },
@@ -58,17 +50,16 @@ Config:
     }, args => {
         const logger = api.logger;
 
-        const isHooks = args.hooks;
         const configFile = args.c || 'micro-app.deploy.config.js';
         const deployConfig = tryRequire(path.resolve(api.root, configFile));
 
         if (!deployConfig || typeof deployConfig !== 'object') {
-            logger.logo(`${chalk.yellow('need "micro-app.deploy.config.js"')}`);
+            logger.warn('Not Found "micro-app.deploy.config.js"');
             return;
         }
 
         const deployCommit = require('./deployCommit');
-        return deployCommit(api, isHooks, Object.assign({}, deployConfig, opts));
+        return deployCommit(api, args, Object.assign({}, deployConfig, opts));
     });
 
 
diff --git a/src/methods.js b/src/methods.js
@@ -0,0 +1,18 @@
+'use strict';
+
+module.exports = function registerMethods(api, opts = {}) {
+
+    api.registerMethod('beforeCommandDeploy', {
+        type: api.API_TYPE.EVENT,
+        description: '发布前事件',
+    });
+    api.registerMethod('afterCommandDeploy', {
+        type: api.API_TYPE.EVENT,
+        description: '发布后事件',
+    });
+    api.registerMethod('modifyCommandDeployMessage', {
+        type: api.API_TYPE.MODIFY,
+        description: '发布消息二次编辑事件',
+    });
+
+};

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@micro-app/plugin-deploy-command",`
`3`		`- "version": "0.0.1",`
	`3`	`+ "version": "0.0.3",`
`4`	`4`	`"description": "[Plugin] auto deploy command plugin.",`
`5`	`5`	`"main": "src/index.js",`
`6`	`6`	`"scripts": {`