Merge pull request #313 from telerik/vladimirov/merge-appBuilder-release

Merge release-appbuilder branch after 2.9.0

Author: rosen-vladimirov

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

@@ -231,7 +231,7 @@ interface IHook {
 }
 
 interface ITypeScriptCompilationService {
-	initialize(typeScriptFiles: string[]): void;
+	initialize(typeScriptFiles: string[], definitionFiles?: string[]): void;
 	compileAllFiles(): IFuture<void>;
 }
 

definitions/commands-service.d.ts

@@ -1,5 +1,5 @@
 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>;

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

@@ -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

@@ -57,8 +57,11 @@ export class AutoCompletionService implements IAutoCompletionService {
 
 	public removeObsoleteAutoCompletion(): IFuture<void> {
 		return (() => {
-			// in previous releases we were writing directly in .bash_profile, .bashrc and .zshrc - remove this old code
-			this.shellProfiles.forEach(file => {
+			// In previous releases we were writing directly in .bash_profile, .bashrc, .zshrc and .profile - remove this old code
+			var shellProfilesToBeCleared = this.shellProfiles;
+			// Add .profile only here as we do not want new autocompletion in this file, but we have to remove our old code from it.
+			shellProfilesToBeCleared.push(this.getHomePath(".profile"));
+			shellProfilesToBeCleared.forEach(file => {
 				try {
 					var text = this.$fs.readText(file).wait();
 					var newText = text.replace(this.getTabTabObsoleteRegex(this.$staticConfig.CLIENT_NAME), "");
@@ -72,7 +75,7 @@ export class AutoCompletionService implements IAutoCompletionService {
 					}
 				} catch(error) {
 					if(error.code !== "ENOENT") {
-						this.$logger.trace("Error while trying to disable autocompletion for '%s' file. Error is:\n%s", error);
+						this.$logger.trace("Error while trying to disable autocompletion for '%s' file. Error is:\n%s", error.toString());
 					}
 				}
 			});
@@ -145,9 +148,13 @@ export class AutoCompletionService implements IAutoCompletionService {
 
 	private isNewAutoCompletionEnabledInFile(fileName: string): IFuture<boolean> {
 		return ((): boolean => {
-			var data = this.$fs.readText(fileName).wait();
-			if(data && data.indexOf(this.completionShellScriptContent) !== -1) {
-				return true;
+			try {
+				var data = this.$fs.readText(fileName).wait();
+				if(data && data.indexOf(this.completionShellScriptContent) !== -1) {
+					return true;
+				}
+			} catch(err) {
+				this.$logger.trace("Error while checking is autocompletion enabled in file %s. Error is: '%s'", fileName, err.toString());
 			}
 
 			return false;
@@ -156,8 +163,12 @@ export class AutoCompletionService implements IAutoCompletionService {
 
 	private isObsoleteAutoCompletionEnabledInFile(fileName: string): IFuture<boolean> {
 		return (() => {
-			var text = this.$fs.readText(fileName).wait();
-			return text.match(this.getTabTabObsoleteRegex(this.$staticConfig.CLIENT_NAME)) || text.match(this.getTabTabObsoleteRegex(this.$staticConfig.CLIENT_NAME));
+			try {
+				var text = this.$fs.readText(fileName).wait();
+				return text.match(this.getTabTabObsoleteRegex(this.$staticConfig.CLIENT_NAME)) || text.match(this.getTabTabObsoleteRegex(this.$staticConfig.CLIENT_NAME));
+			} catch(err) {
+				this.$logger.trace("Error while checking is obsolete autocompletion enabled in file %s. Error is: '%s'", fileName, err.toString());
+			}
 		}).future<boolean>()();
 	}
 
@@ -169,9 +180,15 @@ export class AutoCompletionService implements IAutoCompletionService {
 					this.$fs.appendFile(fileName, this.completionShellScriptContent).wait();
 					this.scriptsUpdated = true;
 				}
-			} catch (err) {
-				this.$logger.out("Failed to update %s. Auto-completion may not work. ", fileName);
-				this.$logger.out(err);
+			} catch(err) {
+				this.$logger.out("Unable to update %s. Command-line completion might not work.", fileName);
+				// When npm is installed with sudo, in some cases the installation cannot write to shell profiles
+				// Advise the user how to enable autocompletion after the installation is completed.
+				if(err.code === "EPERM" && !hostInfo.isWindows() && process.env.SUDO_USER) {
+					this.$logger.out("To enable command-line completion, run '$ %s autocomplete enable'.", this.$staticConfig.CLIENT_NAME);
+				}
+
+				this.$logger.trace(err);
 				this.scriptsOk = false;
 			}
 		}).future<void>()();
@@ -223,7 +240,7 @@ export class AutoCompletionService implements IAutoCompletionService {
 				}
 			} catch(err) {
 				this.$logger.out("Failed to update %s. Auto-completion may not work. ", filePath);
-				this.$logger.out(err);
+				this.$logger.trace(err);
 				this.scriptsOk = false;
 			}
 		}).future<void>()();

services/auto-completion-service.ts

@@ -8,7 +8,11 @@ import os = require("os");
 var options: any = require("../options");
 
 class CommandArgumentsValidationHelper {
-	constructor(public isValid: boolean, public remainingArguments: string[]) { }
+	constructor(public isValid: boolean, _remainingArguments: string[]) {
+		this.remainingArguments = _remainingArguments.slice();
+	}
+
+	public remainingArguments: string[];
 }
 
 export class CommandsService implements ICommandsService {
@@ -25,8 +29,8 @@ export class CommandsService implements ICommandsService {
 		private $commandsServiceProvider: ICommandsServiceProvider) {
 	}
 
-	public allCommands(includeDev: boolean): string[] {
-		var commands = this.$injector.getRegisteredCommandsNames(includeDev);
+	public allCommands(opts: {includeDevCommands: boolean}): string[] {
+		var commands = this.$injector.getRegisteredCommandsNames(opts.includeDevCommands);
 		return _.reject(commands, (command) => _.contains(command, '|'));
 	}
 
@@ -144,7 +148,7 @@ export class CommandsService implements ICommandsService {
 					var argument = _.find(commandArgsHelper.remainingArguments, c => mandatoryParam.validate(c).wait());
 
 					if(argument) {
-						commandArgsHelper.remainingArguments = _.without(commandArgsHelper.remainingArguments, argument);
+						helpers.remove(commandArgsHelper.remainingArguments, arg => arg === argument);
 					}
 					else {
 						this.$errors.fail("Missing mandatory parameter.");
@@ -190,7 +194,7 @@ export class CommandsService implements ICommandsService {
 	}
 
 	private tryMatchCommand(commandName: string): void {
-		var allCommands = this.allCommands(false);
+		var allCommands = this.allCommands({includeDevCommands: false});
 		var similarCommands: ISimilarCommand[] = [];
 		_.each(allCommands, (command) => {
 			if(!this.$injector.isDefaultCommand(command)) {
@@ -230,14 +234,20 @@ export class CommandsService implements ICommandsService {
 
 				var childrenCommands = this.$injector.getChildrenCommandsNames(commandName);
 
-				if(data.words === 1) {
-					return tabtab.log(this.allCommands(false), data);
+				if(data.last && _.startsWith(data.last, "--")) {
+					return tabtab.log(_.keys(options.knownOpts), data, "--");
 				}
 
-				if(data.last.startsWith("--")) {
-					// Resolve optionsService here. It is not part of common lib, because we need all knownOptions for each CLI.
-					var optionsService: IOptionsService = this.$injector.resolve("optionsService");
-					return tabtab.log(optionsService.getKnownOptions(), data, "--");
+				if(data.last && _.startsWith(data.last, "-")) {
+					return tabtab.log(_.keys(options.shorthands), data, "-");
+				}
+
+				if(data.words === 1) {
+					var allCommands = this.allCommands({includeDevCommands: false});
+					if(_.startsWith(data.last, this.$commandsServiceProvider.dynamicCommandsPrefix)) {
+						allCommands = allCommands.concat(this.$commandsServiceProvider.getDynamicCommands().wait());
+					}
+					return tabtab.log(allCommands, data);
 				}
 
 				if(data.words >= 3) { // Hierarchical command

services/commands-service.ts

@@ -16,7 +16,7 @@ export class HtmlHelpService implements IHtmlHelpService {
 	private static RELATIVE_PATH_TO_STYLES_CSS_REGEX = /@RELATIVE_PATH_TO_STYLES_CSS@/g;
 	private static RELATIVE_PATH_TO_IMAGES_REGEX = /@RELATIVE_PATH_TO_IMAGES@/g;
 	private static RELATIVE_PATH_TO_INDEX_REGEX = /@RELATIVE_PATH_TO_INDEX@/g;
-	private static MARKDROWN_LINK_REGEX = /\[([\s\S]+?)\]\([\s\S]*?\)/g;
+	private static MARKDOWN_LINK_REGEX = /\[([\w -`<>]+?)\]\([\s\S]*?\)/g;
 
 	private pathToManPages: string;
 	private pathToHtmlPages: string;
@@ -152,7 +152,7 @@ export class HtmlHelpService implements IHtmlHelpService {
 			var helpText = this.readMdFileForCommand(commandName).wait();
 			var outputText = this.$microTemplateService.parseContent(helpText, { isHtml: false })
 				.replace(/&nbsp;/g, " ")
-				.replace(HtmlHelpService.MARKDROWN_LINK_REGEX, "$1");
+				.replace(HtmlHelpService.MARKDOWN_LINK_REGEX, "$1");
 
 			var opts = {
 				unescape: true,

services/html-help-service.ts

@@ -17,14 +17,16 @@ interface ITypeScriptCompilerMessages {
 
 export class TypeScriptCompilationService implements ITypeScriptCompilationService {
 	private typeScriptFiles: string[];
+	private definitionFiles: string[];
 
 	constructor(private $childProcess: IChildProcess,
 		private $fs: IFileSystem,
 		private $logger: ILogger,
 		private $config: Config.IConfig) { }
 
-	public initialize(typeScriptFiles: string[]): void {
+	public initialize(typeScriptFiles: string[], definitionFiles?: string[]): void {
 		this.typeScriptFiles = typeScriptFiles;
+		this.definitionFiles = definitionFiles || [];
 	}
 
 	public compileAllFiles(): IFuture<void> {
@@ -194,11 +196,14 @@ export class TypeScriptCompilationService implements ITypeScriptCompilationServi
 
 	private getTypeScriptDefinitionsFiles(): IFuture<string[]> {
 		return (() => {
-			var typeScriptDefinitionsFilesPath = path.join(__dirname, "../../../resources/typescript-definitions-files");
-			var definitionsFiles = this.$fs.readDirectory(typeScriptDefinitionsFilesPath).wait();
-			return _.map(definitionsFiles, (definitionFilePath: string) => {
-				return path.join(typeScriptDefinitionsFilesPath, definitionFilePath);
-			});
+			var defaultTypeScriptDefinitionsFilesPath = path.join(__dirname, "../../../resources/typescript-definitions-files");
+			var defaultDefinitionsFiles = this.$fs.readDirectory(defaultTypeScriptDefinitionsFilesPath).wait();
+
+			// Exclude definition files from default path, which are already part of the project (check only the name of the file)
+			var remainingDefaultDefinitionFiles = _.filter(defaultDefinitionsFiles, defFile => !_.any(this.definitionFiles, f => path.basename(f) === defFile));
+			return _.map(remainingDefaultDefinitionFiles,(definitionFilePath: string) => {
+				return path.join(defaultTypeScriptDefinitionsFilesPath, definitionFilePath);
+			}).concat(this.definitionFiles);
 		}).future<string[]>()();
 	}
 }

services/typescript-compilation-service.ts

@@ -227,6 +227,10 @@ export class Yok implements IInjector {
 								commandName = this.getHierarchicalCommandName(name, defaultCommand);
 							} else {
 								commandName = "help";
+
+								// Show command-line help
+								var options = require("./options");
+								options.help = true;
 							}
 						}
 
@@ -259,12 +263,18 @@ export class Yok implements IInjector {
 					// Check if the default command accepts arguments - if no, return false;
 					var defaultCommandName = this.getDefaultCommand(commandName);
 					var defaultCommand = this.resolveCommand(util.format("%s|%s", commandName, defaultCommandName));
-					if(defaultCommand && defaultCommand.allowedParameters.length > 0) {
-						return true;
-					} else {
-						var errors = $injector.resolve("errors");
-						errors.fail("The input is not valid sub-command for '%s' command", commandName);
-					}
+					if(defaultCommand) {
+						if (defaultCommand.canExecute) {
+							return defaultCommand.canExecute(commandArguments).wait();
+						} 
+
+						if (defaultCommand.allowedParameters.length > 0) {
+							return true;
+						}
+					} 
+					
+					var errors = $injector.resolve("errors");
+					errors.fail("The input is not valid sub-command for '%s' command", commandName);
 				}
 
 				return true;