Merge pull request #44 from telerik/fatme/fix-get-application-path-on-xcode-6

Fix getApplicationPath on xcode6

Author: Fatme

lib/command-executor.js

@@ -6,6 +6,7 @@ interface IiPhoneSimulator {
 	printDeviceTypes(): IFuture<void>;
 	printSDKS(): IFuture<void>;
 	sendNotification(notification: string): IFuture<void>;
+	createSimulator(): IFuture<ISimulator>;
 }
 
 interface ICommand {
@@ -31,6 +32,7 @@ interface ISimctl {
 	uninstall(deviceId: string, applicationIdentifier: string): IFuture<void>;
 	notifyPost(deviceId: string, notification: string): IFuture<void>;
 	getDevices(): IFuture<IDevice[]>;
+	getAppContainer(deviceId: string, applicationIdentifier: string): IFuture<string>;
 }
 
 interface IDictionary<T> {
@@ -47,6 +49,7 @@ interface ISimulator {
 	getSdks(): IFuture<ISdk[]>;
 	run(applicationPath: string, applicationIdentifier: string): IFuture<void>;
 	sendNotification(notification: string): IFuture<void>;
+	getApplicationPath(deviceId: string, applicationIdentifier: string): IFuture<string>;
 }
 
 interface IExecuteOptions {

lib/declarations.ts

@@ -42,9 +42,10 @@ Object.defineProperty(global.publicApi, "getRunningSimulator", {
 Object.defineProperty(global.publicApi, "getApplicationPath", {
 	get: () => {
 		return (...args: any[]) => {
-			let libraryPath = require("./simctl");
-			let obj = new libraryPath.Simctl()
-			let result = obj.getAppContainer.apply(obj, args).wait();
+			let libraryPath = require("./iphone-simulator");
+			let obj = new libraryPath.iPhoneSimulator();
+			let simulator = obj.createSimulator().wait();
+			let result = simulator.getApplicationPath.apply(simulator, args).wait();
 			return result;
 		}
 	}

lib/ios-sim.ts

@@ -59,6 +59,10 @@ export class XCode5Simulator extends iPhoneSimulatorBaseLib.IPhoneInteropSimulat
 		return Future.fromResult();
 	}
 
+	public getApplicationPath(deviceId: string, applicationIdentifier: string): IFuture<string> {
+		return Future.fromResult("");
+	}
+
 	private get deviceIdentifier(): string {
 		let identifier = options.device || XCode5Simulator.DEFAULT_DEVICE_IDENTIFIER;
 		return XCode5Simulator.allowedDeviceIdentifiers[identifier];

lib/iphone-simulator-xcode-5.ts

@@ -3,9 +3,14 @@
 import * as errors from "./errors";
 import * as options from "./options";
 import * as utils from "./utils";
+import * as fs from "fs";
+import Future = require("fibers/future");
+import * as path from "path";
 import * as util from "util";
 import * as os from "os";
 let $ = require("nodobjc");
+let bplistParser = require("bplist-parser");
+let osenv = require("osenv");
 
 import iPhoneSimulatorBaseLib = require("./iphone-interop-simulator-base");
 
@@ -39,6 +44,42 @@ export class XCode6Simulator extends iPhoneSimulatorBaseLib.IPhoneInteropSimulat
 		return this.execute(() => this.sdks, { canRunMainLoop: false });
 	}
 
+	public getApplicationPath(deviceId: string, applicationIdentifier: string): IFuture<string> {
+		return (() => {
+			let rootApplicationsPath = path.join(osenv.home(), `/Library/Developer/CoreSimulator/Devices/${deviceId}/data/Containers/Bundle/Application`);
+			if(!fs.existsSync(rootApplicationsPath)) {
+				rootApplicationsPath = path.join(osenv.home(), `/Library/Developer/CoreSimulator/Devices/${deviceId}/data/Applications`);
+			}
+			let applicationGuids = fs.readdirSync(rootApplicationsPath);
+			let result: string = null;
+			_.each(applicationGuids, applicationGuid => {
+				let fullApplicationPath = path.join(rootApplicationsPath, applicationGuid);
+				let applicationDirContents = fs.readdirSync(fullApplicationPath);
+				let applicationName = _.find(applicationDirContents, fileName => path.extname(fileName) === ".app");
+				let plistFilePath = path.join(fullApplicationPath, applicationName, "Info.plist");
+				let applicationData = this.parseFile(plistFilePath).wait();
+				if(applicationData[0].CFBundleIdentifier === applicationIdentifier) {
+					result = path.join(fullApplicationPath, applicationName);
+					return false;
+				}
+			});
+
+			return result;
+		}).future<string>()();
+	}
+
+	private parseFile(plistFilePath: string): IFuture<any> {
+		let future = new Future<any>();
+		bplistParser.parseFile(plistFilePath, (err: Error, obj: any) => {
+			if(err) {
+				future.throw(err);
+			} else {
+				future.return(obj);
+			}
+		});
+		return future;
+	}
+
 	private get devices(): IDevice[] {
 		if(!this.cachedDevices) {
 			this.cachedDevices = [];

lib/iphone-simulator-xcode-6.ts

@@ -70,6 +70,10 @@ export class XCode7Simulator implements ISimulator {
 		}).future<void>()();
 	}
 
+	public getApplicationPath(deviceId: string, applicationIdentifier: string): IFuture<string> {
+		return this.simctl.getAppContainer(deviceId, applicationIdentifier);
+	}
+
 	private getDeviceToRun(): IFuture<IDevice> {
 		return (() => {
 			let devices = this.simctl.getDevices().wait();

lib/iphone-simulator-xcode-7.ts

@@ -75,7 +75,7 @@ export class iPhoneSimulator implements IiPhoneSimulator {
 		return this.simulator.sendNotification(notification);
 	}
 
-	private createSimulator(): IFuture<ISimulator> {
+	public createSimulator(): IFuture<ISimulator> {
 		return (() => {
 			let xcodeVersionData = xcode.getXcodeVersionData().wait();
 			let majorVersion = xcodeVersionData.major;

lib/iphone-simulator.ts

@@ -7,7 +7,6 @@ import errors = require("./errors");
 import options = require("./options");
 
 export class Simctl implements ISimctl {
-	private devices: IDevice[] = null;
 
 	public launch(deviceId: string, applicationIdentifier: string): IFuture<void> {
 		let args: string[] = [];
@@ -42,16 +41,6 @@ export class Simctl implements ISimctl {
 	}
 
 	public getDevices(): IFuture<IDevice[]> {
-		return (() => {
-			if(!this.devices) {
-				this.devices = this.getDevicesCore().wait();
-			}
-
-			return this.devices;
-		}).future<IDevice[]>()();
-	}
-
-	private getDevicesCore(): IFuture<IDevice[]> {
 		return (() => {
 			let rawDevices = this.simctlExec("list", ["devices"]).wait();
 

lib/simctl.ts

@@ -1,6 +1,6 @@
 {
   "name": "ios-sim-portable",
-  "version": "1.0.13-gamma",
+  "version": "1.0.13-delta",
   "description": "",
   "main": "./lib/ios-sim.js",
   "scripts": {
@@ -26,10 +26,12 @@
   },
   "homepage": "https://github.com/telerik/ios-sim-portable",
   "dependencies": {
+    "bplist-parser": "0.1.0",
     "colors": "0.6.2",
     "fibers": "https://github.com/icenium/node-fibers/tarball/v1.0.6.0",
     "lodash": "3.2.0",
     "nodobjc": "https://github.com/telerik/NodObjC/tarball/v2.0.0.0",
+    "osenv": "0.1.3",
     "yargs": "3.15.0"
   },
   "devDependencies": {