Use sync version of fs.rename

Author: rosen-vladimirov

lib/definitions/project.d.ts

@@ -70,7 +70,14 @@ interface IPlatformProjectService {
 	createProject(frameworkDir: string, frameworkVersion: string, pathToTemplate?: string): IFuture<void>;
 	interpolateData(): IFuture<void>;
 	interpolateConfigurationFile(configurationFilePath?: string): IFuture<void>;
-	afterCreateProject(projectRoot: string): IFuture<void>;
+
+	/**
+	 * Executes additional actions after native project is created.
+	 * @param {string} projectRoot Path to the real NativeScript project.
+	 * @returns {void}
+	 */
+	afterCreateProject(projectRoot: string): void;
+
 	buildProject(projectRoot: string, buildConfig?: IBuildConfig): IFuture<void>;
 	prepareProject(): IFuture<void>;
 	prepareAppResources(appResourcesDirectoryPath: string): IFuture<void>;

lib/services/android-project-service.ts

@@ -221,8 +221,8 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
 		return id;
 	}
 
-	public afterCreateProject(projectRoot: string): IFuture<void> {
-		return Future.fromResult();
+	public afterCreateProject(projectRoot: string): void {
+		return null;
 	}
 
 	public canUpdatePlatform(newInstalledModuleDir: string): IFuture<boolean> {

lib/services/ios-project-service.ts

@@ -130,9 +130,9 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
 			// Starting with NativeScript for iOS 1.6.0, the project Info.plist file resides not in the platform project,
 			// but in the hello-world app template as a platform specific resource.
 			if (this.$fs.exists(path.join(projectRootFilePath, IOSProjectService.IOS_PROJECT_NAME_PLACEHOLDER + "-Info.plist"))) {
-				this.replaceFileName("-Info.plist", projectRootFilePath).wait();
+				this.replaceFileName("-Info.plist", projectRootFilePath);
 			}
-			this.replaceFileName("-Prefix.pch", projectRootFilePath).wait();
+			this.replaceFileName("-Prefix.pch", projectRootFilePath);
 
 			let xcschemeDirPath = path.join(this.platformData.projectRoot, IOSProjectService.IOS_PROJECT_NAME_PLACEHOLDER + IOSProjectService.XCODE_PROJECT_EXT_NAME, "xcshareddata/xcschemes");
 			let xcschemeFilePath = path.join(xcschemeDirPath, IOSProjectService.IOS_PROJECT_NAME_PLACEHOLDER + IOSProjectService.XCODE_SCHEME_EXT_NAME);
@@ -142,13 +142,13 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
 				this.$logger.debug("Checkpoint 0");
 				this.replaceFileContent(xcschemeFilePath).wait();
 				this.$logger.debug("Checkpoint 1");
-				this.replaceFileName(IOSProjectService.XCODE_SCHEME_EXT_NAME, xcschemeDirPath).wait();
+				this.replaceFileName(IOSProjectService.XCODE_SCHEME_EXT_NAME, xcschemeDirPath);
 				this.$logger.debug("Checkpoint 2");
 			} else {
 				this.$logger.debug("Copying xcscheme from template not found at " + xcschemeFilePath);
 			}
 
-			this.replaceFileName(IOSProjectService.XCODE_PROJECT_EXT_NAME, this.platformData.projectRoot).wait();
+			this.replaceFileName(IOSProjectService.XCODE_PROJECT_EXT_NAME, this.platformData.projectRoot);
 
 			let pbxprojFilePath = this.pbxProjPath;
 			this.replaceFileContent(pbxprojFilePath).wait();
@@ -162,11 +162,9 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
 		}).future<void>()();
 	}
 
-	public afterCreateProject(projectRoot: string): IFuture<void> {
-		return (() => {
-			this.$fs.rename(path.join(projectRoot, IOSProjectService.IOS_PROJECT_NAME_PLACEHOLDER),
-				path.join(projectRoot, this.$projectData.projectName)).wait();
-		}).future<void>()();
+	public afterCreateProject(projectRoot: string): void {
+		this.$fs.rename(path.join(projectRoot, IOSProjectService.IOS_PROJECT_NAME_PLACEHOLDER),
+			path.join(projectRoot, this.$projectData.projectName));
 	}
 
 	/**
@@ -779,13 +777,11 @@ We will now place an empty obsolete compatability white screen LauncScreen.xib f
 		}).future<void>()();
 	}
 
-	private replaceFileName(fileNamePart: string, fileRootLocation: string): IFuture<void> {
-		return (() => {
-			let oldFileName = IOSProjectService.IOS_PROJECT_NAME_PLACEHOLDER + fileNamePart;
-			let newFileName = this.$projectData.projectName + fileNamePart;
+	private replaceFileName(fileNamePart: string, fileRootLocation: string): void {
+		let oldFileName = IOSProjectService.IOS_PROJECT_NAME_PLACEHOLDER + fileNamePart;
+		let newFileName = this.$projectData.projectName + fileNamePart;
 
-			this.$fs.rename(path.join(fileRootLocation, oldFileName), path.join(fileRootLocation, newFileName)).wait();
-		}).future<void>()();
+		this.$fs.rename(path.join(fileRootLocation, oldFileName), path.join(fileRootLocation, newFileName));
 	}
 
 	private executePodInstall(): IFuture<any> {

lib/services/platform-service.ts

@@ -124,7 +124,7 @@ export class PlatformService implements IPlatformService {
 			platformData.platformProjectService.createProject(path.resolve(frameworkDir), installedVersion, pathToTemplate).wait();
 			platformData.platformProjectService.ensureConfigurationFileInAppResources().wait();
 			platformData.platformProjectService.interpolateData().wait();
-			platformData.platformProjectService.afterCreateProject(platformData.projectRoot).wait();
+			platformData.platformProjectService.afterCreateProject(platformData.projectRoot);
 
 			this.applyBaseConfigOption(platformData).wait();
 

test/platform-service.ts

@@ -255,7 +255,7 @@ describe('Platform Service Tests', () => {
 						validate: () => Future.fromResult(),
 						createProject: (projectRoot: string, frameworkDir: string) => Future.fromResult(),
 						interpolateData: (projectRoot: string) => Future.fromResult(),
-						afterCreateProject: (projectRoot: string) => Future.fromResult(),
+						afterCreateProject: (projectRoot: string): any => null,
 						getAppResourcesDestinationDirectoryPath: () => Future.fromResult(""),
 						processConfigurationFilesFromAppResources: () => Future.fromResult(),
 						ensureConfigurationFileInAppResources: () => Future.fromResult(),
@@ -329,7 +329,7 @@ describe('Platform Service Tests', () => {
 						validate: () => Future.fromResult(),
 						createProject: (projectRoot: string, frameworkDir: string) => Future.fromResult(),
 						interpolateData: (projectRoot: string) => Future.fromResult(),
-						afterCreateProject: (projectRoot: string) => Future.fromResult(),
+						afterCreateProject: (projectRoot: string): any => null,
 						getAppResourcesDestinationDirectoryPath: () => Future.fromResult(""),
 						processConfigurationFilesFromAppResources: () => Future.fromResult(),
 						ensureConfigurationFileInAppResources: () => Future.fromResult(),

test/stubs.ts

@@ -134,7 +134,7 @@ export class FileSystemStub implements IFileSystem {
 		return undefined;
 	}
 
-	rename(oldPath: string, newPath: string): IFuture<void> {
+	rename(oldPath: string, newPath: string): void {
 		return undefined;
 	}
 
@@ -170,7 +170,7 @@ export class FileSystemStub implements IFileSystem {
 		return undefined;
 	}
 
-	renameIfExists(oldPath: string, newPath: string): IFuture<boolean> {
+	renameIfExists(oldPath: string, newPath: string): boolean {
 		return undefined;
 	}
 
@@ -305,8 +305,8 @@ export class PlatformProjectServiceStub implements IPlatformProjectService {
 	interpolateConfigurationFile(): IFuture<void> {
 		return Future.fromResult();
 	}
-	afterCreateProject(projectRoot: string): IFuture<void> {
-		return Future.fromResult();
+	afterCreateProject(projectRoot: string): void {
+		return null;
 	}
 	prepareProject(): IFuture<void> {
 		return Future.fromResult();