@makano/rew 1.2.0 → 1.2.2

package/lib/rew/cli/cli.js

@@ -227,7 +227,7 @@ yargs(hideBin(process.argv))
 		'Install an app',
 		(yargs) => {
 			yargs.positional('path', {
-				describe: 'Path of the app to install',
+				describe: 'Path or github or repo id of the app to install',
 				type: 'string',
 			});
 		},
@@ -235,6 +235,23 @@ yargs(hideBin(process.argv))
 			utils.installAppFrom(argv.path);
 		},
 	)
+	.command(
+		'uninstall <package>',
+		'Unnstall an app',
+		(yargs) => {
+			yargs.positional('package', {
+				describe: 'Package of the app to uninstall',
+				type: 'string',
+			}).option('all', {
+				alias: 'a',
+				describe: 'Remove the configs as well',
+				type: 'boolean',
+			});
+		},
+		async (argv) => {
+			utils.uninstall(argv.package, argv.all);
+		},
+	)
 	.command(
 		'version',
 		'Rew Version',
@@ -294,6 +311,11 @@ yargs(hideBin(process.argv))
 					describe: 'Translate to js',
 					type: 'boolean',
 				})
+				.option('single', {
+					alias: 's',
+					describe: 'Build single file(don\'t build imports)',
+					type: 'boolean',
+				})
 				.option('remove', {
 					alias: 'r',
 					describe: 'Remove all coffee',

package/lib/rew/cli/utils.js

@@ -11,6 +11,7 @@ const { compile } = require('../modules/compiler');
 const { to_qrew } = require('../qrew/compile');
 const { findAppInfo } = require('../misc/findAppInfo');
 const { req } = require('../misc/req');
+const { CONFIG_PATH } = require('../const/config_path');
 
 const npm_package_name = '@makano/rew';
 
@@ -180,11 +181,19 @@ module.exports = {
 								file: path.join(installPath, c.install.build.file)
 							});
 						}
+						if(c.install.commands){
+							for(let command of c.install.commands){
+								execSync(command.replace(/\$installPath/g, installPath));
+							}
+						}
+						if(c.install.file){
+							run(path.join(installPath, c.install.file));
+						}
 					}
 					rl.close();
 				} else {
 					if (rmidiri) {
-						execSync(`rm -r ${apppath}`);
+						execSync(`rm -rf ${apppath}`);
 					}
 					log(' Canceled install'.red.bold, ':end');
 					rl.close();
@@ -235,7 +244,7 @@ module.exports = {
 
 		function processFile(filePath, importsArray) {
 			const content = readFile(filePath);
-			const imports = extractImports(content);
+			const imports = argv.single ? [] : extractImports(content);
 
 			imports.forEach((importStatement) => {
 				const importedFilePath = path.resolve(path.dirname(filePath), importStatement.url);
@@ -292,6 +301,20 @@ module.exports = {
 		else if(path.startsWith('@')) this.fromRepo(path);
 		else this.installApp(path);
 	},
+	uninstall(packageName, all){
+		const confPath = path.join(CONFIG_PATH, packageName);
+		const apppath = path.resolve(confPath, 'app');
+		const appConfpath = path.join(apppath, 'app.yaml');
+		if(!fs.existsSync(appConfpath) && fs.existsSync(confPath) && !all){
+			log(` App ${packageName.green}`.red.bold, `not found`.red.bold, `but configs are found.`.green.bold);
+			return log(`Use the`.cyan, '--all'.green, 'flag to remove them.'.cyan, ':end');
+		} else if(!fs.existsSync(appConfpath) && !all){
+			return log(` App ${packageName.green}`.red.bold, `not found.`.red.bold, ':end');
+		}
+		log('Uninstalling'.cyan, packageName.green);
+		execSync('rm -rf '+(all ? confPath : apppath));
+		log('Uninstalled'.cyan, ':end');
+	},
 	async getRepoJson(repoUrl){
 		try{
 			const text = (await req(repoUrl.startsWith('//.') ? 'http://'+repoUrl.slice(3) : repoUrl.startsWith('//') ? 'https://'+repoUrl : repoUrl)).data;
@@ -346,7 +369,7 @@ module.exports = {
 				if(json.packages) Object.keys(json.packages).forEach(name => log(name)) || log(`${Object.keys(json.packages).length} Packages in ${key}`, ':end');
 				else log('None'.blue, ':end')
 			} else {
-				console.log(Object.keys(repos).join('\n'));
+				console.log(Object.keys(confInstance.getAll()).join('\n'));
 			}
 		} else if (command === 'delete') {
 			confInstance.remove('repos');

package/package.json

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