Merge pull request #1100 from NativeScript/vladimirov/merge-1.4.3

Merge 1.4.3 in master

Author: Vasil Chimev

CHANGELOG.md

@@ -1,6 +1,27 @@
 NativeScript CLI Changelog
 ================
 
+1.4.3 (2015, October 21)
+==
+
+### New
+* [Implemented #883](https://github.com/NativeScript/nativescript-cli/issues/883): Support xcconfig file from plugin.
+* [Implemented #958](https://github.com/NativeScript/nativescript-cli/issues/958): Support for Node 4.2.1+.
+* [Implemented #1065](https://github.com/NativeScript/nativescript-cli/issues/1065): Support sandbox-pod.
+
+### Fixed
+* [Fixed #1031](https://github.com/NativeScript/nativescript-cli/issues/1031): Command emulate android after LiveSync starts the last synced app on the emulator.
+* [Fixed #1044](https://github.com/NativeScript/nativescript-cli/issues/1044): iOS debug break on Simulator causes app crash when the debugger is paused on the first line for a long time.
+* [Fixed #1054](https://github.com/NativeScript/nativescript-cli/issues/1054): ENOENT error is thrown when `tns platform add ios` command is executed.
+* [Fixed #1066](https://github.com/NativeScript/nativescript-cli/issues/1066): Merge Info.plist fails second build.
+* [Fixed #1080](https://github.com/NativeScript/nativescript-cli/issues/1080): Using --symlink for android runtime is modifying the original one.
+
+1.4.2 (2015, October 15)
+==
+
+### Fixed
+* [Fixed #1041](https://github.com/NativeScript/nativescript-cli/issues/1041): Unable to run the application when project root directory is renamed.
+
 1.4.0 (2015, October 07)
 ==
 
@@ -74,7 +95,7 @@ Building NativeScript projects for Android requires Android SDK 22, Android SDK
 
 * [Fixed #776](https://github.com/NativeScript/nativescript-cli/issues/776): `tns livesync ios --emulator --watch` doesn't sync changes.
 * [Fixed #777](https://github.com/NativeScript/nativescript-cli/issues/777): `tns library add ios` does not build correct relative paths to referenced frameworks for mdgenerator.
-* [Fixed #779](https://github.com/NativeScript/nativescript-cli/issues/779): Command failed due to space in library reference path. 
+* [Fixed #779](https://github.com/NativeScript/nativescript-cli/issues/779): Command failed due to space in library reference path.
 
 1.2.2 (2015, August 11)
 ==
@@ -173,7 +194,7 @@ Building NativeScript projects for Android requires Android SDK 22, Android SDK
 
 * [Implemented #510](https://github.com/NativeScript/nativescript-cli/issues/510): You can work with custom NativeScript plugins in your project. You can add a plugin from an npm package, a local folder, a URL or a `.tar.gz` file. For more information, run `$ tns help plugin`
 * [Implemented #362](https://github.com/NativeScript/nativescript-cli/issues/362): You can use npm as package manager for your NativeScript projects.
-	
+
 ### Updated
 
 * [Updated #358](https://github.com/NativeScript/nativescript-cli/issues/358): Multiple improvements and bug fixes for iOS debugging.
@@ -197,7 +218,7 @@ Building NativeScript projects for Android requires Android SDK 22, Android SDK
 
 ### Fixed
 
-* [Fixed #459](https://github.com/NativeScript/nativescript-cli/issues/459): You cannot add a third-party iOS native library to your project, if the path to the library contains spaces. 
+* [Fixed #459](https://github.com/NativeScript/nativescript-cli/issues/459): You cannot add a third-party iOS native library to your project, if the path to the library contains spaces.
 * [Fixed #458](https://github.com/NativeScript/nativescript-cli/issues/458): If you have installed Xcode 6.2 or earlier on your system, you cannot debug in the iOS Simulator.
 * [Fixed #413](https://github.com/NativeScript/nativescript-cli/issues/413): If your project name contains a hyphen, the NativeScript CLI sets your application identifier inconsistently across the project.
 
@@ -206,7 +227,7 @@ Building NativeScript projects for Android requires Android SDK 22, Android SDK
 
 ### New
 
-* [Implemented #447](https://github.com/NativeScript/nativescript-cli/issues/447): `tns run ios`, `tns run android` and `tns emulate android` print the output of the running application in the console. 
+* [Implemented #447](https://github.com/NativeScript/nativescript-cli/issues/447): `tns run ios`, `tns run android` and `tns emulate android` print the output of the running application in the console.
 * [Implemented #441](https://github.com/NativeScript/nativescript-cli/issues/441): Improved command-line completion.
 * [Implemented #416](https://github.com/NativeScript/nativescript-cli/issues/416): Improved installation.
 * [Implemented #358](https://github.com/NativeScript/nativescript-cli/issues/358): Improved `tns debug ios`.
@@ -250,7 +271,7 @@ Building NativeScript projects for Android requires Android SDK 22, Android SDK
 * [Fixed #257](https://github.com/NativeScript/nativescript-cli/issues/257): On bash consoles, you cannot pass arguments with spaces, even if escaped.
 * [Fixed #251](https://github.com/NativeScript/nativescript-cli/issues/251): On OS X systems, the command validation might not work properly.
 * [Fixed #248](https://github.com/NativeScript/nativescript-cli/issues/248): On OS X systems, the `tns deploy` command might not release the console.
-* [Fixed #169](https://github.com/NativeScript/nativescript-cli/issues/169): The native Xcode project is created with an incorrect name. 
+* [Fixed #169](https://github.com/NativeScript/nativescript-cli/issues/169): The native Xcode project is created with an incorrect name.
 
 0.9.4 (2015, March 18)
 ==
@@ -272,7 +293,7 @@ Building NativeScript projects for Android requires Android SDK 22, Android SDK
 ### New
 
 * [Implemented #305](https://github.com/NativeScript/nativescript-cli/issues/305), [#322](https://github.com/NativeScript/nativescript-cli/issues/322): You can quickly add or update your platform runtime to a specific version by running `tns platform update platform@version`<br/>For example: `tns platform update [email protected]`<br/>The NativeScript team will publish experimental support for the latest versions of iOS and Android.<br/>To list all available versions for android, run $ npm view tns-android versions<br/>To list only experimental versions for android, run $ npm view tns-android dist-tags
-To list all available versions for ios, run $ npm view tns-ios versions<br/>To list only experimental versions for ios, run $ npm view tns-ios dist-tags 
+To list all available versions for ios, run $ npm view tns-ios versions<br/>To list only experimental versions for ios, run $ npm view tns-ios dist-tags
 * [Implemented #302](https://github.com/NativeScript/nativescript-cli/issues/302): You can configure proxy settings for the NativeScript CLI.
 
 ### Fixed

lib/common

@@ -37,6 +37,7 @@ interface IPlatformData {
 	targetedOS?: string[];
 	configurationFileName?: string;
 	configurationFilePath?: string;
+	relativeToFrameworkConfigurationFilePath: string;
 	mergeXmlConfig?: any[];
 }
 

lib/definitions/platform.d.ts

@@ -36,7 +36,8 @@ interface IPlatformProjectService {
 	platformData: IPlatformData;
 	validate(): IFuture<void>;
 	createProject(frameworkDir: string, frameworkVersion: string): IFuture<void>;
-	interpolateData(projectRoot: string): IFuture<void>;
+	interpolateData(): IFuture<void>;
+	interpolateConfigurationFile(configurationFilePath?: string): IFuture<void>;
 	afterCreateProject(projectRoot: string): IFuture<void>;
 	buildProject(projectRoot: string, buildConfig?: IBuildConfig): IFuture<void>;
 	prepareProject(): IFuture<void>;

lib/definitions/project.d.ts

@@ -43,7 +43,7 @@ export class NpmInstallationManager implements INpmInstallationManager {
 	public addToCache(packageName: string, version: string): IFuture<void> {
 		return (() => {
 			let cachedPackagePath = this.getCachedPackagePath(packageName, version);
-			if(!this.$fs.exists(cachedPackagePath).wait()) {
+			if(!this.$fs.exists(cachedPackagePath).wait() || !this.$fs.exists(path.join(cachedPackagePath, "framework")).wait()) {
 				this.addToCacheCore(packageName, version).wait();
 			}
 
@@ -151,13 +151,16 @@ export class NpmInstallationManager implements INpmInstallationManager {
 	private installCore(packageName: string, pathToSave: string, version: string): IFuture<string> {
 		return (() => {
 			if (this.$options.frameworkPath) {
-				if (this.$fs.getFsStats(this.$options.frameworkPath).wait().isFile()) {
-					this.npmInstall(packageName, pathToSave, version).wait();
-					let pathToNodeModules = path.join(pathToSave, "node_modules");
-					let folders = this.$fs.readDirectory(pathToNodeModules).wait();
-					return path.join(pathToNodeModules, folders[0]);
+				this.npmInstall(packageName, pathToSave, version).wait();
+				let pathToNodeModules = path.join(pathToSave, "node_modules");
+				let folders = this.$fs.readDirectory(pathToNodeModules).wait();
+
+				let data = this.$fs.readJson(path.join(pathToNodeModules, folders[0], "package.json")).wait();
+				if(!this.isPackageUnpacked(this.getCachedPackagePath(data.name, data.version), data.name).wait()) {
+					this.cacheUnpack(data.name, data.version).wait();
 				}
-				return this.$options.frameworkPath;
+
+				return path.join(pathToNodeModules, folders[0]);
 			} else {
 				version = version || this.getLatestCompatibleVersion(packageName).wait();
 				let packagePath = this.getCachedPackagePath(packageName, version);

lib/npm-installation-manager.ts

@@ -8,7 +8,7 @@ import * as semver from "semver";
 import * as projectServiceBaseLib from "./platform-project-service-base";
 import * as androidDebugBridgePath from "../common/mobile/android/android-debug-bridge";
 
-class AndroidProjectService extends projectServiceBaseLib.PlatformProjectServiceBase implements IPlatformProjectService {
+export class AndroidProjectService extends projectServiceBaseLib.PlatformProjectServiceBase implements IPlatformProjectService {
 	private static VALUES_DIRNAME = "values";
 	private static VALUES_VERSION_DIRNAME_PREFIX = AndroidProjectService.VALUES_DIRNAME + "-v";
 	private static ANDROID_PLATFORM_NAME = "android";
@@ -57,6 +57,7 @@ class AndroidProjectService extends projectServiceBaseLib.PlatformProjectService
 				frameworkFilesExtensions: [".jar", ".dat", ".so"],
 				configurationFileName: "AndroidManifest.xml",
 				configurationFilePath: path.join(projectRoot, "src", "main", "AndroidManifest.xml"),
+				relativeToFrameworkConfigurationFilePath: path.join("src", "main", "AndroidManifest.xml"),
 				mergeXmlConfig: [{ "nodename": "manifest", "attrname": "*" }, {"nodename": "application", "attrname": "*"}]
 			};
 		}
@@ -133,18 +134,24 @@ class AndroidProjectService extends projectServiceBaseLib.PlatformProjectService
 		}).future<void>()();
 	}
 
-	public interpolateData(projectRoot: string): IFuture<void> {
+	public interpolateData(): IFuture<void> {
 		return (() => {
-			// Interpolate the activity name and package
-			let manifestPath = this.platformData.configurationFilePath;
-			shell.sed('-i', /__PACKAGE__/, this.$projectData.projectId, manifestPath);
+			// Interpolate the apilevel and package
+			this.interpolateConfigurationFile().wait();
 
 			let stringsFilePath = path.join(this.getAppResourcesDestinationDirectoryPath().wait(), 'values', 'strings.xml');
 			shell.sed('-i', /__NAME__/, this.$projectData.projectName, stringsFilePath);
 			shell.sed('-i', /__TITLE_ACTIVITY__/, this.$projectData.projectName, stringsFilePath);
 
 			let gradleSettingsFilePath = path.join(this.platformData.projectRoot, "settings.gradle");
 			shell.sed('-i', /__PROJECT_NAME__/, this.getProjectNameFromId(), gradleSettingsFilePath);
+		}).future<void>()();
+	}
+
+	public interpolateConfigurationFile(): IFuture<void> {
+		return (() => {
+			let manifestPath = this.platformData.configurationFilePath;
+			shell.sed('-i', /__PACKAGE__/, this.$projectData.projectId, manifestPath);
 			shell.sed('-i', /__APILEVEL__/, this.$options.sdk || this.$androidToolsInfo.getToolsInfo().wait().compileSdkVersion.toString(), manifestPath);
 		}).future<void>()();
 	}

lib/services/android-project-service.ts

@@ -61,6 +61,7 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
 			targetedOS: ['darwin'],
 			configurationFileName: "Info.plist",
 			configurationFilePath: path.join(projectRoot, this.$projectData.projectName,  this.$projectData.projectName+"-Info.plist"),
+			relativeToFrameworkConfigurationFilePath: path.join("__PROJECT_NAME__", "__PROJECT_NAME__-Info.plist"),
 			mergeXmlConfig: [{ "nodename": "plist", "attrname": "*" }, {"nodename": "dict", "attrname": "*"}]
 		};
 	}
@@ -119,20 +120,27 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
 		}).future<void>()();
 	}
 
-	public interpolateData(projectRoot: string): IFuture<void> {
+	public interpolateData(): IFuture<void> {
 		return (() => {
-			let infoPlistFilePath = path.join(projectRoot, IOSProjectService.IOS_PROJECT_NAME_PLACEHOLDER, util.format("%s-%s", IOSProjectService.IOS_PROJECT_NAME_PLACEHOLDER, "Info.plist"));
-			shell.sed('-i', "__CFBUNDLEIDENTIFIER__", this.$projectData.projectId, infoPlistFilePath);
+			let infoPlistFilePath = path.join(this.platformData.projectRoot, IOSProjectService.IOS_PROJECT_NAME_PLACEHOLDER, util.format("%s-%s", IOSProjectService.IOS_PROJECT_NAME_PLACEHOLDER, "Info.plist"));
+			this.interpolateConfigurationFile(infoPlistFilePath).wait();
 
-			this.replaceFileName("-Info.plist", path.join(projectRoot, IOSProjectService.IOS_PROJECT_NAME_PLACEHOLDER)).wait();
-			this.replaceFileName("-Prefix.pch", path.join(projectRoot, IOSProjectService.IOS_PROJECT_NAME_PLACEHOLDER)).wait();
-			this.replaceFileName(IOSProjectService.XCODE_PROJECT_EXT_NAME, projectRoot).wait();
+			let projectRootFilePath = path.join(this.platformData.projectRoot, IOSProjectService.IOS_PROJECT_NAME_PLACEHOLDER);
+			this.replaceFileName("-Info.plist", projectRootFilePath).wait();
+			this.replaceFileName("-Prefix.pch", projectRootFilePath).wait();
+			this.replaceFileName(IOSProjectService.XCODE_PROJECT_EXT_NAME, this.platformData.projectRoot).wait();
 
-			let pbxprojFilePath = path.join(projectRoot, this.$projectData.projectName + IOSProjectService.XCODE_PROJECT_EXT_NAME, "project.pbxproj");
+			let pbxprojFilePath = path.join(this.platformData.projectRoot, this.$projectData.projectName + IOSProjectService.XCODE_PROJECT_EXT_NAME, "project.pbxproj");
 			this.replaceFileContent(pbxprojFilePath).wait();
 		}).future<void>()();
 	}
 
+	public interpolateConfigurationFile(configurationFilePath?: string): IFuture<void> {
+		return (() => {
+			shell.sed('-i', "__CFBUNDLEIDENTIFIER__", this.$projectData.projectId, configurationFilePath || this.platformData.configurationFilePath);
+		}).future<void>()();
+	}
+
 	public afterCreateProject(projectRoot: string): IFuture<void> {
 		return (() => {
 			this.$fs.rename(path.join(projectRoot, IOSProjectService.IOS_PROJECT_NAME_PLACEHOLDER),

lib/services/ios-project-service.ts

@@ -94,15 +94,25 @@ export class PlatformService implements IPlatformService {
 	private addPlatformCore(platformData: IPlatformData, frameworkDir: string): IFuture<void> {
 		return (() => {
 			let installedVersion = this.$fs.readJson(path.join(frameworkDir, "../", "package.json")).wait().version;
-			platformData.platformProjectService.createProject(frameworkDir, installedVersion).wait();
+			let isFrameworkPathDirectory = false,
+				isFrameworkPathNotSymlinkedFile = false;
 
-			if(this.$options.frameworkPath && this.$fs.getFsStats(this.$options.frameworkPath).wait().isFile() && !this.$options.symlink) {
+			if(this.$options.frameworkPath) {
+				let frameworkPathStats = this.$fs.getFsStats(this.$options.frameworkPath).wait();
+				isFrameworkPathDirectory = frameworkPathStats.isDirectory();
+				isFrameworkPathNotSymlinkedFile = !this.$options.symlink && frameworkPathStats.isFile();
+			}
+
+			let sourceFrameworkDir = isFrameworkPathDirectory && this.$options.symlink ? path.join(this.$options.frameworkPath, "framework") : frameworkDir;
+			platformData.platformProjectService.createProject(path.resolve(sourceFrameworkDir), installedVersion).wait();
+
+			if(isFrameworkPathDirectory || isFrameworkPathNotSymlinkedFile) {
 				// Need to remove unneeded node_modules folder
 				// One level up is the runtime module and one above is the node_modules folder.
 				this.$fs.deleteDirectory(path.join(frameworkDir, "../../")).wait();
 			}
 
-			platformData.platformProjectService.interpolateData(platformData.projectRoot).wait();
+			platformData.platformProjectService.interpolateData().wait();
 			platformData.platformProjectService.afterCreateProject(platformData.projectRoot).wait();
 
 			this.$projectDataService.initialize(this.$projectData.projectDir);