Cocoapods support

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 {

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 {

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("/");		
 	}

lib/services/ios-project-service.ts

@@ -2,19 +2,21 @@
 "use strict";
 
 import Future = require("fibers/future");
-import path = require("path");
-import shell = require("shelljs");
-import util = require("util");
-import xcode = require("xcode");
+import * as path from "path";
+import * as shell from "shelljs";
+import * as util from "util";
+import * as os from "os";
+import * as xcode from "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__";
 	private static IOS_PLATFORM_NAME = "ios";
+	private static PODFILE_POST_INSTALL_SECTION_NAME = "post_install";
 
 	private get $npmInstallationManager(): INpmInstallationManager {
 		return this.$injector.resolve("npmInstallationManager");
@@ -262,14 +264,17 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
 
 				this.savePbxProj(project).wait();
 			}
-
 		}).future<void>()();
 	}
 
 	public prepareAppResources(appResourcesDirectoryPath: string): IFuture<void> {
 		return this.$fs.deleteDirectory(this.platformData.appResourcesDestinationDirectoryPath);
 	}
 
+	private get projectPodFilePath(): string {
+		return path.join(this.platformData.projectRoot, "Podfile");
+	}
+
 	private replace(name: string): string {
 		if(_.startsWith(name, '"')) {
 			name = name.substr(1, name.length-2);
@@ -303,22 +308,41 @@ 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());
+			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();
+			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.");					
+				}
+
+				let projectPodfileContent = this.$fs.readText(this.projectPodFilePath).wait(); 
+				this.$logger.trace("Project Podfile content");
+				this.$logger.trace(projectPodfileContent);
+
+				let firstPostInstallIndex = projectPodfileContent.indexOf(IOSProjectService.PODFILE_POST_INSTALL_SECTION_NAME);
+				if(firstPostInstallIndex !== -1 && firstPostInstallIndex !== projectPodfileContent.lastIndexOf(IOSProjectService.PODFILE_POST_INSTALL_SECTION_NAME)) {
+					this.$logger.warn(`Podfile contains more than one post_install sections. You need to open ${this.projectPodFilePath} file and manually resolve this issue.`);
+				} 
+
+				this.$logger.info("Installing pods...");
+				this.$childProcess.exec("pod install", { cwd: this.platformData.projectRoot }).wait();
+			}
 		}).future<void>()();
 	}
 
@@ -379,5 +403,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);

lib/services/plugins-service.ts

@@ -111,7 +111,6 @@ export class PluginsService implements IPluginsService {
 						this.validateXml(resultXml);
 						this.$fs.writeFile(configurationFilePath, resultXml).wait();	
 					}
-
 
 					this.$projectFilesManager.processPlatformSpecificFiles(pluginDestinationPath, platform).wait();						
 
@@ -145,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");
 	}

lib/tools/broccoli/node-modules-dest-copy.ts

@@ -76,6 +76,10 @@ export class DestCopy implements IBroccoliPlugin {
 			this.$pluginsService.prepare(dependency).wait();
 		}
 	});
+
+	if(!_.isEmpty(this.dependencies)) {
+		this.$pluginsService.afterPrepareAllPlugins().wait();
+	}
   }
 
   public rebuild(treeDiff: IDiffResult): void {	

test/ios-project-service.ts

@@ -0,0 +1,149 @@
+/// <reference path=".d.ts" />
+"use strict";
+
+import Future = require("fibers/future");
+import * as path from "path";
+import temp = require("temp");
+temp.track();
+
+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");
+
+import { assert } from "chai";
+
+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());
+	}); 
+});

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()
 				}
 			}	
 		};