Merge pull request #306 from telerik/fatme/ns-release-1.0.0

TNS release 1.0.0

Author: Fatme

commands/post-install.ts

@@ -13,7 +13,6 @@ export class PostInstallCommand implements ICommand {
 
 	constructor(private $fs: IFileSystem,
 		private $staticConfig: Config.IStaticConfig,
-		private $childProcess: IChildProcess,
 		private $commandsService: ICommandsService,
 		private $htmlHelpService: IHtmlHelpService,
 		private $sysInfo: ISysInfo,
@@ -43,8 +42,6 @@ export class PostInstallCommand implements ICommand {
 				this.printAppBuilderWarnings(sysInfo);
 			}
 
-			this.checkSevenZip().wait();
-
 			this.$commandsService.tryExecuteCommand("autocomplete", []).wait();
 		}).future<void>()();
 	}
@@ -139,10 +136,5 @@ export class PostInstallCommand implements ICommand {
 			+ "or http://docs.oracle.com/javase/7/docs/webnotes/install/ (for JDK 7)." + os.EOL);
 		}
 	}
-
-	private checkSevenZip(): IFuture<void> {
-		var sevenZipErrorMessage = util.format(PostInstallCommand.SEVEN_ZIP_ERROR_MESSAGE, this.$staticConfig.SYS_REQUIREMENTS_LINK);
-		return this.$childProcess.tryExecuteApplication(this.$staticConfig.sevenZipFilePath, ["-h"], "exit", sevenZipErrorMessage);
-	}
 }
 $injector.registerCommand("dev-post-install", PostInstallCommand);

commands/preuninstall.ts

@@ -21,7 +21,7 @@ export class PreUninstallCommand implements ICommand {
 			var adbPath = path.join(__dirname, relativeAdbPath);
 
 			var killAdbServerCommand = util.format("\"%s\" kill-server", adbPath);
-			this.$logger.warn("Trying to kill adb server. Some running andorid related operations may fail.");
+			this.$logger.warn("Trying to kill adb server. Some running Android related operations may fail.");
 
 			try {
 				this.$childProcess.exec(killAdbServerCommand).wait();

declarations.d.ts

@@ -183,8 +183,6 @@ interface IDictionary<T> {
 	[key: string]: T
 }
 
-interface IStringDictionary extends IDictionary<string> { }
-
 interface IAnalyticsService {
 	checkConsent(featureName: string): IFuture<void>;
 	trackFeature(featureName: string): IFuture<void>;
@@ -198,6 +196,8 @@ interface IAnalyticsService {
 interface IPrompter extends IDisposable {
 	get(schema: IPromptSchema[]): IFuture<any>;
 	getPassword(prompt: string, options?: {allowEmpty?: boolean}): IFuture<string>;
+	getString(prompt: string): IFuture<string>;
+	promptForChoice(promptMessage: string, choices: any[]): IFuture<string>;
 	confirm(prompt: string, defaultAction?: () => boolean): IFuture<boolean>;
 }
 

definitions/commands-service.d.ts

@@ -1,11 +1,12 @@
 interface ICommandsService {
-	allCommands(includeDev: boolean): string[];
+	allCommands(opts: {includeDevCommands: boolean}): string[];
 	tryExecuteCommand(commandName: string, commandArguments: string[]): IFuture<void>;
 	executeCommandUnchecked(commandName: string, commandArguments: string[]): IFuture<boolean>;
 	completeCommand(): IFuture<boolean>;
 }
 
 interface ICommandsServiceProvider {
+	dynamicCommandsPrefix: string;
 	getDynamicCommands(): IFuture<string[]>;
 	generateDynamicCommands(): IFuture<void>;
 	registerDynamicSubCommands(): void;

definitions/commands.d.ts

@@ -22,6 +22,7 @@ interface ICommandArgument { }
 
 interface ICommandParameter {
 	mandatory: boolean;
+	errorMessage?: string
 	validate(value: string, errorMessage?: string): IFuture<boolean>;
 }
 

definitions/config.d.ts

@@ -11,7 +11,6 @@ declare module Config {
 		version: string;
 		helpTextPath: string;
 		adbFilePath: string;
-		sevenZipFilePath: string;
 		disableAnalytics?: boolean;
 		disableHooks?: boolean;
 		enableDeviceRunCommandOnWindows?: boolean;

definitions/logger.d.ts

@@ -1,14 +1,14 @@
 interface ILogger {
 	setLevel(level: string): void;
 	getLevel(): string;
-	fatal(formatStr: any, ...args: string[]): void;
-	error(formatStr: any, ...args: string[]): void;
-	warn(formatStr: any, ...args: string[]): void;
-	info(formatStr: any, ...args: string[]): void;
-	debug(formatStr: any, ...args: string[]): void;
-	trace(formatStr: any, ...args: string[]): void;
+	fatal(formatStr?: any, ...args: string[]): void;
+	error(formatStr?: any, ...args: string[]): void;
+	warn(formatStr?: any, ...args: string[]): void;
+	info(formatStr?: any, ...args: string[]): void;
+	debug(formatStr?: any, ...args: string[]): void;
+	trace(formatStr?: any, ...args: string[]): void;
 
-	out(formatStr: any, ...args: string[]): void;
+	out(formatStr?: any, ...args: string[]): void;
 	write(...args: string[]): void;
 
 	prepare(item: any): string;

definitions/minimatch.d.ts

@@ -0,0 +1,45 @@
+///<reference path="./node.d.ts"/>
+
+declare module minimatch {
+	export interface Options {
+		debug?: boolean;
+		nobrace?: boolean;
+		noglobstar?: boolean;
+		dot?: boolean;
+		noext?: boolean;
+		nonull?: boolean;
+		nocase?: boolean;
+		matchBase?: boolean;
+		nocomment?: boolean;
+		nonegate?: boolean;
+		flipNegate?: boolean;
+	}
+
+	export interface Minimatch {
+		constructor(pattern: string, options: Options): Minimatch;
+		pattern: string;
+		options: Options;
+		regexp: RegExp;
+		set: any[][];
+		negate: boolean;
+		comment: boolean;
+		empty: boolean;
+		makeRe(): RegExp;
+		match(path: string): boolean;
+	}
+
+	export interface IMinimatch {
+		(path: string, pattern: string, options?: Options): boolean;
+		filter(pattern: string, options?: Options): (path: string) => boolean;
+		match(fileList: string[], pattern: string, options?: Options): string[];
+		makeRe(pattern: string, options?: Options): RegExp;
+
+		Minimatch: minimatch.Minimatch;
+	}
+}
+
+declare var minimatch: minimatch.IMinimatch;
+
+declare module "minimatch" {
+	export = minimatch;
+}

definitions/mobile.d.ts

@@ -165,7 +165,6 @@ declare module Mobile {
 	}
 
 	interface IHouseArrestClient {
-		getAfcClientForAppDocuments(applicationIdentifier: string): Mobile.IAfcClient;
 		getAfcClientForAppContainer(applicationIdentifier: string): Mobile.IAfcClient;
 		closeSocket(): void;
 	}

definitions/options-service.d.ts

@@ -186,6 +186,7 @@ ul {
 }
 
 ol {
+	margin: 10px 10px 10px 20px;
 	list-style-type: decimal;
 }
 

docs/helpers/styles.css

@@ -6,6 +6,7 @@ import Future = require("fibers/future");
 import path = require("path");
 import util = require("util");
 import rimraf = require("rimraf");
+import minimatch = require("minimatch");
 import hostInfo = require("./host-info");
 
 export class FileSystem implements IFileSystem {
@@ -55,20 +56,38 @@ export class FileSystem implements IFileSystem {
 		return (() => {
 			var shouldOverwriteFiles = !(options && options.overwriteExisitingFiles === false);
 			var isCaseSensitive = !(options && options.caseSensitive === false);
-			
-			//the wild card symbol at the end is required in order for the -ssc- switch of 7zip to behave properly
-			zipFile = isCaseSensitive ? zipFile : zipFile + '*';
 
 			this.createDirectory(destinationDir).wait();
-			var args =  <string[]>(_.flatten(['x', shouldOverwriteFiles ? "-y" : "-aos", '-o' + destinationDir, isCaseSensitive ? '-ssc' : '-ssc-', zipFile, fileFilters || []]));
 
-			var $childProcess = this.$injector.resolve("childProcess");
-			var $staticConfig = this.$injector.resolve("staticConfig");
+			var proc: string;
+			if (hostInfo.isWindows()) {
+				proc = path.join(__dirname, "resources/platform-tools/unzip/win32/unzip");
+			} else if (hostInfo.isDarwin()) {
+				proc = "unzip"; // darwin unzip is info-zip
+			} else if (hostInfo.isLinux()) {
+				proc = "unzip"; // linux unzip is info-zip
+			}
+
+			if (!isCaseSensitive) {
+				zipFile = this.findFileCaseInsensitive(zipFile);
+			}
+
+			var args =  <string[]>(_.flatten(['-b', shouldOverwriteFiles ? "-o" : "-n", isCaseSensitive ? [] : '-C', zipFile, fileFilters || [], '-d', destinationDir]));
 
-			$childProcess.spawnFromEvent($staticConfig.sevenZipFilePath, args, "close", { stdio: "ignore", detached: true }).wait();
+			var $childProcess = this.$injector.resolve("childProcess");
+			$childProcess.spawnFromEvent(proc, args, "close", { stdio: "ignore", detached: true }).wait();
 		}).future<void>()();
 	}
 
+	private findFileCaseInsensitive(file: string): string {
+		var dir = path.dirname(file);
+		var basename = path.basename(file);
+		var entries = this.readDirectory(dir).wait();
+		var match = minimatch.match(entries, basename, {nocase:true, nonegate: true, nonull: true})[0];
+		var result = path.join(dir, match);
+		return result;
+	}
+
 	public exists(path: string): IFuture<boolean> {
 		var future = new Future<boolean>();
 		fs.exists(path, (exists: boolean) => future.return(exists));

file-system.ts

@@ -140,3 +140,13 @@ export function createTable(headers: string[], data: string[][]): any {
 	_.forEach(data, row => table.push(row));
 	return table;
 }
+
+export function remove<T>(array: T[], predicate: (element: T) => boolean, numberOfElements?: number): T[] {
+	numberOfElements = numberOfElements || 1;
+	var index = _.findIndex(array, predicate);
+	if (index === -1) {
+		return new Array<T>();
+	}
+
+    return <T[]>array.splice(index, numberOfElements);
+}

helpers.ts

@@ -378,8 +378,8 @@ export class IOSDevice implements Mobile.IIOSDevice {
 		return(() => {
 			//TODO: CloseSocket must be part of afcClient. Refactor it.
 			var houseArrestClient: Mobile.IHouseArrestClient = this.$injector.resolve(iOSProxyServices.HouseArrestClient, {device: this});
-			var afcClientForAppDocuments = houseArrestClient.getAfcClientForAppDocuments(appIdentifier.appIdentifier);
-			afcClientForAppDocuments.transferCollection(localToDevicePaths).wait();
+			var afcClientForContainer = houseArrestClient.getAfcClientForAppContainer(appIdentifier.appIdentifier);
+			afcClientForContainer.transferCollection(localToDevicePaths).wait();
 			houseArrestClient.closeSocket();
 
 			if (!options.skipRefresh) {

mobile/ios/ios-device.ts

@@ -349,9 +349,13 @@ export class NotificationProxyClient implements Mobile.INotificationProxyClient
 
 export class HouseArrestClient implements Mobile.IHouseArrestClient {
 	private plistService: Mobile.IiOSDeviceSocket = null;
+	private static PREDEFINED_ERRORS: IStringDictionary = {
+		ApplicationLookupFailed: "Unable to find the application on a connected device. Ensure that the application is installed and try again."
+	}
 
 	constructor(private device: Mobile.IIOSDevice,
-		private $injector: IInjector) {
+		private $injector: IInjector,
+		private $errors: IErrors) {
 	}
 
 	private getAfcClientCore(command: string, applicationIdentifier: string): Mobile.IAfcClient {
@@ -363,15 +367,14 @@ export class HouseArrestClient implements Mobile.IHouseArrestClient {
 			"Identifier": applicationIdentifier
 		});
 
-		this.plistService.receiveMessage().wait();
+		var response = this.plistService.receiveMessage().wait();
+		if(response.Error) {
+			this.$errors.failWithoutHelp(HouseArrestClient.PREDEFINED_ERRORS[response.Error] || response.Error);
+		}
 
 		return this.$injector.resolve(AfcClient, {service: service});
 	}
 
-	public getAfcClientForAppDocuments(applicationIdentifier: string): Mobile.IAfcClient {
-		return this.getAfcClientCore("VendDocuments", applicationIdentifier);
-	}
-
 	public getAfcClientForAppContainer(applicationIdentifier: string): Mobile.IAfcClient {
 		return this.getAfcClientCore("VendContainer", applicationIdentifier);
 	}

mobile/ios/ios-proxy-services.ts

@@ -32,11 +32,15 @@ class Wp8EmulatorServices implements Mobile.IEmulatorPlatformServices {
 	startEmulator(app: string, emulatorOptions?: Mobile.IEmulatorOptions) : IFuture<void> {
 		return (() => {
 			this.$logger.info("Starting Windows Phone Emulator");
-			var emulatorStarter = path.join(process.env.ProgramFiles, Wp8EmulatorServices.WP8_LAUNCHER_PATH, Wp8EmulatorServices.WP8_LAUNCHER);
-			this.$childProcess.spawn(emulatorStarter, ["/installlaunch", app, "/targetdevice:xd"], { stdio:  ["ignore", "ignore", "ignore"], detached: true }).unref();
+			var emulatorStarter = path.join(Wp8EmulatorServices.programFilesPath, Wp8EmulatorServices.WP8_LAUNCHER_PATH, Wp8EmulatorServices.WP8_LAUNCHER);
+			this.$childProcess.spawn(emulatorStarter, ["/installlaunch", app, "/targetdevice:xd"], { stdio:  "ignore", detached: true }).unref();
 		}).future<void>()();
 	}
 
+	private static get programFilesPath(): string {
+		return (process.arch === "x64") ? process.env["PROGRAMFILES(X86)"] : process.env.ProgramFiles;
+	}
+
 	private static WP8_LAUNCHER = "XapDeployCmd.exe";
 	private static WP8_LAUNCHER_PATH = "Microsoft SDKs\\Windows Phone\\v8.0\\Tools\\XAP Deployment";
 }

mobile/wp8/wp8-emulator-services.ts

@@ -68,6 +68,33 @@ export class Prompter implements IPrompter {
 		}).future<string>()();
 	}
 
+	public getString(prompt: string): IFuture<string> {
+		return (() => {
+			var schema: IPromptSchema = {
+				message: prompt,
+				type: "input",
+				name: "inputString"
+			};
+
+			var result = this.get([schema]).wait();
+			return result.inputString;
+		}).future<string>()();
+	}
+
+	public promptForChoice(promptMessage: string, choices: any[]): IFuture<string> {
+		return (() => {
+			var schema: IPromptSchema = {
+				message: promptMessage,
+				type: "list",
+				name: "userAnswer",
+				choices: choices
+			};
+
+			var result = this.get([schema]).wait();
+			return result.userAnswer;
+		}).future<string>()();
+	}
+
 	public confirm(prompt: string, defaultAction?: () => boolean): IFuture<boolean> {
 		return ((): boolean => {
 			var schema = {