@makano/rew 1.2.63 → 1.2.65

package/lib/rew/cli/utils.js

@@ -263,12 +263,12 @@ module.exports = {
 								}
 							}
 						}
-						if (c.install.file) {
-							this.runFileWithArgv(path.join(installPath, c.exec[c.install.file] || c.install.file), {}, []);
-						}
 						if (c.install.requirements) {
 							this.installReq(c, opts);
 						}
+						if (c.install.file) {
+							this.runFileWithArgv(path.join(installPath, c.exec[c.install.file] || c.install.file), {}, [installPath]);
+						}
 						if (c.install.exec) {
 							// this.installReq(c);
 							if(conf({}).create('').get('executables') == false){
@@ -405,20 +405,37 @@ module.exports = {
 		}
 	},
 	async cloneGit(gitpath, opts) {
-		const p = gitpath.split('github:')[1];
+		let p = gitpath.split('github:')[1];
 		const clonePath = path.join(cachepath, 'rew-git-clone-'+gen_key(gitpath).substring(0, 12));
+		const load = loading("Finding Repo...".yellow).start();
+
+		let branch = null; // Default branch
+    let commit = null;
+
+    // Extracting branch or commit if specified
+    if (p.includes('@')) {
+			[p, branch] = p.split('@');
+    } 
+		if (branch?.includes('#')) {
+			[branch, commit] = branch.split('#');
+    }
+		if (p.includes('#')) {
+			[p, commit] = p.split('#');
+    }
+
 		const url = `https://github.com/${p}`;
 		const apiurl = `https://api.github.com/repos/${p}/commits`;
-		const load = loading("Finding Repo...".yellow).start();
+
 		try {
 			const response = await req(apiurl);
+			if(!commit) commit = response.data[0].sha;
 			if (response.status !== 200) {
 				load.stop();
 				return log(' Package not found in github'.red.bold, ':end');
 			}
 			let pull = false;
 			if(fs.existsSync(clonePath)){
-				if(fs.existsSync(path.join(clonePath, response.data[0].sha))){
+				if(fs.existsSync(path.join(clonePath, commit))){
 					load.stop();
 					log('Found Cache'.yellow);
 					return clonePath+'/clone';
@@ -427,20 +444,23 @@ module.exports = {
 				}
 			}
 			fs.mkdirSync(clonePath, { recursive: true });
-			fs.writeFileSync(path.join(clonePath, response.data[0].sha), '');
-			load.text = 'Cloning from github'.blue.bold;
-			await sleep(100)
-			if(pull) execSync(`cd ${clonePath}/clone && git pull`, { stdio: opts.verbose ? 'inherit' : 'ignore' });
-			else execSync(`git clone ${url} ${clonePath}/clone`, { stdio: opts.verbose ? 'pipe' : 'ignore' });
-			load.text = 'Installing npm packages'.green.bold;
+			fs.writeFileSync(path.join(clonePath, commit), '');
+			load.text = pull ? 'Updating repository'.blue.bold : 'Cloning from github'.blue.bold;
 			await sleep(100)
-			execSync(`cd ${clonePath}/clone && npm i`, { stdio: opts.verbose ? 'inherit' : 'ignore' });
+			if(pull) execSync(`cd ${clonePath}/clone && git fetch --all${response.data[0].sha !== commit ? ` && git reset --hard ${commit}` : ''}`, { stdio: opts.verbose ? 'inherit' : 'ignore' });
+			else execSync(`git clone ${url} ${clonePath}/clone && cd ${clonePath}/clone${response.data[0].sha !== commit ? ` && git reset --hard ${commit}` : ''}${branch ? ' && git checkout '+branch : ''}`, { stdio: opts.verbose ? 'pipe' : 'ignore' });
+			if (fs.existsSync(path.join(clonePath, 'clone', 'package.json'))) {
+				load.text = 'Installing npm packages'.green.bold;
+				await sleep(100);
+				execSync(`cd ${clonePath}/clone && npm install`, { stdio: opts.verbose ? 'inherit' : 'ignore' });
+			}
 			load.stop();
 			return clonePath+'/clone';
 		} catch (e) {
 			const logFile = path.join(logspath, 'logs-'+Date.now()+'.log');
 			fs.writeFileSync(logFile, e.toString() +'\n'+ e.stack);
 			load.stop();
+			if(opts.verbose) console.error(e);
 			log(' Something went wrong, check logs at'.red.bold, logFile.green, ':end');
 		}
 	},

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@makano/rew",
-  "version": "1.2.63",
+  "version": "1.2.65",
   "description": "A simple coffescript runtime and app manager",
   "main": "main.js",
   "directories": {