Expose method for getting the name of the simulator

Said name is needed in order to pass it to xcodebuild whenever building for a simulator.

Author: Mitko-Kerezov

lib/declarations.ts

@@ -39,12 +39,12 @@ interface IDictionary<T> {
 	[key: string]: T;
 }
 
-interface IInteropSimulator {
+interface IInteropSimulator extends INameGetter {
 	getDevices(): IFuture<IDevice[]>;
 	setSimulatedDevice(config: any): void;
 }
 
-interface ISimulator {
+interface ISimulator extends INameGetter {
 	getDevices(): IFuture<IDevice[]>;
 	getSdks(): IFuture<ISdk[]>;
 	run(applicationPath: string, applicationIdentifier: string): IFuture<void>;
@@ -59,6 +59,10 @@ interface ISimulator {
 	startSimulator(): IFuture<void>;
 }
 
+interface INameGetter {
+	getSimulatorName(deviceId: string): string;
+}
+
 interface IApplication {
 	guid: string;
 	appIdentifier: string;

lib/ios-sim.ts

@@ -66,58 +66,21 @@ Object.defineProperty(global.publicApi, "getInstalledApplications", {
 	}
 });
 
-Object.defineProperty(global.publicApi, "installApplication", {
-	get: () => {
-		return (...args: any[]) => {
-			let simulator = getSimulator().wait();
-			return simulator.installApplication.apply(simulator, args);
-		}
-	}
-});
-
-Object.defineProperty(global.publicApi, "uninstallApplication", {
-	get: () => {
-		return (...args: any[]) => {
-			let simulator = getSimulator().wait();
-			return simulator.uninstallApplication.apply(simulator, args);
-		}
-	}
-});
-
-Object.defineProperty(global.publicApi, "startApplication", {
-	get: () => {
-		return (...args: any[]) => {
-			let simulator = getSimulator().wait();
-			return simulator.startApplication.apply(simulator, args);
-		}
-	}
-});
-
-Object.defineProperty(global.publicApi, "stopApplication", {
-	get: () => {
-		return (...args: any[]) => {
-			let simulator = getSimulator().wait();
-			return simulator.stopApplication.apply(simulator, args);
-		}
-	}
-});
-
-Object.defineProperty(global.publicApi, "printDeviceLog", {
-	get: () => {
-		return (...args: any[]) => {
-			let simulator = getSimulator().wait();
-			return simulator.printDeviceLog.apply(simulator, args);
-		}
-	}
-});
-
-Object.defineProperty(global.publicApi, "startSimulator", {
-	get: () => {
-		return (...args: any[]) => {
-			let simulator = getSimulator().wait();
-			return simulator.startSimulator.apply(simulator, args);
+["installApplication",
+ "uninstallApplication",
+ "startApplication",
+ "stopApplication",
+ "printDeviceLog",
+ "startSimulator",
+ "getSimulatorName"].forEach(methodName => {
+	Object.defineProperty(global.publicApi, methodName, {
+		get: () => {
+			return (...args: any[]) => {
+				let simulator: any = getSimulator().wait();
+				return simulator[methodName].apply(simulator, args);
+			}
 		}
-	}
-});
+	});
+})
 
 module.exports = global.publicApi;

lib/iphone-interop-simulator-base.ts

@@ -11,9 +11,12 @@ import * as path from "path";
 import * as util from "util";
 import * as utils from "./utils";
 let $ = require("nodobjc");
+import {IPhoneSimulatorNameGetter} from "./iphone-simulator-name-getter";
 
-export class IPhoneInteropSimulatorBase {
-	constructor(private simulator: IInteropSimulator) { }
+export class IPhoneInteropSimulatorBase extends IPhoneSimulatorNameGetter {
+	constructor(private simulator: IInteropSimulator) {
+		super();
+	}
 
 	private static FOUNDATION_FRAMEWORK_NAME = "Foundation";
 	private static APPKIT_FRAMEWORK_NAME = "AppKit";

lib/iphone-simulator-name-getter.ts

@@ -0,0 +1,17 @@
+///<reference path="./.d.ts"/>
+"use strict";
+import * as options from "./options";
+
+export abstract class IPhoneSimulatorNameGetter implements INameGetter {
+	private _simulatorName: string;
+
+	public defaultDeviceIdentifier: string;
+
+	public getSimulatorName(): string {
+		if (!this._simulatorName) {
+			this._simulatorName = options.device || this.defaultDeviceIdentifier;
+		}
+
+		return this._simulatorName;
+	}
+}

lib/iphone-simulator-xcode-5.ts

@@ -12,13 +12,13 @@ var $ = require("nodobjc");
 import iPhoneSimulatorBaseLib = require("./iphone-interop-simulator-base");
 
 export class XCode5Simulator extends iPhoneSimulatorBaseLib.IPhoneInteropSimulatorBase implements IInteropSimulator {
+	public defaultDeviceIdentifier: string;
 
 	constructor() {
 		super(this);
+		this.defaultDeviceIdentifier = "iPhone"
 	}
 
-	private static DEFAULT_DEVICE_IDENTIFIER = "iPhone";
-
 	private static allowedDeviceIdentifiers: IDictionary<string> = {
 		"iPhone": "iPhone",
 		"iPhone-Retina-3.5-inch": "iPhone Retina (3.5-inch)",
@@ -90,7 +90,6 @@ export class XCode5Simulator extends iPhoneSimulatorBaseLib.IPhoneInteropSimulat
 	}
 
 	private get deviceIdentifier(): string {
-		let identifier = options.device || XCode5Simulator.DEFAULT_DEVICE_IDENTIFIER;
-		return XCode5Simulator.allowedDeviceIdentifiers[identifier];
+		return XCode5Simulator.allowedDeviceIdentifiers[this.getSimulatorName()];
 	}
 }

lib/iphone-simulator-xcode-6.ts

@@ -19,15 +19,17 @@ import iPhoneSimulatorBaseLib = require("./iphone-interop-simulator-base");
 
 export class XCode6Simulator extends iPhoneSimulatorBaseLib.IPhoneInteropSimulatorBase implements IInteropSimulator {
 
+	public defaultDeviceIdentifier: string;
+
 	private static DEVICE_IDENTIFIER_PREFIX = "com.apple.CoreSimulator.SimDeviceType";
-	private static DEFAULT_DEVICE_IDENTIFIER = "iPhone-4s";
 
 	private cachedDevices: IDevice[];
 	private simctl: ISimctl;
 
 	constructor() {
 		super(this);
 
+		this.defaultDeviceIdentifier = "iPhone-4s";
 		this.cachedDevices = null;
 		this.simctl = new Simctl();
 	}
@@ -155,15 +157,11 @@ export class XCode6Simulator extends iPhoneSimulatorBaseLib.IPhoneInteropSimulat
 		return this.execute(action, { canRunMainLoop: false });
 	}
 
-	private get deviceName(): string {
-		return options.device || XCode6Simulator.DEFAULT_DEVICE_IDENTIFIER;
-	}
-
 	private getDeviceByName(): IDevice {
 		let devices = this.getDevices().wait();
-		let device = _.find(devices, (device) => device.name === this.deviceName);
+		let device = _.find(devices, (device) => device.name === this.getSimulatorName());
 		if(!device) {
-			errors.fail("Unable to find device with name ", this.deviceName);
+			errors.fail("Unable to find device with name ", this.getSimulatorName());
 		}
 
 		return device;

lib/iphone-simulator-xcode-7.ts

@@ -11,16 +11,17 @@ import { Simctl } from "./simctl";
 import util = require("util");
 import utils = require("./utils");
 import xcode = require("./xcode");
-var $ = require("nodobjc");
-var osenv = require("osenv");
 
-export class XCode7Simulator implements ISimulator {
+import {IPhoneSimulatorNameGetter} from "./iphone-simulator-name-getter";
+
+export class XCode7Simulator extends IPhoneSimulatorNameGetter implements ISimulator {
 	private static DEVICE_IDENTIFIER_PREFIX = "com.apple.CoreSimulator.SimDeviceType";
-	private static DEFAULT_DEVICE_NAME = "iPhone 6";
+	public defaultDeviceIdentifier = "iPhone 6";
 
 	private simctl: ISimctl = null;
 
 	constructor() {
+		super();
 		this.simctl = new Simctl();
 	}
 
@@ -123,7 +124,7 @@ export class XCode7Simulator implements ISimulator {
 			});
 
 			if(!result) {
-				result = _.find(devices, (device: IDevice) => device.name === XCode7Simulator.DEFAULT_DEVICE_NAME);
+				result = _.find(devices, (device: IDevice) => device.name === this.defaultDeviceIdentifier);
 			}
 
 			if(!result) {