From f9cb751d0bd4c86750980fa55cac3ae647bc7297 Mon Sep 17 00:00:00 2001
From: xiaofengchen <xiaofengchen@whale.im>
Date: Thu, 26 May 2022 11:21:44 +0800
Subject: [PATCH] =?UTF-8?q?feat:whale=20=E5=88=9B=E5=BB=BAfeature=E8=84=9A?=
 =?UTF-8?q?=E6=9C=AC=20v1.0.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 index.js          | 30 ++++++++++++++++--------------
 package-lock.json |  4 ++--
 package.json      |  6 +++---
 readme.md         |  7 +++++++
 src/git.js        |  8 +++++---
 src/question.js   |  2 +-
 6 files changed, 34 insertions(+), 23 deletions(-)
 create mode 100644 readme.md

diff --git a/index.js b/index.js
index d2ece06..16a597c 100755
--- a/index.js
+++ b/index.js
@@ -13,59 +13,61 @@ inquirer
 function doAnswer(anwsers) {
   console.log("anwsers.git:", anwsers.git);
   switch (anwsers.git) {
-    case "push":
+    case "feature":
       inquirer
         .prompt([
           {
             type: "input",
-            name: "commit",
-            message: "请输入git commit:",
-            default: "update"
+            name: "feature",
+            message: "请输入git分支名称",
+            default: "function"
           }
         ])
         .then(anwsers => {
-          git.updateCode(anwsers);
+          git.feature(anwsers);
         })
         .catch(err => {
           console.log(err);
         });
       break;
 
-    case "checkout":
+    case "push":
       inquirer
         .prompt([
           {
             type: "input",
-            name: "branch",
-            message: "请输入git分支名称"
+            name: "commit",
+            message: "请输入git commit:",
+            default: "update"
           }
         ])
         .then(anwsers => {
-          git.checkoutBranch(anwsers);
+          git.updateCode(anwsers);
         })
         .catch(err => {
           console.log(err);
         });
       break;
 
-    case "feature":
+    case "checkout":
       inquirer
         .prompt([
           {
             type: "input",
-            name: "feature",
-            message: "请输入git分支名称",
-            default: "function"
+            name: "branch",
+            message: "请输入git分支名称"
           }
         ])
         .then(anwsers => {
-          git.feature(anwsers);
+          git.checkoutBranch(anwsers);
         })
         .catch(err => {
           console.log(err);
         });
       break;
 
+
+
     case "release":
       inquirer
         .prompt([
diff --git a/package-lock.json b/package-lock.json
index 1b60ee5..75844c7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
-  "name": "pp-git-cli",
-  "version": "1.0.3",
+  "name": "@whale/git",
+  "version": "1.0.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index c8be997..c602c74 100644
--- a/package.json
+++ b/package.json
@@ -1,13 +1,13 @@
 {
-  "name": "pp-git-cli",
-  "version": "1.0.4",
+  "name": "@whale/git",
+  "version": "1.0.0",
   "description": "for simplify git command operation",
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "bin": {
-    "ppgit": "index.js"
+    "wgit": "index.js"
   },
   "author": "chenxf",
   "license": "ISC",
diff --git a/readme.md b/readme.md
new file mode 100644
index 0000000..b7de03e
--- /dev/null
+++ b/readme.md
@@ -0,0 +1,7 @@
+### whale 创建 feature 分支小脚本
+
+终端执行wgit，选择创建feature分支，输入feature 名字，即可创建feature_yyyymmdd_迭代名 格式的feature分支。此脚本默认从release 创建feature分支
+
+```
+wgit
+```
\ No newline at end of file
diff --git a/src/git.js b/src/git.js
index 8657508..edce16b 100644
--- a/src/git.js
+++ b/src/git.js
@@ -25,11 +25,13 @@ function checkoutBranch({ branch }) {
 }
 
 function feature({ feature }) {
-  updateCode();
+  execSync(`git checkout release`);
+  execSync(`git pull`);
+
   const dateStr = utils.getDateStr();
-  const branch = `feature/${dateStr}-${feature}`;
+  const branch = `feature_${dateStr}_${feature}`;
   execSync(`git checkout -b ${branch}`);
-  execSync(`git push origin ${branch}`);
+  execSync(`git push --set-upstream origin ${branch}`);
 }
 
 function release({ release }) {
diff --git a/src/question.js b/src/question.js
index b49d1ba..f2af570 100644
--- a/src/question.js
+++ b/src/question.js
@@ -4,9 +4,9 @@ module.exports = [
     type: "list",
     message: "请选择您要进行的git操作：",
     choices: [
+      { name: "新建feature分支", value: "feature" },
       { name: "提交代码", value: "push" },
       { name: "切换分支", value: "checkout" },
-      { name: "新建feature分支", value: "feature" },
       { name: "新建release分支", value: "release" },
       { name: "自动tag", value: "tag" }
     ],