Use sync api of fs

lib/android-tools-info.ts

@@ -42,7 +42,7 @@ export class AndroidToolsInfo implements IAndroidToolsInfo {
 				this.showWarningsAsErrors = options.showWarningsAsErrors;
 			}
 			if (!this.pathToAndroidExecutable) {
-				if (this.validateAndroidHomeEnvVariable(this.androidHome).wait()) {
+				if (this.validateAndroidHomeEnvVariable(this.androidHome)) {
 					let androidPath = path.join(this.androidHome, "tools", this.androidExecutableName);
 					if (!this.trySetAndroidPath(androidPath).wait() && !this.trySetAndroidPath(this.androidExecutableName).wait()) {
 						this.printMessage(`Unable to find "${this.androidExecutableName}" executable file. Make sure you have set ANDROID_HOME environment variable correctly.`);
@@ -100,7 +100,7 @@ export class AndroidToolsInfo implements IAndroidToolsInfo {
 			let detectedErrors = false;
 			this.showWarningsAsErrors = options && options.showWarningsAsErrors;
 			let toolsInfoData = this.getToolsInfo().wait();
-			let isAndroidHomeValid = this.validateAndroidHomeEnvVariable(toolsInfoData.androidHomeEnvVar).wait();
+			let isAndroidHomeValid = this.validateAndroidHomeEnvVariable(toolsInfoData.androidHomeEnvVar);
 			if (!toolsInfoData.compileSdkVersion) {
 				this.printMessage(`Cannot find a compatible Android SDK for compilation. To be able to build for Android, install Android SDK ${AndroidToolsInfo.MIN_REQUIRED_COMPILE_TARGET} or later.`,
 					"Run `$ android` to manage your Android SDK versions.");
@@ -258,32 +258,30 @@ export class AndroidToolsInfo implements IAndroidToolsInfo {
 		}).future<number>()();
 	}
 
-	private getMatchingDir(pathToDir: string, versionRange: string): IFuture<string> {
-		return ((): string => {
-			let selectedVersion: string;
-			if (this.$fs.exists(pathToDir).wait()) {
-				let subDirs = this.$fs.readDirectory(pathToDir).wait();
-				this.$logger.trace(`Directories found in ${pathToDir} are ${subDirs.join(", ")}`);
-
-				let subDirsVersions = subDirs
-					.map(dirName => {
-						let dirNameGroups = dirName.match(AndroidToolsInfo.VERSION_REGEX);
-						if (dirNameGroups) {
-							return dirNameGroups[1];
-						}
+	private getMatchingDir(pathToDir: string, versionRange: string): string {
+		let selectedVersion: string;
+		if (this.$fs.exists(pathToDir)) {
+			let subDirs = this.$fs.readDirectory(pathToDir);
+			this.$logger.trace(`Directories found in ${pathToDir} are ${subDirs.join(", ")}`);
+
+			let subDirsVersions = subDirs
+				.map(dirName => {
+					let dirNameGroups = dirName.match(AndroidToolsInfo.VERSION_REGEX);
+					if (dirNameGroups) {
+						return dirNameGroups[1];
+					}
 
-						return null;
-					})
-					.filter(dirName => !!dirName);
-				this.$logger.trace(`Versions found in ${pathToDir} are ${subDirsVersions.join(", ")}`);
-				let version = semver.maxSatisfying(subDirsVersions, versionRange);
-				if (version) {
-					selectedVersion = _.find(subDirs, dir => dir.indexOf(version) !== -1);
-				}
+					return null;
+				})
+				.filter(dirName => !!dirName);
+			this.$logger.trace(`Versions found in ${pathToDir} are ${subDirsVersions.join(", ")}`);
+			let version = semver.maxSatisfying(subDirsVersions, versionRange);
+			if (version) {
+				selectedVersion = _.find(subDirs, dir => dir.indexOf(version) !== -1);
 			}
-			this.$logger.trace("Selected version is: ", selectedVersion);
-			return selectedVersion;
-		}).future<string>()();
+		}
+		this.$logger.trace("Selected version is: ", selectedVersion);
+		return selectedVersion;
 	}
 
 	private getBuildToolsRange(): string {
@@ -296,7 +294,7 @@ export class AndroidToolsInfo implements IAndroidToolsInfo {
 			if (this.androidHome) {
 				let pathToBuildTools = path.join(this.androidHome, "build-tools");
 				let buildToolsRange = this.getBuildToolsRange();
-				buildToolsVersion = this.getMatchingDir(pathToBuildTools, buildToolsRange).wait();
+				buildToolsVersion = this.getMatchingDir(pathToBuildTools, buildToolsRange);
 			}
 
 			return buildToolsVersion;
@@ -321,7 +319,7 @@ export class AndroidToolsInfo implements IAndroidToolsInfo {
 			let requiredAppCompatRange = this.getAppCompatRange().wait();
 			if (this.androidHome && requiredAppCompatRange) {
 				let pathToAppCompat = path.join(this.androidHome, "extras", "android", "m2repository", "com", "android", "support", "appcompat-v7");
-				selectedAppCompatVersion = this.getMatchingDir(pathToAppCompat, requiredAppCompatRange).wait();
+				selectedAppCompatVersion = this.getMatchingDir(pathToAppCompat, requiredAppCompatRange);
 			}
 
 			this.$logger.trace(`Selected AppCompat version is: ${selectedAppCompatVersion}`);
@@ -366,25 +364,23 @@ export class AndroidToolsInfo implements IAndroidToolsInfo {
 	}
 
 	private _cachedAndroidHomeValidationResult: boolean = null;
-	private validateAndroidHomeEnvVariable(androidHomeEnvVar: string): IFuture<boolean> {
-		return ((): boolean => {
-			if (this._cachedAndroidHomeValidationResult === null) {
-				this._cachedAndroidHomeValidationResult = true;
-				let expectedDirectoriesInAndroidHome = ["build-tools", "tools", "platform-tools", "extras"];
-				if (!androidHomeEnvVar || !this.$fs.exists(androidHomeEnvVar).wait()) {
-					this.printMessage("The ANDROID_HOME environment variable is not set or it points to a non-existent directory. You will not be able to perform any build-related operations for Android.",
-						"To be able to perform Android build-related operations, set the `ANDROID_HOME` variable to point to the root of your Android SDK installation directory.");
-					this._cachedAndroidHomeValidationResult = false;
-				} else if (!_.some(expectedDirectoriesInAndroidHome.map(dir => this.$fs.exists(path.join(androidHomeEnvVar, dir)).wait()))) {
-					this.printMessage("The ANDROID_HOME environment variable points to incorrect directory. You will not be able to perform any build-related operations for Android.",
-						"To be able to perform Android build-related operations, set the `ANDROID_HOME` variable to point to the root of your Android SDK installation directory, " +
-						"where you will find `tools` and `platform-tools` directories.");
-					this._cachedAndroidHomeValidationResult = false;
-				}
+	private validateAndroidHomeEnvVariable(androidHomeEnvVar: string): boolean {
+		if (this._cachedAndroidHomeValidationResult === null) {
+			this._cachedAndroidHomeValidationResult = true;
+			let expectedDirectoriesInAndroidHome = ["build-tools", "tools", "platform-tools", "extras"];
+			if (!androidHomeEnvVar || !this.$fs.exists(androidHomeEnvVar)) {
+				this.printMessage("The ANDROID_HOME environment variable is not set or it points to a non-existent directory. You will not be able to perform any build-related operations for Android.",
+					"To be able to perform Android build-related operations, set the `ANDROID_HOME` variable to point to the root of your Android SDK installation directory.");
+				this._cachedAndroidHomeValidationResult = false;
+			} else if (!_.some(expectedDirectoriesInAndroidHome.map(dir => this.$fs.exists(path.join(androidHomeEnvVar, dir))))) {
+				this.printMessage("The ANDROID_HOME environment variable points to incorrect directory. You will not be able to perform any build-related operations for Android.",
+					"To be able to perform Android build-related operations, set the `ANDROID_HOME` variable to point to the root of your Android SDK installation directory, " +
+					"where you will find `tools` and `platform-tools` directories.");
+				this._cachedAndroidHomeValidationResult = false;
 			}
+		}
 
-			return this._cachedAndroidHomeValidationResult;
-		}).future<boolean>()();
+		return this._cachedAndroidHomeValidationResult;
 	}
 }
 $injector.register("androidToolsInfo", AndroidToolsInfo);

lib/commands/build.ts

@@ -7,7 +7,7 @@ export class BuildCommandBase {
 			let platform = args[0].toLowerCase();
 			this.$platformService.buildPlatform(platform, null, true).wait();
 			if(this.$options.copyTo) {
-				this.$platformService.copyLastOutput(platform, this.$options.copyTo, {isForDevice: this.$options.forDevice}).wait();
+				this.$platformService.copyLastOutput(platform, this.$options.copyTo, {isForDevice: this.$options.forDevice});
 			}
 		}).future<void>()();
 	}

lib/commands/install.ts

@@ -28,7 +28,7 @@ export class InstallCommand implements ICommand {
 			this.$projectDataService.initialize(this.$projectData.projectDir);
 			_.each(this.$platformsData.platformsNames, platform => {
 				let platformData = this.$platformsData.getPlatformData(platform);
-				let frameworkPackageData = this.$projectDataService.getValue(platformData.frameworkPackageName).wait();
+				let frameworkPackageData = this.$projectDataService.getValue(platformData.frameworkPackageName);
 				if (frameworkPackageData && frameworkPackageData.version) {
 					try {
 						this.$platformService.addPlatforms([`${platform}@${frameworkPackageData.version}`]).wait();
@@ -49,7 +49,7 @@ export class InstallCommand implements ICommand {
 			let projectDir = this.$projectData.projectDir;
 
 			let devPrefix = 'nativescript-dev-';
-			if (!this.$fs.exists(moduleName).wait() && moduleName.indexOf(devPrefix) !== 0) {
+			if (!this.$fs.exists(moduleName) && moduleName.indexOf(devPrefix) !== 0) {
 				moduleName = devPrefix + moduleName;
 			}
 

lib/commands/list-platforms.ts

@@ -6,18 +6,18 @@ export class ListPlatformsCommand implements ICommand {
 
 	execute(args: string[]): IFuture<void> {
 		return (() => {
-			let installedPlatforms = this.$platformService.getInstalledPlatforms().wait();
+			let installedPlatforms = this.$platformService.getInstalledPlatforms();
 
 			if(installedPlatforms.length > 0) {
-				let preparedPlatforms = this.$platformService.getPreparedPlatforms().wait();
+				let preparedPlatforms = this.$platformService.getPreparedPlatforms();
 				if(preparedPlatforms.length > 0) {
 					this.$logger.out("The project is prepared for: ", helpers.formatListOfNames(preparedPlatforms, "and"));
 				} else {
 					this.$logger.out("The project is not prepared for any platform");
 				}
 				this.$logger.out("Installed platforms: ", helpers.formatListOfNames(installedPlatforms, "and"));
 			} else {
-				let formattedPlatformsList = helpers.formatListOfNames(this.$platformService.getAvailablePlatforms().wait(), "and");
+				let formattedPlatformsList = helpers.formatListOfNames(this.$platformService.getAvailablePlatforms(), "and");
 				this.$logger.out("Available platforms for this OS: ", formattedPlatformsList);
 				this.$logger.out("No installed platforms found. Use $ tns platform add");
 			}

lib/commands/platform-clean.ts

@@ -4,7 +4,7 @@ export class CleanCommand implements ICommand {
 
 	public execute(args: string[]): IFuture<void> {
 		return (() => {
-			this.$platformService.removePlatforms(args).wait();
+			this.$platformService.removePlatforms(args);
 			this.$platformService.addPlatforms(args).wait();
 		}).future<void>()();
 	}

lib/commands/plugin/list-plugins.ts

@@ -8,7 +8,7 @@ export class ListPluginsCommand implements ICommand {
 
 	public execute(args: string[]): IFuture<void> {
 		return (() => {
-			let installedPlugins: IPackageJsonDepedenciesResult = this.$pluginsService.getDependenciesFromPackageJson().wait();
+			let installedPlugins: IPackageJsonDepedenciesResult = this.$pluginsService.getDependenciesFromPackageJson();
 
 			let headers: string[] = ["Plugin", "Version"];
 			let dependenciesData: string[][] = this.createTableCells(installedPlugins.dependencies);

lib/commands/remove-platform.ts

@@ -4,7 +4,7 @@ export class RemovePlatformCommand implements ICommand {
 
 	execute(args: string[]): IFuture<void> {
 		return (() => {
-			this.$platformService.removePlatforms(args).wait();
+			this.$platformService.removePlatforms(args);
 		}).future<void>()();
 	}
 

lib/commands/test-init.ts

@@ -41,26 +41,26 @@ class TestInitCommand implements ICommand {
 
 			let testsDir = path.join(projectDir, 'app/tests');
 			let shouldCreateSampleTests = true;
-			if (this.$fs.exists(testsDir).wait()) {
+			if (this.$fs.exists(testsDir)) {
 				this.$logger.info('app/tests/ directory already exists, will not create an example test project.');
 				shouldCreateSampleTests = false;
 			}
 
-			this.$fs.ensureDirectoryExists(testsDir).wait();
+			this.$fs.ensureDirectoryExists(testsDir);
 
-			let karmaConfTemplate = this.$resources.readText('test/karma.conf.js').wait();
+			let karmaConfTemplate = this.$resources.readText('test/karma.conf.js');
 			let karmaConf = _.template(karmaConfTemplate)({
 				frameworks: [frameworkToInstall].concat(dependencies)
 					.map(fw => `'${fw}'`)
 					.join(', ')
 			});
 
-			this.$fs.writeFile(path.join(projectDir, 'karma.conf.js'), karmaConf).wait();
+			this.$fs.writeFile(path.join(projectDir, 'karma.conf.js'), karmaConf);
 
 			let exampleFilePath = this.$resources.resolvePath(`test/example.${frameworkToInstall}.js`);
 
-			if (shouldCreateSampleTests && this.$fs.exists(exampleFilePath).wait()) {
-				this.$fs.copyFile(exampleFilePath, path.join(testsDir, 'example.js')).wait();
+			if (shouldCreateSampleTests && this.$fs.exists(exampleFilePath)) {
+				this.$fs.copyFile(exampleFilePath, path.join(testsDir, 'example.js'));
 				this.$logger.info('\nExample test file created in app/tests/'.yellow);
 			} else {
 				this.$logger.info('\nPlace your test files under app/tests/'.yellow);

lib/commands/update.ts

@@ -30,7 +30,7 @@ export class UpdateCommand implements ICommand {
 			}
 
 			try {
-				this.executeCore(args, folders);
+				this.executeCore(args, folders).wait();
 			} catch (error) {
 				shelljs.cp("-f", path.join(tmpDir, "package.json"), this.$projectData.projectDir);
 				for (let folder of folders) {
@@ -51,40 +51,42 @@ export class UpdateCommand implements ICommand {
 		}).future<boolean>()();
 	}
 
-	private executeCore(args: string[], folders: string[]) {
-		let platforms = this.$platformService.getInstalledPlatforms().wait();
-		let availablePlatforms = this.$platformService.getAvailablePlatforms().wait();
-		let packagePlatforms: string[] = [];
+	private executeCore(args: string[], folders: string[]): IFuture<void> {
+		return (() => {
+			let platforms = this.$platformService.getInstalledPlatforms();
+			let availablePlatforms = this.$platformService.getAvailablePlatforms();
+			let packagePlatforms: string[] = [];
 
-		this.$projectDataService.initialize(this.$projectData.projectDir);
-		for (let platform of availablePlatforms) {
-			let platformData = this.$platformsData.getPlatformData(platform);
-			let platformVersion = this.$projectDataService.getValue(platformData.frameworkPackageName).wait();
-			if (platformVersion) {
-				packagePlatforms.push(platform);
-				this.$projectDataService.removeProperty(platformData.frameworkPackageName).wait();
+			this.$projectDataService.initialize(this.$projectData.projectDir);
+			for (let platform of availablePlatforms) {
+				let platformData = this.$platformsData.getPlatformData(platform);
+				let platformVersion = this.$projectDataService.getValue(platformData.frameworkPackageName);
+				if (platformVersion) {
+					packagePlatforms.push(platform);
+					this.$projectDataService.removeProperty(platformData.frameworkPackageName);
+				}
 			}
-		}
 
-		this.$platformService.removePlatforms(platforms).wait();
-		this.$pluginsService.remove("tns-core-modules").wait();
-		this.$pluginsService.remove("tns-core-modules-widgets").wait();
+			this.$platformService.removePlatforms(platforms);
+			this.$pluginsService.remove("tns-core-modules").wait();
+			this.$pluginsService.remove("tns-core-modules-widgets").wait();
 
-		for (let folder of folders) {
-			shelljs.rm("-fr", folder);
-		}
+			for (let folder of folders) {
+				shelljs.rm("-fr", folder);
+			}
 
-		platforms = platforms.concat(packagePlatforms);
-		if (args.length === 1) {
-			for (let platform of platforms) {
-				this.$platformService.addPlatforms([ platform+"@"+args[0] ]).wait();
+			platforms = platforms.concat(packagePlatforms);
+			if (args.length === 1) {
+				for (let platform of platforms) {
+					this.$platformService.addPlatforms([ platform+"@"+args[0] ]).wait();
+				}
+				this.$pluginsService.add("tns-core-modules@" + args[0]).wait();
+			} else {
+				this.$platformService.addPlatforms(platforms).wait();
+				this.$pluginsService.add("tns-core-modules").wait();
 			}
-			this.$pluginsService.add("tns-core-modules@" + args[0]).wait();
-		} else {
-			this.$platformService.addPlatforms(platforms).wait();
-			this.$pluginsService.add("tns-core-modules").wait();
-		}
-		this.$pluginsService.ensureAllDependenciesAreInstalled().wait();
+			this.$pluginsService.ensureAllDependenciesAreInstalled().wait();
+		}).future<void>()();
 	}
 
 	allowedParameters: ICommandParameter[] = [];

lib/config.ts

@@ -14,7 +14,7 @@ export class Configuration extends ConfigBase implements IConfiguration { // Use
 	/*don't require logger and everything that has logger as dependency in config.js due to cyclic dependency*/
 	constructor(protected $fs: IFileSystem) {
 		super($fs);
-		_.extend(this, this.loadConfig("config").wait());
+		_.extend(this, this.loadConfig("config"));
 	}
 }
 $injector.register("config", Configuration);

lib/declarations.ts

@@ -257,16 +257,16 @@ interface IXmlValidator {
 	/**
 	 * Checks the passed xml files for errors and if such exists, print them on the stdout.
 	 * @param {string[]} sourceFiles Files to be checked. Only the ones that ends with .xml are filtered.
-	 * @return {IFuture<boolean>} true in case there are no errors in specified files and false in case there's at least one error.
+	 * @return {boolean} true in case there are no errors in specified files and false in case there's at least one error.
 	 */
-	validateXmlFiles(sourceFiles: string[]): IFuture<boolean>;
+	validateXmlFiles(sourceFiles: string[]): boolean;
 
 	/**
 	 * Checks the passed xml file for errors and returns them as a result.
 	 * @param {string} sourceFile File to be checked.
-	 * @return {IFuture<string>} The errors detected (as a single string) or null in case there are no errors.
+	 * @return {string} The errors detected (as a single string) or null in case there are no errors.
 	 */
-	getXmlFileErrors(sourceFile: string): IFuture<string>;
+	getXmlFileErrors(sourceFile: string): string;
 }
 
 /**