@makano/rew 1.2.64 → 1.2.66

package/lib/rew/cli/utils.js

@@ -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;
+			fs.writeFileSync(path.join(clonePath, commit), '');
+			load.text = pull ? 'Updating repository'.blue.bold : '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;
-			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/lib/rew/const/config_path.js

@@ -1,4 +1,4 @@
 const path = require('path');
 
-const CONFIG_PATH = path.resolve(process.env.HOME, '.local/share/rew');
+const CONFIG_PATH = path.resolve(process.env.HOME || process.env.USERPROFILE, '.local/share/rew');
 module.exports.CONFIG_PATH = CONFIG_PATH;

package/lib/rew/const/usage.js

@@ -12,4 +12,18 @@ module.exports.USING_DEFAULT = {
   DECORATORS: {
     use:  (options) => options.decorators = true
   }
+}
+
+module.exports.Usage = class Usage {
+  name = "null";
+  trigger = () => {}
+
+  constructor(name, trigger){
+    this.name = name;
+    this.trigger = trigger;
+  }
+
+  create(name, trigger){
+    return new Usage(name, trigger);
+  }
 }

package/lib/rew/modules/context.js

@@ -7,7 +7,7 @@ const fsLib = require("../functions/fs");
 const pathLib = require("../functions/path");
 const execLib = require("../functions/exec");
 const { findAppInfo } = require("../misc/findAppInfo");
-const { USING_DEFAULT } = require("../const/usage");
+const { USING_DEFAULT, Usage } = require("../const/usage");
 
 let mainFile = "";
 const isMainFile = (filepath) => filepath == mainFile;
@@ -45,6 +45,7 @@ module.exports.prepareContext = function (
       ...pathLib(filepath),
       ...execLib(filepath),
       ...custom_context,
+      Usage
     };
   }
   if (!context.process)
@@ -98,6 +99,8 @@ module.exports.prepareContext = function (
       if(USING_DEFAULT[name].param) {
         context.__using__[name] = USING_DEFAULT[name].param(...params);
       }
+    }  else if(name instanceof Usage) {
+      context.__using__[name.name] = name.trigger(...params) || true;
     } else {
       context.__using__[name] = params.length ? params.length > 1 ? [...params] : params : true;
     }

package/package.json

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