Merge pull request #870 from NativeScript/fatme/fix-cocoapods

Execute pod install when a plugin containing only Podfile is added after the ios platform

Author: Fatme

lib/definitions/project.d.ts

@@ -43,7 +43,7 @@ interface IPlatformProjectService {
 	addLibrary(libraryPath: string): IFuture<void>;
 	canUpdatePlatform(currentVersion: string, newVersion: string): IFuture<boolean>;
 	updatePlatform(currentVersion: string, newVersion: string): IFuture<void>;
-	preparePluginNativeCode(pluginData: IPluginData): IFuture<void>;
+	preparePluginNativeCode(pluginData: IPluginData, options?: any): IFuture<void>;
 	removePluginNativeCode(pluginData: IPluginData): IFuture<void>;
 	afterPrepareAllPlugins(): IFuture<void>;
 	getAppResourcesDestinationDirectoryPath(): IFuture<string>;

lib/services/ios-project-service.ts

@@ -329,11 +329,11 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
 		 return this.$fs.writeFile(this.pbxProjPath, project.writeSync());
 	}
 
-	public preparePluginNativeCode(pluginData: IPluginData): IFuture<void> {
+	public preparePluginNativeCode(pluginData: IPluginData, opts?: any): IFuture<void> {
 		return (() => {
 			let pluginPlatformsFolderPath = pluginData.pluginPlatformsFolderPath(IOSProjectService.IOS_PLATFORM_NAME);
 			this.prepareFrameworks(pluginPlatformsFolderPath, pluginData).wait();
-			this.prepareCocoapods(pluginPlatformsFolderPath).wait();
+			this.prepareCocoapods(pluginPlatformsFolderPath, opts).wait();
 		}).future<void>()();
 	}
 
@@ -372,8 +372,7 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
 					this.$childProcess.exec(createSchemeRubyScript, { cwd: this.platformData.projectRoot }).wait();
 				}
 
-				this.$logger.info("Installing pods...");
-				this.$childProcess.exec("pod install", { cwd: this.platformData.projectRoot }).wait();
+				this.executePodInstall().wait();
 			}
 		}).future<void>()();
 	}
@@ -418,13 +417,18 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
 		}).future<void>()();
 	}
 
+	private executePodInstall(): IFuture<any> {
+		this.$logger.info("Installing pods...");
+		return this.$childProcess.exec("pod install", { cwd: this.platformData.projectRoot });
+	}
+
 	private prepareFrameworks(pluginPlatformsFolderPath: string, pluginData: IPluginData): IFuture<void> {
 		return (() => {
 			_.each(this.getAllFrameworksForPlugin(pluginData).wait(), fileName => this.addLibrary(path.join(pluginPlatformsFolderPath, fileName)).wait());
 		}).future<void>()();
 	}
 
-	private prepareCocoapods(pluginPlatformsFolderPath: string): IFuture<void> {
+	private prepareCocoapods(pluginPlatformsFolderPath: string, opts?: any): IFuture<void> {
 		return (() => {
 			let pluginPodFilePath = path.join(pluginPlatformsFolderPath, "Podfile");
 			if(this.$fs.exists(pluginPodFilePath).wait()) {
@@ -436,6 +440,10 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
 				let contentToWrite = this.buildPodfileContent(pluginPodFilePath, pluginPodFileContent);
 				this.$fs.appendFile(this.projectPodFilePath, contentToWrite).wait();
 			}
+
+			if(opts && opts.executePodInstall && this.$fs.exists(pluginPodFilePath).wait()) {
+				this.executePodInstall().wait();
+			}
 		}).future<void>()();
 	}
 

lib/services/plugins-service.ts

@@ -117,7 +117,7 @@ export class PluginsService implements IPluginsService {
 						this.$projectFilesManager.processPlatformSpecificFiles(pluginDestinationPath, platform).wait();
 
 						pluginData.pluginPlatformsFolderPath = (_platform: string) => path.join(pluginData.fullPath, "platforms", _platform);
-						platformData.platformProjectService.preparePluginNativeCode(pluginData).wait();
+						platformData.platformProjectService.preparePluginNativeCode(pluginData, {executePodInstall: true }).wait();
 
 						shelljs.rm("-rf", path.join(pluginDestinationPath, pluginData.name, "platforms"));