Merge pull request #572 from NativeScript/vladimirov/merge-1.1.1

Merge changes for 1.1.1 release in master

Author: rosen-vladimirov

CHANGELOG.md

@@ -1,6 +1,18 @@
 NativeScript CLI Changelog
 ================
 
+1.1.1 (2015, June 17)
+==
+
+### New
+* [Implemented #551](https://github.com/NativeScript/nativescript-cli/issues/551): Add support for Android 5.1.1 (API Level 22). In case you have this SDK installed, it will be used as default when using `tns platform add android`.
+* [Implemented #552](https://github.com/NativeScript/nativescript-cli/issues/552): Add `--sdk` option to specify Android Target SDK. You can use `tns platform add android --sdk <API_LEVEL>` to target specific SDK.
+
+### Fixed
+* [Fixed #555](https://github.com/NativeScript/nativescript-cli/issues/555): Merging plugin's platform specific XMLs with project's platform specific XMLs is not working correctly in some cases.
+* [Fixed #567](https://github.com/NativeScript/nativescript-cli/issues/567): Npm support does not work.
+* [Fixed #569](https://github.com/NativeScript/nativescript-cli/issues/569): On some Windows systems, installation is showing errors in the output.
+
 1.1.0 (2015, June 10)
 ==
 

docs/man_pages/project/configuration/platform-add.md

@@ -3,8 +3,8 @@ platform add
 
 Usage | Synopsis
 ------|-------
-Android latest runtime | `$ tns platform add android [--frameworkPath <File Path>] [--symlink]`
-Android selected runtime | `$ tns platform add android[@<Version>] [--frameworkPath <File Path>] [--symlink]`
+Android latest runtime | `$ tns platform add android [--frameworkPath <File Path>] [--symlink] [--sdk <target sdk>]`
+Android selected runtime | `$ tns platform add android[@<Version>] [--frameworkPath <File Path>] [--symlink] [--sdk <target sdk>]`
 <% if (isMacOS) { %>iOS latest runtime | `$ tns platform add ios [--frameworkPath <File Path>] [--symlink]`
 iOS selected runtime | `$ tns platform add ios[@<Version>] [--frameworkPath <File Path>] [--symlink]`<% } %>
 
@@ -13,6 +13,7 @@ Configures the current project to target the selected platform. <% if(isHtml) {
 ### Options
 * `--frameworkPath` - Sets the path to a NativeScript runtime for the specified platform that you want to use instead of the default runtime. If `--symlink` is specified, `<File Path>` must point to directory in which the runtime is already extracted. If `--symlink` is not specified, `<File Path>` must point to a valid npm package. 
 * `--symlink` - Creates a symlink to a NativeScript runtime for the specified platform that you want to use instead of the default runtime. If `--frameworkPath` is specified, creates a symlink to the specified directory. If `--frameworkPath` is not specified, creates a symlink to platform runtime installed with your current version of NativeScript.
+* `--sdk` - Sets the Android target SDK. The value should be a valid Android API Level, for example 17, 19, MNC.
 
 ### Attributes
 * `<File Path>` is the complete path to a valid npm package or a directory that contains a NativeScript runtime for the selected platform.

lib/common

@@ -62,4 +62,5 @@ interface IOptions extends ICommonOptions {
 	keyStorePassword: string;
 	keyStoreAlias: string;
 	keyStoreAliasPassword: string;
+	sdk: string;
 }

lib/declarations.ts

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

lib/definitions/platform.d.ts

@@ -24,7 +24,8 @@ export class Options extends commonOptionsLibPath.OptionsBase {
 			keyStorePath: { type: OptionType.String },
 			keyStorePassword: { type: OptionType.String,},
 			keyStoreAlias: { type: OptionType.String },
-			keyStoreAliasPassword: { type: OptionType.String }
+			keyStoreAliasPassword: { type: OptionType.String },
+			sdk: { type: OptionType.String }
 		},
 		path.join($hostInfo.isWindows ? process.env.LocalAppData : path.join(osenv.home(), ".local/share"), ".nativescript-cli"),
 			$errors, $staticConfig);

lib/options.ts

@@ -10,7 +10,9 @@ import fs = require("fs");
 import os = require("os");
 
 class AndroidProjectService implements IPlatformProjectService {
-	private SUPPORTED_TARGETS = ["android-17", "android-18", "android-19", "android-21"]; // forbidden for now: "android-MNC"
+	private static MIN_SUPPORTED_VERSION = 17;
+	private SUPPORTED_TARGETS = ["android-17", "android-18", "android-19", "android-21", "android-22"]; // forbidden for now: "android-MNC"
+	private static ANDROID_TARGET_PREFIX = "android";
 	private static RES_DIRNAME = "res";
 	private static VALUES_DIRNAME = "values";
 	private static VALUES_VERSION_DIRNAME_PREFIX = AndroidProjectService.VALUES_DIRNAME + "-v";
@@ -48,7 +50,8 @@ class AndroidProjectService implements IPlatformProjectService {
 				],
 				frameworkFilesExtensions: [".jar", ".dat", ".so"],
 				configurationFileName: "AndroidManifest.xml",
-				configurationFilePath: path.join(this.$projectData.platformsDir, "android", "AndroidManifest.xml")
+				configurationFilePath: path.join(this.$projectData.platformsDir, "android", "AndroidManifest.xml"),
+				mergeXmlConfig: [{ "nodename": "manifest", "attrname": "*" }]
 			};
 		}
 
@@ -67,7 +70,9 @@ class AndroidProjectService implements IPlatformProjectService {
 	public createProject(projectRoot: string, frameworkDir: string): IFuture<void> {
 		return (() => {
 			this.$fs.ensureDirectoryExists(projectRoot).wait();
-			let newTarget = this.getLatestValidAndroidTarget(frameworkDir).wait();
+			
+			let newTarget = this.getAndroidTarget(frameworkDir).wait();
+			this.$logger.trace(`Using Android SDK '${newTarget}'.`);
 			let versionNumber = _.last(newTarget.split("-"));
 			if(this.$options.symlink) {
 				this.copyResValues(projectRoot, frameworkDir, versionNumber).wait();
@@ -101,8 +106,22 @@ class AndroidProjectService implements IPlatformProjectService {
 			this.$fs.createDirectory(resDestinationDir).wait();
 			let versionDirName = AndroidProjectService.VALUES_VERSION_DIRNAME_PREFIX + versionNumber;
 			let directoriesToCopy = [AndroidProjectService.VALUES_DIRNAME];
-			if(this.$fs.exists(path.join(resSourceDir, versionDirName)).wait()) {
-				directoriesToCopy.push(versionDirName);
+			let directoriesInResFolder = this.$fs.readDirectory(resSourceDir).wait();
+			let integerFrameworkVersion = parseInt(versionNumber);
+			let versionDir = _.find(directoriesInResFolder, dir => dir === versionDirName) || 
+				_(directoriesInResFolder)
+				.map(dir => { 
+					return {
+						dirName: dir,
+						sdkNum: parseInt(dir.substr(AndroidProjectService.VALUES_VERSION_DIRNAME_PREFIX.length))
+					}
+				})
+				.filter(dir => dir.dirName.match(AndroidProjectService.VALUES_VERSION_DIRNAME_PREFIX) && dir.sdkNum && (!integerFrameworkVersion || (integerFrameworkVersion >= dir.sdkNum)))
+				.max(dir => dir.sdkNum)
+				.dirName;
+
+			if(versionDir) {
+				directoriesToCopy.push(versionDir);
 			}
 
 			this.copy(resDestinationDir, resSourceDir, directoriesToCopy.join(" "), "-R").wait();
@@ -331,17 +350,37 @@ class AndroidProjectService implements IPlatformProjectService {
 		}
 	}
 
+	private getAndroidTarget(frameworkDir: string): IFuture<string> {
+		return ((): string => { 
+			let newTarget = this.$options.sdk ? `${AndroidProjectService.ANDROID_TARGET_PREFIX}-${this.$options.sdk}` : this.getLatestValidAndroidTarget(frameworkDir).wait();
+			if(!_.contains(this.SUPPORTED_TARGETS, newTarget)) {
+				let versionNumber = parseInt(_.last(newTarget.split("-")));
+				if(versionNumber && (versionNumber < AndroidProjectService.MIN_SUPPORTED_VERSION)) {
+					this.$errors.failWithoutHelp(`The selected target SDK ${newTarget} is not supported. You should target at least ${AndroidProjectService.MIN_SUPPORTED_VERSION}.`);
+				}
+
+				if(!_.contains(this.getInstalledTargets().wait(), newTarget)) {
+					this.$errors.failWithoutHelp(`You have selected to use ${newTarget}, but it is not currently installed.`+
+						' Run \"android\" from your command-line to install/update any missing SDKs or tools.');
+				}
+				this.$logger.warn(`The selected Android target '${newTarget}' is not verified as supported. Some functionality may not work as expected.`);
+			}
+
+			return newTarget;
+		}).future<string>()();
+	}
+
 	private getLatestValidAndroidTarget(frameworkDir: string): IFuture<string> {
 		return (() => {
 			let validTarget = this.getTarget(frameworkDir).wait();
 			let installedTargets = this.getInstalledTargets().wait();
 
 			// adjust to the latest available version
-			var	newTarget = _(this.SUPPORTED_TARGETS).sort().findLast(supportedTarget => _.contains(installedTargets, supportedTarget));
+			var newTarget = _(this.SUPPORTED_TARGETS).sort().findLast(supportedTarget => _.contains(installedTargets, supportedTarget));
 			if (!newTarget) {
-				this.$errors.fail("Please install Android target %s. Make sure you have the latest Android tools installed as well." +
-					" Run \"android\" from your command-line to install/update any missing SDKs or tools.",
-					validTarget.split('-')[1]);
+				this.$errors.failWithoutHelp(`Could not find supported Android target. Please install one of the following: ${this.SUPPORTED_TARGETS.join(", ")}.` + 
+					" Make sure you have the latest Android tools installed as well." + 
+					' Run "android" from your command-line to install/update any missing SDKs or tools.')
 			}
 
 			return newTarget;

lib/services/android-project-service.ts

@@ -6,6 +6,7 @@ import semver = require("semver");
 import Future = require("fibers/future");
 import constants = require("./../constants");
 let xmlmerge = require("xmlmerge-js");
+let DOMParser = require('xmldom').DOMParser;
 
 export class PluginsService implements IPluginsService {
 	private static INSTALL_COMMAND_NAME = "install";
@@ -60,40 +61,52 @@ export class PluginsService implements IPluginsService {
 	public prepare(pluginData: IPluginData): IFuture<void> {
 		return (() => {
 			let action = (pluginDestinationPath: string, platform: string, platformData: IPlatformData) => {
-				let skipExecution = false;
 				// Process .js files 				
 				let installedFrameworkVersion = this.getInstalledFrameworkVersion(platform).wait();
 				let pluginPlatformsData = pluginData.platformsData;
 				if(pluginPlatformsData) {
 					let pluginVersion = (<any>pluginPlatformsData)[platform];
+					if(!pluginVersion) {
+						this.$logger.warn(`${pluginData.name} is not supported for ${platform}.`);
+						return;
+					} 
+					
 					if(semver.gt(pluginVersion, installedFrameworkVersion)) {
 						this.$logger.warn(`${pluginData.name} ${pluginVersion} for ${platform} is not compatible with the currently installed framework version ${installedFrameworkVersion}.`);
-						skipExecution = true;  
+						return;
 					}
 				}
+			
+				this.$fs.ensureDirectoryExists(pluginDestinationPath).wait();
+				shelljs.cp("-R", pluginData.fullPath, pluginDestinationPath);
+			
+				let pluginPlatformsFolderPath = path.join(pluginDestinationPath, pluginData.name, "platforms", platform);
+				let pluginConfigurationFilePath = path.join(pluginPlatformsFolderPath, platformData.configurationFileName);
+				let configurationFilePath = platformData.configurationFilePath;
 
-				if(!skipExecution) {
-					this.$fs.ensureDirectoryExists(pluginDestinationPath).wait();
-					shelljs.cp("-R", pluginData.fullPath, pluginDestinationPath);
-				
-					let pluginPlatformsFolderPath = path.join(pluginDestinationPath, pluginData.name, "platforms", platform);
-					let pluginConfigurationFilePath = path.join(pluginPlatformsFolderPath, platformData.configurationFileName);					
-					if(this.$fs.exists(pluginConfigurationFilePath).wait()) {
-						let pluginConfigurationFileContent = this.$fs.readText(pluginConfigurationFilePath).wait();
-						let configurationFileContent = this.$fs.readText(platformData.configurationFilePath).wait();
-						let resultXml = this.mergeXml(pluginConfigurationFileContent, configurationFileContent).wait();
-						this.$fs.writeFile(platformData.configurationFilePath, resultXml).wait();	
-					}
-					
-					if(this.$fs.exists(pluginPlatformsFolderPath).wait()) {
-						shelljs.rm("-rf", pluginPlatformsFolderPath);			
-					}						
+				if(this.$fs.exists(pluginConfigurationFilePath).wait()) {
+					// Validate plugin configuration file
+					let pluginConfigurationFileContent = this.$fs.readText(pluginConfigurationFilePath).wait();
+					this.validateXml(pluginConfigurationFileContent, pluginConfigurationFilePath);
 
-					// TODO: Add libraries
+					// Validate configuration file
+					let configurationFileContent = this.$fs.readText(configurationFilePath).wait();
+					this.validateXml(configurationFileContent, configurationFilePath);
 
-					// Show message
-					this.$logger.out(`Successfully prepared plugin ${pluginData.name} for ${platform}.`);
+					// Merge xml
+					let resultXml = this.mergeXml(configurationFileContent, pluginConfigurationFileContent, platformData.mergeXmlConfig || []).wait();
+					this.validateXml(resultXml);
+					this.$fs.writeFile(configurationFilePath, resultXml).wait();	
 				}
+				
+				if(this.$fs.exists(pluginPlatformsFolderPath).wait()) {
+					shelljs.rm("-rf", pluginPlatformsFolderPath);			
+				}						
+				
+				// TODO: Add libraries
+				
+				// Show message
+				this.$logger.out(`Successfully prepared plugin ${pluginData.name} for ${platform}.`);
 			};
 
 			this.executeForAllInstalledPlatforms(action);
@@ -209,11 +222,11 @@ export class PluginsService implements IPluginsService {
 		}).future<string>()();
 	}
 
-	private mergeXml(xml1: string, xml2: string): IFuture<string> {
+	private mergeXml(xml1: string, xml2: string, config: any[]): IFuture<string> {
 		let future = new Future<string>();
 
 		try {
-			xmlmerge.merge(xml1, xml2, "", (mergedXml: string) => { 
+			xmlmerge.merge(xml1, xml2, config, (mergedXml: string) => { 
 				future.return(mergedXml);
 			});
 		} catch(err) {
@@ -222,5 +235,16 @@ export class PluginsService implements IPluginsService {
 
 		return future;
 	}
+	
+	private validateXml(xml: string, xmlFilePath?: string): void {
+		let doc = new DOMParser({
+			locator: {},
+			errorHandler: (level: any, msg: string) => {
+				let errorMessage = xmlFilePath ? `Invalid xml file ${xmlFilePath}.` : `Invalid xml ${xml}.`;
+				this.$errors.fail(errorMessage + ` Additional technical information: ${msg}.` )
+			}
+		});
+		doc.parseFromString(xml, 'text/xml');
+	}
 }
 $injector.register("pluginsService", PluginsService);

lib/services/plugins-service.ts

@@ -6,9 +6,9 @@ let Funnel = require('broccoli-funnel');
 import path = require("path");
 import destCopy from '../node-modules-dest-copy';
 
-class NodeModulesTree implements INodeModulesTree {	
+export class NodeModulesTree implements INodeModulesTree {	
 	public makeNodeModulesTree(absoluteOutputPath: string, projectDir: string): any {
-		let nodeModulesFunnel = new Funnel(".", { include: [projectDir + "/node_modules/**"] });
+		let nodeModulesFunnel = new Funnel(projectDir, { include: ["node_modules/**"] });
    		let result = destCopy(nodeModulesFunnel, absoluteOutputPath, "node_modules", projectDir);   
 		return result;	
 	}

lib/tools/broccoli/trees/node-modules-tree.ts

@@ -1,7 +1,7 @@
 {
   "name": "nativescript",
   "preferGlobal": true,
-  "version": "1.1.0",
+  "version": "1.1.1",
   "author": "Telerik <support@telerik.com>",
   "description": "Command-line interface for building NativeScript projects",
   "bin": {
@@ -28,6 +28,7 @@
     "broccoli": "0.16.2",
     "broccoli-funnel": "0.2.3",
     "bufferpack": "0.0.6",
+    "bufferutil": "https://github.com/telerik/bufferutil/tarball/master",
     "byline": "4.1.1",
     "chalk": "1.0.0",
     "cli-table": "https://github.com/telerik/cli-table/tarball/master",
@@ -64,9 +65,11 @@
     "shelljs": "0.3.0",
     "tabtab": "https://github.com/Icenium/node-tabtab/tarball/master",
     "temp": "0.8.1",
+    "utf-8-validate": "https://github.com/telerik/utf-8-validate/tarball/master",
     "winreg": "0.0.12",
     "ws": "0.7.1",
     "xcode": "https://github.com/NativeScript/node-xcode/archive/NativeScript-0.9.tar.gz",
+    "xmldom": "0.1.19",
     "xmlhttprequest": "https://github.com/telerik/node-XMLHttpRequest/tarball/master",
     "xmlmerge-js": "0.2.4",
     "yargs": "1.2.2"