Use sync version of fs.writeFile

Author: rosen-vladimirov

lib/commands/test-init.ts

@@ -55,7 +55,7 @@ class TestInitCommand implements ICommand {
 					.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`);
 

lib/definitions/plugins.d.ts

@@ -48,29 +48,34 @@ interface IPluginVariablesService {
 	 * @return {IFuture<void>}
 	 */
 	savePluginVariablesInProjectFile(pluginData: IPluginData): IFuture<void>;
+
 	/**
 	 * Removes plugin variables from project package.json file.
 	 * @param  {string}		pluginName Name of the plugin.
 	 * @return {IFuture<void>}
 	 */
 	removePluginVariablesFromProjectFile(pluginName: string): IFuture<void>;
+
 	/**
 	 * Replaces all plugin variables with their corresponding values.
 	 * @param {IPluginData}		pluginData for the plugin.
 	 * @param {pluginConfigurationFilePath}		pluginConfigurationFilePath for the plugin.
 	 * @return {IFuture<void>}
 	 */
 	interpolatePluginVariables(pluginData: IPluginData, pluginConfigurationFilePath: string): IFuture<void>;
+
 	/**
 	 * Replaces {nativescript.id} expression with the application identifier from package.json.
 	 * @param {pluginConfigurationFilePath}	pluginConfigurationFilePath for the plugin.
-	 * @return {IFuture<void>}
+	 * @return {void}
 	 */
-	interpolateAppIdentifier(pluginConfigurationFilePath: string): IFuture<void>;
+	interpolateAppIdentifier(pluginConfigurationFilePath: string): void;
+
 	/**
 	 * Replaces both plugin variables and appIdentifier
 	 */
 	interpolate(pluginData: IPluginData, pluginConfigurationFilePath: string): IFuture<void>;
+
 	/**
 	 * Returns the
 	 * @param {string}		pluginName for the plugin.

lib/definitions/project.d.ts

@@ -89,9 +89,22 @@ interface IPlatformProjectService {
 	 */
 	isPlatformPrepared(projectRoot: string): boolean;
 
-	canUpdatePlatform(newInstalledModuleDir: string): IFuture<boolean>;
+	/**
+	 * Checks if current platform can be updated to a newer versions.
+	 * @param {string} newInstalledModuleDir Path to the native project.
+	 * @return {boolean} True if platform can be updated. false otherwise.
+	 */
+	canUpdatePlatform(newInstalledModuleDir: string): boolean;
+
 	preparePluginNativeCode(pluginData: IPluginData, options?: any): IFuture<void>;
-	removePluginNativeCode(pluginData: IPluginData): IFuture<void>;
+
+	/**
+	 * Removes native code of a plugin (CocoaPods, jars, libs, src).
+	 * @param {IPluginData} Plugins data describing the plugin which should be cleaned.
+	 * @returns {void}
+	 */
+	removePluginNativeCode(pluginData: IPluginData): void;
+
 	afterPrepareAllPlugins(): IFuture<void>;
 	beforePrepareAllPlugins(dependencies?: IDictionary<IDependencyData>): IFuture<void>;
 	getAppResourcesDestinationDirectoryPath(): IFuture<string>;
@@ -134,7 +147,7 @@ interface ICocoaPodsService {
 	 * Merges the content of hooks with the provided name if there are more than one hooks with this name in the Podfile.
 	 * @param {string} hookName The name of the hook.
 	 * @param {string} pathToPodfile The path to the Podfile.
-	 * @return {IFuture<void>}
+	 * @return {void}
 	 */
-	mergePodfileHookContent(sectionName: string, pathToPodfile: string): IFuture<void>
+	mergePodfileHookContent(sectionName: string, pathToPodfile: string): void
 }

lib/services/android-project-service.ts

@@ -225,8 +225,8 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
 		return null;
 	}
 
-	public canUpdatePlatform(newInstalledModuleDir: string): IFuture<boolean> {
-		return Future.fromResult(true);
+	public canUpdatePlatform(newInstalledModuleDir: string): boolean {
+		return true;
 	}
 
 	public updatePlatform(currentVersion: string, newVersion: string, canUpdate: boolean, addPlatform?: Function, removePlatforms?: (platforms: string[]) => IFuture<void>): IFuture<boolean> {
@@ -372,20 +372,17 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
 		}).future<void>()();
 	}
 
-	// TODO: Remove IFuture, reason: fs.deleteDirectory - blocked as the other implementation of the interface has async operations.
-	public removePluginNativeCode(pluginData: IPluginData): IFuture<void> {
-		return (() => {
-			try {
-				this.$fs.deleteDirectory(path.join(this.platformData.projectRoot, "configurations", pluginData.name));
-				this.$fs.deleteDirectory(path.join(this.platformData.projectRoot, "src", pluginData.name));
-			} catch (e) {
-				if (e.code === "ENOENT") {
-					this.$logger.debug("No native code jars found: " + e.message);
-				} else {
-					throw e;
-				}
+	public removePluginNativeCode(pluginData: IPluginData): void {
+		try {
+			this.$fs.deleteDirectory(path.join(this.platformData.projectRoot, "configurations", pluginData.name));
+			this.$fs.deleteDirectory(path.join(this.platformData.projectRoot, "src", pluginData.name));
+		} catch (e) {
+			if (e.code === "ENOENT") {
+				this.$logger.debug("No native code jars found: " + e.message);
+			} else {
+				throw e;
 			}
-		}).future<void>()();
+		}
 	}
 
 	public afterPrepareAllPlugins(): IFuture<void> {

lib/services/cocoapods-service.ts

@@ -16,54 +16,52 @@ export class CocoaPodsService implements ICocoaPodsService {
 		return `${EOL}end`;
 	}
 
-	public mergePodfileHookContent(hookName: string, pathToPodfile: string): IFuture<void> {
-		return (() => {
-			if (!this.$fs.exists(pathToPodfile)) {
-				throw new Error(`The Podfile ${pathToPodfile} does not exist.`);
+	public mergePodfileHookContent(hookName: string, pathToPodfile: string): void {
+		if (!this.$fs.exists(pathToPodfile)) {
+			throw new Error(`The Podfile ${pathToPodfile} does not exist.`);
+		}
+
+		let podfileContent = this.$fs.readText(pathToPodfile);
+		let hookStart = `${hookName} do`;
+
+		let hookDefinitionRegExp = new RegExp(`${hookStart} *(\\|(\\w+)\\|)?`, "g");
+		let newFunctionNameIndex = 1;
+		let newFunctions: IRubyFunction[] = [];
+
+		let replacedContent = podfileContent.replace(hookDefinitionRegExp, (substring: string, firstGroup: string, secondGroup: string, index: number): string => {
+			let newFunctionName = `${hookName}${newFunctionNameIndex++}`;
+			let newDefinition = `def ${newFunctionName}`;
+
+			let rubyFunction: IRubyFunction = { functionName: newFunctionName };
+			// firstGroup is the block parameter, secondGroup is the block parameter name.
+			if (firstGroup && secondGroup) {
+				newDefinition = `${newDefinition} (${secondGroup})`;
+				rubyFunction.functionParameters = secondGroup;
 			}
 
-			let podfileContent = this.$fs.readText(pathToPodfile);
-			let hookStart = `${hookName} do`;
+			newFunctions.push(rubyFunction);
+			return newDefinition;
+		});
 
-			let hookDefinitionRegExp = new RegExp(`${hookStart} *(\\|(\\w+)\\|)?`, "g");
-			let newFunctionNameIndex = 1;
-			let newFunctions: IRubyFunction[] = [];
+		if (newFunctions.length > 1) {
+			// Execute all methods in the hook and pass the parameter to them.
+			let blokParameterName = "installer";
+			let mergedHookContent = `${hookStart} |${blokParameterName}|${EOL}`;
 
-			let replacedContent = podfileContent.replace(hookDefinitionRegExp, (substring: string, firstGroup: string, secondGroup: string, index: number): string => {
-				let newFunctionName = `${hookName}${newFunctionNameIndex++}`;
-				let newDefinition = `def ${newFunctionName}`;
-
-				let rubyFunction: IRubyFunction = { functionName: newFunctionName };
-				// firstGroup is the block parameter, secondGroup is the block parameter name.
-				if (firstGroup && secondGroup) {
-					newDefinition = `${newDefinition} (${secondGroup})`;
-					rubyFunction.functionParameters = secondGroup;
+			_.each(newFunctions, (rubyFunction: IRubyFunction) => {
+				let functionExecution = rubyFunction.functionName;
+				if (rubyFunction.functionParameters && rubyFunction.functionParameters.length) {
+					functionExecution = `${functionExecution} ${blokParameterName}`;
 				}
 
-				newFunctions.push(rubyFunction);
-				return newDefinition;
+				mergedHookContent = `${mergedHookContent}  ${functionExecution}${EOL}`;
 			});
 
-			if (newFunctions.length > 1) {
-				// Execute all methods in the hook and pass the parameter to them.
-				let blokParameterName = "installer";
-				let mergedHookContent = `${hookStart} |${blokParameterName}|${EOL}`;
-
-				_.each(newFunctions, (rubyFunction: IRubyFunction) => {
-					let functionExecution = rubyFunction.functionName;
-					if (rubyFunction.functionParameters && rubyFunction.functionParameters.length) {
-						functionExecution = `${functionExecution} ${blokParameterName}`;
-					}
-
-					mergedHookContent = `${mergedHookContent}  ${functionExecution}${EOL}`;
-				});
+			mergedHookContent = `${mergedHookContent}end`;
 
-				mergedHookContent = `${mergedHookContent}end`;
-
-				let newPodfileContent = `${replacedContent}${EOL}${mergedHookContent}`;
-				this.$fs.writeFile(pathToPodfile, newPodfileContent).wait();
-			}
-		}).future<void>()();
+			let newPodfileContent = `${replacedContent}${EOL}${mergedHookContent}`;
+			this.$fs.writeFile(pathToPodfile, newPodfileContent);
+		}
 	}
 }
 

lib/services/doctor-service.ts

@@ -193,7 +193,7 @@ class DoctorService implements IDoctorService {
 			this.$fs.writeFile(
 				path.join(iosDir, "Podfile"),
 				`${this.$cocoapodsService.getPodfileHeader(DoctorService.PROJECT_NAME_PLACEHOLDER)}pod 'AFNetworking', '~> 1.0'${this.$cocoapodsService.getPodfileFooter()}`
-			).wait();
+			);
 
 			spinner.message("Verifying CocoaPods. This may take some time, please be patient.");
 			spinner.start();