More tslint changes

lib/bootstrap.ts

@@ -33,7 +33,7 @@ $injector.requireCommand("platform|add", "./commands/add-platform");
 $injector.requireCommand("platform|remove", "./commands/remove-platform");
 $injector.requireCommand("platform|update", "./commands/update-platform");
 $injector.requireCommand("library|add", "./commands/add-library");
-$injector.requireCommand("run|ios", "./commands/run"); 
+$injector.requireCommand("run|ios", "./commands/run");
 $injector.requireCommand("run|android", "./commands/run");
 
 $injector.requireCommand("debug|ios", "./commands/debug");

lib/commands/add-library.ts

@@ -25,23 +25,25 @@ export class AddLibraryCommand implements ICommand {
             if (args.length !== 2) {
                 this.$errors.fail("This command needs two parameters.");
             }
-  
-            let platform = args[0]; 
-            let platformLowerCase = platform.toLowerCase(); 
+
+            let platform = args[0];
+            let platformLowerCase = platform.toLowerCase();
             let libraryPath = path.resolve(args[1]);
             if(platformLowerCase === "android") {
                 if(!this.$fs.exists(path.join(libraryPath, "project.properties")).wait()) {
                     let files = this.$fs.enumerateFilesInDirectorySync(libraryPath);
                     if(!_.any(files, file => path.extname(file) === ".jar")) {
-                        this.$errors.failWithoutHelp("Invalid library path. Ensure that the library path is the file path to a directory containing one or more `*.jar` files or to a directory containing the `project.properties` files.");
+                        this.$errors.failWithoutHelp("Invalid library path. Ensure that the library path is the file path to a directory " +
+                            "containing one or more `*.jar` files or to a directory containing the `project.properties` files.");
                     }
                 }
             } else if(platformLowerCase === "ios") {
                 if(path.extname(libraryPath) !== ".framework") {
-                    this.$errors.failWithoutHelp("Invalid library path. Ensure that the library path is a Cocoa Touch Framework with all build architectures enabled.");
+                    this.$errors.failWithoutHelp("Invalid library path. Ensure that the library path is a Cocoa Touch Framework with " +
+                        "all build architectures enabled.");
                 }
             }
-            
+
             this.$platformService.validatePlatformInstalled(args[0]);
             return true;
         }).future<boolean>()();

lib/commands/init.ts

@@ -3,10 +3,10 @@
 
 export class InitCommand implements ICommand {
 	constructor(private $initService: IInitService) { }
-		
+
 	public allowedParameters: ICommandParameter[] = [];
 	public enableHooks = false;
-	
+
 	public execute(args: string[]): IFuture<void> {
 		return this.$initService.initialize();
 	}

lib/commands/install.ts

@@ -8,17 +8,17 @@ export class InstallCommand implements ICommand {
 		private $projectDataService: IProjectDataService,
 		private $pluginsService: IPluginsService,
 		private $logger: ILogger) { }
-		
+
 	public enableHooks = false;
-		
+
 	public allowedParameters: ICommandParameter[] = [];
-	
+
 	public execute(args: string[]): IFuture<void> {
 		return (() => {
 			let error: string = "";
-			
+
 			this.$pluginsService.ensureAllDependenciesAreInstalled().wait();
-						
+
 			this.$projectDataService.initialize(this.$projectData.projectDir);
 			_.each(this.$platformsData.platformsNames, platform => {
 				let platformData = this.$platformsData.getPlatformData(platform);
@@ -31,11 +31,11 @@ export class InstallCommand implements ICommand {
 					}
 				}
 			});
-			
+
 			if(error) {
 				this.$logger.error(error);
 			}
-			
+
 		}).future<void>()();
 	}
 }

lib/commands/list-platforms.ts

@@ -20,7 +20,8 @@ export class ListPlatformsCommand implements ICommand {
 				}
 				this.$logger.out("Installed platforms: ", helpers.formatListOfNames(installedPlatforms, "and"));
 			} else {
-				this.$logger.out("Available platforms for this OS: ", helpers.formatListOfNames(this.$platformService.getAvailablePlatforms().wait(), "and"));
+				let formattedPlatformsList = helpers.formatListOfNames(this.$platformService.getAvailablePlatforms().wait(), "and");
+				this.$logger.out("Available platforms for this OS: ", formattedPlatformsList);
 				this.$logger.out("No installed platforms found. Use $ tns platform add");
 			}
 		}).future<void>()();

lib/commands/livesync.ts

@@ -9,25 +9,25 @@ export class LivesyncCommand implements ICommand {
 		private $errors: IErrors) { }
 
 	public execute(args: string[]): IFuture<void> {
-		this.$options.justlaunch = true;	
+		this.$options.justlaunch = true;
 		return this.$usbLiveSyncService.liveSync(args[0]);
 	}
-	
+
 	public canExecute(args: string[]): IFuture<boolean> {
 		return (() => {
 			if(args.length >= 2) {
 				this.$errors.fail("Invalid number of arguments.");
 			}
-			
+
 			let platform = args[0];
 			if(platform) {
 				 return _.contains(this.$mobileHelper.platformNames, this.$mobileHelper.normalizePlatformName(platform));
 			}
-			
+
 			return true;
 		}).future<boolean>()();
 	}
-	
+
 	allowedParameters: ICommandParameter[] = [];
 }
 $injector.registerCommand("livesync", LivesyncCommand);

lib/commands/plugin/add-plugin.ts

@@ -4,27 +4,27 @@
 export class AddPluginCommand implements ICommand {
 	constructor(private $pluginsService: IPluginsService,
 		private $errors: IErrors) { }
-	
+
 	execute(args: string[]): IFuture<void> {
 		return this.$pluginsService.add(args[0]);
 	}
-	
+
 	canExecute(args: string[]): IFuture<boolean> {
 		return (() => {
 			if(!args[0]) {
 				this.$errors.fail("You must specify plugin name.");
 			}
-			
+
 			let installedPlugins = this.$pluginsService.getAllInstalledPlugins().wait();
 			let pluginName = args[0].toLowerCase();
 			if(_.any(installedPlugins, (plugin: IPluginData) => plugin.name.toLowerCase() === pluginName)) {
 				this.$errors.failWithoutHelp(`Plugin "${pluginName}" is already installed.`);
 			}
-			
-			return true; 
+
+			return true;
 		}).future<boolean>()();
 	}
-	
+
 	public allowedParameters: ICommandParameter[] = [];
 }
 $injector.registerCommand("plugin|add", AddPluginCommand);

lib/commands/plugin/remove-plugin.ts

@@ -4,27 +4,27 @@
 export class RemovePluginCommand implements ICommand {
 	constructor(private $pluginsService: IPluginsService,
 		private $errors: IErrors) { }
-	
+
 	execute(args: string[]): IFuture<void> {
 		return this.$pluginsService.remove(args[0]);
 	}
-	
+
 	canExecute(args: string[]): IFuture<boolean> {
 		return (() => {
 			if(!args[0]) {
 				this.$errors.fail("You must specify plugin name.");
 			}
-			
+
 			let installedPlugins = this.$pluginsService.getAllInstalledPlugins().wait();
 			let pluginName = args[0].toLowerCase();
 			if(!_.any(installedPlugins, (plugin: IPluginData) => plugin.name.toLowerCase() === pluginName)) {
 				this.$errors.failWithoutHelp(`Plugin "${pluginName}" is not installed.`);
 			}
-			
+
 			return true;
 		}).future<boolean>()();
 	}
-	
+
 	public allowedParameters: ICommandParameter[] = [];
 }
 $injector.registerCommand("plugin|remove", RemovePluginCommand);

lib/commands/run.ts

@@ -28,7 +28,7 @@ export class RunAndroidCommand extends RunCommandBase implements ICommand {
 		private $platformsData: IPlatformsData) {
 		super($platformService);
 	}
-	
+
 	public allowedParameters: ICommandParameter[] = [];
 
 	public execute(args: string[]): IFuture<void> {

lib/config.ts

@@ -30,11 +30,11 @@ export class StaticConfig extends staticConfigBaseLibPath.StaticConfigBase imple
 	public ERROR_REPORT_SETTING_NAME = "TrackExceptions";
 	public ANALYTICS_INSTALLATION_ID_SETTING_NAME = "AnalyticsInstallationID";
 	public START_PACKAGE_ACTIVITY_NAME = "com.tns.NativeScriptActivity";
-	
+
 	constructor($injector: IInjector) {
-		super($injector);	 
+		super($injector);
 	}
-	
+
 	public get SYS_REQUIREMENTS_LINK(): string {
 		let linkToSysRequirements: string;
 		switch(process.platform) {
@@ -63,7 +63,7 @@ export class StaticConfig extends staticConfigBaseLibPath.StaticConfigBase imple
 	public get HTML_CLI_HELPERS_DIR(): string {
 		return path.join(__dirname, "../docs/helpers");
 	}
-	
+
 	public get pathToPackageJson(): string {
 		return path.join(__dirname, "..", "package.json");
 	}

lib/declarations.ts

@@ -27,7 +27,7 @@ interface INpmInstallOptions {
 interface IDependencyData {
 	name: string;
 	version: string;
-	nativescript: any;	
+	nativescript: any;
 	dependencies?: IStringDictionary;
 	devDependencies?: IStringDictionary;
 }

lib/lockfile.ts

@@ -7,11 +7,11 @@ import * as path from "path";
 
 export class LockFile implements ILockFile {
 	private lockFilePath: string;
-	
+
 	constructor(private $options: IOptions) {
 		this.lockFilePath = path.join(this.$options.profileDir, ".lock");
 	}
-	
+
 	private static LOCK_EXPIRY_PERIOD_SEC = 180;
 	private static LOCK_PARAMS = {
 		retryWait: 100,

lib/node-package-manager.ts

@@ -2,7 +2,7 @@
 "use strict";
 
 import Future = require("fibers/future");
-import npm = require("npm");
+import * as npm from "npm";
 
 export class NodePackageManager implements INodePackageManager {
 	constructor(private $childProcess: IChildProcess,
@@ -15,7 +15,7 @@ export class NodePackageManager implements INodePackageManager {
 	public getCache(): string {
 		return npm.cache;
 	}
-	
+
 	public load(config?: any): IFuture<void> {
 		let future = new Future<void>();
 		npm.load(config, (err) => {
@@ -27,7 +27,7 @@ export class NodePackageManager implements INodePackageManager {
 		});
 		return future;
 	}
-	
+
 	public install(packageName: string, pathToSave: string, config?: any): IFuture<any> {
 		if(this.$options.ignoreScripts) {
 			config = config || {};
@@ -36,7 +36,7 @@ export class NodePackageManager implements INodePackageManager {
 
 		return this.loadAndExecute("install", [pathToSave, packageName], { config: config });
 	}
-	
+
 	public uninstall(packageName: string, config?: any): IFuture<any> {
 		return this.loadAndExecute("uninstall", [[packageName]], { config: config });
 	}
@@ -45,28 +45,28 @@ export class NodePackageManager implements INodePackageManager {
 		// function cache (pkg, ver, where, scrub, cb)
 		return this.loadAndExecute("cache", [packageName, version, undefined, false], { subCommandName: "add", config: config });
 	}
-	
+
 	public cacheUnpack(packageName: string, version: string, unpackTarget?: string): IFuture<void> {
 		// function unpack (pkg, ver, unpackTarget, dMode, fMode, uid, gid, cb)
 		return this.loadAndExecute("cache", [packageName, version, unpackTarget, null, null, null, null], { subCommandName: "unpack" });
 	}
-	
+
 	public view(packageName: string, propertyName: string): IFuture<any> {
 		return this.loadAndExecute("view", [[packageName, propertyName], [false]]);
 	}
 
 	public executeNpmCommand(npmCommandName: string, currentWorkingDirectory: string): IFuture<any> {
 		return this.$childProcess.exec(npmCommandName, { cwd: currentWorkingDirectory });
 	}
-	
+
 	private loadAndExecute(commandName: string, args: any[], opts?: { config?: any, subCommandName?: string }): IFuture<any> {
 		return (() => {
 			opts = opts || {};
 			this.load(opts.config).wait();
 			return this.executeCore(commandName, args, opts.subCommandName).wait();
 		}).future<any>()();
 	}
-	
+
 	private executeCore(commandName: string, args: any[], subCommandName?: string): IFuture<any> {
 		let future = new Future<any>();
 		let callback = (err: Error, data: any) => {
@@ -77,10 +77,10 @@ export class NodePackageManager implements INodePackageManager {
 			}
 		};
 		args.push(callback);
-		
+
 		let command = subCommandName ? npm.commands[commandName][subCommandName] : npm.commands[commandName];
 		command.apply(this, args);
-		
+
 		return future;
 	}
 }