Merge pull request #756 from NativeScript/fatme/merge-release-1.2.2

Merge release 1.2.2

Author: Fatme

CHANGELOG.md

@@ -1,7 +1,14 @@
 NativeScript CLI Changelog
 ================
 
-1.2.0 (2015, July 22)
+1.2.1 (2015, July 27)
+==
+
+### Fixed
+
+* [Fixed #690](https://github.com/NativeScript/nativescript-cli/issues/690): The `$ tns debug ios --debug-brk` command does not work.
+
+1.2.0 (2015, July 24)
 ==
 
 ### New

LICENSE

@@ -186,7 +186,7 @@ Apache License
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright {yyyy} {name of copyright owner}
+   Copyright (c) 2015 Telerik AD
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

docs/man_pages/project/testing/debug-android.md

@@ -23,6 +23,7 @@ Debugs your project on a connected device, in a native emulator or in Genymotion
 * `--stop` - Detaches the debug tools.
 * `--get-port` - Retrieves the port on which you are debugging your application.
 * `--debug-port` - Sets a new port on which to attach the debug tools.
+* `--timeout` - Sets the number of seconds that NativeScript CLI will wait for the debugger to boot. If not set, the default timeout is 90 seconds.
 
 ### Attributes
 * `<Device ID>` is the index or name of the target device as listed by `$ tns device` 

docs/man_pages/project/testing/debug-ios.md

@@ -20,6 +20,7 @@ Debugs your project on a connected device or in the iOS Simulator. <% if(isHtml)
 * `--start` - Attaches the debug tools to a deployed and running app and launches the developer tools of your Safari browser.
 * `--emulator` - Indicates that you want to debug your app in the iOS simulator.
 * `--no-client` - If set, the NativeScript CLI attaches the debug tools but does not launch the developer tools in Safari.
+* `--timeout` - Sets the number of seconds that NativeScript CLI will wait for the debugger to boot. If not set, the default timeout is 90 seconds.
 
 ### Attributes
 * `<Device ID>` is the index or name of the target device as listed by `$ tns device`

docs/man_pages/project/testing/livesync-ios.md

@@ -3,13 +3,14 @@ livesync ios
 
 Usage | Synopsis
 ------|-------
-General | `$ tns livesync ios [--device <Device ID>] [--watch]`
+General | `$ tns livesync ios [--device <Device ID>] [--watch] [--emulator]`
 
-Synchronizes the latest changes in your project to iOS devices. 
+Synchronizes the latest changes in your project to iOS devices or iOS simulator. 
 
 ### Options
 * `--watch` - If set, when you save changes to the project, changes are automatically synchronized to the connected device.
 * `--device` - Specifies the serial number or the index of the connected device to which you want to synchronize changes. To list all connected devices, grouped by platform, run `$ tns device`
+* `--emulator` - If set, changes are synchronized to iOS simulator.
 
 ### Attributes
 * `<Device ID>` is the device index or identifier as listed by `$ tns device`

lib/common

@@ -28,6 +28,7 @@ export class StaticConfig extends staticConfigBaseLibPath.StaticConfigBase imple
 	public CLIENT_NAME_ALIAS = "NativeScript";
 	public ANALYTICS_API_KEY = "5752dabccfc54c4ab82aea9626b7338e";
 	public TRACK_FEATURE_USAGE_SETTING_NAME = "TrackFeatureUsage";
+	public ERROR_REPORT_SETTING_NAME = "TrackExceptions";
 	public ANALYTICS_INSTALLATION_ID_SETTING_NAME = "AnalyticsInstallationID";
 	public START_PACKAGE_ACTIVITY_NAME = "com.tns.NativeScriptActivity";
 

lib/config.ts

@@ -15,6 +15,7 @@ interface INpmInstallationManager {
 	install(packageName: string, options?: INpmInstallOptions): IFuture<string>;
 	getLatestVersion(packageName: string): IFuture<string>;
 	getCachedPackagePath(packageName: string, version: string): string;
+	addCleanCopyToCache(packageName: string, version: string): IFuture<void>;
 }
 
 interface INpmInstallOptions {
@@ -56,6 +57,7 @@ interface IUsbLiveSyncService {
 
 interface IPlatformSpecificUsbLiveSyncService {
 	restartApplication(deviceAppData: Mobile.IDeviceAppData, localToDevicePaths?: Mobile.ILocalToDevicePathData[]): IFuture<void>;
+	beforeLiveSyncAction?(deviceAppData: Mobile.IDeviceAppData): IFuture<void>;
 }
 
 interface IOptions extends ICommonOptions {

lib/declarations.ts

@@ -6,7 +6,7 @@ import semver = require("semver");
 import npm = require("npm");
 import constants = require("./constants");
 
-export class NpmInstallationManager {
+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[]>;	
 
@@ -27,13 +27,18 @@ export class NpmInstallationManager {
 	public getCachedPackagePath(packageName: string, version: string): string {
 		return path.join(this.getCacheRootPath(), packageName, version, "package");
 	}
-	
+
 	public addToCache(packageName: string, version: string): IFuture<void> {
 		return (() => {
-			this.$npm.cache(packageName, version).wait();
-			let packagePath = path.join(this.getCacheRootPath(), packageName, version, "package");
-			if(!this.isPackageUnpacked(packagePath).wait()) {
-				this.cacheUnpack(packageName, version).wait();
+			let cachedPackagePath = this.getCachedPackagePath(packageName, version);
+			if(!this.$fs.exists(cachedPackagePath).wait()) {
+				this.addToCacheCore(packageName, version).wait();
+			}
+
+			if(!this.isShasumOfPackageCorrect(packageName, version).wait()) {
+				// In some cases the package is not fully downloaded and the framework directory is missing
+				// Try removing the old package and add the real one to cache again
+				this.addCleanCopyToCache(packageName, version).wait();
 			}
 		}).future<void>()();
 	}
@@ -73,6 +78,43 @@ export class NpmInstallationManager {
 		}).future<string>()();
 	}
 
+	public addCleanCopyToCache(packageName: string, version: string): IFuture<void> {
+		return (() => {
+			let packagePath = path.join(this.getCacheRootPath(), packageName, version);
+			this.$logger.trace(`Deleting: ${packagePath}.`);
+			this.$fs.deleteDirectory(packagePath).wait();
+			this.addToCacheCore(packageName, version).wait();
+			if(!this.isShasumOfPackageCorrect(packageName, version).wait()) {
+				this.$errors.failWithoutHelp(`Unable to add package ${packageName} with version ${version} to npm cache. Try cleaning your cache and execute the command again.`)
+			}
+		}).future<void>()();
+	}
+
+	private addToCacheCore(packageName: string, version: string): IFuture<void> {
+		return (() => {
+			this.$npm.cache(packageName, version).wait();
+			let packagePath = path.join(this.getCacheRootPath(), packageName, version, "package");
+			if(!this.isPackageUnpacked(packagePath).wait()) {
+				this.cacheUnpack(packageName, version).wait();
+			}
+		}).future<void>()();
+	}
+
+	private isShasumOfPackageCorrect(packageName: string, version: string): IFuture<boolean> {
+		return ((): boolean => {
+			let shasumProperty = "dist.shasum";
+			let cachedPackagePath = this.getCachedPackagePath(packageName, version);
+			let realShasum = this.$npm.view(`${packageName}@${version}`, shasumProperty).wait()[version][shasumProperty];
+			let packageTgz = cachedPackagePath + ".tgz";
+			let currentShasum = "";
+			if(this.$fs.exists(packageTgz).wait()) {
+				currentShasum = this.$fs.getFileShasum(packageTgz).wait();
+			}
+			this.$logger.trace(`Checking shasum of package: ${packageName}@${version}: expected ${realShasum}, actual ${currentShasum}.`);
+			return realShasum === currentShasum;
+		}).future<boolean>()();
+	}
+
 	private installCore(packageName: string, pathToSave: string, version: string): IFuture<string> {
 		return (() => {
 			if (this.$options.frameworkPath) {
@@ -116,7 +158,8 @@ export class NpmInstallationManager {
 	private isPackageUnpacked(packagePath: string): IFuture<boolean> {
 		return (() => {
 			return this.$fs.getFsStats(packagePath).wait().isDirectory() &&
-				this.$fs.enumerateFilesInDirectorySync(packagePath).length > 1;
+				this.$fs.exists(path.join(packagePath, "framework")).wait() && 
+				this.$fs.enumerateFilesInDirectorySync(path.join(packagePath, "framework")).length > 1;
 		}).future<boolean>()();
 	}	
 }

lib/definitions/shelljs.d.ts

@@ -18,7 +18,6 @@ export class Options extends commonOptionsLibPath.OptionsBase {
 			copyFrom: { type: OptionType.String },
 			linkTo: { type: OptionType.String  },
 			release: { type: OptionType.Boolean },
-			emulator: { type: OptionType.Boolean },
 			symlink: { type: OptionType.Boolean },
 			forDevice: { type: OptionType.Boolean },
 			client: { type: OptionType.Boolean, default: true},

lib/npm-installation-manager.ts

@@ -26,7 +26,9 @@ export class AndroidAppIdentifier extends deviceAppDataBaseLib.DeviceAppDataBase
 	}
 
 	public get deviceProjectRootPath(): string {
-		return `/data/local/tmp/12590FAA-5EDD-4B12-856D-F52A0A1599F2/${this.appIdentifier}`;
+		let options: IOptions = $injector.resolve("options");
+		let syncFolderName = options.watch ? "sync" : "fullsync";
+		return `/data/local/tmp/${this.appIdentifier}/${syncFolderName}`;		 
 	}
 
 	public isLiveSyncSupported(device: Mobile.IDevice): IFuture<boolean> {

lib/options.ts

@@ -24,7 +24,9 @@ class AndroidDebugService implements IDebugService {
         private $hostInfo: IHostInfo,
         private $errors: IErrors,
         private $opener: IOpener,
-        private $staticConfig: IStaticConfig) { }
+        private $staticConfig: IStaticConfig,
+        private $utils: IUtils,
+        private $config: IConfiguration) { }
 
 	private get platform() { return "android"; }
 
@@ -53,9 +55,12 @@ class AndroidDebugService implements IDebugService {
 		return (() => {
 			let packageFile = "";
 
-			if (this.$options.debugBrk) {
-				this.$platformService.preparePlatform(this.platform).wait();
+			if(!this.$options.debugBrk && !this.$options.start && !this.$options.getPort && !this.$options.stop) {
+				this.$logger.warn("Neither --debug-brk nor --start option was specified. Defaulting to --debug-brk.");                
+				this.$options.debugBrk = true;
+			}
 
+			if (this.$options.debugBrk && !this.$options.emulator) {
 				let cachedDeviceOption = this.$options.forDevice;
 				this.$options.forDevice = true;
 				this.$platformService.buildPlatform(this.platform).wait();
@@ -85,8 +90,6 @@ class AndroidDebugService implements IDebugService {
                 this.detachDebugger(packageName).wait();
             } else if (this.$options.debugBrk) {
                 this.startAppWithDebugger(packageFile, packageName).wait();
-            } else {
-                this.$logger.info("Should specify at least one option: debug-brk, start, stop, get-port.");
             }
         }).future<void>()();
     }
@@ -129,8 +132,10 @@ class AndroidDebugService implements IDebugService {
 
     private startAppWithDebugger(packageFile: string, packageName: string): IFuture<void> {
         return (() => {
-            this.device.applicationManager.uninstallApplication(packageName).wait();
-            this.device.applicationManager.installApplication(packageFile).wait();
+            if(!this.$options.emulator) {
+                this.device.applicationManager.uninstallApplication(packageName).wait();
+                this.device.applicationManager.installApplication(packageFile).wait();
+            }
 
             let port = this.$options.debugPort;
 
@@ -168,7 +173,7 @@ class AndroidDebugService implements IDebugService {
     }
 
     private openDebuggerClient(url: string): void {
-		let chrome = this.$hostInfo.isDarwin ? "Google\ Chrome" : "chrome";
+		let chrome = this.$hostInfo.isDarwin ? this.$config.ANDROID_DEBUG_UI_MAC : "chrome";
 		let child = this.$opener.open(url, chrome);
 		if(!child) {
 			this.$errors.fail(`Unable to open ${chrome}.`);
@@ -195,8 +200,8 @@ class AndroidDebugService implements IDebugService {
     private startAndGetPort(packageName: string): IFuture<number> {
         return (() => {
             let port = -1;
-			let timeout = 60;
-
+			let timeout = this.$utils.getParsedTimeout(90);       
+             
             let packageDir = util.format(AndroidDebugService.PACKAGE_EXTERNAL_DIR_TEMPLATE, packageName);
             let envDebugInFullpath = packageDir + AndroidDebugService.ENV_DEBUG_IN_FILENAME;
             this.device.adb.executeShellCommand(`rm "${envDebugInFullpath}"`).wait();

lib/providers/device-app-data-provider.ts

@@ -8,6 +8,7 @@ import constants = require("../constants");
 import helpers = require("../common/helpers");
 import fs = require("fs");
 import os = require("os");
+import semver = require("semver");
 
 import androidProjectPropertiesManagerLib = require("./android-project-properties-manager");
 import projectServiceBaseLib = require("./platform-project-service-base");
@@ -21,7 +22,7 @@ class AndroidProjectService extends projectServiceBaseLib.PlatformProjectService
 	private static VALUES_VERSION_DIRNAME_PREFIX = AndroidProjectService.VALUES_DIRNAME + "-v";
 	private static ANDROID_PLATFORM_NAME = "android";
 	private static LIBS_FOLDER_NAME = "libs";
-	
+	private static MIN_JAVA_VERSION = "1.7.0";	
 
 	private targetApi: string;
 	private _androidProjectPropertiesManagers: IDictionary<IAndroidProjectPropertiesManager>;
@@ -35,6 +36,7 @@ class AndroidProjectService extends projectServiceBaseLib.PlatformProjectService
 		private $options: IOptions,
 		private $projectData: IProjectData,
 		private $propertiesParser: IPropertiesParser,
+		private $sysInfo: ISysInfo,
 		$fs: IFileSystem) {
 			super($fs);
 			this._androidProjectPropertiesManagers = Object.create(null);
@@ -73,7 +75,7 @@ class AndroidProjectService extends projectServiceBaseLib.PlatformProjectService
 			this.validatePackageName(this.$projectData.projectId);
 			this.validateProjectName(this.$projectData.projectName);
 
-			this.checkAnt().wait() && this.checkAndroid().wait();
+			this.checkJava().wait() && this.checkAnt().wait() && this.checkAndroid().wait();
 		}).future<void>()();
 	}
 
@@ -478,6 +480,19 @@ class AndroidProjectService extends projectServiceBaseLib.PlatformProjectService
 			return this.targetApi;
 		}).future<string>()();
 	}
+	
+	private checkJava(): IFuture<void> {
+		return (() => {
+			try {
+				let javaVersion = this.$sysInfo.getSysInfo().javaVer;
+				if(semver.lt(javaVersion, AndroidProjectService.MIN_JAVA_VERSION)) {
+					this.$errors.failWithoutHelp(`Your current java version is ${javaVersion}. NativeScript CLI needs at least ${AndroidProjectService.MIN_JAVA_VERSION} version to work correctly. Ensure that you have at least ${AndroidProjectService.MIN_JAVA_VERSION} java version installed and try again.`);
+				}
+			} catch(error) {
+				this.$errors.failWithoutHelp("Error executing command 'java'. Make sure you have java installed and added to your PATH.");
+			}
+		}).future<void>()();
+	}
 
 	private checkAnt(): IFuture<void> {
 		return (() => {