Merge branch 'dev'

Author: saqqdy

README.md

@@ -143,8 +143,10 @@ gitm admin create release
 ### gitm admin publish
 发版操作
 ```
-# 形式：gitm admin publish <type> [-c --combine] [-r --rebase]
-# 可传入2个参数，传入combine时合并release之后会把release同步到bugfix，传入rebase使用release方法合并
+# 形式：gitm admin publish <type> [-c --combine] [-r --rebase] [-p --prod]
+# 传入combine时合并release之后会把release同步到bugfix
+# 传入rebase使用release方法合并
+# 当需要发布bugfix时，传入prod会把bugfix同步到master，不传则不合并
 gitm admin publish release
 ```
 

bin/gitm-admin.js

@@ -48,6 +48,7 @@ program
 	.description('发布bugfix、release、support分支')
 	.option('-c, --combine', '是否把release代码同步到bug', false)
 	.option('-r, --rebase', '是否使用rebase方式更新，默认merge', false)
+	.option('-p, --prod', '发布bug分支时，是否合并bug到master', false)
 	.action(async (type, opt) => {
 		const opts = ['bugfix', 'release', 'support'] // 允许执行的指令
 		let status = await getStatus()
@@ -69,16 +70,6 @@ program
 						cmd: `git merge --no-ff ${config.bugfix}`,
 						config: { slient: false, again: false, success: '分支合并成功', fail: '合并失败，请根据提示处理' }
 					},
-					{
-						cmd: `git push`,
-						config: { slient: false, again: true, success: '推送成功', fail: '推送失败，请根据提示处理' }
-					},
-					`git checkout ${config.master}`,
-					`git pull`,
-					{
-						cmd: `git merge --no-ff ${config.bugfix}`,
-						config: { slient: false, again: false, success: '分支合并成功', fail: '合并失败，请根据提示处理' }
-					},
 					{
 						cmd: `git push`,
 						config: { slient: false, again: true, success: '推送成功', fail: '推送失败，请根据提示处理' }
@@ -123,6 +114,20 @@ program
 					}
 				]
 			}
+			if (type === 'bugfix' && opt.prod) {
+				cmd[type] = cmd[type].concat([
+					`git checkout ${config.master}`,
+					`git pull`,
+					{
+						cmd: `git merge --no-ff ${config.bugfix}`,
+						config: { slient: false, again: false, success: '分支合并成功', fail: '合并失败，请根据提示处理' }
+					},
+					{
+						cmd: `git push`,
+						config: { slient: false, again: true, success: '推送成功', fail: '推送失败，请根据提示处理' }
+					}
+				])
+			}
 			if (type === 'release' && opt.combine) {
 				if (opt.rebase) {
 					cmd[type] = cmd[type].concat([
@@ -135,7 +140,7 @@ program
 						},
 						{
 							cmd: `git rebase ${config.release}`,
-							config: { slient: false, again: false, success: '分支合并成功', fail: '合并失败，请根据提示处理' }
+							config: { slient: false, again: false, postmsg: true, success: '分支合并成功', fail: '合并失败，请根据提示处理' }
 						},
 						{
 							cmd: `git push`,
@@ -151,7 +156,7 @@ program
 						`git pull`,
 						{
 							cmd: `git merge --no-ff ${config.release}`,
-							config: { slient: false, again: false, success: '分支合并成功', fail: '合并失败，请根据提示处理' }
+							config: { slient: false, again: false, postmsg: true, success: '分支合并成功', fail: '合并失败，请根据提示处理' }
 						},
 						{
 							cmd: `git push`,
@@ -190,7 +195,7 @@ program
 				},
 				{
 					cmd: `git merge --no-ff ${base}`,
-					config: { slient: false, again: false, success: '分支合并成功', fail: '合并失败，请根据提示处理' }
+					config: { slient: false, again: false, postmsg: true, success: '分支合并成功', fail: '合并失败，请根据提示处理' }
 				},
 				{
 					cmd: `git push`,
@@ -208,7 +213,7 @@ program
 					},
 					{
 						cmd: `git rebase ${base}`,
-						config: { slient: false, again: false, success: '分支合并成功', fail: '合并失败，请根据提示处理' }
+						config: { slient: false, again: false, postmsg: true, success: '分支合并成功', fail: '合并失败，请根据提示处理' }
 					},
 					{
 						cmd: `git push`,

bin/gitm-config.js

@@ -19,7 +19,8 @@ const defaults = {
 	bugfix: 'bug',
 	support: 'support',
 	user: '',
-	email: ''
+	email: '',
+	msgUrl: 'http://crp.kingdee.com/cd/metroOperateOutside/startMetroByMetroId?metroId=305648017963220992&describe=1235&isCurlAnother=false'
 }
 const getConfigFrom = () => {
 	if (sh.test('-f', pwd + '.gitmarsrc')) {
@@ -39,10 +40,10 @@ configFrom = getConfigFrom()
 function getConfig() {
 	if (configFrom === 1) {
 		let str = (sh.cat('.gitmarsrc') + '')
-			.replace(/(^\n*)|(\n*$)/g, '')
-			.replace(/\n{2,}/g, '\n')
-			.replace(/\r/g, '')
-			.replace(/[^\S\x0a\x0d]/g, ''),
+				.replace(/(^\n*)|(\n*$)/g, '')
+				.replace(/\n{2,}/g, '\n')
+				.replace(/\r/g, '')
+				.replace(/[^\S\x0a\x0d]/g, ''),
 			arr = []
 		if (str) arr = str.split('\n')
 		arr.forEach(el => {
@@ -88,10 +89,11 @@ const queue = list => {
 		list = JSON.parse(JSON.stringify(list))
 		wait(list, (command, cb) => {
 			let config = {
-				silent: true,
-				kill: true,
-				again: false // 指令执行中断之后是否需要重新执行，类似冲突解决之后的指令，不再需要重复执行
-			},
+					silent: true,
+					postmsg: false,
+					kill: true,
+					again: false // 指令执行中断之后是否需要重新执行，类似冲突解决之后的指令，不再需要重复执行
+				},
 				cmd = command
 			// 传入对象形式：{ cmd: '', config: {} }
 			if (command instanceof Object) {
@@ -119,11 +121,13 @@ const queue = list => {
 						// 只有silent模式才需要输出信息
 						config.silent && sh.echo(error(err))
 						sh.echo(error('指令 ' + cmd + ' 执行失败，中断了进程'))
+						config.postmsg && postMessage('指令 ' + cmd + ' 执行失败，中断了进程')
 						rest.length > 0 && sh.echo(error('请处理相关问题之后输入gitm continue继续'))
 						sh.exit(1)
 					} else {
 						if (code === 0) {
 							sh.echo(success(config.success || '指令 ' + cmd + ' 执行成功'))
+							config.postmsg && postMessage(config.success || '指令 ' + cmd + ' 执行成功')
 						} else {
 							sh.echo(warning(config.fail || '指令 ' + cmd + ' 执行失败'))
 						}
@@ -178,13 +182,12 @@ const setLog = log => {
 const getStatus = async () => {
 	const data = await queue(['gitm status'])
 	if (data[0].out.indexOf('Changes to be committed') > -1 || data[0].out.indexOf('Changes not staged for commit') > -1) {
-		sh.echo(warning('您还有未提交的文件，请处理后再继续') + '\n如果需要暂存文件请执行: gitm save\n恢复时执行：gitm get')
+		sh.echo(error('您还有未提交的文件，请处理后再继续') + '\n如果需要暂存文件请执行: gitm save\n恢复时执行：gitm get')
 		sh.exit(1)
 		return false
 	} else if (data[0].out.indexOf('Untracked files') > -1) {
-		sh.echo(warning('您还有未加入版本的文件，请处理后再继续') + '\n如果需要暂存文件请执行: gitm save --force\n恢复时执行：gitm get')
-		sh.exit(1)
-		return false
+		sh.echo(warning('您有未加入版本的文件,') + '\n如果需要暂存文件请执行: gitm save --force\n恢复时执行：gitm get')
+		return true
 	} else {
 		return true
 	}
@@ -210,6 +213,15 @@ const getCurrent = async () => {
 	return data[0].out.replace(/^\*\s+/, '')
 }
 
+/**
+ * postMessage
+ * @description 发送消息
+ */
+const postMessage = msg => {
+	msg = msg.replace(/\s/g, '')
+	config.msgUrl && sh.exec(`curl -i -H "Content-Type: application/json" -X POST -d '{"envParams":{"error_msg":"'${msg}'"}}' "${config.msgUrl}"`)
+}
+
 const handleConfigOutput = name => {
 	if (name === 'user') {
 		return '请输入Git用户名(必填)'
@@ -219,4 +231,4 @@ const handleConfigOutput = name => {
 	return '请输入' + name + '分支名称，默认为：' + defaults[name]
 }
 
-module.exports = { pwd, warning, error, success, defaults, config, configFrom, wait, queue, getCache, setCache, getStatus, checkBranch, getCurrent, handleConfigOutput }
+module.exports = { pwd, warning, error, success, defaults, config, configFrom, wait, queue, getCache, setCache, getStatus, checkBranch, getCurrent, postMessage, handleConfigOutput }

bin/index.js

@@ -1,7 +1,7 @@
 {
 	"name": "gitmars",
 	"description": "git tool for newbees",
-	"version": "1.0.9",
+	"version": "1.0.10",
 	"main": "bin/gitm.js",
 	"scripts": {
 		"start": "react-scripts start"