Improve CLI:

- add checks for package.json, RN dependency
- add ability to version a RN project from any other folder via the "projectPath" argument
- add some status text output, "--quiet" option

Author: stovmascript

README.md

@@ -49,6 +49,8 @@ react-native-version will then update your `android/` and `ios/` code. Depending
 
 ```shell
 npm install -g react-native-version
+# or
+yarn global add react-native-version
 ```
 
 ### Example usage
@@ -65,13 +67,14 @@ react-native-version
 -h, --help                output usage information
 -V, --version             output the version number
 -a, --amend               Amend the previous commit. Also updates the latest Git tag to point to the amended commit. This is done automatically when react-native-version is run from the "version" or "postversion" npm script. Use "--never-amend" if you never want to amend.
---skip-tag                For use with "--amend" if you don't want to update Git tags
--A, --never-amend         Never amend the previous commit
--b, --increment-build     Only increment build number
--d, --android [path]      Path to your "android/app/build.gradle" file
--i, --ios [path]          Path to your "ios/" folder
--r, --reset-build         Reset build number back to "1" (iOS only). Unlike Android's "versionCode", iOS doesn't require you to bump the "CFBundleVersion", as long as "CFBundleShortVersionString" changes. To make it consistent across platforms, react-native-version bumps both by default. You can use this option if you prefer to reset the build number after every version change. If you then need to push another build under the same version, you can use "-bt ios".
--t, --target <platforms>  Only version specified platforms, eg. "--target android,ios"
+--skip-tag                For use with "--amend", if you don't want to update Git tags.
+-A, --never-amend         Never amend the previous commit.
+-b, --increment-build     Only increment build number.
+-d, --android [path]      Path to your "android/app/build.gradle" file.
+-i, --ios [path]          Path to your "ios/" folder.
+-q, --quiet               Be quiet, only report errors.
+-r, --reset-build         Reset build number back to "1" (iOS only). Unlike Android's "versionCode", iOS doesn't require you to bump the "CFBundleVersion", as long as "CFBundleShortVersionString" changes. To make it consistent across platforms, react-native-version bumps both by default. You can use this option if you prefer to keep the build number value at "1" after every version change. If you then need to push another build under the same version, you can use "-bt ios" to increment.
+-t, --target <platforms>  Only version specified platforms, eg. "--target android,ios".
 ```
 
 You can apply these options to the "version" or "postversion" script too. If for example you want to commit the changes made by RNV yourself, add the "--never-amend" option:
@@ -133,7 +136,7 @@ version({
 
 <a name="version"></a>
 
-#### version(program) ⇒ <code>Promise.&lt;(string\|Error)&gt;</code>
+#### version(program, projectPath) ⇒ <code>Promise.&lt;(string\|Error)&gt;</code>
 Versions your app
 
 **Kind**: global function  
@@ -142,6 +145,7 @@ Versions your app
 | Param | Type | Description |
 | --- | --- | --- |
 | program | <code>Object</code> | commander/CLI-style options, camelCased |
+| projectPath | <code>string</code> | Path to your React Native project |
 
 ### Types
 

cli.js

@@ -9,15 +9,18 @@ const defaults = rnv.getDefaults();
 
 program
 .version(pkg.version)
+.description(pkg.description)
+.arguments('[projectPath]')
 /* eslint-disable max-len */
 .option('-a, --amend', 'Amend the previous commit. Also updates the latest Git tag to point to the amended commit. This is done automatically when ' + pkg.name + ' is run from the "version" or "postversion" npm script. Use "--never-amend" if you never want to amend.')
-.option('--skip-tag', 'For use with "--amend" if you don\'t want to update Git tags')
-.option('-A, --never-amend', 'Never amend the previous commit')
-.option('-b, --increment-build', 'Only increment build number')
-.option('-d, --android [path]', 'Path to your "android/app/build.gradle" file', defaults.android)
-.option('-i, --ios [path]', 'Path to your "ios/" folder', defaults.ios)
-.option('-r, --reset-build', 'Reset build number back to "1" (iOS only). Unlike Android\'s "versionCode", iOS doesn\'t require you to bump the "CFBundleVersion", as long as "CFBundleShortVersionString" changes. To make it consistent across platforms, ' + pkg.name + ' bumps both by default. You can use this option if you prefer to reset the build number after every version change. If you then need to push another build under the same version, you can use "-bt ios".')
-.option('-t, --target <platforms>', 'Only version specified platforms, eg. "--target android,ios"', list)
+.option('--skip-tag', 'For use with "--amend", if you don\'t want to update Git tags.')
+.option('-A, --never-amend', 'Never amend the previous commit.')
+.option('-b, --increment-build', 'Only increment build number.')
+.option('-d, --android [path]', 'Path to your "android/app/build.gradle" file.', defaults.android)
+.option('-i, --ios [path]', 'Path to your "ios/" folder.', defaults.ios)
+.option('-q, --quiet', 'Be quiet, only report errors.')
+.option('-r, --reset-build', 'Reset build number back to "1" (iOS only). Unlike Android\'s "versionCode", iOS doesn\'t require you to bump the "CFBundleVersion", as long as "CFBundleShortVersionString" changes. To make it consistent across platforms, ' + pkg.name + ' bumps both by default. You can use this option if you prefer to keep the build number value at "1" after every version change. If you then need to push another build under the same version, you can use "-bt ios" to increment.')
+.option('-t, --target <platforms>', 'Only version specified platforms, eg. "--target android,ios".', list)
 /* eslint-enable */
 .parse(process.argv);
 

index.js

@@ -21,33 +21,79 @@ const env = {
  * @return {Object} Defaults
  */
 function getDefaults() {
-	const cwd = process.cwd();
-
 	return {
-		android: path.join(cwd, 'android/app/build.gradle'),
-		cwd: cwd,
-		ios: path.join(cwd, 'ios')
+		android: 'android/app/build.gradle',
+		ios: 'ios'
 	};
 }
 
 /**
  * Versions your app
  * @param {Object} program commander/CLI-style options, camelCased
+ * @param {string} projectPath Path to your React Native project
  * @return {Promise<string|Error>} A promise which resolves with the last commit hash
  */
-function version(program) {
-	const programOpts = Object.assign({}, getDefaults(), program);
+function version(program, projectPath) {
+	const prog = Object.assign({}, getDefaults(), program || {});
+	const projPath = path.resolve(process.cwd(), projectPath || prog.args[0] || '');
+
+	const programOpts = Object.assign({}, prog, {
+		android: path.join(projPath, prog.android),
+		ios: path.join(projPath, prog.ios)
+	});
 
 	const targets = []
 	.concat(programOpts.target, env.target)
 	.filter(Boolean);
 
-	const appPkg = require(path.join(programOpts.cwd, 'package.json'));
+	const appPkgJSONPath = path.join(projPath, 'package.json');
+	const MISSING_RN_DEP = 'MISSING_RN_DEP';
+	var appPkg;
+
+	try {
+		appPkg = require(appPkgJSONPath);
+
+		if (!appPkg.dependencies['react-native']) {
+			throw new Error(MISSING_RN_DEP);
+		}
+	} catch (err) {
+		if (err.message === MISSING_RN_DEP) {
+			log({
+				style: 'red',
+				text: 'Is this the right folder? React Native isn\'t listed as a dependency in '
+				+ appPkgJSONPath
+			});
+		} else {
+			log({
+				style: 'red',
+				text: err.message
+			});
+
+			log({
+				style: 'red',
+				text: 'Is this the right folder? Looks like there isn\'t a package.json here'
+			});
+		}
+
+		log({
+			style: 'yellow',
+			text: 'Pass the project path as an argument, see --help for usage'
+		});
+
+		if (program.outputHelp) {
+			program.outputHelp();
+		}
+
+		process.exit(1);
+	}
+
 	var android;
 	var ios;
 
 	if (!targets.length || targets.indexOf('android') > -1) {
 		android = new Promise(function(resolve, reject) {
+			log({text: 'Versioning Android...'}, programOpts.quiet);
+
 			var gradleFile;
 
 			try {
@@ -78,12 +124,15 @@ function version(program) {
 			});
 
 			fs.writeFileSync(programOpts.android, gradleFile);
+			log({text: 'Android updated'}, programOpts.quiet);
 			resolve();
 		});
 	}
 
 	if (!targets.length || targets.indexOf('ios') > -1) {
 		ios = new Promise(function(resolve, reject) {
+			log({text: 'Versioning iOS...'}, programOpts.quiet);
+
 			try {
 				child.execSync('xcode-select --print-path', {
 					stdio: ['ignore', 'ignore', 'pipe']
@@ -137,6 +186,7 @@ function version(program) {
 				child.execSync('agvtool next-version -all', agvtoolOpts);
 			}
 
+			log({text: 'iOS updated'}, programOpts.quiet);
 			resolve();
 		});
 	}
@@ -174,7 +224,7 @@ function version(program) {
 		}
 
 		const gitCmdOpts = {
-			cwd: programOpts.cwd
+			cwd: projPath
 		};
 
 		if (
@@ -183,28 +233,44 @@ function version(program) {
 			&& process.env.npm_lifecycle_event.indexOf('version') > -1
 			&& !programOpts.neverAmend
 		) {
+			log({text: 'Amending...'}, programOpts.quiet);
+
 			switch (process.env.npm_lifecycle_event) {
 				case 'version':
-					child.spawnSync('git', ['add', program.android, program.ios], gitCmdOpts);
+					child.spawnSync(
+						'git', ['add', programOpts.android, programOpts.ios], gitCmdOpts
+					);
+
 					break;
 
 				case 'postversion':
 				default:
 					child.execSync('git commit -a --amend --no-edit', gitCmdOpts);
 
-					if (!program.skipTag) {
+					if (!programOpts.skipTag) {
+						log({text: 'Adjusting Git tag...'}, programOpts.quiet);
 						child.execSync('git tag -f $(git tag | tail -1)', gitCmdOpts);
 					}
 			}
 		}
 
+		log({
+			style: 'green',
+			text: 'Done'
+		}, programOpts.quiet);
+
 		return child.execSync('git log -1 --pretty=%H', gitCmdOpts).toString();
 	})
 	.catch(function(err) {
 		if (process.env.RNV_ENV === 'ava') {
 			console.error(err);
 		}
 
+		log({
+			style: 'red',
+			text: 'Done, with errors.'
+		});
+
 		process.exit(1);
 	});
 }

test/index.js

@@ -18,8 +18,8 @@ test('API: default', async t => {
 	tempInitAndVersion();
 
 	await version({
-		cwd: t.context.tempDir
-	});
+		quiet: true
+	}, t.context.tempDir);
 
 	t.deepEqual(await getCurrTree(t), expectedTree.notAmended);
 });
@@ -29,8 +29,8 @@ test('API: amend', async t => {
 
 	await version({
 		amend: true,
-		cwd: t.context.tempDir
-	});
+		quiet: true
+	}, t.context.tempDir);
 
 	t.deepEqual(await getCurrTree(t), expectedTree.amended);
 
@@ -45,9 +45,9 @@ test('API: amend, skipTag', async t => {
 
 	await version({
 		amend: true,
-		cwd: t.context.tempDir,
+		quiet: true,
 		skipTag: true
-	});
+	}, t.context.tempDir);
 
 	t.deepEqual(await getCurrTree(t), expectedTree.amended);
 
@@ -61,9 +61,9 @@ test('API: neverAmend', async t => {
 	tempInitAndVersion();
 
 	await version({
-		cwd: t.context.tempDir,
-		neverAmend: true
-	});
+		neverAmend: true,
+		quiet: true
+	}, t.context.tempDir);
 
 	t.deepEqual(await getCurrTree(t), expectedTree.notAmended);
 });

util.js

@@ -12,9 +12,12 @@ function list(val) {
 /**
  * Logs a message into the console with style
  * @param {Object} msg Object containing the message text and chalk style
+ * @param {boolean} silent Whether log should be quiet
  */
-function log(msg) {
-	console.log(chalk[msg.style || 'reset'](msg.text));
+function log(msg, silent) {
+	if (!silent) {
+		console.log('[RNV]', chalk[msg.style || 'reset'](msg.text));
+	}
 }
 
 module.exports = {