create 命令#6

f25e311d · 潘亚楠 · 5b57a372 · f25e311d · f25e311d · f25e311d
--- a/.npmignore
+++ b/.npmignore
+src
+.gitlab
+tsconfig.json
+.gitignore
\ No newline at end of file
--- a/package-lock.json
+++ b/package-lock.json
 {
-  "name": "qj-vue-cli",
+  "name": "qj-cli",
  "version": "0.1.0",
  "lockfileVersion": 1,
  "requires": true,
@@ -42,6 +42,16 @@
        "@types/node": "*"
      }
    },
+    "@types/inquirer": {
+      "version": "6.5.0",
+      "resolved": "http://39.106.145.141:9000/repository/node-public/@types/inquirer/-/inquirer-6.5.0.tgz",
+      "integrity": "sha1-uDsL8wuIuL5yRtQOUdMv6dEOCb4=",
+      "dev": true,
+      "requires": {
+        "@types/through": "*",
+        "rxjs": "^6.4.0"
+      }
+    },
    "@types/mocha": {
      "version": "5.2.7",
      "resolved": "http://39.106.145.141:9000/repository/node-public/@types/mocha/-/mocha-5.2.7.tgz",
@@ -70,6 +80,15 @@
      "integrity": "sha1-Jbj922MiJZxrkcNTONObD45SQlI=",
      "dev": true
    },
+    "@types/through": {
+      "version": "0.0.29",
+      "resolved": "http://39.106.145.141:9000/repository/node-public/@types/through/-/through-0.0.29.tgz",
+      "integrity": "sha1-cpQ6rJIuF5M5xlH6NKRCik1yL5M=",
+      "dev": true,
+      "requires": {
+        "@types/node": "*"
+      }
+    },
    "abbrev": {
      "version": "1.1.1",
      "resolved": "http://39.106.145.141:9000/repository/node-public/abbrev/-/abbrev-1.1.1.tgz",
@@ -103,6 +122,14 @@
      "integrity": "sha1-V9NbhoboUeLMBMQD8cACA5dqGBM=",
      "dev": true
    },
+    "ansi-escapes": {
+      "version": "4.3.0",
+      "resolved": "http://39.106.145.141:9000/repository/node-public/ansi-escapes/-/ansi-escapes-4.3.0.tgz",
+      "integrity": "sha1-pM4rM9ayFLeVDYWVwhLxKsnMVp0=",
+      "requires": {
+        "type-fest": "^0.8.1"
+      }
+    },
    "ansi-regex": {
      "version": "3.0.0",
      "resolved": "http://39.106.145.141:9000/repository/node-public/ansi-regex/-/ansi-regex-3.0.0.tgz",
@@ -283,6 +310,11 @@
        }
      }
    },
+    "chardet": {
+      "version": "0.7.0",
+      "resolved": "http://39.106.145.141:9000/repository/node-public/chardet/-/chardet-0.7.0.tgz",
+      "integrity": "sha1-kAlISfCTfy7twkJdDSip5fDLrZ4="
+    },
    "chokidar": {
      "version": "3.3.0",
      "resolved": "http://39.106.145.141:9000/repository/node-public/chokidar/-/chokidar-3.3.0.tgz",
@@ -324,6 +356,11 @@
      "resolved": "http://39.106.145.141:9000/repository/node-public/cli-spinners/-/cli-spinners-2.2.0.tgz",
      "integrity": "sha1-6LmI2SBsaSMC2O6DTnqFwBRNj3c="
    },
+    "cli-width": {
+      "version": "2.2.0",
+      "resolved": "http://39.106.145.141:9000/repository/node-public/cli-width/-/cli-width-2.2.0.tgz",
+      "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk="
+    },
    "cliui": {
      "version": "5.0.0",
      "resolved": "http://39.106.145.141:9000/repository/node-public/cliui/-/cliui-5.0.0.tgz",
@@ -705,6 +742,24 @@
        }
      }
    },
+    "external-editor": {
+      "version": "3.1.0",
+      "resolved": "http://39.106.145.141:9000/repository/node-public/external-editor/-/external-editor-3.1.0.tgz",
+      "integrity": "sha1-ywP3QL764D6k0oPK7SdBqD8zVJU=",
+      "requires": {
+        "chardet": "^0.7.0",
+        "iconv-lite": "^0.4.24",
+        "tmp": "^0.0.33"
+      }
+    },
+    "figures": {
+      "version": "3.1.0",
+      "resolved": "http://39.106.145.141:9000/repository/node-public/figures/-/figures-3.1.0.tgz",
+      "integrity": "sha1-SxmN0H2NcVMGQoZK8tRd2eRZxOw=",
+      "requires": {
+        "escape-string-regexp": "^1.0.5"
+      }
+    },
    "fill-range": {
      "version": "7.0.1",
      "resolved": "http://39.106.145.141:9000/repository/node-public/fill-range/-/fill-range-7.0.1.tgz",
@@ -872,6 +927,14 @@
      "resolved": "http://39.106.145.141:9000/repository/node-public/human-signals/-/human-signals-1.1.1.tgz",
      "integrity": "sha1-xbHNFPUK6uCatsWf5jujOV/k36M="
    },
+    "iconv-lite": {
+      "version": "0.4.24",
+      "resolved": "http://39.106.145.141:9000/repository/node-public/iconv-lite/-/iconv-lite-0.4.24.tgz",
+      "integrity": "sha1-ICK0sl+93CHS9SSXSkdKr+czkIs=",
+      "requires": {
+        "safer-buffer": ">= 2.1.2 < 3"
+      }
+    },
    "ignore-by-default": {
      "version": "1.0.1",
      "resolved": "http://39.106.145.141:9000/repository/node-public/ignore-by-default/-/ignore-by-default-1.0.1.tgz",
@@ -918,6 +981,88 @@
      "integrity": "sha1-7uJfVtscnsYIXgwid4CD9Zar+Sc=",
      "dev": true
    },
+    "inquirer": {
+      "version": "7.0.1",
+      "resolved": "http://39.106.145.141:9000/repository/node-public/inquirer/-/inquirer-7.0.1.tgz",
+      "integrity": "sha1-E/eYDu3HPGif7/OZSxCcTnmcbrs=",
+      "requires": {
+        "ansi-escapes": "^4.2.1",
+        "chalk": "^2.4.2",
+        "cli-cursor": "^3.1.0",
+        "cli-width": "^2.0.0",
+        "external-editor": "^3.0.3",
+        "figures": "^3.0.0",
+        "lodash": "^4.17.15",
+        "mute-stream": "0.0.8",
+        "run-async": "^2.2.0",
+        "rxjs": "^6.5.3",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^5.1.0",
+        "through": "^2.3.6"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "5.0.0",
+          "resolved": "http://39.106.145.141:9000/repository/node-public/ansi-regex/-/ansi-regex-5.0.0.tgz",
+          "integrity": "sha1-OIU59VF5vzkznIGvMKZU1p+Hy3U="
+        },
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "http://39.106.145.141:9000/repository/node-public/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha1-zUJUFnelQzPPVBpJEIwUMrRMlCQ=",
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          }
+        },
+        "emoji-regex": {
+          "version": "8.0.0",
+          "resolved": "http://39.106.145.141:9000/repository/node-public/emoji-regex/-/emoji-regex-8.0.0.tgz",
+          "integrity": "sha1-6Bj9ac5cz8tARZT4QpY79TFkzDc="
+        },
+        "is-fullwidth-code-point": {
+          "version": "3.0.0",
+          "resolved": "http://39.106.145.141:9000/repository/node-public/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+          "integrity": "sha1-8Rb4Bk/pCz94RKOJl8C3UFEmnx0="
+        },
+        "string-width": {
+          "version": "4.2.0",
+          "resolved": "http://39.106.145.141:9000/repository/node-public/string-width/-/string-width-4.2.0.tgz",
+          "integrity": "sha1-lSGCxGzHssMT0VluYjmSvRY7crU=",
+          "requires": {
+            "emoji-regex": "^8.0.0",
+            "is-fullwidth-code-point": "^3.0.0",
+            "strip-ansi": "^6.0.0"
+          },
+          "dependencies": {
+            "strip-ansi": {
+              "version": "6.0.0",
+              "resolved": "http://39.106.145.141:9000/repository/node-public/strip-ansi/-/strip-ansi-6.0.0.tgz",
+              "integrity": "sha1-CxVx3XZpzNTz4G4U7x7tJiJa5TI=",
+              "requires": {
+                "ansi-regex": "^5.0.0"
+              }
+            }
+          }
+        },
+        "strip-ansi": {
+          "version": "5.2.0",
+          "resolved": "http://39.106.145.141:9000/repository/node-public/strip-ansi/-/strip-ansi-5.2.0.tgz",
+          "integrity": "sha1-jJpTb+tq/JYr36WxBKUJHBrZwK4=",
+          "requires": {
+            "ansi-regex": "^4.1.0"
+          },
+          "dependencies": {
+            "ansi-regex": {
+              "version": "4.1.0",
+              "resolved": "http://39.106.145.141:9000/repository/node-public/ansi-regex/-/ansi-regex-4.1.0.tgz",
+              "integrity": "sha1-i5+PCM8ay4Q3Vqg5yox+MWjFGZc="
+            }
+          }
+        }
+      }
+    },
    "is-arrayish": {
      "version": "0.2.1",
      "resolved": "http://39.106.145.141:9000/repository/node-public/is-arrayish/-/is-arrayish-0.2.1.tgz",
@@ -1023,6 +1168,11 @@
        "path-is-inside": "^1.0.1"
      }
    },
+    "is-promise": {
+      "version": "2.1.0",
+      "resolved": "http://39.106.145.141:9000/repository/node-public/is-promise/-/is-promise-2.1.0.tgz",
+      "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o="
+    },
    "is-redirect": {
      "version": "1.0.0",
      "resolved": "http://39.106.145.141:9000/repository/node-public/is-redirect/-/is-redirect-1.0.0.tgz",
@@ -1110,8 +1260,7 @@
    "lodash": {
      "version": "4.17.15",
      "resolved": "http://39.106.145.141:9000/repository/node-public/lodash/-/lodash-4.17.15.tgz",
-      "integrity": "sha1-tEf2ZwoEVbv+7dETku/zMOoJdUg=",
-      "dev": true
+      "integrity": "sha1-tEf2ZwoEVbv+7dETku/zMOoJdUg="
    },
    "log-symbols": {
      "version": "2.2.0",
@@ -1430,6 +1579,11 @@
        }
      }
    },
+    "os-tmpdir": {
+      "version": "1.0.2",
+      "resolved": "http://39.106.145.141:9000/repository/node-public/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ="
+    },
    "p-finally": {
      "version": "2.0.1",
      "resolved": "http://39.106.145.141:9000/repository/node-public/p-finally/-/p-finally-2.0.1.tgz",
@@ -1750,11 +1904,18 @@
        "signal-exit": "^3.0.2"
      }
    },
+    "run-async": {
+      "version": "2.3.0",
+      "resolved": "http://39.106.145.141:9000/repository/node-public/run-async/-/run-async-2.3.0.tgz",
+      "integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=",
+      "requires": {
+        "is-promise": "^2.1.0"
+      }
+    },
    "rxjs": {
      "version": "6.5.3",
      "resolved": "http://39.106.145.141:9000/repository/node-public/rxjs/-/rxjs-6.5.3.tgz",
      "integrity": "sha1-UQ4mMX9NuRp+sd532d2boKSJmjo=",
-      "dev": true,
      "requires": {
        "tslib": "^1.9.0"
      }
@@ -1765,6 +1926,11 @@
      "integrity": "sha1-t02uxJsRSPiMZLaNSbHoFcHy9Rk=",
      "dev": true
    },
+    "safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "http://39.106.145.141:9000/repository/node-public/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha1-RPoWGwGHuVSd2Eu5GAL5vYOFzWo="
+    },
    "semver": {
      "version": "5.7.1",
      "resolved": "http://39.106.145.141:9000/repository/node-public/semver/-/semver-5.7.1.tgz",
@@ -2012,12 +2178,25 @@
        }
      }
    },
+    "through": {
+      "version": "2.3.8",
+      "resolved": "http://39.106.145.141:9000/repository/node-public/through/-/through-2.3.8.tgz",
+      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU="
+    },
    "timed-out": {
      "version": "4.0.1",
      "resolved": "http://39.106.145.141:9000/repository/node-public/timed-out/-/timed-out-4.0.1.tgz",
      "integrity": "sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8=",
      "dev": true
    },
+    "tmp": {
+      "version": "0.0.33",
+      "resolved": "http://39.106.145.141:9000/repository/node-public/tmp/-/tmp-0.0.33.tgz",
+      "integrity": "sha1-bTQzWIl2jSGyvNoKonfO07G/rfk=",
+      "requires": {
+        "os-tmpdir": "~1.0.2"
+      }
+    },
    "to-regex-range": {
      "version": "5.0.1",
      "resolved": "http://39.106.145.141:9000/repository/node-public/to-regex-range/-/to-regex-range-5.0.1.tgz",
@@ -2072,8 +2251,12 @@
    "tslib": {
      "version": "1.10.0",
      "resolved": "http://39.106.145.141:9000/repository/node-public/tslib/-/tslib-1.10.0.tgz",
-      "integrity": "sha1-w8GflZc/sKYpc/sJ2Q2WHuQ+XIo=",
-      "dev": true
+      "integrity": "sha1-w8GflZc/sKYpc/sJ2Q2WHuQ+XIo="
+    },
+    "type-fest": {
+      "version": "0.8.1",
+      "resolved": "http://39.106.145.141:9000/repository/node-public/type-fest/-/type-fest-0.8.1.tgz",
+      "integrity": "sha1-CeJJ696FHTseSNJ8EFREZn8XuD0="
    },
    "type-name": {
      "version": "2.0.2",

--- a/package.json
+++ b/package.json
 {
-  "name": "qj-vue-cli",
+  "name": "qj-cli",
  "version": "0.1.0",
  "description": "qj-vue-cli",
  "main": "index.js",
@@ -11,8 +11,8 @@
    "watch-bin": "nodemon dist/bin/index.js create vue2.0 hello",
    "dev": "concurrently \"npm run watch-ts\" \"npm run watch-bin\"",
    "build": "tsc",
-    "dev-link": "npm run build && npm unlink && npm link",
-    "test": "mocha -r ts-node/register src/test/**/*.test.ts"
+    "test-ts": "mocha -r ts-node/register src/test/**/*.test.ts",
+    "test": "mocha dist/test/**/*.test.js"
  },
  "repository": {
    "type": "git",
@@ -29,6 +29,7 @@
    "@types/commander": "^2.12.2",
    "@types/cross-spawn": "^6.0.1",
    "@types/fs-extra": "^8.0.1",
+    "@types/inquirer": "^6.5.0",
    "@types/mocha": "^5.2.7",
    "@types/node": "^12.12.17",
    "@types/power-assert": "^1.5.2",
@@ -45,6 +46,7 @@
    "cross-spawn": "^7.0.1",
    "execa": "^3.4.0",
    "fs-extra": "^8.1.0",
+    "inquirer": "^7.0.1",
    "ora": "^4.0.3"
  }
 }
--- a/src/bin/index.ts
+++ b/src/bin/index.ts
@@ -6,7 +6,7 @@ import { create } from '../lib/create'
 // 版本号
 program
  .version(`${require('../../package.json').version}`)
-  .name('world')
+  .name('qj-cli')
  .usage('<command> [options]');
 // create command
 program

--- a/src/lib/create_vue2.ts
+++ b/src/lib/create_vue2.ts
 import * as ora from 'ora'
 import { Git } from '../util/Git'
 import { Templates, Template } from '../config/template.config'
+import * as inquirer from 'inquirer'
+import * as chalk from 'chalk';
 /**
 * @date 2019.12.18
 * @author panyanan
@@ -18,16 +20,40 @@ export class CreateVue2 {
        this.projectName = projectName;
        this.targetDir = targetDir;
    }
-    create(options: any): void{
+    /**
+     * @date 2019.12.19
+     * @author panyanan
+     * @information 创建
+     * @param { Object } commander中设置的option 
+     */
+    public async create(options: any): Promise<void>{
+        try {
+            let spinner = ora('create new a project');
+            spinner.start(`拉取${this.template.name}模板`);
+            // 通过仓库地址和输出目录创建git实例
+            const pullGit = new Git(this.template.repo, this.targetDir);
+            pullGit.pull();
+            spinner.succeed('拉取模板成功');
+            // 是否推送到gitLab
+            let answer = await inquirer.prompt([
+                { name: 'push', type: 'confirm', message: '是否将项目推送到gitlab',}
+            ]);
+            // 如果推送
+            if (answer.push) {
+                const { repo } = await inquirer.prompt([
+                 { name: 'repo', type: 'input', message: '请输入gitlab项目地址:'}
+                ]);
+                const pushGit = new Git(repo, this.targetDir);
                try {
-            const spinner = ora('create new a project');
-            spinner.start();
-            const git = new Git(this.template.repo, this.targetDir);
-            git.pull();
-            spinner.stop();
-            spinner.succeed('clone succeed');
+                    spinner.start(`正在推送到gitlab: ${repo}`)
+                    pushGit.push();
+                    spinner.succeed('推送成功')
+                } catch (error) {
+                    spinner.fail(`推送失败: ${error.message}`);
+                }
+            }
        } catch (error) {
-            console.error(error);            
+            console.log(`${chalk.red('创建失败')}: ${error.message}`);           
        }
    }
 }
\ No newline at end of file
--- a/src/util/Git.ts
+++ b/src/util/Git.ts
@@ -42,11 +42,11 @@ export class Git {
            cwd: this.dir,
        }
        // remove origin
-        spawn.sync('git', ['remote', 'remove', 'origin',], options);
+        spawn.sync('git', ['remote', 'remove', 'origin'], options);
        // set origin 为当前url
        spawn.sync('git', ['remote', 'add', 'origin', this.gitURL], options);
        // 推送
-        const { status, stderr } = spawn.sync('git', ['push', '-u', 'origin', '--all'], options);
+        const { status, stderr, stdout } = spawn.sync('git', ['push', '-u', 'origin', '--all'], options);
        // status 为0时命令执行成功, 为1是命令执行失败
        if (status === 0) {
            res = true;