Make ensureDirectoryExists sync

Author: rosen-vladimirov

lib/commands/test-init.ts

@@ -46,7 +46,7 @@ class TestInitCommand implements ICommand {
 				shouldCreateSampleTests = false;
 			}
 
-			this.$fs.ensureDirectoryExists(testsDir).wait();
+			this.$fs.ensureDirectoryExists(testsDir);
 
 			let karmaConfTemplate = this.$resources.readText('test/karma.conf.js').wait();
 			let karmaConf = _.template(karmaConfTemplate)({

lib/services/android-project-service.ts

@@ -104,7 +104,7 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
 				this.$errors.failWithoutHelp(`The NativeScript CLI requires Android runtime ${AndroidProjectService.MIN_RUNTIME_VERSION_WITH_GRADLE} or later to work properly.`);
 			}
 
-			this.$fs.ensureDirectoryExists(this.platformData.projectRoot).wait();
+			this.$fs.ensureDirectoryExists(this.platformData.projectRoot);
 			this.$androidToolsInfo.validateInfo({ showWarningsAsErrors: true, validateTargetSdk: true }).wait();
 			let androidToolsInfo = this.$androidToolsInfo.getToolsInfo().wait();
 			let targetSdkVersion = androidToolsInfo.targetSdkVersion;
@@ -346,15 +346,15 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
 	private processResourcesFromPlugin(pluginData: IPluginData, pluginPlatformsFolderPath: string): IFuture<void> {
 		return (() => {
 			let configurationsDirectoryPath = path.join(this.platformData.projectRoot, "configurations");
-			this.$fs.ensureDirectoryExists(configurationsDirectoryPath).wait();
+			this.$fs.ensureDirectoryExists(configurationsDirectoryPath);
 
 			let pluginConfigurationDirectoryPath = path.join(configurationsDirectoryPath, pluginData.name);
 			if (this.$fs.exists(pluginPlatformsFolderPath)) {
-				this.$fs.ensureDirectoryExists(pluginConfigurationDirectoryPath).wait();
+				this.$fs.ensureDirectoryExists(pluginConfigurationDirectoryPath);
 
 				// Copy all resources from plugin
 				let resourcesDestinationDirectoryPath = path.join(this.platformData.projectRoot, "src", pluginData.name);
-				this.$fs.ensureDirectoryExists(resourcesDestinationDirectoryPath).wait();
+				this.$fs.ensureDirectoryExists(resourcesDestinationDirectoryPath);
 				shell.cp("-Rf", path.join(pluginPlatformsFolderPath, "*"), resourcesDestinationDirectoryPath);
 
 				(this.$fs.enumerateFilesInDirectorySync(resourcesDestinationDirectoryPath, file => this.$fs.getFsStats(file).isDirectory() || path.extname(file) === constants.XML_FILE_EXTENSION) || [])

lib/services/ios-project-service.ts

@@ -108,7 +108,7 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
 
 	public createProject(frameworkDir: string, frameworkVersion: string, pathToTemplate?: string): IFuture<void> {
 		return (() => {
-			this.$fs.ensureDirectoryExists(path.join(this.platformData.projectRoot, IOSProjectService.IOS_PROJECT_NAME_PLACEHOLDER)).wait();
+			this.$fs.ensureDirectoryExists(path.join(this.platformData.projectRoot, IOSProjectService.IOS_PROJECT_NAME_PLACEHOLDER));
 			if (pathToTemplate) {
 				// Copy everything except the template from the runtime
 				this.$fs.readDirectory(frameworkDir).wait()

lib/services/platform-service.ts

@@ -43,7 +43,7 @@ export class PlatformService implements IPlatformService {
 	public addPlatforms(platforms: string[]): IFuture<void> {
 		return (() => {
 			let platformsDir = this.$projectData.platformsDir;
-			this.$fs.ensureDirectoryExists(platformsDir).wait();
+			this.$fs.ensureDirectoryExists(platformsDir);
 
 			_.each(platforms, platform => {
 				this.addPlatform(platform.toLowerCase()).wait();
@@ -272,7 +272,7 @@ export class PlatformService implements IPlatformService {
 			let appDestinationDirectoryPath = path.join(platformData.appDestinationDirectoryPath, constants.APP_FOLDER_NAME);
 
 			// Copy app folder to native project
-			this.$fs.ensureDirectoryExists(appDestinationDirectoryPath).wait();
+			this.$fs.ensureDirectoryExists(appDestinationDirectoryPath);
 			let appSourceDirectoryPath = path.join(this.$projectData.projectDir, constants.APP_FOLDER_NAME);
 
 			const appUpdater = new AppFilesUpdater(appSourceDirectoryPath, appDestinationDirectoryPath, this.$options, this.$fs);
@@ -290,7 +290,7 @@ export class PlatformService implements IPlatformService {
 			if (this.$fs.exists(appResourcesDirectoryPath)) {
 				platformData.platformProjectService.prepareAppResources(appResourcesDirectoryPath).wait();
 				let appResourcesDestination = platformData.platformProjectService.getAppResourcesDestinationDirectoryPath().wait();
-				this.$fs.ensureDirectoryExists(appResourcesDestination).wait();
+				this.$fs.ensureDirectoryExists(appResourcesDestination);
 				shell.cp("-Rf", path.join(appResourcesDirectoryPath, platformData.normalizedPlatformName, "*"), appResourcesDestination);
 				this.$fs.deleteDirectory(appResourcesDirectoryPath);
 			}
@@ -385,7 +385,7 @@ export class PlatformService implements IPlatformService {
 
 			let packageFile = this.lastOutputPath(platform, settings);
 
-			this.$fs.ensureDirectoryExists(path.dirname(targetPath)).wait();
+			this.$fs.ensureDirectoryExists(path.dirname(targetPath));
 
 			if (this.$fs.exists(targetPath) && this.$fs.getFsStats(targetPath).isDirectory()) {
 				let sourceFileName = path.basename(packageFile);

lib/services/plugins-service.ts

@@ -258,7 +258,7 @@ export class PluginsService implements IPluginsService {
 	private ensure(): IFuture<void> {
 		return (() => {
 			this.ensureAllDependenciesAreInstalled().wait();
-			this.$fs.ensureDirectoryExists(this.nodeModulesPath).wait();
+			this.$fs.ensureDirectoryExists(this.nodeModulesPath);
 		}).future<void>()();
 	}
 

lib/services/project-service.ts

@@ -134,7 +134,7 @@ export class ProjectService implements IProjectService {
 
 	private createProjectCore(projectDir: string, appSourcePath: string, projectId: string): IFuture<void> {
 		return (() => {
-			this.$fs.ensureDirectoryExists(projectDir).wait();
+			this.$fs.ensureDirectoryExists(projectDir);
 
 			let appDestinationPath = path.join(projectDir, constants.APP_FOLDER_NAME);
 			this.$fs.createDirectory(appDestinationPath);

test/ios-project-service.ts

@@ -421,7 +421,7 @@ describe("Static libraries support", () => {
 
 	it("checks validation of header files", () => {
 		let iOSProjectService = testInjector.resolve("iOSProjectService");
-		fs.ensureDirectoryExists(staticLibraryHeadersPath).wait();
+		fs.ensureDirectoryExists(staticLibraryHeadersPath);
 		_.each(headers, header => { fs.writeFile(path.join(staticLibraryHeadersPath, header), "").wait(); });
 
 		// Add all header files.
@@ -439,7 +439,7 @@ describe("Static libraries support", () => {
 
 	it("checks generation of modulemaps", () => {
 		let iOSProjectService = testInjector.resolve("iOSProjectService");
-		fs.ensureDirectoryExists(staticLibraryHeadersPath).wait();
+		fs.ensureDirectoryExists(staticLibraryHeadersPath);
 		_.each(headers, header => { fs.writeFile(path.join(staticLibraryHeadersPath, header), "").wait(); });
 
 		iOSProjectService.generateModulemap(staticLibraryHeadersPath, libraryName);

test/npm-support.ts

@@ -128,7 +128,7 @@ function setupProject(dependencies?: any): IFuture<any> {
 
 		// Creates platforms/android folder
 		let androidFolderPath = path.join(projectFolder, "platforms", "android");
-		fs.ensureDirectoryExists(androidFolderPath).wait();
+		fs.ensureDirectoryExists(androidFolderPath);
 
 		// Mock platform data
 		let appDestinationFolderPath = path.join(androidFolderPath, "assets");

test/plugins-service.ts

@@ -537,7 +537,7 @@ describe("Plugins service", () => {
 
 			// Ensure the pluginDestinationPath folder exists
 			let pluginPlatformsDirPath = path.join(projectFolder, "node_modules", pluginName, "platforms", "android");
-			fs.ensureDirectoryExists(pluginPlatformsDirPath).wait();
+			fs.ensureDirectoryExists(pluginPlatformsDirPath);
 
 			// Creates invalid plugin's AndroidManifest.xml file
 			let xml = '<?xml version="1.0" encoding="UTF-8"?>' +

test/stubs.ts

@@ -130,8 +130,8 @@ export class FileSystemStub implements IFileSystem {
 		return Future.fromResult(true);
 	}
 
-	ensureDirectoryExists(directoryPath: string): IFuture<void> {
-		return Future.fromResult();
+	ensureDirectoryExists(directoryPath: string): void {
+		return undefined;
 	}
 
 	rename(oldPath: string, newPath: string): IFuture<void> {