Add unit tests

Fatme Havaluova · Fatme Havaluova · commit c2fd3943a43b · 2015-08-17T16:44:55.000+03:00
diff --git a/lib/definitions/plugins.d.ts b/lib/definitions/plugins.d.ts
@@ -4,6 +4,7 @@ interface IPluginsService {
 	prepare(pluginData: IDependencyData): IFuture<void>;
 	getAllInstalledPlugins(): IFuture<IPluginData[]>;
 	ensureAllDependenciesAreInstalled(): IFuture<void>;
+	afterPrepareAllPlugins(): IFuture<void>;
 }
 
 interface IPluginData extends INodeModuleData {
diff --git a/lib/definitions/project.d.ts b/lib/definitions/project.d.ts
@@ -40,6 +40,7 @@ interface IPlatformProjectService {
 	updatePlatform(currentVersion: string, newVersion: string): IFuture<void>;
 	preparePluginNativeCode(pluginData: IPluginData): IFuture<void>;
 	removePluginNativeCode(pluginData: IPluginData): IFuture<void>;
+	afterPrepareAllPlugins(): IFuture<void>;
 }
 
 interface IAndroidProjectPropertiesManager {
diff --git a/lib/services/android-project-service.ts b/lib/services/android-project-service.ts
@@ -296,6 +296,10 @@ class AndroidProjectService extends projectServiceBaseLib.PlatformProjectService
 		}).future<void>()();
 	}
 	
+	public afterPrepareAllPlugins(): IFuture<void> {
+		return Future.fromResult();
+	}
+	
 	private getLibraryRelativePath(basePath: string, libraryPath: string): string {
 		return path.relative(basePath, libraryPath).split("\\").join("/");		
 	}
diff --git a/lib/services/ios-project-service.ts b/lib/services/ios-project-service.ts
@@ -2,15 +2,16 @@
 "use strict";
 
 import Future = require("fibers/future");
-import path = require("path");
+import * as path from "path";
 import shell = require("shelljs");
 import util = require("util");
+import * as os from "os";
 import xcode = require("xcode");
 import constants = require("./../constants");
 import helpers = require("./../common/helpers");
 import projectServiceBaseLib = require("./platform-project-service-base");
 
-class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase implements  IPlatformProjectService {
+export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase implements  IPlatformProjectService {
 	private static XCODE_PROJECT_EXT_NAME = ".xcodeproj";
 	private static XCODEBUILD_MIN_VERSION = "6.0";
 	private static IOS_PROJECT_NAME_PLACEHOLDER = "__PROJECT_NAME__";
@@ -262,14 +263,6 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
 				
 				this.savePbxProj(project).wait();
 			}
-			
-			if(this.$fs.exists(this.projectPodFilePath).wait() && this.$fs.getFsStats(this.projectPodFilePath).wait().mtime < this.$fs.getFsStats(this.$projectData.projectFilePath).wait().mtime) {
-				try {
-					this.$childProcess.exec("pod install", { cwd: this.platformData.projectRoot }).wait();
-				} catch(e) {
-					this.$errors.failWithoutHelp("CocoaPods are not installed. Run `sudo gem install cocoapods` and try again.");
-				}
-			}
 		}).future<void>()();
 	}
 	
@@ -314,35 +307,31 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
 	public preparePluginNativeCode(pluginData: IPluginData): IFuture<void> {
 		return (() => {
 			let pluginPlatformsFolderPath = pluginData.pluginPlatformsFolderPath(IOSProjectService.IOS_PLATFORM_NAME);
-			_.each(this.getAllDynamicFrameworksForPlugin(pluginData).wait(), fileName => this.addLibrary(path.join(pluginPlatformsFolderPath, fileName)).wait());
-			
-			let pluginPodFilePath = path.join(pluginPlatformsFolderPath, "Podfile");
-			if(this.$fs.exists(pluginPodFilePath).wait()) {
-				let pluginPodFileContent = this.$fs.readText(pluginPodFilePath).wait();
-				this.$fs.appendFile(this.projectPodFilePath, pluginPodFileContent).wait();
-			}
+			this.prepareDynamicFrameworks(pluginPlatformsFolderPath, pluginData).wait();
+			this.prepareCocoapods(pluginPlatformsFolderPath).wait();
 		}).future<void>()();
 	}
 	
 	public removePluginNativeCode(pluginData: IPluginData): IFuture<void> {
 		return (() => {
 			let pluginPlatformsFolderPath = pluginData.pluginPlatformsFolderPath(IOSProjectService.IOS_PLATFORM_NAME);
-			let project = this.createPbxProj();
-						
-			_.each(this.getAllDynamicFrameworksForPlugin(pluginData).wait(), fileName => {
-				let fullFrameworkPath = path.join(pluginPlatformsFolderPath, fileName);
-				let relativeFrameworkPath = this.getFrameworkRelativePath(fullFrameworkPath);
-				project.removeFramework(relativeFrameworkPath, { customFramework: true, embed: true })
-			});
-			
-			this.savePbxProj(project).wait();
-			
-			let pluginPodFilePath = path.join(pluginPlatformsFolderPath, "Podfile");
-			if(this.$fs.exists(pluginPodFilePath).wait()) {
-				let pluginPodFileContent = this.$fs.readText(pluginPodFilePath).wait();
-				let projectPodFileContent = this.$fs.readText(this.projectPodFilePath).wait();
-				projectPodFileContent = helpers.stringReplaceAll(projectPodFileContent, pluginPodFileContent, "");
-				this.$fs.writeFile(this.projectPodFilePath, projectPodFileContent).wait();
+			this.removeDynamicFrameworks(pluginPlatformsFolderPath, pluginData).wait();
+			this.removeCocoapods(pluginPlatformsFolderPath).wait();
+		}).future<void>()();
+	}
+	
+	public afterPrepareAllPlugins(): IFuture<void> {
+		return (() => {
+			if(this.$fs.exists(this.projectPodFilePath).wait()) {
+				// Check availability
+				try {
+					this.$childProcess.exec("gem which cocoapods").wait();
+				} catch(e) {
+					this.$errors.failWithoutHelp("CocoaPods are not installed. Run `sudo gem install cocoapods` and try again.");					
+				}
+				
+				this.$logger.info("Installing pods...");
+				this.$childProcess.exec("pod install", { cwd: this.platformData.projectRoot }).wait();
 			}
 		}).future<void>()();
 	}
@@ -404,5 +393,57 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
 			this.$fs.rename(path.join(fileRootLocation, oldFileName), path.join(fileRootLocation, newFileName)).wait();
 		}).future<void>()();
 	}
+	
+	private prepareDynamicFrameworks(pluginPlatformsFolderPath: string, pluginData: IPluginData): IFuture<void> {
+		return (() => {
+			_.each(this.getAllDynamicFrameworksForPlugin(pluginData).wait(), fileName => this.addLibrary(path.join(pluginPlatformsFolderPath, fileName)).wait());			
+		}).future<void>()();
+	}
+	
+	private prepareCocoapods(pluginPlatformsFolderPath: string): IFuture<void> {
+		return (() => {
+			let pluginPodFilePath = path.join(pluginPlatformsFolderPath, "Podfile");
+			if(this.$fs.exists(pluginPodFilePath).wait()) {
+				let pluginPodFileContent = this.$fs.readText(pluginPodFilePath).wait();
+				let contentToWrite = this.buildPodfileContent(pluginPodFilePath, pluginPodFileContent);
+				this.$fs.appendFile(this.projectPodFilePath, contentToWrite).wait();
+			}
+		}).future<void>()();
+	}
+	
+	private removeDynamicFrameworks(pluginPlatformsFolderPath: string, pluginData: IPluginData): IFuture<void> {
+		return (() => {
+			let project = this.createPbxProj();
+						
+			_.each(this.getAllDynamicFrameworksForPlugin(pluginData).wait(), fileName => {
+				let fullFrameworkPath = path.join(pluginPlatformsFolderPath, fileName);
+				let relativeFrameworkPath = this.getFrameworkRelativePath(fullFrameworkPath);
+				project.removeFramework(relativeFrameworkPath, { customFramework: true, embed: true })
+			});
+			
+			this.savePbxProj(project).wait();
+		}).future<void>()();
+	}
+	
+	private removeCocoapods(pluginPlatformsFolderPath: string): IFuture<void> {
+		return (() => {
+			let pluginPodFilePath = path.join(pluginPlatformsFolderPath, "Podfile");
+			if(this.$fs.exists(pluginPodFilePath).wait()) {
+				let pluginPodFileContent = this.$fs.readText(pluginPodFilePath).wait();
+				let projectPodFileContent = this.$fs.readText(this.projectPodFilePath).wait();
+				let contentToRemove= this.buildPodfileContent(pluginPodFilePath, pluginPodFileContent);
+				projectPodFileContent = helpers.stringReplaceAll(projectPodFileContent, contentToRemove, "");
+				if(_.isEmpty(projectPodFileContent)) {
+					this.$fs.deleteFile(this.projectPodFilePath).wait();
+				} else {
+					this.$fs.writeFile(this.projectPodFilePath, projectPodFileContent).wait();
+				}
+			}
+		}).future<void>()();
+	}
+	
+	private buildPodfileContent(pluginPodFilePath: string, pluginPodFileContent: string): string {
+		return `# Begin Podfile - ${pluginPodFilePath} ${os.EOL} ${pluginPodFileContent} ${os.EOL} # End Podfile ${os.EOL}`;
+	}
 }
 $injector.register("iOSProjectService", IOSProjectService);
diff --git a/lib/services/plugins-service.ts b/lib/services/plugins-service.ts
@@ -144,6 +144,14 @@ export class PluginsService implements IPluginsService {
 		}).future<IPluginData[]>()();
 	}
 	
+	public afterPrepareAllPlugins(): IFuture<void> {
+		let action = (pluginDestinationPath: string, platform: string, platformData: IPlatformData) => {
+			return platformData.platformProjectService.afterPrepareAllPlugins();
+		};
+		
+		return this.executeForAllInstalledPlatforms(action);
+	}
+	
 	private get nodeModulesPath(): string {
 		return path.join(this.$projectData.projectDir, "node_modules");
 	}
diff --git a/lib/tools/broccoli/node-modules-dest-copy.ts b/lib/tools/broccoli/node-modules-dest-copy.ts
@@ -76,6 +76,10 @@ export class DestCopy implements IBroccoliPlugin {
 			this.$pluginsService.prepare(dependency).wait();
 		}
 	});
+	
+	if(_.keys(this.dependencies).length > 0) {
+		this.$pluginsService.afterPrepareAllPlugins().wait();
+	}
   }
 
   public rebuild(treeDiff: IDiffResult): void {	
diff --git a/test/ios-project-service.ts b/test/ios-project-service.ts
@@ -0,0 +1,148 @@
+/// <reference path=".d.ts" />
+"use strict";
+
+import Future = require("fibers/future");
+import * as path from "path";
+import temp = require("temp");
+
+import ChildProcessLib = require("../lib/common/child-process");
+import ConfigLib = require("../lib/config");
+import ErrorsLib = require("../lib/common/errors");
+import FileSystemLib = require("../lib/common/file-system");
+import HostInfoLib = require("../lib/common/host-info");
+import iOSProjectServiceLib = require("../lib/services/ios-project-service");
+import LoggerLib = require("../lib/common/logger");
+import OptionsLib = require("../lib/options");
+import ProjectDataLib = require("../lib/project-data");
+
+import yok = require("../lib/common/yok");
+
+let assert = require("chai").assert;
+
+function createTestInjector(projectPath: string, projectName: string): IInjector {
+	let testInjector = new yok.Yok();
+	testInjector.register("childProcess", ChildProcessLib.ChildProcess);
+	testInjector.register("config", ConfigLib.Configuration);
+	testInjector.register("errors", ErrorsLib.Errors);
+	testInjector.register("fs", FileSystemLib.FileSystem);
+	testInjector.register("hostInfo", HostInfoLib.HostInfo);
+	testInjector.register("injector", testInjector);	
+	testInjector.register("iOSEmulatorServices", {});
+	testInjector.register("iOSProjectService", iOSProjectServiceLib.IOSProjectService);	
+	testInjector.register("logger", LoggerLib.Logger);
+	testInjector.register("options", OptionsLib.Options);
+	testInjector.register("projectData", {
+		platformsDir: projectPath,
+		projectName: projectName
+	});
+	testInjector.register("projectHelper", {});
+	testInjector.register("staticConfig", ConfigLib.StaticConfig);
+	
+	return testInjector;
+}
+
+describe("Cocoapods support", () => {
+	 it("adds plugin with Podfile", () => {
+		let projectName = "projectDirectory";
+		let projectPath = temp.mkdirSync(projectName);		
+		
+		let testInjector = createTestInjector(projectPath, projectName);
+		let fs: IFileSystem = testInjector.resolve("fs");
+		
+		let packageJsonData = {
+			"name": "myProject",
+			"version": "0.1.0",
+			"nativescript": {
+				"id": "org.nativescript.myProject",
+				"tns-android": {
+					"version": "1.0.0"
+				}
+			}
+		};
+		fs.writeJson(path.join(projectPath, "package.json"), packageJsonData).wait();
+		
+		let platformsFolderPath = path.join(projectPath, "ios");
+		fs.createDirectory(platformsFolderPath).wait();
+		
+		let iOSProjectService = testInjector.resolve("iOSProjectService");
+		iOSProjectService.prepareDynamicFrameworks = (pluginPlatformsFolderPath: string, pluginData: IPluginData): IFuture<void> => {
+			return Future.fromResult();
+		};
+		
+		let pluginPath = temp.mkdirSync("pluginDirectory");
+		let pluginPlatformsFolderPath = path.join(pluginPath, "platforms", "ios");
+		let pluginPodfilePath = path.join(pluginPlatformsFolderPath, "Podfile");
+		let pluginPodfileContent = ["source 'https://github.com/CocoaPods/Specs.git'",  "platform :ios, '8.1'", "pod 'GoogleMaps'"].join("\n");
+		fs.writeFile(pluginPodfilePath, pluginPodfileContent).wait();		
+		
+		let pluginData = {
+			pluginPlatformsFolderPath(platform: string): string {
+				return pluginPlatformsFolderPath;
+			}
+		};
+		
+		iOSProjectService.preparePluginNativeCode(pluginData).wait();
+		
+		let projectPodfilePath = path.join(platformsFolderPath, "Podfile");
+		assert.isTrue(fs.exists(projectPodfilePath).wait());
+		
+		let actualProjectPodfileContent = fs.readText(projectPodfilePath).wait();
+		let expectedProjectPodfileContent = [`# Begin Podfile - ${pluginPodfilePath} `, ` ${pluginPodfileContent} `, " # End Podfile \n"].join("\n"); 
+		assert.equal(actualProjectPodfileContent, expectedProjectPodfileContent);
+	}); 
+	it("adds and removes plugin with Podfile", () => {
+		let projectName = "projectDirectory2";
+		let projectPath = temp.mkdirSync(projectName);		
+		
+		let testInjector = createTestInjector(projectPath, projectName);
+		let fs: IFileSystem = testInjector.resolve("fs");
+		
+		let packageJsonData = {
+			"name": "myProject2",
+			"version": "0.1.0",
+			"nativescript": {
+				"id": "org.nativescript.myProject2",
+				"tns-android": {
+					"version": "1.0.0"
+				}
+			}
+		};
+		fs.writeJson(path.join(projectPath, "package.json"), packageJsonData).wait();
+		
+		let platformsFolderPath = path.join(projectPath, "ios");
+		fs.createDirectory(platformsFolderPath).wait();
+		
+		let iOSProjectService = testInjector.resolve("iOSProjectService");
+		iOSProjectService.prepareDynamicFrameworks = (pluginPlatformsFolderPath: string, pluginData: IPluginData): IFuture<void> => {
+			return Future.fromResult();
+		};
+		iOSProjectService.removeDynamicFrameworks = (pluginPlatformsFolderPath: string, pluginData: IPluginData): IFuture<void> => {
+			return Future.fromResult();
+		}
+		
+		let pluginPath = temp.mkdirSync("pluginDirectory");
+		let pluginPlatformsFolderPath = path.join(pluginPath, "platforms", "ios");
+		let pluginPodfilePath = path.join(pluginPlatformsFolderPath, "Podfile");
+		let pluginPodfileContent = ["source 'https://github.com/CocoaPods/Specs.git'",  "platform :ios, '8.1'", "pod 'GoogleMaps'"].join("\n");
+		fs.writeFile(pluginPodfilePath, pluginPodfileContent).wait();		
+		
+		let pluginData = {
+			pluginPlatformsFolderPath(platform: string): string {
+				return pluginPlatformsFolderPath;
+			}
+		};
+		
+		iOSProjectService.preparePluginNativeCode(pluginData).wait();
+		
+		let projectPodfilePath = path.join(platformsFolderPath, "Podfile");
+		assert.isTrue(fs.exists(projectPodfilePath).wait());
+		
+		let actualProjectPodfileContent = fs.readText(projectPodfilePath).wait();
+		let expectedProjectPodfileContent = [`# Begin Podfile - ${pluginPodfilePath} `, ` ${pluginPodfileContent} `, " # End Podfile \n"].join("\n"); 
+		assert.equal(actualProjectPodfileContent, expectedProjectPodfileContent);
+		
+		iOSProjectService.removePluginNativeCode(pluginData).wait();
+		
+		assert.isFalse(fs.exists(projectPodfilePath).wait());
+	}); 
+});
diff --git a/test/npm-support.ts b/test/npm-support.ts
@@ -120,7 +120,8 @@ function setupProject(): IFuture<any> {
 				normalizedPlatformName: "Android",
 				platformProjectService: {
 					prepareProject: () => Future.fromResult(),
-					prepareAppResources: () => Future.fromResult()
+					prepareAppResources: () => Future.fromResult(),
+					afterPrepareAllPlugins: () => Future.fromResult()
 				}
 			}	
 		};
diff --git a/test/stubs.ts b/test/stubs.ts
@@ -250,7 +250,8 @@ export class PlatformsDataStub implements IPlatformsData {
 			appDestinationDirectoryPath: "",
 			appResourcesDestinationDirectoryPath: "",
 			preparePluginNativeCode: () => Future.fromResult(),
-			removePluginNativeCode: () => Future.fromResult()
+			removePluginNativeCode: () => Future.fromResult(),
+			afterPrepareAllPlugins: () => Future.fromResult()
 		};
 	}
 
@@ -271,7 +272,7 @@ export class PlatformProjectServiceStub implements IPlatformProjectService {
 			validPackageNamesForDevice: [],
 			frameworkFilesExtensions: [],
 			appDestinationDirectoryPath: "",
-			appResourcesDestinationDirectoryPath: ""
+			appResourcesDestinationDirectoryPath: "",
 		};
 	}
 	validate(): IFuture<void> {
@@ -316,6 +317,9 @@ export class PlatformProjectServiceStub implements IPlatformProjectService {
 	removePluginNativeCode(pluginData: IPluginData): IFuture<void> { 
 		return Future.fromResult();
 	}
+	afterPrepareAllPlugins(): IFuture<void> {
+		return Future.fromResult();
+	} 	
 }
 
 export class ProjectDataService implements IProjectDataService {

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@ interface IPluginsService {`
`4`	`4`	`prepare(pluginData: IDependencyData): IFuture<void>;`
`5`	`5`	`getAllInstalledPlugins(): IFuture<IPluginData[]>;`
`6`	`6`	`ensureAllDependenciesAreInstalled(): IFuture<void>;`
	`7`	`+ afterPrepareAllPlugins(): IFuture<void>;`
`7`	`8`	`}`
`8`	`9`
`9`	`10`	`interface IPluginData extends INodeModuleData {`
Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,7 @@ interface IPlatformProjectService {`
`40`	`40`	`updatePlatform(currentVersion: string, newVersion: string): IFuture<void>;`
`41`	`41`	`preparePluginNativeCode(pluginData: IPluginData): IFuture<void>;`
`42`	`42`	`removePluginNativeCode(pluginData: IPluginData): IFuture<void>;`
	`43`	`+ afterPrepareAllPlugins(): IFuture<void>;`
`43`	`44`	`}`
`44`	`45`
`45`	`46`	`interface IAndroidProjectPropertiesManager {`
Original file line number	Diff line number	Diff line change
`@@ -296,6 +296,10 @@ class AndroidProjectService extends projectServiceBaseLib.PlatformProjectService`
`296`	`296`	`}).future<void>()();`
`297`	`297`	`}`
`298`	`298`
	`299`	`+ public afterPrepareAllPlugins(): IFuture<void> {`
	`300`	`+ return Future.fromResult();`
	`301`	`+ }`
	`302`	`+`
`299`	`303`	`private getLibraryRelativePath(basePath: string, libraryPath: string): string {`
`300`	`304`	`return path.relative(basePath, libraryPath).split("\\").join("/");`
`301`	`305`	`}`
Original file line number	Diff line number	Diff line change
`@@ -144,6 +144,14 @@ export class PluginsService implements IPluginsService {`
`144`	`144`	`}).future<IPluginData[]>()();`
`145`	`145`	`}`
`146`	`146`
	`147`	`+ public afterPrepareAllPlugins(): IFuture<void> {`
	`148`	`+ let action = (pluginDestinationPath: string, platform: string, platformData: IPlatformData) => {`
	`149`	`+ return platformData.platformProjectService.afterPrepareAllPlugins();`
	`150`	`+ };`
	`151`	`+`
	`152`	`+ return this.executeForAllInstalledPlatforms(action);`
	`153`	`+ }`
	`154`	`+`
`147`	`155`	`private get nodeModulesPath(): string {`
`148`	`156`	`return path.join(this.$projectData.projectDir, "node_modules");`
`149`	`157`	`}`
Original file line number	Diff line number	Diff line change
`@@ -76,6 +76,10 @@ export class DestCopy implements IBroccoliPlugin {`
`76`	`76`	`this.$pluginsService.prepare(dependency).wait();`
`77`	`77`	`}`
`78`	`78`	`});`
	`79`	`+`
	`80`	`+ if(_.keys(this.dependencies).length > 0) {`
	`81`	`+ this.$pluginsService.afterPrepareAllPlugins().wait();`
	`82`	`+ }`
`79`	`83`	`}`
`80`	`84`
`81`	`85`	`public rebuild(treeDiff: IDiffResult): void {`
Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,8 @@ function setupProject(): IFuture<any> {`
`120`	`120`	`normalizedPlatformName: "Android",`
`121`	`121`	`platformProjectService: {`
`122`	`122`	`prepareProject: () => Future.fromResult(),`
`123`		`- prepareAppResources: () => Future.fromResult()`
	`123`	`+ prepareAppResources: () => Future.fromResult(),`
	`124`	`+ afterPrepareAllPlugins: () => Future.fromResult()`
`124`	`125`	`}`
`125`	`126`	`}`
`126`	`127`	`};`