@makano/rew 1.2.41 → 1.2.43

package/lib/rew/cli/cli.js

@@ -223,6 +223,10 @@ yargs(hideBin(process.argv))
 				alias: 'r',
 				describe: 'Install requirements of the app',
 				type: 'boolean',
+			}).option('verbose', {
+				alias: 'v',
+				describe: 'Verbose',
+				type: 'boolean',
 			}).option('update', {
 				alias: 'u',
 				describe: 'Update the app',
@@ -280,6 +284,20 @@ yargs(hideBin(process.argv))
 			}
 		},
 	)
+
+	.command(
+		'cache <command>',
+		'Manage cache',
+		(yargs) => {
+			yargs.positional('command', {
+				describe: 'Command to clear/list',
+				type: 'string',
+			});
+		},
+		async (argv) => {
+			utils.cache(argv.command)
+		},
+	)
 	.command(
 		'repo <command> [name] [url]',
 		'Manage install repositories',

package/lib/rew/cli/log.js

@@ -4,6 +4,8 @@ const middlePrefix = '├';
 const separator = '│';
 const endPrefix = '╰';
 
+let last = '';
+
 const log = (module.exports.log = function (...toPrint) {
 	let prefix = start ? startPrefix : middlePrefix;
 	let returns = false;
@@ -16,8 +18,10 @@ const log = (module.exports.log = function (...toPrint) {
 		toPrint.pop();
 	}
 	if (prefix == endPrefix && start) prefix = separator;
-	if (!start) console.log(separator);
+	// if(last == endPrefix && prefix == separator) prefix = startPrefix;
+	if (!start) console.log(last == endPrefix ? startPrefix : separator);
 	if (start) start = false;
+	last = prefix;
 	if (returns) return [prefix, ...toPrint].join(' ');
 	else console.log(prefix, ...toPrint);
 });

package/lib/rew/cli/utils.js

@@ -14,9 +14,14 @@ const { req } = require('../misc/req');
 const { CONFIG_PATH } = require('../const/config_path');
 const { watch } = require('chokidar');
 const { execRewFile } = require('./run');
+const { seededID } = require('../misc/seededid');
+const loading = require('loading-cli');
+const sleep = require('../functions/sleep');
+const { gen_key } = require('../misc/bin');
 
 const binpath = path.join(conf({}).create('').root, '.bin');
 const logspath = path.join(conf({}).create('').root, '.logs');
+const cachepath = path.join(conf({}).create('').root, '.cache');
 const localBinPath = path.join(binpath, '../../../', 'bin');
 
 module.exports = {
@@ -195,28 +200,30 @@ module.exports = {
 			});
 			log(' Installing '.blue + pname.green.bold);
 			log(' Package'.blue + ': ' + p.name.green + '@' + p.version.yellow);
-			if (p.descriptiondescription) {
-				log(' Description'.blue + ': ' + p.description);
+			if (p.description) {
+				log(' Description'.blue + '\n' + p.description.split('\n').map((i, ind, a) => '  '+(ind == 0 && a.length > 1 ? log.startPrefix : (a.length-1 == ind ? log.endPrefix : log.middlePrefix))+' '+i).join('\n'), ':end');
+			}
+			if (p.keywords && p.keywords.length) {
+				log(' Tags'.blue + '\n  ' + log.endPrefix + p.keywords.map(i => '#'+i).join(' '), ':end')
 			}
 			const done = (f) => {
 				if (f.toLowerCase() == 'y' || f.toLowerCase() == 'yes') {
 					if (fs.existsSync(installPath)) {
 						execSync(`rm -r ${installPath}`);
 					}
-					execSync(`cp -r ${apppath} ${installPath}`);
-					execSync(`chmod 444 ${installPath}/app.yaml`);
-					if (rmidir) {
-						execSync(`rm -r ${apppath}`);
-					}
-					log(' Installed '.green + pname.cyan.bold, c.install ? '' : ':end');
-					if (c.install) {
-						if (c.install.build) {
-							log(' Building'.blue);
+					if (c.install?.build) {
+						log(' Building'.blue);
+						try{
 							this.build({
 								...c.install.build,
-								file: path.join(installPath, c.install.build.file)
+								file: path.join(apppath, c.exec[c.install.build.file] || c.install.build.file)
 							});
-						}
+						} catch(e){}
+					}
+					execSync(`cp -r ${apppath} ${installPath}`);
+					execSync(`chmod 444 ${installPath}/app.yaml`);
+					log(' Installed '.green + pname.cyan.bold, ':end');
+					if (c.install) {
 						if (c.install.commands) {
 							for (let command of c.install.commands) {
 								try{
@@ -232,7 +239,7 @@ module.exports = {
 							this.runFileWithArgv(path.join(installPath, c.exec[c.install.file] || c.install.file), {}, []);
 						}
 						if (c.install.requirements) {
-							this.installReq(c);
+							this.installReq(c, opts);
 						}
 						if (c.install.exec) {
 							// this.installReq(c);
@@ -251,9 +258,6 @@ module.exports = {
 					}
 					rl.close();
 				} else {
-					if (rmidiri) {
-						execSync(`rm -rf ${apppath}`);
-					}
 					log(' Canceled install'.red.bold, ':end');
 					rl.close();
 				}
@@ -355,21 +359,51 @@ module.exports = {
 		processFile(filePath, importsArray);
 		log('󰈔 Compiled'.yellow, (importsArray.length + 1 + '').blue, `file${importsArray.length ? 's' : ''}.`.yellow, ':end');
 	},
-	async cloneGit(gitpath) {
+	cache(command){
+		if(command == 'list'){
+			console.log(fs.readdirSync(cachepath).join('\n').trim());
+		} else {
+			fs.readdirSync(cachepath).forEach(file => fs.rmSync(path.join(cachepath, file), { recursive: true }));
+		}
+	},
+	async cloneGit(gitpath, opts) {
 		const p = gitpath.split('github:')[1];
+		const clonePath = path.join(cachepath, 'rew-git-clone-'+gen_key(gitpath).substring(0, 12));
 		const url = `https://github.com/${p}`;
-		const apiurl = `https://api.github.com/repos/${p}`;
+		const apiurl = `https://api.github.com/repos/${p}/commits`;
+		const load = loading("Finding Repo...".yellow).start();
 		try {
 			const response = await req(apiurl);
-			if (response.status !== 200) return log(' Repo not found'.red.bold, ':end');
-			log(''.blue, 'Cloning from github'.yellow);
-			const tempPath = '/tmp/rew-git-clone-' + p.replace(/\//g, '_') + '-' + generateRandomID();
-			execSync(`git clone ${url} ${tempPath}`, { stdio: 'ignore' });
-			log(''.blue, 'Installing deps...'.yellow);
-			execSync(`cd ${tempPath} && npm i`);
-			return tempPath;
+			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))){
+					load.stop();
+					log('Found Cache'.yellow);
+					return clonePath+'/clone';
+				} else {
+					pull = true;
+				}
+			}
+			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;
+			await sleep(100)
+			execSync(`cd ${clonePath}/clone && npm i`, { stdio: opts.verbose ? 'inherit' : 'ignore' });
+			load.stop();
+			return clonePath+'/clone';
 		} catch (e) {
-			log(' Repo not found'.red.bold, ':end');
+			const logFile = path.join(logspath, 'logs-'+Date.now()+'.log');
+			fs.writeFileSync(logFile, e.toString() +'\n'+ e.stack);
+			load.stop();
+			log(' Something went wrong, check logs at'.red.bold, logFile.green, ':end');
 		}
 	},
 	findRepo(repo) {
@@ -377,7 +411,7 @@ module.exports = {
 		return repos.get(repo);
 	},
 	async installAppFrom(path, opts) {
-		if (path.startsWith('github:')) this.installApp(await this.cloneGit(path), opts, true, true);
+		if (path.startsWith('github:')) this.installApp(await this.cloneGit(path, opts), opts, true);
 		else if (path.startsWith('@')) this.fromRepo(path, opts);
 		else this.installApp(path, opts, null, null);
 	},
@@ -465,7 +499,7 @@ module.exports = {
 				console.log(Object.keys(confInstance.getAll()).join('\n'));
 			}
 		} else if (command === 'delete') {
-			confInstance.remove('repos');
+			confInstance.remove(key);
 		} else {
 			log(' Invalid command'.red.bold, ':end');
 		}
@@ -474,6 +508,7 @@ module.exports = {
 		log('First time init')
 		conf({}).create('').optionCenter('repos').set('rewpkgs', '//raw.githubusercontent.com/kevinJ045/rewpkgs/main/main.yaml');
 		fs.mkdirSync(binpath, { recursive: true });
+		fs.mkdirSync(cachepath, { recursive: true });
 		fs.mkdirSync(logspath, { recursive: true });
 	}
 };

package/lib/rew/functions/exec.js

@@ -23,8 +23,8 @@ module.exports = (currentFile) => {
 		);
 	};
 
-	function spawn(command, options) {
-		return shell.spawn(command, options);
+	function spawn(command, ...args) {
+		return shell.spawn(command, ...args);
 	}
 
 	return { exec, spawn };

package/lib/rew/functions/id.js

@@ -1,5 +1,5 @@
-module.exports.generateRandomID = function generateRandomID(length = 12, characters) {
-	const characters = characters || 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
+module.exports.generateRandomID = function generateRandomID(length = 12, _characters) {
+	const characters = _characters || 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
 	const charactersLength = characters.length;
 	let randomID = '';
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@makano/rew",
-  "version": "1.2.41",
+  "version": "1.2.43",
   "description": "A simple coffescript runtime and app manager",
   "main": "main.js",
   "directories": {
@@ -38,6 +38,7 @@
     "colors": "^1.4.0",
     "deasync": "^0.1.30",
     "js-yaml": "^4.1.0",
+    "loading-cli": "^1.1.2",
     "tiny-msgpack": "^2.2.0",
     "uuid": "^9.0.1",
     "vm": "^0.1.0",