Merge pull request #1082 from NativeScript/fatme/merge-release-1.4.3

Merge release

Author: Fatme

config/config.json

@@ -5,5 +5,6 @@
 	"PROXY_HOSTNAME": "127.0.0.1",
 	"TYPESCRIPT_COMPILER_OPTIONS": {},
 	"CI_LOGGER": false,
-	"ANDROID_DEBUG_UI_MAC": "Google Chrome"
+	"ANDROID_DEBUG_UI_MAC": "Google Chrome",
+	"USE_POD_SANDBOX": true
 }

lib/config.ts

@@ -11,6 +11,7 @@ export class Configuration extends configBaseLib.ConfigBase implements IConfigur
 	TYPESCRIPT_COMPILER_OPTIONS = {};
 	USE_PROXY = false;
 	ANDROID_DEBUG_UI: string = null;
+	USE_POD_SANDBOX: boolean = true;
 
 	/*don't require logger and everything that has logger as dependency in config.js due to cyclic dependency*/
 	constructor(protected $fs: IFileSystem) {

lib/declarations.ts

@@ -15,6 +15,7 @@ interface INpmInstallationManager {
 	cacheUnpack(packageName: string, version: string, unpackTarget?: string): IFuture<void>;
 	install(packageName: string, options?: INpmInstallOptions): IFuture<string>;
 	getLatestVersion(packageName: string): IFuture<string>;
+	getLatestCompatibleVersion(packageName: string): IFuture<string>;
 	getCachedPackagePath(packageName: string, version: string): string;
 	addCleanCopyToCache(packageName: string, version: string): IFuture<void>;
 }
@@ -36,6 +37,7 @@ interface IStaticConfig extends Config.IStaticConfig { }
 
 interface IConfiguration extends Config.IConfig {
 	ANDROID_DEBUG_UI: string;
+	USE_POD_SANDBOX: boolean;
 }
 
 interface IApplicationPackage {

lib/npm-installation-manager.ts

@@ -6,6 +6,12 @@ import semver = require("semver");
 import * as npm from "npm";
 import * as constants from "./constants";
 
+interface IVersionData {
+	major: string;
+	minor: string;
+	patch: string;
+}
+
 export class NpmInstallationManager implements INpmInstallationManager {
 	private static NPM_LOAD_FAILED = "Failed to retrieve data from npm. Please try again a little bit later.";
 	private versionsCache: IDictionary<string[]>;
@@ -20,7 +26,8 @@ export class NpmInstallationManager implements INpmInstallationManager {
 		private $lockfile: ILockFile,
 		private $errors: IErrors,
 		private $options: IOptions,
-		private $fs: IFileSystem) {
+		private $fs: IFileSystem,
+		private $staticConfig: IStaticConfig) {
 		this.versionsCache = {};
 		this.$npm.load().wait();
 	}
@@ -63,6 +70,27 @@ export class NpmInstallationManager implements INpmInstallationManager {
 		}).future<string>()();
 	}
 
+	public getLatestCompatibleVersion(packageName: string): IFuture<string> {
+		return (() => {
+			let latestVersion = this.getLatestVersion(packageName).wait();
+			let data = this.$npm.view(packageName, "versions").wait();
+			let versions: string[] = data[latestVersion].versions;
+
+			let versionData = this.getVersionData(this.$staticConfig.version);
+
+ 			let compatibleVersions = _(versions)
+				.map(ver => this.getVersionData(ver))
+				.filter(verData => versionData.major === verData.major && versionData.minor === verData.minor)
+				.sortBy(verData => verData.patch)
+				.value();
+
+			let result = _.last(compatibleVersions);
+
+			let latestCompatibleVersion = `${result.major}.${result.minor}.${result.patch}`;
+			return latestCompatibleVersion;
+		}).future<string>()();
+	}
+
 	public install(packageName: string, opts?: INpmInstallOptions): IFuture<string> {
 		return (() => {
 			this.$lockfile.lock().wait();
@@ -131,7 +159,7 @@ export class NpmInstallationManager implements INpmInstallationManager {
 				}
 				return this.$options.frameworkPath;
 			} else {
-				version = version || this.getLatestVersion(packageName).wait();
+				version = version || this.getLatestCompatibleVersion(packageName).wait();
 				let packagePath = this.getCachedPackagePath(packageName, version);
 				this.addToCache(packageName, version).wait();
 				return packagePath;
@@ -163,5 +191,10 @@ export class NpmInstallationManager implements INpmInstallationManager {
 			return this.$fs.exists(directory).wait() &&	this.$fs.enumerateFilesInDirectorySync(directory).length > 0;
 		}).future<boolean>()();
 	}
+
+	private getVersionData(version: string): IVersionData {
+		let [ major, minor, patch ] = version.split(".");
+		return { major, minor, patch };
+	}
 }
 $injector.register("npmInstallationManager", NpmInstallationManager);

lib/services/android-project-service.ts

@@ -100,15 +100,14 @@ class AndroidProjectService extends projectServiceBaseLib.PlatformProjectService
 			if(this.$options.symlink) {
 				this.symlinkDirectory("build-tools", this.platformData.projectRoot, frameworkDir).wait();
 				this.symlinkDirectory("libs", this.platformData.projectRoot, frameworkDir).wait();
-				this.symlinkDirectory("src", this.platformData.projectRoot, frameworkDir).wait();
-
-				this.$fs.symlink(path.join(frameworkDir, "build.gradle"), path.join(this.platformData.projectRoot, "build.gradle")).wait();
-				this.$fs.symlink(path.join(frameworkDir, "settings.gradle"), path.join(this.platformData.projectRoot, "settings.gradle")).wait();
 			} else {
-				this.copy(this.platformData.projectRoot, frameworkDir, "build-tools libs src", "-R");
-				this.copy(this.platformData.projectRoot, frameworkDir, "build.gradle settings.gradle", "-f");
+				this.copy(this.platformData.projectRoot, frameworkDir, "build-tools libs", "-R");
 			}
 
+			// These files and directories should not be symlinked as CLI is modifying them and we'll change the original values as well.
+			this.copy(this.platformData.projectRoot, frameworkDir, "src", "-R");
+			this.copy(this.platformData.projectRoot, frameworkDir, "build.gradle settings.gradle", "-f");
+
 			this.cleanResValues(targetSdkVersion, frameworkVersion).wait();
 
 		}).future<any>()();

lib/services/init-service.ts

@@ -99,7 +99,7 @@ export class InitService implements IInitService {
 
 	private getVersionData(packageName: string): IFuture<IStringDictionary> {
 		return (() => {
-			let latestVersion = this.$npmInstallationManager.getLatestVersion(packageName).wait();
+			let latestVersion = this.$npmInstallationManager.getLatestCompatibleVersion(packageName).wait();
 			if(this.useDefaultValue) {
 				return this.buildVersionData(latestVersion);
 			}

lib/services/ios-project-service.ts

@@ -32,7 +32,8 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
 		private $options: IOptions,
 		private $injector: IInjector,
 		$projectDataService: IProjectDataService,
-		private $prompter: IPrompter) {
+		private $prompter: IPrompter,
+		private $config: IConfiguration) {
 			super($fs, $projectData, $projectDataService);
 		}
 
@@ -499,7 +500,8 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
 
 	private executePodInstall(): IFuture<any> {
 		this.$logger.info("Installing pods...");
-		return this.$childProcess.spawnFromEvent("pod",  ["install"], "close", { cwd: this.platformData.projectRoot, stdio: 'inherit' });
+		let podTool = this.$config.USE_POD_SANDBOX ? "sandbox-pod" : "pod";
+		return this.$childProcess.spawnFromEvent(podTool,  ["install"], "close", { cwd: this.platformData.projectRoot, stdio: 'inherit' });
 	}
 
 	private prepareFrameworks(pluginPlatformsFolderPath: string, pluginData: IPluginData): IFuture<void> {

package.json

@@ -10,7 +10,7 @@
   },
   "main": "./lib/nativescript-cli.js",
   "scripts": {
-    "test": "node_modules/.bin/istanbul cover node_modules/mocha/bin/_mocha -- --ui mocha-fibers --recursive --reporter spec --require test/test-bootstrap.js --timeout 60000 test/ lib/common/test/unit-tests",
+    "test": "node_modules/.bin/istanbul cover node_modules/mocha/bin/_mocha -- --ui mocha-fibers --recursive --reporter spec --require test/test-bootstrap.js --timeout 150000 test/ lib/common/test/unit-tests",
     "postinstall": "node postinstall.js",
     "preuninstall": "node preuninstall.js"
   },

test/npm-installation-manager.ts

@@ -0,0 +1,95 @@
+/// <reference path=".d.ts" />
+"use strict";
+
+import {assert} from "chai";
+import * as ConfigLib from "../lib/config";
+import * as ErrorsLib from "../lib/common/errors";
+import * as FsLib from "../lib/common/file-system";
+import * as HostInfoLib from "../lib/common/host-info";
+import * as LoggerLib from "../lib/common/logger";
+import * as NpmInstallationManagerLib from "../lib/npm-installation-manager";
+import * as OptionsLib from "../lib/options";
+import * as StaticConfigLib from "../lib/config";
+
+import Future = require("fibers/future");
+import yok = require("../lib/common/yok");
+
+function createTestInjector(): IInjector {
+	let testInjector = new yok.Yok();
+
+	testInjector.register("config", ConfigLib.Configuration);
+	testInjector.register("logger", LoggerLib.Logger);
+	testInjector.register("lockfile", { });
+	testInjector.register("errors", ErrorsLib.Errors);
+	testInjector.register("options", OptionsLib.Options);
+	testInjector.register("fs", FsLib.FileSystem);
+	testInjector.register("hostInfo", HostInfoLib.HostInfo);
+	testInjector.register("staticConfig", StaticConfigLib.StaticConfig);
+
+	testInjector.register("npmInstallationManager", NpmInstallationManagerLib.NpmInstallationManager);
+
+	return testInjector;
+}
+
+function mockNpm(testInjector: IInjector, versions: string[], latestVersion: string) {
+	testInjector.register("npm", {
+		view: (packageName: string, propertyName: string) => {
+			return (() => {
+				if(propertyName === "versions") {
+					let result = Object.create(null);
+					result[latestVersion] = {
+						"versions": versions
+					};
+
+					return result;
+				}
+
+				throw new Error(`Unable to find propertyName ${propertyName}.`);
+			}).future<any>()();
+		},
+		load: () => Future.fromResult()
+	});
+}
+
+describe("Npm installation manager tests", () => {
+	it("returns correct latest compatible version when only one exists", () => {
+		let testInjector = createTestInjector();
+
+		let versions = ["1.4.0"];
+		let latestVersion = "1.4.0";
+
+		mockNpm(testInjector, versions, latestVersion);
+
+		// Mock staticConfig.version
+		let staticConfig = testInjector.resolve("staticConfig");
+		staticConfig.version = "1.4.0";
+
+		// Mock npmInstallationManager.getLatestVersion
+		let npmInstallationManager = testInjector.resolve("npmInstallationManager");
+		npmInstallationManager.getLatestVersion = (packageName: string) => Future.fromResult(latestVersion);
+
+		let actualLatestCompatibleVersion = npmInstallationManager.getLatestCompatibleVersion("").wait();
+		let expectedLatestCompatibleVersion = "1.4.0";
+		assert.equal(actualLatestCompatibleVersion, expectedLatestCompatibleVersion);
+	});
+	it("returns correct latest compatible version", () => {
+		let testInjector = createTestInjector();
+
+		let versions = ["1.2.0", "1.3.0", "1.3.1", "1.3.2", "1.3.3", "1.4.0"];
+		let latestVersion = "1.3.3";
+
+		mockNpm(testInjector, versions, latestVersion);
+
+		// Mock staticConfig.version
+		let staticConfig = testInjector.resolve("staticConfig");
+		staticConfig.version = "1.3.0";
+
+		// Mock npmInstallationManager.getLatestVersion
+		let npmInstallationManager = testInjector.resolve("npmInstallationManager");
+		npmInstallationManager.getLatestVersion = (packageName: string) => Future.fromResult(latestVersion);
+
+		let actualLatestCompatibleVersion = npmInstallationManager.getLatestCompatibleVersion("").wait();
+		let expectedLatestCompatibleVersion = "1.3.3";
+		assert.equal(actualLatestCompatibleVersion, expectedLatestCompatibleVersion);
+	});
+});