rigjs 3.0.26 → 3.0.31

package/lib/tag/index.ts

@@ -12,7 +12,15 @@ import json5 from 'json5';
 
 let red = chalk.red;
 
-
+const exec = (cmd:string)=>{
+	shell.exec(`cmd`,(code, stdout, stderr)=>{
+		if (stderr){
+			print.error(stderr);
+		}else{
+			print.succeed(`success: ${cmd}`);
+		}
+	});
+}
 const load = async () => {
 	try {
 		let pkgJson = JSON.parse(fs.readFileSync('package.json').toString());
@@ -45,15 +53,33 @@ const load = async () => {
 							process.exit(1)
 						}
 					});
-					shell.exec(`git tag ${tagStr}`);
+					exec(`git tag ${tagStr}`);
 					print.succeed(`tag:${tagStr} created.`);
 				}catch(e:any){
 					print.error(`create tag failed:${e.message}`);
 					process.exit(1)
 				}
+			}else if (pkgJson&&pkgJson.rig_tag_template){
+				let tagStr = `${pkgJson.rig_tag_template}`;
+
+				try{
+					const fields = pkgJson.rig_tag_template.match(/(?<={)[^{}]+(?=})/g)
+					fields.forEach((field: string) => {
+						const value = pkgJson[field];
+						if (value) {
+							tagStr = tagStr.replace(`{${field}}`, value)
+						} else {
+							print.error(`field:${field} not found in package.json`);
+							process.exit(1)
+						}
+					});
+					exec(`git tag ${tagStr}`)
+				}catch(e:any){
+					print.error(`create tag failed:${e.message}`);
+					process.exit(1)
+				}
 			}else{
-				shell.exec(`git tag ${version}`);
-				print.succeed(`tag:${version} created.`);
+				exec(`git tag ${version}`)
 			}
 		} else {
 			print.error('please commit your changes before tag');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rigjs",
-  "version": "3.0.26",
+  "version": "3.0.31",
   "description": "A multi-repos dev tool based on yarn and git.Rigjs is intended to be the simplest way to develop,share and deliver codes between different developers or different projects.",
   "keywords": [
     "modular",
@@ -13,7 +13,10 @@
     "workspaces"
   ],
   "main": "index.js",
-  "repository": "https://github.com/FlashHand/rig",
+  "repository":{
+    "type": "git",
+    "url":  "https://github.com/FlashHand/rig"
+  },
   "author": "ralwayne",
   "license": "MIT",
   "bin": {