update

cmd.js

@@ -13,15 +13,9 @@ const rl = readline.createInterface({
 
 let json = {
   'shPath':'/data/sh',
-  'basePath':'/data',
-  'product':{
-    'sample':{
-      git:'git@116.62.143.3:sample/server-app.git',
-      path:'/nserver/app/sample'
-    }
-  }
+  'basePath':'/data'
 }
-
+json = Object.assign(json,require('./config'))
 let defaultArgs = [];
 defaultArgs.push('exec')
 defaultArgs.push('-i')
@@ -68,7 +62,7 @@ async function rollbackProcess(productName){
 
   args.push(`${json.shPath}/checkoutTag.sh`)
   args.push(json.basePath)
-  args = formatArgs(productName, args)
+  args = formatArgs(productName, args, false, true)
   let tagName = await makeQuestion('请选择要切换的tag(直接回车切换到最新的tag)')
   args.push(tagName)
   exec(defaultArgs.concat(args))
@@ -79,7 +73,7 @@ async function publishProcess(productName){
     let args = []
     args.push(`${json.shPath}/pull.sh`)
     args.push(json.basePath)
-    args = formatArgs(productName, args)
+    args = formatArgs(productName, args,false,true)
 
     exec(defaultArgs.concat(args))
 }
@@ -105,11 +99,13 @@ async function cloneProcess(productName){
   exec(defaultArgs.concat(args))
 }
 
-function formatArgs(productName,args,needGit = false){
+function formatArgs(productName,args,needGit = false,needPM2 = false){
   let info = json.product[productName];
   if(needGit)
     args.push(info.git)
   args.push(json.basePath+info.path)
+  if(needPM2)
+    args.push(info.pm2)
   return args;
 }
 

config.js

+module.exports = {
+  'basePath':'/data',
+  'product':{
+    'sample':{
+      git:'git@116.62.143.3:sample/server-app.git',
+      path:'/nserver/app/sample',
+      pm2:'sample'
+    }
+  }
+}

sh/checkoutTag.sh

@@ -4,5 +4,5 @@ set -e
 base_path="$1"
 cd $base_path
 cd $2
-git checkout $3
-pm2 reload $2
+git checkout $4
+pm2 reload $3

sh/pull.sh

@@ -4,5 +4,6 @@ set -e
 base_path="$1"
 cd $base_path
 cd $2
+git checkout release
 git pull
-pm2 reload $2
+pm2 reload $3

yarn-error.log

 Arguments: 
-  /usr/local/bin/node /usr/local/Cellar/yarn/1.5.1_1/libexec/bin/yarn.js run pr
+  /usr/local/bin/node /usr/local/Cellar/yarn/1.5.1_1/libexec/bin/yarn.js run pd
 
 PATH: 
   /usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/Library/Frameworks/Mono.framework/Versions/Current/Commands:/Users/felix/Library/Android/sdk/tools:/Users/felix/Library/Android/sdk/platform-tools:/Users/felix/Library/Android/sdk/tools:/Users/felix/Library/Android/sdk/platform-tools
@@ -24,7 +24,7 @@ npm manifest:
     "scripts": {
       "pr": "node cmd.js test",
       "pd": "node cmd.js test"
-    },
+    }
   }
 
 yarn manifest: 
@@ -34,10 +34,17 @@ Lockfile:
   No lockfile
 
 Trace: 
-  SyntaxError: /Users/felix/Desktop/ugengit/node/gitPublish/package.json: Unexpected token } in JSON at position 261
-      at JSON.parse (<anonymous>)
-      at /usr/local/Cellar/yarn/1.5.1_1/libexec/lib/cli.js:1036:59
-      at Generator.next (<anonymous>)
-      at step (/usr/local/Cellar/yarn/1.5.1_1/libexec/lib/cli.js:98:30)
-      at /usr/local/Cellar/yarn/1.5.1_1/libexec/lib/cli.js:109:13
-      at <anonymous>
+  Error: Command failed.
+  Exit code: 1
+  Command: sh
+  Arguments: -c node cmd.js test
+  Directory: /Users/felix/Desktop/ugengit/node/gitPublish
+  Output:
+  
+      at ProcessTermError.MessageError (/usr/local/Cellar/yarn/1.5.1_1/libexec/lib/cli.js:186:110)
+      at new ProcessTermError (/usr/local/Cellar/yarn/1.5.1_1/libexec/lib/cli.js:226:113)
+      at ChildProcess.<anonymous> (/usr/local/Cellar/yarn/1.5.1_1/libexec/lib/cli.js:30281:17)
+      at emitTwo (events.js:126:13)
+      at ChildProcess.emit (events.js:214:7)
+      at maybeClose (internal/child_process.js:925:16)
+      at Process.ChildProcess._handle.onexit (internal/child_process.js:209:5)