@makano/rew 1.5.1 → 1.5.2

package/lib/rew/cli/helpers.js

@@ -10,7 +10,7 @@ const cachepath = path.join(conf({}).create('').root, '.cache');
 const localBinPath = path.join(binpath, '../../../', 'bin');
 
 const FILE_DL_EXTRACT_REGEX = /^file\+sha\(([^)]+)\)\+([a-zA-Z0-9_-]+)(\([^\)]*\))?:(.*)$|^file\+([a-zA-Z0-9_-]+)(\([^\)]*\))?:(.*)$/;
-
+const HTTP_REGEX = /^https?:\/\/(www\.)?[a-zA-Z0-9\-._~:\/?#@!$&'()*+,;=%]+$/
 
 if (!fs.existsSync(CONFIG_PATH) || !fs.existsSync(CONFIG_PATH + '/repos.yaml')) {
 	fs.mkdirSync(CONFIG_PATH, { recursive: true });
@@ -70,5 +70,6 @@ module.exports = {
   npm_package_name,
   getAllPipeInput,
   hashTags,
-  FILE_DL_EXTRACT_REGEX
+  FILE_DL_EXTRACT_REGEX,
+  HTTP_REGEX
 }

package/lib/rew/cli/utils.js

@@ -22,7 +22,8 @@ const {
   cachepath,
   localBinPath,
 	hashTags,
-	FILE_DL_EXTRACT_REGEX
+	FILE_DL_EXTRACT_REGEX,
+	HTTP_REGEX
 } = require('./helpers');
 const { input } = require('../functions/stdout');
 
@@ -203,7 +204,7 @@ module.exports = {
 			}
 		}
 	},
-	installApp(pathname, opts, rmidir, rmidiri) {
+	installApp(pathname, opts, rmidir) {
 		if (!pathname) {
 			return;
 		}
@@ -282,6 +283,9 @@ module.exports = {
 						}
 
 						log(' Installed '.green + pname.cyan.bold, ':end');
+						if(rmidir){
+							fs.rmdirSync(apppath);
+						}
 					}
 					rl.close();
 				} else {
@@ -587,8 +591,10 @@ module.exports = {
 			process.exit(1);
     }
 
+		const isUrl = HTTP_REGEX.test(url);
+
 		const fileName = path.basename(url);
-		const filePath = path.join(pathToDownloadInto, fileName);
+		const filePath = isUrl ? path.join(pathToDownloadInto, fileName) : url;
 
 		const extractPath = path.join(pathToDownloadInto, 'extract');
 		if(opts.c || opts.clean || opts.u){
@@ -604,13 +610,15 @@ module.exports = {
 			);
 		
 		if(opts.verbose){
-			log('Download started for'.cyan, url.yellow, 'at'.cyan, filePath.yellow, shaHash ? 'with sha'.cyan : '', shaHash ? shaHash.yellow : '');
+			if(isUrl) log('Download started for'.cyan, url.yellow, 'at'.cyan, filePath.yellow, shaHash ? 'with sha'.cyan : '', shaHash ? shaHash.yellow : '');
 		} else {
-			log(`Downloading`.cyan, fileName.yellow);
+			if(isUrl) log(`Downloading`.cyan, fileName.yellow);
 		}
-		const downloaded = fs.existsSync(extractPath) ? true : this.downloadFileFromUrl(url, filePath, shaHash, opts);
+		const downloaded = isUrl ? (
+			fs.existsSync(extractPath) ? true : this.downloadFileFromUrl(url, filePath, shaHash, opts)
+		) : true;
 		if(downloaded){
-			log(`Download Complete for`.cyan, fileName.yellow);
+			if(isUrl) log(`Download Complete for`.cyan, fileName.yellow);
 			log('Extracting'.cyan, fileName.yellow);
 			if(opts.verbose){
 				log('Running command:'.cyan, command.green.bold, 'for'.cyan, filePath.yellow, 'at'.cyan, extractPath.yellow);
@@ -631,16 +639,16 @@ module.exports = {
 				return null;
 			}
 
-			return extractPath;
+			return [extractPath, opts, !isUrl];
 		} else {
-			return null;
+			return [null, opts];
 		}
 	},
 	async installAppFrom(path, opts) {
-		if (path.startsWith('github:')) this.installApp(await this.cloneGit(path, opts), opts, true);
-		if (path.match(FILE_DL_EXTRACT_REGEX)) this.installApp(this.downloadFile(path, opts), opts, true);
+		if (path.startsWith('github:')) this.installApp(await this.cloneGit(path, opts), opts);
+		else if (path.match(FILE_DL_EXTRACT_REGEX)) this.installApp(...this.downloadFile(path, opts));
 		else if (path.startsWith('@')) this.fromRepo(path, opts);
-		else this.installApp(path, opts, null, null);
+		else this.installApp(path, opts);
 	},
 	uninstall(packageName, all) {
 		const confPath = path.join(CONFIG_PATH, packageName);

package/package.json

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