Issue 21 (#28)

* WIP #21 Working pure JS solution for iOS

* WIP #21 Add legacy option, remove prerequisites from README

* WIP #21 Remove hardcoded xcodeproj filename

* Rely on shebang inside cli.js instead of directly executing node binary

* WIP #21 Add tests for checking version values

* Refactor tests, add missing & legacy

* Fix #21 Tweak paths, test names, enable Travis multi OS, update Node.js versions

Author: stovmascript

.travis.yml

@@ -1,6 +1,9 @@
-os: osx
+os:
+  - linux
+  - osx
 language: node_js
 node_js:
-  - "4"
-  - "6"
-  - "7"
+  - "lts/argon"
+  - "lts/boron"
+  - "lts/carbon"
+  - "node"

README.md

@@ -2,16 +2,6 @@
 
 Seamlessly shadows the behaviour of [`npm version`](https://docs.npmjs.com/cli/version).
 
-## Prerequisites
-
-- Xcode Command Line Tools (`xcode-select --install`)
-
-## Project setup
-
-Open your Xcode project and under "Build Settings -> Versioning -> Current Project Version", set the value to your current `CFBundleVersion` ("General -> Identity -> Build").
-
----
-
 ## npm-scripts hook (automatic method)
 
 ### Setup
@@ -72,6 +62,7 @@ react-native-version
 -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.
+-L, --legacy              Version iOS using agvtool (macOS only). Requires Xcode Command Line Tools.
 -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".

cli.js

@@ -29,6 +29,10 @@ program
 		defaults.android
 	)
 	.option("-i, --ios [path]", 'Path to your "ios/" folder.', defaults.ios)
+	.option(
+		"-L, --legacy",
+		"Version iOS using agvtool (macOS only). Requires Xcode Command Line Tools."
+	)
 	.option("-q, --quiet", "Be quiet, only report errors.")
 	.option(
 		"-r, --reset-build",

index.js

@@ -1,9 +1,16 @@
+const beautify = require("js-beautify").html;
 const child = require("child_process");
+const detectIndent = require("detect-indent");
+const flatten = require("lodash.flattendeep");
 const fs = require("fs");
 const list = require("./util").list;
 const log = require("./util").log;
 const path = require("path");
+const plist = require("plist");
 const pSettle = require("p-settle");
+const stripIndents = require("common-tags/lib/stripIndents");
+const unique = require("lodash.uniq");
+const Xcode = require("pbxproj-dom/xcode").Xcode;
 
 /**
  * Custom type definition for Promises
@@ -27,6 +34,28 @@ function getDefaults() {
 	};
 }
 
+/**
+ * Returns Info.plist filenames
+ * @param {Xcode} xcode Opened Xcode project file
+ * @return {Array} Plist filenames
+ */
+function getPlistFilenames(xcode) {
+	return unique(
+		flatten(
+			xcode.document.projects.map(project => {
+				return project.targets.map(target => {
+					return target.buildConfigurationsList.buildConfigurations.map(
+						config => {
+							return config.ast.value.get("buildSettings").get("INFOPLIST_FILE")
+								.text;
+						}
+					);
+				});
+			})
+		)
+	);
+}
+
 /**
  * Versions your app
  * @param {Object} program commander/CLI-style options, camelCased
@@ -139,61 +168,157 @@ function version(program, projectPath) {
 		ios = new Promise(function(resolve, reject) {
 			log({ text: "Versioning iOS..." }, programOpts.quiet);
 
-			try {
-				child.execSync("xcode-select --print-path", {
-					stdio: ["ignore", "ignore", "pipe"]
-				});
-			} catch (err) {
-				reject([
-					{
-						style: "red",
-						text: err
-					},
-					{
-						style: "yellow",
-						text: "Looks like Xcode Command Line Tools aren't installed"
-					},
-					{
-						text: "\n  Install:\n\n    $ xcode-select --install\n"
-					}
-				]);
+			if (program.legacy) {
+				try {
+					child.execSync("xcode-select --print-path", {
+						stdio: ["ignore", "ignore", "pipe"]
+					});
+				} catch (err) {
+					reject([
+						{
+							style: "red",
+							text: err
+						},
+						{
+							style: "yellow",
+							text: "Looks like Xcode Command Line Tools aren't installed"
+						},
+						{
+							text: "\n  Install:\n\n    $ xcode-select --install\n"
+						}
+					]);
 
-				return;
-			}
+					return;
+				}
 
-			const agvtoolOpts = {
-				cwd: programOpts.ios
-			};
+				const agvtoolOpts = {
+					cwd: programOpts.ios
+				};
+
+				try {
+					child.execSync("agvtool what-version", agvtoolOpts);
+				} catch (err) {
+					reject([
+						{
+							style: "red",
+							text: "No project folder found at " + programOpts.ios
+						},
+						{
+							style: "yellow",
+							text: 'Use the "--ios" option to specify the path manually'
+						}
+					]);
 
-			try {
-				child.execSync("agvtool what-version", agvtoolOpts);
-			} catch (err) {
-				reject([
-					{
-						style: "red",
-						text: "No project folder found at " + programOpts.ios
-					},
-					{
-						style: "yellow",
-						text: 'Use the "--ios" option to specify the path manually'
-					}
-				]);
+					return;
+				}
 
-				return;
-			}
+				if (!programOpts.incrementBuild) {
+					child.spawnSync(
+						"agvtool",
+						["new-marketing-version", appPkg.version],
+						agvtoolOpts
+					);
+				}
 
-			if (!programOpts.incrementBuild) {
-				child.spawnSync(
-					"agvtool",
-					["new-marketing-version", appPkg.version],
-					agvtoolOpts
+				if (programOpts.resetBuild) {
+					child.execSync("agvtool new-version -all 1", agvtoolOpts);
+				} else {
+					child.execSync("agvtool next-version -all", agvtoolOpts);
+				}
+			} else {
+				const xcode = Xcode.open(
+					path.join(
+						programOpts.ios,
+						`${appPkg.name}.xcodeproj`,
+						"project.pbxproj"
+					)
 				);
-			}
 
-			if (programOpts.resetBuild) {
-				child.execSync("agvtool new-version -all 1", agvtoolOpts);
-			} else {
-				child.execSync("agvtool next-version -all", agvtoolOpts);
+				const plistFilenames = getPlistFilenames(xcode);
+
+				xcode.document.projects.forEach(project => {
+					project.targets.forEach(target => {
+						target.buildConfigurationsList.buildConfigurations.forEach(
+							config => {
+								if (target.name === appPkg.name) {
+									config.patch({
+										buildSettings: {
+											CURRENT_PROJECT_VERSION: programOpts.resetBuild
+												? 1
+												: parseInt(
+														config.ast.value
+															.get("buildSettings")
+															.get("CURRENT_PROJECT_VERSION").text,
+														10
+													) + 1
+										}
+									});
+								}
+							}
+						);
+					});
+
+					const plistFiles = plistFilenames.map(filename => {
+						return fs.readFileSync(
+							path.join(programOpts.ios, filename),
+							"utf8"
+						);
+					});
+
+					const parsedPlistFiles = plistFiles.map(file => {
+						return plist.parse(file);
+					});
+
+					parsedPlistFiles.forEach((json, index) => {
+						fs.writeFileSync(
+							path.join(programOpts.ios, plistFilenames[index]),
+							plist.build(
+								Object.assign(
+									{},
+									json,
+									!programOpts.incrementBuild
+										? {
+												CFBundleShortVersionString: appPkg.version
+											}
+										: {},
+									{
+										CFBundleVersion: `${programOpts.resetBuild
+											? 1
+											: parseInt(json.CFBundleVersion, 10) + 1}`
+									}
+								)
+							)
+						);
+					});
+
+					plistFilenames.forEach((filename, index) => {
+						const indent = detectIndent(plistFiles[index]);
+
+						fs.writeFileSync(
+							path.join(programOpts.ios, filename),
+							stripIndents`
+							<?xml version="1.0" encoding="UTF-8"?>
+							<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+							<plist version="1.0">` +
+								"\n" +
+								beautify(
+									fs
+										.readFileSync(path.join(programOpts.ios, filename), "utf8")
+										.match(/<dict>[\s\S]*<\/dict>/)[0],
+									{
+										end_with_newline: true,
+										indent_char: indent.indent,
+										indent_size: indent.amount
+									}
+								) +
+								stripIndents`
+							</plist>` +
+								"\n"
+						);
+					});
+				});
+
+				xcode.save();
 			}
 
 			log({ text: "iOS updated" }, programOpts.quiet);
@@ -299,5 +424,6 @@ function version(program, projectPath) {
 
 module.exports = {
 	getDefaults: getDefaults,
+	getPlistFilenames: getPlistFilenames,
 	version: version
 };

package.json

@@ -11,12 +11,19 @@
   "dependencies": {
     "chalk": "^1.1.3",
     "commander": "^2.9.0",
-    "p-settle": "^2.0.0"
+    "common-tags": "^1.4.0",
+    "detect-indent": "^5.0.0",
+    "js-beautify": "^1.7.4",
+    "lodash.flattendeep": "^4.4.0",
+    "lodash.uniq": "^4.5.0",
+    "p-settle": "^2.0.0",
+    "pbxproj-dom": "^1.0.11",
+    "plist": "^2.1.0"
   },
   "devDependencies": {
-    "ava": "^0.17.0",
-    "eslint": "^3.4.0",
-    "eslint-plugin-ava": "^4.0.0",
+    "ava": "^0.23.0",
+    "eslint": "^4.10.0",
+    "eslint-plugin-ava": "^4.2.2",
     "eslint-plugin-prettier": "^2.3.1",
     "fs-extra": "^1.0.0",
     "husky": "^0.14.3",
@@ -53,7 +60,7 @@
   "scripts": {
     "precommit": "lint-staged",
     "docs": "jsdoc2md -d 4 index.js",
-    "test": "ava"
+    "test": "./test.sh"
   },
   "lint-staged": {
     "*.{js,json}": ["prettier --write", "git add"]

test.sh

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+if [[ "$CI" != "true" || "$TRAVIS_OS_NAME" == "osx" ]]; then
+	ava
+else
+	ava --match="!*legacy*"
+fi