abao-cli 1.0.0 → 1.0.2

package/bin/cli.js

@@ -12,12 +12,19 @@ const { del } = require("../commands/del")
 
 const { init } = require("../commands/init")
 
+const fs = require("fs")
+
+const path = require("path")
+
+const chalk = require("chalk")
+
 program.version(packageConfig.version).option("-v, --version")
 
 program.name("my-command").usage("可执行命令")
 
 program
-    .command("ls")
+    .command("list")
+    .alias("ls")
     .description("查看模板列表")
     .action(() => {
         showList()
@@ -38,10 +45,18 @@ program
     })
 
 program
-    .command("init")
+    .command("init <projectName> [项目名称]")
     .description("初始化模板")
-    .action(() => {
-        init()
+    .action((projectName) => {
+        const cwd = process.cwd()
+        const fullPath = path.join(cwd, projectName)
+        if (fs.existsSync(fullPath)) {
+            console.log("\n")
+            console.log(chalk.yellow("警告:"), "目录已存在,请重新输入")
+            console.log("\n")
+        } else {
+            init(cwd, projectName)
+        }
     })
 
 program.parse()

package/commands/del.js

@@ -8,7 +8,7 @@ exports.del = async () => {
     const tempJson = await readFile()
     const nameArray = (tempJson || []).map(item => item.name)
 
-    if (nameArray.length === 0) return console.log("不存在可以删除的模板")
+    if (nameArray.length === 0) return console.log("模板已为空，无需删除")
 
     const question = [
         {

package/commands/init.js

@@ -1,18 +1,31 @@
 #!/usr/bin/env node
 
-const path = require("path")
-const ora = require("ora")
 const inquirer = require("inquirer")
-const download = require("download-git-repo")
 const { readFile } = require("../utils/file")
-// 定义一个loading
-const spinner = ora("Generate ing...");
+const path = require("path")
+const download = require("download-git-repo")
+const shell = require("shelljs")
+const chalk = require("chalk")
+const ora = require("ora")
+const spinner = ora("Generate ing...")
 
-exports.init = async () => {
+const gitRegExp = /^http.*\.git$/
+
+exports.init = async (cwd, projectName) => {
     const tempJson = await readFile()
     const nameArray = (tempJson || []).map(item => item.name)
 
     const question = [
+        {
+            name: "git_origin",
+            type: "input",
+            message: "请输入git源地址",
+            validate(val) {
+                if (val === '') return 'git源地址必填'
+                else if (gitRegExp.test(val)) return true
+                else return '这不是一个有效的地址'
+            }
+        },
         {
             name: "name",
             type: "list",
@@ -22,22 +35,36 @@ exports.init = async () => {
     ]
 
     inquirer.prompt(question).then(async answer => {
-        const { name } = answer
+        const { name, git_origin } = answer
         const { git_url, branch } = tempJson.find(item => item.name === name)
-
-        console.log('\n');
-        // console.log(`direct:${git_url}#${branch}`);
-        spinner.start();
-        download(`direct:${git_url}#${branch}`, path.join(__dirname, '../test'), { clone: true }, err => {
+        spinner.start()
+        download(`direct:${git_url}#${branch}`, path.join(cwd, projectName), { clone: true }, err => {
+            spinner.stop()
             if (err) {
-                console.log(err.message);
-                console.log('\n');
+                console.log(err.message)
+                console.log('\n')
                 // loading 失败
                 spinner.fail("Generate failed");
             } else {
-                console.log('\n');
+                console.log('\n')
                 // loading 成功
-                spinner.succeed("Generate success");
+                spinner.succeed("Generate success")
+
+                console.log("\n")
+                //判定git命令是否可用
+                if (!shell.which('git')) {
+                    //向命令行打印git命令不可用的提示信息
+                    shell.echo('抱歉, git命令不可用')
+                    //退出当前进程
+                    shell.exit(1)
+                } else {
+                    shell.cd(projectName)
+                    shell.exec(`git init`)
+                    shell.exec(`git remote add origin ${git_origin}`)
+                    console.log("\n")
+                    console.log(chalk.white("git 初始化成功:"), chalk.blue(git_origin))
+                    console.log("\n")
+                }
             }
         })
     })

package/package.json

@@ -1,19 +1,25 @@
 {
   "name": "abao-cli",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "",
   "main": "index.js",
-  "bin": "./index.js",
+  "bin": {
+    "abao-cli": "./bin/cli.js"
+  },
   "scripts": {
-    "publish": "npm publish"
+    "buildPublish": "npm publish"
   },
-  "keywords": [],
-  "author": "",
+  "keywords": [
+    "abao-cli"
+  ],
+  "author": "bao",
   "license": "ISC",
   "dependencies": {
+    "chalk": "4.1.2",
     "cli-table": "0.3.11",
     "commander": "10.0.0",
     "download-git-repo": "3.0.2",
-    "inquirer": "8.2.5"
+    "inquirer": "8.2.5",
+    "shelljs": "0.8.5"
   }
-}
+}

package/utils/file.js

@@ -1,3 +1,5 @@
+#!/usr/bin/env node
+
 const path = require("path")
 const fs = require("fs")
 

package/utils/temp.json

@@ -0,0 +1 @@
+[]