♻️ change name

Author: zyao89

README.md

@@ -1,33 +1,33 @@
-# Micro APP Plugin - Deploy Command
+# Micro APP Plugin - Deploy
 
-[Plugin] auto deploy command plugin.
+[Plugin] auto deploy plugin.
 
-基于webpack多入口的多仓库业务模块开发的插件应用框架核心库.
+集成自动部署配置. 用于 `@micro-app/cli` 的插件.
 
+[![Github Actions Coveralls][Github-Actions-Coveralls]][Github-Actions-Coveralls-url]
 [![Coverage Status][Coverage-img]][Coverage-url]
-[![CircleCI][CircleCI-img]][CircleCI-url]
 [![NPM Version][npm-img]][npm-url]
 [![NPM Download][download-img]][download-url]
 
-[Coverage-img]: https://coveralls.io/repos/github/MicroAppJS/MicroApp-Plugin-Deploy-Command/badge.svg?branch=master
-[Coverage-url]: https://coveralls.io/github/MicroAppJS/MicroApp-Plugin-Deploy-Command?branch=master
-[CircleCI-img]: https://circleci.com/gh/MicroAppJS/MicroApp-Plugin-Deploy-Command/tree/master.svg?style=svg
-[CircleCI-url]: https://circleci.com/gh/MicroAppJS/MicroApp-Plugin-Deploy-Command/tree/master
-[npm-img]: https://img.shields.io/npm/v/@micro-app/plugin-deploy-command.svg?style=flat-square
-[npm-url]: https://npmjs.org/package/@micro-app/plugin-deploy-command
-[download-img]: https://img.shields.io/npm/dm/@micro-app/plugin-deploy-command.svg?style=flat-square
-[download-url]: https://npmjs.org/package/@micro-app/plugin-deploy-command
+[Github-Actions-Coveralls]: https://github.com/MicroAppJS/plugin-deploy/workflows/Coveralls/badge.svg
+[Github-Actions-Coveralls-url]: https://github.com/MicroAppJS/plugin-deploy
+[Coverage-img]: https://coveralls.io/repos/github/MicroAppJS/plugin-deploy/badge.svg?branch=master
+[Coverage-url]: https://coveralls.io/github/MicroAppJS/plugin-deploy?branch=master
+[npm-img]: https://img.shields.io/npm/v/@micro-app/plugin-deploy.svg?style=flat-square
+[npm-url]: https://npmjs.org/package/@micro-app/plugin-deploy
+[download-img]: https://img.shields.io/npm/dm/@micro-app/plugin-deploy.svg?style=flat-square
+[download-url]: https://npmjs.org/package/@micro-app/plugin-deploy
 
 ## Install
 
 ```sh
-yarn add @micro-app/plugin-deploy-command
+yarn add @micro-app/plugin-deploy
 ```
 
 or
 
 ```sh
-npm install -S @micro-app/plugin-deploy-command
+npm install -S @micro-app/plugin-deploy
 ```
 
 ## Usage
@@ -39,7 +39,7 @@ module.exports = {
     // ...
 
     plugins: [ // 自定义插件
-        [ '@micro-app/plugin-deploy-command', {
+        [ '@micro-app/plugin-deploy', {
             // default config
             git: '',
             branch: {
@@ -56,8 +56,7 @@ module.exports = {
 };
 ```
 
-
-### 创建 `micro-app.deploy.config.js` 文件, 并如下配置:
+### 创建 `micro-app.deploy.config.js` 文件, 并如下配置
 
 ```js
 {

micro-app.config.js

@@ -1,7 +1,7 @@
 {
-    "name": "@micro-app/plugin-deploy-command",
-    "version": "0.1.5",
-    "description": "[Plugin] auto deploy command plugin.",
+    "name": "@micro-app/plugin-deploy",
+    "version": "0.0.1",
+    "description": "[Plugin] auto deploy plugin.",
     "main": "src/index.js",
     "scripts": {
         "prepublishOnly": "npm run test",
@@ -10,13 +10,13 @@
     "files": [
         "src"
     ],
-    "homepage": "https://github.com/MicroAppJS/MicroApp-Plugin-Deploy-Command",
+    "homepage": "https://github.com/MicroAppJS/plugin-deploy",
     "repository": {
         "type": "git",
-        "url": "git+https://github.com/MicroAppJS/MicroApp-Plugin-Deploy-Command.git"
+        "url": "git+https://github.com/MicroAppJS/plugin-deploy.git"
     },
     "bugs": {
-        "url": "https://github.com/MicroAppJS/MicroApp-Plugin-Deploy-Command/issues"
+        "url": "https://github.com/MicroAppJS/plugin-deploy/issues"
     },
     "keywords": [
         "micro",
@@ -40,5 +40,8 @@
         "eslint": "^5.16.0",
         "eslint-config-2o3t": "^1.1.17",
         "jest": "^24.9.0"
+    },
+    "dependencies": {
+        "@micro-app/shared-utils": "^0.1.11"
     }
 }

package.json

@@ -3,7 +3,7 @@
 const path = require('path');
 const { fs, _, chalk, execa, Env } = require('@micro-app/shared-utils');
 const CONSTANTS = require('../../constants');
-const { execGit, getCurrBranch, getGitBranch, getGitUser } = require('./utils');
+const { execGit, execGitSync, getCurrBranch, getGitBranch, getGitUser } = require('./utils');
 
 function createCNAMEFile({ deployConfig, deployDir }) {
     const cname = deployConfig.cname;
@@ -65,17 +65,17 @@ function gitPush(api, { args, deployConfig, deployDir, gitURL, gitBranch, commit
 function getCommitHash(api, { isHooks, gitBranch }) {
     let commitHash = '';
     if (isHooks) {
-        commitHash = ((execa.commandSync('git rev-parse --verify HEAD', { silent: true }) || {}).stdout || '').trim();
+        commitHash = execGitSync([ 'rev-parse', '--verify', 'HEAD' ]);
     } else {
-        commitHash = ((execa.commandSync(`git rev-parse origin/${gitBranch}`, { silent: true }) || {}).stdout || '').trim();
+        commitHash = execGitSync([ 'rev-parse', `origin/${gitBranch}` ]);
     }
     return commitHash;
 }
 
 function getGitMessage(api, { deployConfig, commitHash }) {
     let gitMessage = deployConfig.message && ` | ${deployConfig.message}` || '';
     if (!gitMessage) {
-        const msg = ((execa.commandSync(`git log --pretty=format:“%s” ${commitHash} -1`, { silent: true }) || {}).stdout || '').trim();
+        const msg = execGitSync([ 'log', '--pretty=format:“%s”', commitHash, '-1' ]);
         if (msg) {
             gitMessage = ` | ${msg}`;
         }

src/commands/git/index.js

@@ -6,6 +6,7 @@ const TIMEOUT = 1000 * 60 * 3;
 
 module.exports = {
     execGit,
+    execGitSync,
     getCurrBranch,
     getGitBranch,
     getGitUser,
@@ -22,8 +23,13 @@ function execGit(args, options = {}) {
     });
 }
 
+function execGitSync(args, options = {}) {
+    const { stdout, exitCode } = execa.sync('git', args, Object.assign({ stdio: 'ignore', timeout: TIMEOUT }, options));
+    return exitCode === 0 ? (stdout || '').trim() : '';
+}
+
 function getCurrBranch() {
-    const currBranch = ((execa.commandSync('git rev-parse --abbrev-ref HEAD', { silent: true }) || {}).stdout || '').trim();
+    const currBranch = execGitSync([ 'rev-parse', '--abbrev-ref', 'HEAD' ]);
     return currBranch;
 }
 
@@ -44,11 +50,11 @@ function getGitBranch(deployConfig) {
 function getGitUser(deployConfig) {
     let userName = deployConfig.userName;
     if (_.isEmpty(userName)) {
-        userName = ((execa.commandSync('git config user.name', { silent: true }) || {}).stdout || '').trim();
+        userName = execGitSync([ 'config', 'user.name' ]);
     }
     let userEmail = deployConfig.userEmail;
     if (_.isEmpty(userEmail)) {
-        userEmail = ((execa.commandSync('git config user.email', { silent: true }) || {}).stdout || '').trim();
+        userEmail = execGitSync([ 'config', 'user.email' ]);
     }
     return {
         name: userName || 'Git Deploy Anonymous',

src/commands/git/utils.js

@@ -386,7 +386,7 @@
     "@types/istanbul-reports" "^1.1.1"
     "@types/yargs" "^13.0.0"
 
-"@micro-app/cli@^0.3.0-alpha.2":
+"@micro-app/cli@^0.3.0-alpha.3":
   version "0.3.0-alpha.3"
   resolved "https://registry.yarnpkg.com/@micro-app/cli/-/cli-0.3.0-alpha.3.tgz#066e952cb4119f91e5ede684485a52207e285e05"
   integrity sha512-WfdCV1dWkOfHhWXoXUUsBKLjpT72soaOmen3/HyWtaKwoqqX9vYswqMOfsEt/bYU8po2eThwU2TlAApoCBRn4A==
@@ -552,17 +552,12 @@
     "@types/istanbul-lib-coverage" "*"
     "@types/istanbul-lib-report" "*"
 
-"@types/jest-diff@*":
-  version "20.0.1"
-  resolved "https://registry.yarnpkg.com/@types/jest-diff/-/jest-diff-20.0.1.tgz#35cc15b9c4f30a18ef21852e255fdb02f6d59b89"
-  integrity sha512-yALhelO3i0hqZwhjtcr6dYyaLoCHbAMshwtj6cGxTvHZAKXHsYGdff6E8EPw3xLKY0ELUTQ69Q1rQiJENnccMA==
-
-"@types/jest@^24.0.18":
-  version "24.0.18"
-  resolved "https://registry.yarnpkg.com/@types/jest/-/jest-24.0.18.tgz#9c7858d450c59e2164a8a9df0905fc5091944498"
-  integrity sha512-jcDDXdjTcrQzdN06+TSVsPPqxvsZA/5QkYfIZlq1JMw7FdP5AZylbOc+6B/cuDurctRe+MziUMtQ3xQdrbjqyQ==
+"@types/jest@^24.0.25":
+  version "24.0.25"
+  resolved "https://registry.yarnpkg.com/@types/jest/-/jest-24.0.25.tgz#2aba377824ce040114aa906ad2cac2c85351360f"
+  integrity sha512-hnP1WpjN4KbGEK4dLayul6lgtys6FPz0UfxMeMQCv0M+sTnzN3ConfiO72jHgLxl119guHgI8gLqDOrRLsyp2g==
   dependencies:
-    "@types/jest-diff" "*"
+    jest-diff "^24.3.0"
 
 "@types/json-schema@^7.0.3":
   version "7.0.3"
@@ -1353,18 +1348,6 @@ [email protected], core-util-is@~1.0.0:
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
   integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
 
-coveralls@^3.0.6:
-  version "3.0.6"
-  resolved "https://registry.yarnpkg.com/coveralls/-/coveralls-3.0.6.tgz#5c63b2759b6781118e7439bd870ba5e9ee428b25"
-  integrity sha512-Pgh4v3gCI4T/9VijVrm8Ym5v0OgjvGLKj3zTUwkvsCiwqae/p6VLzpsFNjQS2i6ewV7ef+DjFJ5TSKxYt/mCrA==
-  dependencies:
-    growl "~> 1.10.0"
-    js-yaml "^3.13.1"
-    lcov-parse "^0.0.10"
-    log-driver "^1.2.7"
-    minimist "^1.2.0"
-    request "^2.86.0"
-
 cross-spawn@^5.0.1:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449"
@@ -2515,11 +2498,6 @@ graceful-fs@^4.1.6, graceful-fs@^4.2.0:
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz#4a12ff1b60376ef09862c2093edd908328be8423"
   integrity sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==
 
-"growl@~> 1.10.0":
-  version "1.10.5"
-  resolved "https://registry.yarnpkg.com/growl/-/growl-1.10.5.tgz#f2735dc2283674fa67478b10181059355c369e5e"
-  integrity sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==
-
 growly@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081"
@@ -3179,7 +3157,7 @@ jest-config@^24.9.0:
     pretty-format "^24.9.0"
     realpath-native "^1.1.0"
 
-jest-diff@^24.9.0:
+jest-diff@^24.3.0, jest-diff@^24.9.0:
   version "24.9.0"
   resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-24.9.0.tgz#931b7d0d5778a1baf7452cb816e325e3724055da"
   integrity sha512-qMfrTs8AdJE2iqrTp0hzh7kTd2PQWrsFyj9tORoKmu32xjPjeE4NyjVRDz8ybYwqS2ik8N4hsIpiVTyFeo2lBQ==
@@ -3492,7 +3470,7 @@ js-tokens@^3.0.0:
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
   integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
 
-js-yaml@^3.13.0, js-yaml@^3.13.1:
+js-yaml@^3.13.0:
   version "3.13.1"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"
   integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==
@@ -3711,11 +3689,6 @@ lcid@^2.0.0:
   dependencies:
     invert-kv "^2.0.0"
 
-lcov-parse@^0.0.10:
-  version "0.0.10"
-  resolved "https://registry.yarnpkg.com/lcov-parse/-/lcov-parse-0.0.10.tgz#1b0b8ff9ac9c7889250582b70b71315d9da6d9a3"
-  integrity sha1-GwuP+ayceIklBYK3C3ExXZ2m2aM=
-
 left-pad@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/left-pad/-/left-pad-1.3.0.tgz#5b8a3a7765dfe001261dde915589e782f8c94d1e"
@@ -3790,11 +3763,6 @@ lodash@^4.15.0, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
   integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
 
-log-driver@^1.2.7:
-  version "1.2.7"
-  resolved "https://registry.yarnpkg.com/log-driver/-/log-driver-1.2.7.tgz#63b95021f0702fedfa2c9bb0a24e7797d71871d8"
-  integrity sha512-U7KCmLdqsGHBLeWqYlFA0V0Sl6P08EE1ZrmA9cxjUE0WVqT9qnyVDPz1kzpFEP0jdJuFnasWIfSd7fsaNXkpbg==
-
 log-symbols@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-2.2.0.tgz#5740e1c5d6f0dfda4ad9323b5332107ef6b4c40a"
@@ -4942,7 +4910,7 @@ request-promise-native@^1.0.5:
     stealthy-require "^1.1.1"
     tough-cookie "^2.3.3"
 
-request@^2.86.0, request@^2.87.0:
+request@^2.87.0:
   version "2.88.0"
   resolved "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef"
   integrity sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==