Merge pull request #1099 from NativeScript/fatme/fix-prepare-for-both-platforms

Fix prepare for both platforms

Author: Fatme

lib/common

@@ -1,7 +1,7 @@
 interface IPluginsService {
 	add(plugin: string): IFuture<void>; // adds plugin by name, github url, local path and et.
 	remove(pluginName: string): IFuture<void>; // removes plugin only by name
-	prepare(pluginData: IDependencyData): IFuture<void>;
+	prepare(pluginData: IDependencyData, platform: string): IFuture<void>;
 	getAllInstalledPlugins(): IFuture<IPluginData[]>;
 	ensureAllDependenciesAreInstalled(): IFuture<void>;
 	afterPrepareAllPlugins(): IFuture<void>;

lib/definitions/plugins.d.ts

@@ -122,40 +122,37 @@ export class PluginsService implements IPluginsService {
 		}).future<void>()();
 	}
 
-	public prepare(dependencyData: IDependencyData): IFuture<void> {
+	public prepare(dependencyData: IDependencyData, platform: string): IFuture<void> {
 		return (() => {
+			platform = platform.toLowerCase();
+			let platformData = this.$platformsData.getPlatformData(platform);
+			let pluginDestinationPath = path.join(platformData.appDestinationDirectoryPath, constants.APP_FOLDER_NAME, "tns_modules");
 			let pluginData = this.convertToPluginData(dependencyData);
 
-			let action = (pluginDestinationPath: string, platform: string, platformData: IPlatformData) => {
-				return (() => {
-					if(!this.isPluginDataValidForPlatform(pluginData, platform).wait()) {
-						return;
-					}
+			if(!this.isPluginDataValidForPlatform(pluginData, platform).wait()) {
+				return;
+			}
 
-					if(this.$fs.exists(path.join(platformData.appDestinationDirectoryPath, constants.APP_FOLDER_NAME)).wait()) {
-						this.$fs.ensureDirectoryExists(pluginDestinationPath).wait();
-						shelljs.cp("-Rf", pluginData.fullPath, pluginDestinationPath);
+			if(this.$fs.exists(path.join(platformData.appDestinationDirectoryPath, constants.APP_FOLDER_NAME)).wait()) {
+				this.$fs.ensureDirectoryExists(pluginDestinationPath).wait();
+				shelljs.cp("-Rf", pluginData.fullPath, pluginDestinationPath);
 
-						let pluginConfigurationFilePath = this.getPluginConfigurationFilePath(pluginData, platformData);
-						if(this.$fs.exists(pluginConfigurationFilePath).wait()) {
-							this.merge(pluginData, platformData).wait();
-						}
+				let pluginConfigurationFilePath = this.getPluginConfigurationFilePath(pluginData, platformData);
 
-						this.$projectFilesManager.processPlatformSpecificFiles(pluginDestinationPath, platform).wait();
+				if(this.$fs.exists(pluginConfigurationFilePath).wait()) {
+					this.merge(pluginData, platformData).wait();
+				}
 
-						pluginData.pluginPlatformsFolderPath = (_platform: string) => path.join(pluginData.fullPath, "platforms", _platform);
-						platformData.platformProjectService.preparePluginNativeCode(pluginData).wait();
+				this.$projectFilesManager.processPlatformSpecificFiles(pluginDestinationPath, platform).wait();
 
-						shelljs.rm("-rf", path.join(pluginDestinationPath, pluginData.name, "platforms"));
+				pluginData.pluginPlatformsFolderPath = (_platform: string) => path.join(pluginData.fullPath, "platforms", _platform);
+				platformData.platformProjectService.preparePluginNativeCode(pluginData).wait();
 
-						// Show message
-						this.$logger.out(`Successfully prepared plugin ${pluginData.name} for ${platform}.`);
-					}
+				shelljs.rm("-rf", path.join(pluginDestinationPath, pluginData.name, "platforms"));
 
-				}).future<void>()();
-			};
-
-			this.executeForAllInstalledPlatforms(action).wait();
+				// Show message
+				this.$logger.out(`Successfully prepared plugin ${pluginData.name} for ${platform}.`);
+			}
 		}).future<void>()();
 	}
 

lib/services/plugins-service.ts

@@ -74,7 +74,7 @@ export class DestCopy implements IBroccoliPlugin {
 
 		let isPlugin = !!dependency.nativescript;
 		if(isPlugin) {
-			this.$pluginsService.prepare(dependency).wait();
+			this.$pluginsService.prepare(dependency, platform).wait();
 		}
 
 		if (dependency.name === constants.TNS_CORE_MODULES_NAME) {

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

@@ -530,7 +530,7 @@ describe("Plugins service", () => {
 				`\n@#[line:1,col:39].` +
 				`\n@#[line:1,col:39].`;
 			mockBeginCommand(testInjector, expectedErrorMessage);
-			pluginsService.prepare(pluginJsonData).wait();
+			pluginsService.prepare(pluginJsonData, "android").wait();
 		});
 		it("merges AndroidManifest.xml and produces correct xml", () => {
 			let pluginName = "mySamplePlugin";
@@ -609,7 +609,7 @@ describe("Plugins service", () => {
 			let pluginConfigurationFilePath = path.join(pluginPlatformsDirPath, "AndroidManifest.xml");
 			fs.writeFile(pluginConfigurationFilePath, xml).wait();
 
-			pluginsService.prepare(pluginJsonData).wait();
+			pluginsService.prepare(pluginJsonData, "android").wait();
 
 			let expectedXml = '<?xmlversion="1.0"encoding="utf-8"?><manifestxmlns:android="http://schemas.android.com/apk/res/android"package="com.example.android.basiccontactables"android:versionCode="1"android:versionName="1.0"><supports-screensandroid:smallScreens="true"android:normalScreens="true"android:largeScreens="true"android:xlargeScreens="true"/><uses-sdkandroid:minSdkVersion="17"android:targetSdkVersion="23"/><uses-permissionandroid:name="android.permission.READ_EXTERNAL_STORAGE"/><uses-permissionandroid:name="android.permission.WRITE_EXTERNAL_STORAGE"/><uses-permissionandroid:name="android.permission.INTERNET"/><applicationandroid:name="com.tns.NativeScriptApplication"android:allowBackup="true"android:icon="@drawable/icon"android:label="@string/app_name"android:theme="@style/AppTheme"><activityandroid:name="com.tns.NativeScriptActivity"android:label="@string/title_activity_kimera"android:configChanges="keyboardHidden|orientation|screenSize"><intent-filter><actionandroid:name="android.intent.action.MAIN"/><categoryandroid:name="android.intent.category.LAUNCHER"/></intent-filter></activity><activityandroid:name="com.tns.ErrorReportActivity"/></application><uses-permissionandroid:name="android.permission.READ_CONTACTS"/></manifest>';
 			expectedXml = helpers.stringReplaceAll(expectedXml, EOL, "");