:add: 增加 deploy 中 extends 参数, 用于继承当前分支名称

Author: zyao89

libs/deploy.js

@@ -23,7 +23,18 @@ module.exports = isHook => {
         return;
     }
     const gitPath = gitURL.replace(/^git\+/ig, '').split('#')[0];
-    const gitBranch = deployCfg.branch || gitURL.split('#')[1] || 'master';
+    let gitBranch = deployCfg.branch || gitURL.split('#')[1] || 'master';
+    const currBranch = ((shelljs.exec('git rev-parse --abbrev-ref HEAD', { silent: true }) || {}).stdout || '').trim();
+    if (typeof gitBranch === 'object') {
+        // 继承当前分支
+        if (currBranch && gitBranch.extends === true) {
+            gitBranch = currBranch;
+        } else if (gitBranch.name) {
+            gitBranch = gitBranch.name;
+        } else {
+            gitBranch = 'master';
+        }
+    }
     const gitMessage = deployCfg.message && ` | ${deployCfg.message}` || '';
 
     const gitUser = deployCfg.user || {};
@@ -38,7 +49,6 @@ module.exports = isHook => {
     if (isHook) {
         commitHash = ((shelljs.exec('git rev-parse --verify HEAD', { silent: true }) || {}).stdout || '').trim();
     } else {
-        const currBranch = ((shelljs.exec('git rev-parse --abbrev-ref HEAD', { silent: true }) || {}).stdout || '').trim();
         commitHash = ((shelljs.exec(`git rev-parse origin/${currBranch}`, { silent: true }) || {}).stdout || '').trim();
     }
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@micro-app/cli",
-  "version": "0.0.50",
+  "version": "0.0.55-beta.1",
   "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.50",
+    "@micro-app/core": "^0.0.54",
     "chalk": "^2.4.2",
     "commander": "^2.19.0",
     "opn": "^5.5.0",