rigjs 2.1.0 → 2.1.3

package/demo/package.rig.json5

@@ -7,6 +7,6 @@
   {
     name: "rig-test-2",
     source: "git@github.com:FlashHand/rig-test-2.git",
-    version: "1.0.1",
+    version: "1.0.2",
   },
 ]

package/jest.config.ts

@@ -0,0 +1,7 @@
+const config = {
+	verbose: false,
+	collectCoverage: true,
+
+};
+
+module.exports = config;

package/lib/build/index.ts

@@ -4,6 +4,7 @@ import shell from 'shelljs';
 import path from 'path';
 import fs from 'fs';
 import vueEnv from '../vue-env';
+const print = require('../print');
 
 const JSON5 = require('json5');
 
@@ -68,6 +69,7 @@ export default async (cmd: any) => {
 			switch (frameworktype) {
 				case FrameworkType.vue: {
 					vueEnv.useEnv(ep.vue_env!, ep.extra_env);
+					//推测vue脚本
 					if (!ep.build) ep.build = 'npx vue-cli-service build --mode rig';
 				}
 					break;
@@ -75,6 +77,7 @@ export default async (cmd: any) => {
 					break;
 			}
 			ep.build = ep.build.replace(regexPublicPath, ep.publicPath);
+			print.info(`using build script:${ep.build}`);
 			shell.exec(ep.build);
 			//setup default defines and replace text in built source.
 			if (!ep.defines) ep.defines = {};

package/lib/preinstall/index.d.ts

@@ -1,6 +1,7 @@
 declare namespace preinstall {
 	function load(): void;
 	const name: string;
+	const checkDepsValid: (rigJSON5:any) => void
 
 }
 export default preinstall;

package/lib/preinstall/index.js

@@ -9,6 +9,8 @@ const fs = require('fs');
 const json5 = require('json5');
 const print = require('../print');
 const path = require('path');
+const compareVersions = require('compare-versions');
+
 // let semverReg = /^([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*))?(?:\+[0-9A-Za-z-]+)?$/;
 let gitUrlReg = /(?:git|ssh|https?|git@[-\w.]+):(\/\/)?(.*?)(\.git)(\/?|\#[-\d\w._]+?)$/;
 const validateName = (name) => {
@@ -76,53 +78,63 @@ const clone = (target, dep) => {
 	}
 }
 const checkDepsValid = (rigJson5) => {
-	// git show origin/master:package.json
-// ➜  projects git show tags/2.0.1:package.json
+	let valid = true;
 	for (let rig of rigJson5) {
 		try {
-			const cmd = `git fetch  ${rig.source} --tag ${rig.version} -n && git show FETCH_HEAD:package.json`;
+			const cmd = `git fetch  ${rig.source} refs/tags/${rig.version} && git show FETCH_HEAD:package.json`;
 			console.log(cmd);
 			let showPackageProcess = shell.exec(cmd,
 				{silent: true}
 			);
 			let pkgStr = showPackageProcess.stdout.trim();
 			const pkg = JSON.parse(pkgStr);
-			console.log(pkgStr);
 			//获取rig依赖
-			if (pkg.rig){
+			if (pkg.rig) {
 				const rigConfig = pkg.rig;
 				//遍历rig依赖
 				Object.keys(rigConfig).forEach(key => {
 					//获取该rig依赖的要求的版本范围
-					let max='';
+					let max = '';
 					let min = '';
-					if (Array.isArray(rigConfig[key]) ) {
+					if (Array.isArray(rigConfig[key])) {
 						//使用数组的情况
-						if (rigConfig[key].length === 2){
-							console.log('array\'s length must equal to 2!');
-							process.exit(1);
-						}else{
+						if (rigConfig[key].length !== 2) {
+							print.error('array\'s length must equal to 2!');
+							valid = false;
+						} else {
 							min = rigConfig[key][0]
 							max = rigConfig[key][1];
 						}
 					} else {
 						//使用字典的情况
-						min = rigConfig[key]['min'];
-						max = rigConfig[key]['max'];
+						min = rigConfig[key]['min'] || '';
+						max = rigConfig[key]['max'] || '';
 					}
+
 					//从rigJson5获取该依赖的版本号
 					const dep = rigJson5.find(r => r.name === key);
-					if (dep){
-
-					}else{
-						console.log(`${key}[${min},${max}] is required`);
-						process.exit(1);
+					if (dep) {
+						console.log(min,max,dep);
+						if (min) {
+							valid = compareVersions(dep.version, min) >= 0
+						}
+						if (max) {
+							valid = compareVersions(dep.version, max) <= 0
+						}
+						if (!valid){
+							print.error(`${rig.name} requires ${key}[${min},${max}],but ${key} is ${dep.version}!`);
+						}
+					} else {
+						print.error(`${key}[${min},${max}] is required`);
+						valid = false;
 					}
 				})
 			}
 		} catch (e) {
-			console.log(e);
+
+			valid = false;
 		}
+		return valid;
 	}
 }
 //加载命令控制器
@@ -133,7 +145,7 @@ const load = async (cmd) => {
 		let rigJson5Str = fs.readFileSync(path.join(process.cwd(), 'package.rig.json5'));
 		let rigJson5 = json5.parse(rigJson5Str);
 		if (!validate(rigJson5)) process.exit(1);
-		checkDepsValid(rigJson5);
+		if (!checkDepsValid(rigJson5)) process.exit(1);
 		//重置rigs
 		if (!(fs.existsSync('./rigs') && fs.lstatSync('./rigs').isDirectory())) {
 			print.info('create folder rigs');
@@ -181,5 +193,6 @@ const load = async (cmd) => {
 }
 module.exports = {
 	name: 'install',
-	load
+	load,
+	checkDepsValid
 }

package/lib/preinstall/index.test.js

@@ -0,0 +1,16 @@
+const checkDepsValid = require('./index').checkDepsValid;
+const testRigPkgArr = [
+	{
+		name: "rig-test-1",
+		source: "git@github.com:FlashHand/rig-test-1.git",
+		version: "1.0.1",
+	},
+	{
+		name: "rig-test-2",
+		source: "git@github.com:FlashHand/rig-test-2.git",
+		version: "1.0.2",
+	},
+];
+test('checkDepsValid', () => {
+	expect(checkDepsValid(testRigPkgArr)).toBe(true);
+});

package/lib/tag/index.js

@@ -11,26 +11,28 @@ const print = require('../print');
 let red = chalk.red;
 
 
-const load = async ()=>{
-  try {
-    let pkgJson = JSON.parse(fs.readFileSync('package.json').toString());
-    let version = pkgJson.version;
-    if (!fs.existsSync('.git')) {
-      print.error('.git not found at the level of package.json');
-      print.error('should run "rig tag" in the directory with both .git and package.json');
-      return;
-    }
-    let statusProcess = shell.exec('git status',{silent:true});
-    if (statusProcess.stdout.indexOf('nothing to commit')>=0) {
-      shell.exec(`git tag ${version}`);
-      print.succeed(`tag:${version} created.`);
-    }else {
-      print.error(statusProcess.stdout);
-    }
-  }catch (e){
-    console.log(red(e.message));
-  }
+const load = async () => {
+	try {
+		let pkgJson = JSON.parse(fs.readFileSync('package.json').toString());
+		let version = pkgJson.version;
+		if (!fs.existsSync('.git')) {
+			print.error('.git not found at the level of package.json');
+			print.error('should run "rig tag" in the directory with both .git and package.json');
+			process.exit(1)
+		}
+		let statusProcess = shell.exec('git status', {silent: true});
+		if (statusProcess.stdout.indexOf('nothing to commit') >= 0) {
+			shell.exec(`git tag ${version}`);
+			print.succeed(`tag:${version} created.`);
+		} else {
+			print.error(statusProcess.stdout);
+			process.exit(1)
+		}
+	} catch (e) {
+		console.log(red(e.message));
+		process.exit(1);
+	}
 }
 module.exports = {
-  load
+	load
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rigjs",
-  "version": "2.1.0",
+  "version": "2.1.3",
   "description": "A multi-repos dev tool based on yarn and git.Rig is inspired by cocoapods. Not like those monorepo solutions,rig is a tool for organizing multi-repos.",
   "keywords": [
     "modular",
@@ -20,6 +20,7 @@
     "rig": "bin/rig.js"
   },
   "scripts": {
+    "test": "jest",
     "init": "cd demo && node ../lib/rig/index.js init",
     "i": "cd demo && node ../lib/rig/index.js install",
     "p": "cd demo && node ../lib/rig/index.js publish",
@@ -42,14 +43,20 @@
     "axios": "^0.26.1",
     "chalk": "^4.1.0",
     "commander": "6.1.0",
+    "compare-versions": "^4.1.3",
     "dayjs": "^1.11.0",
     "inquirer": "7.3.3",
     "json5": "2.1.3",
     "ora": "^5.1.0",
+    "semver": "^7.3.6",
     "shelljs": "^0.8.4",
     "uuid": "^8.3.2"
   },
   "devDependencies": {
-    "@types/node": "^17.0.21"
+    "@types/jest": "^27.4.1",
+    "@types/node": "^17.0.21",
+    "jest": "^27.5.1",
+    "ts-node": "^10.7.0",
+    "typescript": "^4.6.3"
   }
 }