Merge remote-tracking branch 'origin/release' into HEAD

IceBuildUser · IceBuildUser · commit cf3fefb06aa4 · 2016-03-10T21:42:07.000+02:00
diff --git a/lib/android-tools-info.ts b/lib/android-tools-info.ts
@@ -156,63 +156,28 @@ export class AndroidToolsInfo implements IAndroidToolsInfo {
 		}).future<boolean>()();
 	}
 
-	public validateJava(javacVersion: string, options?: {showWarningsAsErrors: boolean}): IFuture<boolean> {
+	public validateJavacVersion(installedJavaVersion: string, options?: {showWarningsAsErrors: boolean}): IFuture<boolean> {
 		return ((): boolean => {
+			let hasProblemWithJavaVersion = false;
 			if(options) {
 				this.showWarningsAsErrors = options.showWarningsAsErrors;
 			}
-
-			let helpfulMessage = "You will not be able to build your projects for Android." + EOL
+			let additionalMessage = "You will not be able to build your projects for Android." + EOL
 				+ "To be able to build for Android, verify that you have installed The Java Development Kit (JDK) and configured it according to system requirements as" + EOL +
 				" described in https://github.com/NativeScript/nativescript-cli#system-requirements.";
-
-			let hasProblemWithJavaHome = this.validateJavaHome(helpfulMessage).wait();
-			let hasProblemWithJavaVersion: boolean;
-			if(!hasProblemWithJavaHome) {
-				hasProblemWithJavaVersion = this.validateJavacVersion(javacVersion, helpfulMessage);
-			}
-
-			return hasProblemWithJavaHome || hasProblemWithJavaVersion;
-		}).future<boolean>()();
-	}
-
-	private validateJavaHome(helpfulMessage: string): IFuture<boolean> {
-		return ((): boolean => {
-			let hasProblemWithJavaHome = false;
-			let javaHome = process.env.JAVA_HOME;
-
-			if(javaHome) {
-				// validate jarsigner as it does not exist in JRE, but is mandatory for JDK and Android Runtime
-				let jarSigner = path.join(javaHome, "bin", "jarsigner");
-				let childProcessResult = this.$childProcess.spawnFromEvent(jarSigner, [], "close", {}, { throwError: false }).wait();
-				this.$logger.trace(`Result of calling jarsigner from path: ${jarSigner}:`, childProcessResult);
-				if(childProcessResult.stderr || childProcessResult.exitCode !== 0) {
-					hasProblemWithJavaHome = true;
-					this.printMessage("JAVA_HOME environment variable points to incorrect path. Make sure it points to the installation directory of JDK.", helpfulMessage);
+			let matchingVersion = (installedJavaVersion || "").match(AndroidToolsInfo.VERSION_REGEX);
+			if(matchingVersion && matchingVersion[1]) {
+				if(semver.lt(matchingVersion[1], AndroidToolsInfo.MIN_JAVA_VERSION)) {
+					hasProblemWithJavaVersion = true;
+					this.printMessage(`Javac version ${installedJavaVersion} is not supported. You have to install at least ${AndroidToolsInfo.MIN_JAVA_VERSION}.`, additionalMessage);
 				}
 			} else {
-				hasProblemWithJavaHome = true;
-				this.printMessage("JAVA_HOME environment variable is not set.", helpfulMessage);
-			}
-
-			return hasProblemWithJavaHome;
-		}).future<boolean>()();
-	}
-
-	private validateJavacVersion(installedJavaVersion: string, helpfulMessage: string): boolean {
-		let hasProblemWithJavaVersion = false;
-		let matchingVersion = (installedJavaVersion || "").match(AndroidToolsInfo.VERSION_REGEX);
-		if(matchingVersion && matchingVersion[1]) {
-			if(semver.lt(matchingVersion[1], AndroidToolsInfo.MIN_JAVA_VERSION)) {
 				hasProblemWithJavaVersion = true;
-				this.printMessage(`Javac version ${installedJavaVersion} is not supported. You have to install at least ${AndroidToolsInfo.MIN_JAVA_VERSION}.`, helpfulMessage);
+				this.printMessage("Error executing command 'javac'. Make sure you have installed The Java Development Kit (JDK) and set JAVA_HOME environment variable.", additionalMessage);
 			}
-		} else {
-			hasProblemWithJavaVersion = true;
-			this.printMessage("Error executing command 'javac'. Make sure you have installed The Java Development Kit (JDK) and set JAVA_HOME environment variable.", helpfulMessage);
-		}
 
-		return hasProblemWithJavaVersion;
+			return hasProblemWithJavaVersion;
+		}).future<boolean>()();
 	}
 
 	public getPathToAdbFromAndroidHome(): IFuture<string> {
diff --git a/lib/commands/plugin/remove-plugin.ts b/lib/commands/plugin/remove-plugin.ts
@@ -3,7 +3,9 @@
 
 export class RemovePluginCommand implements ICommand {
 	constructor(private $pluginsService: IPluginsService,
-		private $errors: IErrors) { }
+		private $errors: IErrors,
+		private $logger: ILogger,
+		private $projectData: IProjectData) { }
 
 	execute(args: string[]): IFuture<void> {
 		return this.$pluginsService.remove(args[0]);
@@ -15,9 +17,18 @@ export class RemovePluginCommand implements ICommand {
 				this.$errors.fail("You must specify plugin name.");
 			}
 
-			let installedPlugins = this.$pluginsService.getAllInstalledPlugins().wait();
+			let pluginNames: string[] = [];
+			try {
+				// try installing the plugins, so we can get information from node_modules about their native code, libs, etc.
+				let installedPlugins = this.$pluginsService.getAllInstalledPlugins().wait();
+				pluginNames = installedPlugins.map(pl => pl.name);
+			} catch(err) {
+				this.$logger.trace("Error while installing plugins. Error is:", err);
+				pluginNames =  _.keys(this.$projectData.dependencies);
+			}
+
 			let pluginName = args[0].toLowerCase();
-			if(!_.any(installedPlugins, (plugin: IPluginData) => plugin.name.toLowerCase() === pluginName)) {
+			if(!_.any(pluginNames, name => name.toLowerCase() === pluginName)) {
 				this.$errors.failWithoutHelp(`Plugin "${pluginName}" is not installed.`);
 			}
 
diff --git a/lib/common b/lib/common
@@ -1 +1 @@
-Subproject commit b2db250d44cd0b095151153717debbd425f39615
+Subproject commit 76e1c9c362e5d1f0f2d05cb2b301a766e852b900
diff --git a/lib/config.ts b/lib/config.ts
@@ -27,6 +27,7 @@ export class StaticConfig extends StaticConfigBase implements IStaticConfig {
 	public CLIENT_NAME = "tns";
 	public CLIENT_NAME_ALIAS = "NativeScript";
 	public ANALYTICS_API_KEY = "5752dabccfc54c4ab82aea9626b7338e";
+	public ANALYTICS_FEATURE_USAGE_TRACKING_API_KEY = "9912cff308334c6d9ad9c33f76a983e3";
 	public TRACK_FEATURE_USAGE_SETTING_NAME = "TrackFeatureUsage";
 	public ERROR_REPORT_SETTING_NAME = "TrackExceptions";
 	public ANALYTICS_INSTALLATION_ID_SETTING_NAME = "AnalyticsInstallationID";
diff --git a/lib/declarations.ts b/lib/declarations.ts
@@ -161,12 +161,12 @@ interface IAndroidToolsInfo {
 	validateInfo(options?: {showWarningsAsErrors: boolean, validateTargetSdk: boolean}): IFuture<boolean>;
 
 	/**
-	 * Validates the information about required JAVA version and JAVA_HOME.
-	 * @param {string} javacVersion The JAVA version that will be checked.
+	 * Validates the information about required JAVA version.
+	 * @param {string} installedJavaVersion The JAVA version that will be checked.
 	 * @param {any} options Defines if the warning messages should treated as error.
 	 * @return {boolean} True if there are detected issues, false otherwise.
 	 */
-	validateJava(javacVersion: string, options?: {showWarningsAsErrors: boolean}): IFuture<boolean>;
+	validateJavacVersion(installedJavaVersion: string, options?: {showWarningsAsErrors: boolean}): IFuture<boolean>;
 
 	/**
 	 * Returns the path to `android` executable. It should be `$ANDROID_HOME/tools/android`.
diff --git a/lib/definitions/plugins.d.ts b/lib/definitions/plugins.d.ts
@@ -36,10 +36,10 @@ interface IPluginVariablesService {
 	savePluginVariablesInProjectFile(pluginData: IPluginData): IFuture<void>;
 	/**
 	 * Removes plugin variables from project package.json file.
-	 * @param  {IPluginData}		pluginData for the plugin.
+	 * @param  {string}		pluginName Name of the plugin.
 	 * @return {IFuture<void>}
 	 */
-	removePluginVariablesFromProjectFile(pluginData: IPluginData): IFuture<void>;
+	removePluginVariablesFromProjectFile(pluginName: string): IFuture<void>;
 	/**
 	 * Replaces all plugin variables with their corresponding values.
 	 * @param {IPluginData}		pluginData for the plugin.
@@ -59,10 +59,10 @@ interface IPluginVariablesService {
 	interpolate(pluginData: IPluginData, pluginConfigurationFilePath: string): IFuture<void>;
 	/**
 	 * Returns the
-	 * @param {IPluginData}		pluginData for the plugin.
+	 * @param {string}		pluginName for the plugin.
 	 * @return {IFuture<string>}		returns the changed plugin configuration file content.
 	 */
-	getPluginVariablePropertyName(pluginData: IPluginData): string;
+	getPluginVariablePropertyName(pluginName: string): string;
 
 }
 
diff --git a/lib/nativescript-cli.ts b/lib/nativescript-cli.ts
@@ -9,7 +9,6 @@ import * as fiber from "fibers";
 import Future = require("fibers/future");
 import * as shelljs from "shelljs";
 shelljs.config.silent = true;
-shelljs.config.fatal = true;
 import {installUncaughtExceptionListener} from "./common/errors";
 installUncaughtExceptionListener(process.exit);
 
diff --git a/lib/services/android-project-service.ts b/lib/services/android-project-service.ts
@@ -88,7 +88,7 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
 
 			// this call will fail in case `android` is not set correctly.
 			this.$androidToolsInfo.getPathToAndroidExecutable({showWarningsAsErrors: true}).wait();
-			this.$androidToolsInfo.validateJava(this.$sysInfo.getSysInfo(path.join(__dirname, "..", "..", "package.json")).wait().javacVersion, {showWarningsAsErrors: true}).wait();
+			this.$androidToolsInfo.validateJavacVersion(this.$sysInfo.getSysInfo(path.join(__dirname, "..", "..", "package.json")).wait().javacVersion, {showWarningsAsErrors: true}).wait();
 		}).future<void>()();
 	}
 
diff --git a/lib/services/doctor-service.ts b/lib/services/doctor-service.ts
@@ -8,7 +8,8 @@ let clui = require("clui");
 class DoctorService implements IDoctorService {
 	private static MIN_SUPPORTED_POD_VERSION = "0.38.2";
 
-	constructor(private $androidToolsInfo: IAndroidToolsInfo,
+	constructor(private $analyticsService: IAnalyticsService,
+		private $androidToolsInfo: IAndroidToolsInfo,
 		private $hostInfo: IHostInfo,
 		private $logger: ILogger,
 		private $progressIndicator: IProgressIndicator,
@@ -18,7 +19,7 @@ class DoctorService implements IDoctorService {
 		private $npm: INodePackageManager,
 		private $fs: IFileSystem) {	}
 
-	public printWarnings(): boolean {
+	public printWarnings(configOptions?: { trackResult: boolean }): boolean {
 		let result = false;
 		let sysInfo = this.$sysInfo.getSysInfo(path.join(__dirname, "..", "..", "package.json")).wait();
 
@@ -87,8 +88,14 @@ class DoctorService implements IDoctorService {
 		}
 
 		let androidToolsIssues = this.$androidToolsInfo.validateInfo().wait();
-		let javaVersionIssue = this.$androidToolsInfo.validateJava(sysInfo.javacVersion).wait();
-		return result || androidToolsIssues || javaVersionIssue;
+		let javaVersionIssue = this.$androidToolsInfo.validateJavacVersion(sysInfo.javacVersion).wait();
+		let doctorResult = result || androidToolsIssues || javaVersionIssue;
+
+		if(!configOptions || configOptions.trackResult) {
+			this.$analyticsService.track("DoctorEnvironmentSetup", doctorResult ? "incorrect" : "correct").wait();
+		}
+
+		return doctorResult;
 	}
 
 	private printPackageManagerTip() {
diff --git a/lib/services/plugin-variables-service.ts b/lib/services/plugin-variables-service.ts
@@ -13,8 +13,8 @@ export class PluginVariablesService implements IPluginVariablesService {
 		private $prompter: IPrompter,
 		private $fs: IFileSystem) { }
 
-	public getPluginVariablePropertyName(pluginData: IPluginData): string {
-		return `${pluginData.name}-${PluginVariablesService.PLUGIN_VARIABLES_KEY}`;
+	public getPluginVariablePropertyName(pluginName: string): string {
+		return `${pluginName}-${PluginVariablesService.PLUGIN_VARIABLES_KEY}`;
 	}
 
 	public savePluginVariablesInProjectFile(pluginData: IPluginData): IFuture<void> {
@@ -29,14 +29,14 @@ export class PluginVariablesService implements IPluginVariablesService {
 
 			if(!_.isEmpty(values)) {
 				this.$projectDataService.initialize(this.$projectData.projectDir);
-				this.$projectDataService.setValue(this.getPluginVariablePropertyName(pluginData), values).wait();
+				this.$projectDataService.setValue(this.getPluginVariablePropertyName(pluginData.name), values).wait();
 			}
 		}).future<void>()();
 	}
 
-	public removePluginVariablesFromProjectFile(pluginData: IPluginData): IFuture<void> {
+	public removePluginVariablesFromProjectFile(pluginName: string): IFuture<void> {
 		this.$projectDataService.initialize(this.$projectData.projectDir);
-		return this.$projectDataService.removeProperty(this.getPluginVariablePropertyName(pluginData));
+		return this.$projectDataService.removeProperty(this.getPluginVariablePropertyName(pluginName));
 	}
 
 	public interpolatePluginVariables(pluginData: IPluginData, pluginConfigurationFilePath: string): IFuture<void> {
@@ -115,7 +115,7 @@ export class PluginVariablesService implements IPluginVariablesService {
 			variableData.name = pluginVariableName;
 
 			this.$projectDataService.initialize(this.$projectData.projectDir);
-			let pluginVariableValues = this.$projectDataService.getValue(this.getPluginVariablePropertyName(pluginData)).wait();
+			let pluginVariableValues = this.$projectDataService.getValue(this.getPluginVariablePropertyName(pluginData.name)).wait();
 			variableData.value = pluginVariableValues ? pluginVariableValues[pluginVariableName] : undefined;
 
 			return variableData;
diff --git a/lib/services/plugins-service.ts b/lib/services/plugins-service.ts
@@ -47,7 +47,7 @@ export class PluginsService implements IPluginsService {
 				} catch(err) {
 					// Revert package.json
 					this.$projectDataService.initialize(this.$projectData.projectDir);
-					this.$projectDataService.removeProperty(this.$pluginVariablesService.getPluginVariablePropertyName(pluginData)).wait();
+					this.$projectDataService.removeProperty(this.$pluginVariablesService.getPluginVariablePropertyName(pluginData.name)).wait();
 					this.$projectDataService.removeDependency(pluginData.name).wait();
 
 					throw err;
@@ -68,12 +68,10 @@ export class PluginsService implements IPluginsService {
 					let pluginData = this.convertToPluginData(this.getNodeModuleData(pluginName).wait());
 
 					platformData.platformProjectService.removePluginNativeCode(pluginData).wait();
-
-					if(pluginData.pluginVariables) {
-						this.$pluginVariablesService.removePluginVariablesFromProjectFile(pluginData).wait();
-					}
 				}).future<void>()();
 			};
+
+			this.$pluginVariablesService.removePluginVariablesFromProjectFile(pluginName.toLowerCase()).wait();
 			this.executeForAllInstalledPlatforms(removePluginNativeCodeAction).wait();
 
 			this.executeNpmCommand(PluginsService.UNINSTALL_COMMAND_NAME, pluginName).wait();
@@ -224,6 +222,10 @@ export class PluginsService implements IPluginsService {
 				result = this.$npm.install(npmCommandArguments, this.$projectData.projectDir, PluginsService.NPM_CONFIG).wait();
 			} else if(npmCommandName === PluginsService.UNINSTALL_COMMAND_NAME) {
 				result = this.$npm.uninstall(npmCommandArguments, PluginsService.NPM_CONFIG, this.$projectData.projectDir).wait();
+				if(!result || !result.length) {
+					// indicates something's wrong with the data in package.json, for example version of the plugin that we are trying to remove is invalid.
+					return npmCommandArguments.toLowerCase();
+				}
 			}
 
 			return this.parseNpmCommandResult(result);

Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject`
`88`	`88`
`89`	`89`	// this call will fail in case `android` is not set correctly.
`90`	`90`	`this.$androidToolsInfo.getPathToAndroidExecutable({showWarningsAsErrors: true}).wait();`
`91`		`- this.$androidToolsInfo.validateJava(this.$sysInfo.getSysInfo(path.join(__dirname, "..", "..", "package.json")).wait().javacVersion, {showWarningsAsErrors: true}).wait();`
	`91`	`+ this.$androidToolsInfo.validateJavacVersion(this.$sysInfo.getSysInfo(path.join(__dirname, "..", "..", "package.json")).wait().javacVersion, {showWarningsAsErrors: true}).wait();`
`92`	`92`	`}).future<void>()();`
`93`	`93`	`}`
`94`	`94`