rigjs 1.0.29 → 1.0.32

package/demo/test.js

@@ -1,11 +1,18 @@
-const fs = require('fs');
-let pkgStr = fs.readFileSync('package.json').toString();
-let pkg = JSON.parse(pkgStr);
-console.log(pkg);
-pkg.info = 'test';
-// fs.('package.json');
-fs.writeFileSync('package.json', JSON.stringify(pkg,null,2));
- pkgStr = fs.readFileSync('package.json').toString();
- pkg = JSON.parse(pkgStr);
-console.log(pkg);
+// const fs = require('fs');
+// let pkgStr = fs.readFileSync('package.json').toString();
+// let pkg = JSON.parse(pkgStr);
+// console.log(pkg);
+// pkg.info = 'test';
+// // fs.('package.json');
+// fs.writeFileSync('package.json', JSON.stringify(pkg,null,2));
+//  pkgStr = fs.readFileSync('package.json').toString();
+//  pkg = JSON.parse(pkgStr);
+// console.log(pkg);
+//
+console.log(/^([a-z]+-){1,3}([0-9]+)(\.([0-9]+)){3}$/.test('a-a-1.2.1.1'));
+//cmd
+// console.log(/^(\.([0-9]+)){3}$/.test('a-a-1.2.1.1'));
+console.log('a-a-1.2.1.1'.split(/(?<=[a-z])-(?=[0-9])/));
+
+//抓取版本
 

package/lib/check/index.js

@@ -14,12 +14,14 @@ const load = async () => {
   try {
     let rigJson5Str = fs.readFileSync('package.rig.json5');
     let rigJson5 = json5.parse(rigJson5Str);
+    let hasErr = false;
     for (let dep of rigJson5) {
       if (dep.dev) {
+        hasErr = true;
         print.error(`${dep.name} is in developing!\nUse correct version and set dev to false!`);
-        process.exit(1);
       }
     }
+    if (hasErr) process.exit(1);
     print.succeed(`Ready for production!`);
   } catch (e) {
     print.error(e.message);

package/lib/deps/index.js

@@ -0,0 +1,10 @@
+const checkDepVersions = ()=>{
+	console.log('deps is in developing');
+}
+const load = async (cmd) => {
+	checkDepVersions();
+}
+module.exports = {
+	load,
+	checkDepVersions,
+}

package/lib/info/index.js

@@ -9,34 +9,36 @@ const fs = require('fs');
 const json5 = require('json5');
 const print = require('../print');
 //加载命令控制器
-const info = ()=>{
-  print.info(`start checking modules`);
-  let rigJson5 = json5.parse(fs.readFileSync('package.rig.json5'));
-  for (let dep of rigJson5) {
-    let describeProcess = shell.exec(`git ls-remote --tags --refs --sort="version:refname" ${dep.source} | awk -F/ 'END{print$NF}'`,
-      {silent: true}
-    );
-    let remoteLatestTag = describeProcess.stdout.trim();
-    if (dep.dev){
-      print.warn(`[${dep.name}] is in developing.latest:${remoteLatestTag},`);
-    }else{
-      if (remoteLatestTag) {
-        if (dep.version === remoteLatestTag) {
-          print.info(`[${dep.name}] using:${dep.version},latest:${remoteLatestTag}`);
-        } else {
-          print.warn(`[${dep.name}] using:${dep.version},latest:${remoteLatestTag},Please confirm before updating!!!`);
-        }
-      } else {
-        print.warn(`Get latest tag failed!Error:${describeProcess.stderr}`);
-      }
-    }
-  }
+const info = () => {
+	print.info(`start checking modules|OS:${process.platform} `);
+	let rigJson5 = json5.parse(fs.readFileSync('package.rig.json5'));
+	for (let dep of rigJson5) {
+		let describeProcess = process.platform === 'win32'?shell.exec(`git ls-remote --tags --refs --sort="version:refname" ${dep.source} | awk -F/ "END{print$NF}"`,
+			{silent: true}
+		):  shell.exec(`git ls-remote --tags --refs --sort="version:refname" ${dep.source} | awk -F/ 'END{print$NF}'`,
+			{silent: true}
+		);
+		let remoteLatestTag = describeProcess.stdout.trim();
+		if (dep.dev) {
+			print.warn(`[${dep.name}] is in developing.latest:${remoteLatestTag},`);
+		} else {
+			if (remoteLatestTag) {
+				if (dep.version === remoteLatestTag) {
+					print.info(`[${dep.name}] using:${dep.version},latest:${remoteLatestTag}`);
+				} else {
+					print.warn(`[${dep.name}] using:${dep.version},latest:${remoteLatestTag},Please confirm before updating!!!`);
+				}
+			} else {
+				print.error(`Get latest tag of ${dep.name} failed!Error:${describeProcess.stderr}`);
+			}
+		}
+	}
 
 }
 const load = async (cmd) => {
-  info();
+	info();
 }
 module.exports = {
-  load,
-  info,
+	load,
+	info,
 }

package/lib/postinstall/index.js

@@ -23,6 +23,7 @@ const load = async (cmd) => {
     console.log(rigJson5);
     let devDeps = [];
     for (let dep of rigJson5) {
+
       if (dep.dev) {
         print.warn(`developing:${dep.name}`);
         devDeps.push(dep.name);
@@ -35,6 +36,7 @@ const load = async (cmd) => {
           'dir'
         );
       }
+      //TODO:检查依赖间的版本号要求
     }
     info.info();
     print.succeed(`postinstall SUCCEED!`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rigjs",
-  "version": "1.0.29",
+  "version": "1.0.32",
   "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",