:add: deploy commit message

Author: zyao89

libs/deploy.js

@@ -35,7 +35,7 @@ module.exports = isHook => {
             gitBranch = 'master';
         }
     }
-    const gitMessage = deployCfg.message && ` | ${deployCfg.message}` || '';
+    let gitMessage = deployCfg.message && ` | ${deployCfg.message}` || '';
 
     const gitUser = deployCfg.user || {};
     if (!gitUser.name || typeof gitUser.name !== 'string') {
@@ -57,6 +57,13 @@ module.exports = isHook => {
         return;
     }
 
+    if (!gitMessage) {
+        const msg = ((shelljs.exec(`git log --pretty=format:“%s” ${commitHash} -1`, { silent: true }) || {}).stdout || '').trim();
+        if (msg) {
+            gitMessage = ` | ${msg}`;
+        }
+    }
+
     const gitRoot = path.resolve(microAppConfig.root, '.git');
     if (fs.statSync(gitRoot).isDirectory()) {
         const deployDir = path.resolve(gitRoot, 'micro-deploy');
@@ -108,7 +115,7 @@ module.exports = isHook => {
                             shelljs.exec(`git config user.email ${gitUser.email}`, { silent: true, cwd: deployDir });
                         }
                         // commit + push
-                        const { code } = shelljs.exec(`git commit -a -m ":package: auto deploy ${MICRO_APP_CONFIG_NAME} - ${commitHash.substr(0, 8)}${gitMessage}"`, { cwd: deployDir });
+                        const { code } = shelljs.exec(`git commit -a -m ":package: auto deploy ${MICRO_APP_CONFIG_NAME} - ${currBranch} - ${commitHash.substr(0, 8)}${gitMessage}"`, { cwd: deployDir });
                         if (code === 0) {
                             const { code } = shelljs.exec('git push', { cwd: deployDir });
                             if (code === 0) {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@micro-app/cli",
-  "version": "0.0.56-beta.1",
+  "version": "0.0.57",
   "description": "micro app cli",
   "bin": {
     "micro-app": "./bin/micro-app.js",
@@ -32,7 +32,7 @@
     "eslint-config-2o3t": "^1.1.17"
   },
   "dependencies": {
-    "@micro-app/core": "^0.0.56-beta.1",
+    "@micro-app/core": "^0.0.57",
     "chalk": "^2.4.2",
     "commander": "^2.19.0",
     "opn": "^5.5.0",

test/index.js

@@ -1,7 +1,7 @@
 'use strict';
 
-// const deploy = require('../libs/deploy');
-// deploy();
+const deploy = require('../libs/deploy');
+deploy();
 
 
-const microApp = require('../bin/micro-app-dev');
+// const microApp = require('../bin/micro-app-dev');