Add 'sandbox-pod' command. Implement test.

Author: e2l3n

config/config.json

@@ -5,5 +5,6 @@
 	"PROXY_HOSTNAME": "127.0.0.1",
 	"TYPESCRIPT_COMPILER_OPTIONS": {},
 	"CI_LOGGER": false,
-	"ANDROID_DEBUG_UI_MAC": "Google Chrome"
+	"ANDROID_DEBUG_UI_MAC": "Google Chrome",
+	"USE_POD_SANDBOX": true
 }

lib/declarations.ts

@@ -36,6 +36,7 @@ interface IStaticConfig extends Config.IStaticConfig { }
 
 interface IConfiguration extends Config.IConfig {
 	ANDROID_DEBUG_UI: string;
+	USE_POD_SANDBOX: boolean;
 }
 
 interface IApplicationPackage {

lib/services/ios-project-service.ts

@@ -32,7 +32,8 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
 		private $options: IOptions,
 		private $injector: IInjector,
 		$projectDataService: IProjectDataService,
-		private $prompter: IPrompter) {
+		private $prompter: IPrompter,
+		private $config: Config.IConfig) {
 			super($fs, $projectData, $projectDataService);
 		}
 
@@ -495,7 +496,8 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
 
 	private executePodInstall(): IFuture<any> {
 		this.$logger.info("Installing pods...");
-		return this.$childProcess.spawnFromEvent("pod",  ["install"], "close", { cwd: this.platformData.projectRoot, stdio: 'inherit' });
+		let podTool = this.$config.USE_POD_SANDBOX ? "sandbox-pod" : "pod";
+		return this.$childProcess.spawnFromEvent(podTool,  ["install"], "close", { cwd: this.platformData.projectRoot, stdio: 'inherit' });
 	}
 
 	private prepareFrameworks(pluginPlatformsFolderPath: string, pluginData: IPluginData): IFuture<void> {

test/project-service.ts

@@ -39,21 +39,20 @@ class ProjectIntegrationTest {
 		return projectService.createProject(projectName);
 	}
 
-	public getDefaultTemplatePath(): IFuture<string> {
+	public getDefaultTemplatePath(templateName: string): IFuture<string> {
 		return (() => {
 			let npmInstallationManager = this.testInjector.resolve("npmInstallationManager");
 			let fs = this.testInjector.resolve("fs");
 
-			let defaultTemplatePackageName = "tns-template-hello-world";
 			let cacheRoot = npmInstallationManager.getCacheRootPath();
-			let defaultTemplatePath = path.join(cacheRoot, defaultTemplatePackageName);
-			let latestVersion = npmInstallationManager.getLatestVersion(defaultTemplatePackageName).wait();
+			let defaultTemplatePath = path.join(cacheRoot, templateName);
+			let latestVersion = npmInstallationManager.getLatestVersion(templateName).wait();
 
 			if(!fs.exists(path.join(defaultTemplatePath, latestVersion)).wait()) {
-				npmInstallationManager.addToCache(defaultTemplatePackageName, latestVersion).wait();
+				npmInstallationManager.addToCache(templateName, latestVersion).wait();
 			}
 			if(!fs.exists(path.join(defaultTemplatePath, latestVersion, "package", "app")).wait()) {
-				npmInstallationManager.cacheUnpack(defaultTemplatePackageName, latestVersion).wait();
+				npmInstallationManager.cacheUnpack(templateName, latestVersion).wait();
 			}
 
 			return path.join(defaultTemplatePath, latestVersion, "package");
@@ -118,7 +117,6 @@ class ProjectIntegrationTest {
 		this.testInjector.register("npmInstallationManager", NpmInstallationManagerLib.NpmInstallationManager);
 		this.testInjector.register("npm", NpmLib.NodePackageManager);
 		this.testInjector.register("httpClient", HttpClientLib.HttpClient);
-		this.testInjector.register("config", {});
 		this.testInjector.register("lockfile", stubs.LockFile);
 
 		this.testInjector.register("options", optionsLib.Options);
@@ -135,7 +133,7 @@ describe("Project Service Tests", () => {
 			let options = projectIntegrationTest.testInjector.resolve("options");
 
 			options.path = tempFolder;
-			options.copyFrom = projectIntegrationTest.getDefaultTemplatePath().wait();
+			options.copyFrom = projectIntegrationTest.getDefaultTemplatePath("tns-template-hello-world").wait();
 
 			projectIntegrationTest.createProject(projectName).wait();
 			projectIntegrationTest.assertProject(tempFolder, projectName, "org.nativescript.myapp").wait();
@@ -147,12 +145,34 @@ describe("Project Service Tests", () => {
 			let options = projectIntegrationTest.testInjector.resolve("options");
 
 			options.path = tempFolder;
-			options.copyFrom = projectIntegrationTest.getDefaultTemplatePath().wait();
+			options.copyFrom = projectIntegrationTest.getDefaultTemplatePath("tns-template-hello-world").wait();
 			options.appid = "my.special.id";
 
 			projectIntegrationTest.createProject(projectName).wait();
 			projectIntegrationTest.assertProject(tempFolder, projectName, options.appid).wait();
 		});
+		it("creates valid project and tests pod sandbox", () => {
+			let testInjector = createTestInjector();
+			let fs: IFileSystem = testInjector.resolve("fs");
+			let config = testInjector.resolve("config");
+			let childProcess = testInjector.resolve("childProcess");
+			let	projectIntegrationTest = new ProjectIntegrationTest();
+			let workingFolderPath = temp.mkdirSync("ios_project");
+
+			let iosTemplatePath = path.join(projectIntegrationTest.getDefaultTemplatePath("tns-ios").wait(), "framework/");
+			childProcess.exec(`cp -R ${iosTemplatePath} ${workingFolderPath}`, { cwd: workingFolderPath }).wait();
+			fs.writeFile("/tmp/Podfile/testFile.txt", "Test content.").wait();
+
+			let postInstallCommmand = `\`cat /tmp/Podfile/testFile.txt > ${workingFolderPath}/copyTestFile.txt && rm -rf /tmp/Podfile\``;
+			let podfileContent = `post_install do |installer_representation| ${postInstallCommmand} end`;
+			fs.writeFile(path.join(workingFolderPath, "Podfile"), podfileContent).wait();
+
+			let podTool = config.USE_POD_SANDBOX ? "sandbox-pod" : "pod";
+			childProcess.spawnFromEvent(podTool,  ["install"], "close", { cwd: workingFolderPath, stdio: 'inherit' }).wait();
+
+			assert.isTrue(fs.exists("/tmp/Podfile").wait());
+			assert.isTrue(fs.exists(path.join(workingFolderPath, "copyTestFile.txt")).wait());
+		});
 	});
 });
 
@@ -164,7 +184,6 @@ function createTestInjector() {
 	testInjector.register("projectService", ProjectServiceLib.ProjectService);
 	testInjector.register("projectHelper", ProjectHelperLib.ProjectHelper);
 	testInjector.register("projectTemplatesService", stubs.ProjectTemplatesService);
-	testInjector.register("projectNameValidator", mockProjectNameValidator);
 
 	testInjector.register("fs", fsLib.FileSystem);
 	testInjector.register("projectDataService", ProjectDataServiceLib.ProjectDataService);
@@ -173,7 +192,9 @@ function createTestInjector() {
 
 	testInjector.register("npmInstallationManager", NpmInstallationManagerLib.NpmInstallationManager);
 	testInjector.register("httpClient", HttpClientLib.HttpClient);
-	testInjector.register("config", {});
+	testInjector.register("config", {
+		"USE_POD_SANDBOX": true
+	});
 	testInjector.register("lockfile", stubs.LockFile);
 
 	testInjector.register("childProcess", ChildProcessLib.ChildProcess);