Merge pull request #12 from stovmascript/next

stovmascript · web-flow · commit bb2085de1086 · 2016-12-11T01:55:11.000+01:00
diff --git a/.travis.yml b/.travis.yml
@@ -2,3 +2,5 @@ os: osx
 language: node_js
 node_js:
   - "4"
+  - "6"
+  - "7"
diff --git a/README.md b/README.md
@@ -18,6 +18,8 @@ Open your Xcode project and under "Build Settings -> Versioning -> Current Proje
 
 ```shell
 npm install react-native-version --save
+# or
+yarn add react-native-version
 ```
 
 Hook into the "version" or "postversion" npm script in your app's package.json:
@@ -106,10 +108,24 @@ RNV=android react-native-version --target ios
 ```javascript
 import { version } from 'react-native-version';
 
+async function doSomething() {
+	const versionResult = await version({
+		amend: true,
+		// ...
+	});
+}
+
+// or
+
 version({
 	amend: true,
-	resetBuild: true,
 	// ...
+})
+.then(commitHash => {
+	console.log(commitHash);
+})
+.catch(err => {
+	console.error(err);
 });
 ```
 
@@ -127,6 +143,8 @@ Versions your app
 | --- | --- | --- |
 | program | <code>Object</code> | commander/CLI-style options, camelCased |
 
+### Types
+
 <a name="Promise"></a>
 
 #### Promise
diff --git a/index.js b/index.js
@@ -151,11 +151,11 @@ function version(program) {
 
 	return pSettle([android, ios]).then(function(result) {
 		const errs = result
-		.filter(function(err) {
-			return err.reason;
+		.filter(function(item) {
+			return item.isRejected;
 		})
-		.map(function(err) {
-			return err.reason;
+		.map(function(item) {
+			return item.reason;
 		});
 
 		if (errs.length) {
@@ -186,7 +186,9 @@ function version(program) {
 
 		if (
 			programOpts.amend
-			|| process.env.npm_lifecycle_event.indexOf('version') > -1 && !programOpts.neverAmend
+			|| process.env.npm_lifecycle_event
+			&& process.env.npm_lifecycle_event.indexOf('version') > -1
+			&& !programOpts.neverAmend
 		) {
 			switch (process.env.npm_lifecycle_event) {
 				case 'version':
@@ -204,6 +206,10 @@ function version(program) {
 		}
 
 		return child.execSync('git log -1 --pretty=%H', gitCmdOpts).toString();
+	})
+	.catch(function(err) {
+		console.error(err);
+		process.exit(1);
 	});
 }
 
diff --git a/package.json b/package.json
@@ -11,7 +11,7 @@
   "dependencies": {
     "chalk": "^1.1.3",
     "commander": "^2.9.0",
-    "p-settle": "^1.0.0"
+    "p-settle": "^2.0.0"
   },
   "devDependencies": {
     "ava": "^0.17.0",
diff --git a/test/cli.amend.js b/test/cli.amend.js
@@ -0,0 +1,18 @@
+import beforeEachCLI from './helpers/beforeEachCLI';
+import expectedTree from './fixture/tree';
+import getCurrCommitHash from './helpers/getCurrCommitHash';
+import getCurrTagHash from './helpers/getCurrTagHash';
+import getCurrTree from './helpers/getCurrTree';
+import test from 'ava';
+import versionTempWithCLI from './helpers/versionTempWithCLI';
+
+test('CLI: amend', async t => {
+	beforeEachCLI(t);
+	versionTempWithCLI(['-a']);
+	t.deepEqual(await getCurrTree(t), expectedTree.amended);
+
+	const currTagHash = await getCurrTagHash(t);
+	const currCommitHash = await getCurrCommitHash(t);
+
+	t.is(currTagHash, currCommitHash);
+});
diff --git a/test/cli.amend.skipTag.js b/test/cli.amend.skipTag.js
@@ -0,0 +1,18 @@
+import beforeEachCLI from './helpers/beforeEachCLI';
+import expectedTree from './fixture/tree';
+import getCurrCommitHash from './helpers/getCurrCommitHash';
+import getCurrTagHash from './helpers/getCurrTagHash';
+import getCurrTree from './helpers/getCurrTree';
+import test from 'ava';
+import versionTempWithCLI from './helpers/versionTempWithCLI';
+
+test('CLI: amend, skipTag', async t => {
+	beforeEachCLI(t);
+	versionTempWithCLI(['-a', '--skip-tag']);
+	t.deepEqual(await getCurrTree(t), expectedTree.amended);
+
+	const currTagHash = await getCurrTagHash(t);
+	const currCommitHash = await getCurrCommitHash(t);
+
+	t.not(currTagHash, currCommitHash);
+});
diff --git a/test/cli.default.js b/test/cli.default.js
@@ -0,0 +1,11 @@
+import beforeEachCLI from './helpers/beforeEachCLI';
+import expectedTree from './fixture/tree';
+import getCurrTree from './helpers/getCurrTree';
+import test from 'ava';
+import versionTempWithCLI from './helpers/versionTempWithCLI';
+
+test('CLI: default', async t => {
+	beforeEachCLI(t);
+	versionTempWithCLI();
+	t.deepEqual(await getCurrTree(t), expectedTree.notAmended);
+});
diff --git a/test/cli.neverAmend.js b/test/cli.neverAmend.js
@@ -0,0 +1,11 @@
+import beforeEachCLI from './helpers/beforeEachCLI';
+import expectedTree from './fixture/tree';
+import getCurrTree from './helpers/getCurrTree';
+import test from 'ava';
+import versionTempWithCLI from './helpers/versionTempWithCLI';
+
+test('CLI: neverAmend', async t => {
+	beforeEachCLI(t);
+	versionTempWithCLI(['-A']);
+	t.deepEqual(await getCurrTree(t), expectedTree.notAmended);
+});
diff --git a/test/helpers/beforeEach.js b/test/helpers/beforeEach.js
@@ -0,0 +1,11 @@
+const fs = require('fs-extra');
+const path = require('path');
+const temp = require('temp');
+
+temp.track();
+
+module.exports = function(t) {
+	t.context.tempDir = temp.mkdirSync('rnv-');
+	fs.copySync(path.join(__dirname, '../fixture/AwesomeProjectEssentials'), t.context.tempDir);
+	process.chdir(t.context.tempDir);
+};
diff --git a/test/helpers/beforeEachCLI.js b/test/helpers/beforeEachCLI.js
@@ -0,0 +1,8 @@
+const beforeEach = require('./beforeEach');
+const tempInitAndVersion = require('./tempInitAndVersion');
+
+module.exports = function(t) {
+	beforeEach(t);
+	delete process.env.npm_lifecycle_event;
+	tempInitAndVersion();
+};
diff --git a/test/helpers/execAsync.js b/test/helpers/execAsync.js
@@ -0,0 +1,27 @@
+const child = require('child_process');
+
+/**
+ * Promisified child_process.exec
+ * @param {string} cmd child_process.exec command
+ * @param {Object} opts child_process.exec options
+ * @return {Promise} ChildProcess Promise object
+ */
+function execAsync(cmd, opts) {
+	return new Promise(function(resolve, reject) {
+		child.exec(cmd, opts, function(err, stdout) {
+			if (err) {
+				reject(err);
+			} else {
+				resolve(stdout.trim());
+			}
+		});
+	})
+	.then(function(result) {
+		return result;
+	})
+	.catch(function(err) {
+		console.log(err);
+	});
+}
+
+module.exports = execAsync;
diff --git a/test/helpers/getCurrCommitHash.js b/test/helpers/getCurrCommitHash.js
@@ -0,0 +1,14 @@
+const execAsync = require('./execAsync');
+
+/**
+ * Returns the latest commit hash
+ * @param {Object} t Test Object
+ * @return {string} Commit hash
+ */
+function getCurrCommitHash(t) {
+	return execAsync('git rev-parse HEAD', {
+		cwd: t.context.tempDir
+	});
+}
+
+module.exports = getCurrCommitHash;
diff --git a/test/helpers/getCurrTagHash.js b/test/helpers/getCurrTagHash.js
@@ -0,0 +1,14 @@
+const execAsync = require('./execAsync');
+
+/**
+ * Returns a commit hash based on the latest tag
+ * @param {Object} t Test Object
+ * @return {string} Commit hash
+ */
+function getCurrTagHash(t) {
+	return execAsync('git rev-list -n 1 $(git tag | tail -1)', {
+		cwd: t.context.tempDir
+	});
+}
+
+module.exports = getCurrTagHash;
diff --git a/test/helpers/getCurrTree.js b/test/helpers/getCurrTree.js
@@ -0,0 +1,26 @@
+const gitPathnames = require('./gitPathnames');
+
+/**
+ * Returns the current Git tree pathnames
+ * @param {Object} t Test object
+ * @return {Object} head & index pathnames
+ */
+function getCurrTree(t) {
+	const childProcessOpts = {
+		cwd: t.context.tempDir
+	};
+
+	return Promise
+	.all([
+		gitPathnames('git show --name-only --pretty=', childProcessOpts),
+		gitPathnames('git status -s | grep " M " | cut -c4-', childProcessOpts)
+	])
+	.then(function(result) {
+		return {
+			head: result[0],
+			index: result[1]
+		};
+	});
+}
+
+module.exports = getCurrTree;
diff --git a/test/helpers/gitPathnames.js b/test/helpers/gitPathnames.js
@@ -0,0 +1,15 @@
+const execAsync = require('./execAsync');
+
+/**
+ * Returns a filtered list of pathnames based on a supplied Git command
+ * @param {string} cmd Git shell command which outputs parsable file paths
+ * @param {Object} opts Child process options
+ * @return {Array} List of pathnames
+ */
+function gitPathnames(cmd, opts) {
+	return execAsync(cmd, opts).then(function(result) {
+		return result.split('\n').filter(Boolean);
+	});
+}
+
+module.exports = gitPathnames;
diff --git a/test/helpers/injectPackageJSON.js b/test/helpers/injectPackageJSON.js
@@ -0,0 +1,17 @@
+const apePackageJSON = require('../fixture/AwesomeProjectEssentials/package');
+const fs = require('fs-extra');
+
+/**
+ * Saves a new package.json with injected scripts
+ * @param {Object} t Test object
+ * @param {Object} script npm scripts to merge
+ */
+function injectPackageJSON(t, script) {
+	fs.writeFileSync('package.json', `${JSON.stringify(Object.assign({}, apePackageJSON, {
+		scripts: Object.assign({}, apePackageJSON.scripts, script)
+	}), null, 2)}\n`, {
+		cwd: t.context.tempDir
+	});
+}
+
+module.exports = injectPackageJSON;
diff --git a/test/helpers/tempInitAndVersion.js b/test/helpers/tempInitAndVersion.js
@@ -0,0 +1,19 @@
+const child = require('child_process');
+
+/**
+ * Inits and npm-versions an APE copy
+ * @param {string} newVersion New version to pass to npm-version
+ */
+function tempInitAndVersion(newVersion) {
+	child.execSync(`
+		git init \
+		&& git config user.email "test@zor.arpa" \
+		&& git config user.name "Test Zor" \
+		&& git add . \
+		&& git commit -m "Initial commit" \
+		&& npm version ${newVersion || 'patch'} \
+		`
+	);
+}
+
+module.exports = tempInitAndVersion;
diff --git a/test/helpers/versionTempWithCLI.js b/test/helpers/versionTempWithCLI.js
@@ -0,0 +1,18 @@
+const child = require('child_process');
+
+/**
+ * Versions an APE copy using the CLI
+ * @param {Array} params Child process params
+ */
+function versionTempWithCLI(params) {
+	const versionProcess = child.spawnSync(
+		'node',
+		[require.resolve('../../cli')].concat(params).filter(Boolean)
+	);
+
+	if (versionProcess.status > 0) {
+		throw new Error(versionProcess.stderr.toString());
+	}
+}
+
+module.exports = versionTempWithCLI;
diff --git a/test/index.js b/test/index.js
diff --git a/util.js b/util.js
diff --git a/yarn.lock b/yarn.lock
