Specify device type for Xcode 6 simulator

Author: Fatme Havaluova

lib/declarations.ts

@@ -11,4 +11,19 @@ interface ICommand {
 
 interface ICommandExecutor {
 	execute(): IFuture<void>;
+}
+
+interface IDevice {
+	device: any; // NodObjC wrapper to device
+	deviceTypeIdentifier: string;
+	runtimeVersion: string;
+}
+
+interface IDictionary<T> {
+	[key: string]: T;
+}
+
+interface ISimulator {
+	validateDeviceIdentifier(): void;
+	setSimulatedDevice(config: any): void;
 }

lib/iphone-simulator-xcode-5.ts

@@ -0,0 +1,32 @@
+///<reference path="./.d.ts"/>
+"use strict";
+
+import options = require("./options");
+import util = require("util");
+
+
+export class XCode5Simulator implements ISimulator {
+
+	private static DEFAULT_DEVICE_IDENTIFIER = "Resizable-iPad";
+
+	private static allowedDeviceIdentifiers = [
+		"iPhone",
+		"iPhone Retina (3.5-inch)",
+		"iPhone Retina (4-inch)",
+		"iPhone Retina (4-inch 64-bit)",
+		"iPad",
+		"iPad Retina",
+		"iPad Retina (64-bit)"
+	];
+
+	public validateDeviceIdentifier(): void {
+	}
+
+	public setSimulatedDevice(config:any): void {
+		config("setSimulatedDeviceInfoName", this.deviceIdentifier);
+	}
+
+	private get deviceIdentifier() {
+		return options.devie || XCode5Simulator.DEFAULT_DEVICE_IDENTIFIER;
+	}
+}

lib/iphone-simulator-xcode-6.ts

@@ -0,0 +1,81 @@
+///<reference path="./.d.ts"/>
+"use strict";
+import options = require("./options");
+import utils = require("./utils");
+import util = require("util");
+var $ = require("NodObjC");
+
+export class XCode6Simulator implements ISimulator {
+
+	private static DEVICE_IDENTIFIER_PREFIX = "com.apple.CoreSimulator.SimDeviceType";
+	private static DEFAULT_DEVICE_IDENTIFIER = "Resizable-iPad";
+
+	private static allowedDeviceIdentifiers = [
+		"iPhone-4s",
+		"iPhone-5",
+		"iPhone-5s",
+		"iPhone-6",
+		"iPhone-6-Plus",
+		"Resizable-iPhone",
+		"iPad-2",
+		"iPad-Retina",
+		"iPad-Air",
+		"Resizable-iPad"
+	];
+
+	private availableDevices: IDictionary<IDevice>;
+
+	constructor() {
+		this.availableDevices = Object.create(null);
+	}
+
+	public validateDeviceIdentifier(): void {
+		if(!_.contains(XCode6Simulator.allowedDeviceIdentifiers, this.deviceIdentifier)) {
+			throw new Error(util.format("Invalid device identifier %s. Valid device identifiers are %s.", this.deviceIdentifier, utils.stringify(XCode6Simulator.allowedDeviceIdentifiers)));
+		}
+	}
+
+	public setSimulatedDevice(config: any): void {
+		var device = this.getDeviceByIdentifier(this.deviceIdentifier);
+		config("setDevice", device);
+	}
+
+	private get deviceIdentifier(): string {
+		return options.device || XCode6Simulator.DEFAULT_DEVICE_IDENTIFIER;
+	}
+
+	private getAvailableDevices(): IDictionary<IDevice> {
+		if(utils.isEmptyDictionary(this.availableDevices)) {
+			var deviceSet = $.classDefinition.getClassByName("SimDeviceSet")("defaultSet");
+			var devices = deviceSet("availableDevices");
+			var count = devices("count");
+			if(count > 0) {
+				for(var index=0; index<count; index++) {
+					var device = devices("objectAtIndex", index);
+					var deviceTypeIdentifier = device("deviceType")("identifier").toString();
+					var runtimeVersion = device("runtime")("versionString").toString();
+					this.availableDevices[deviceTypeIdentifier] = {
+						device: device,
+						deviceTypeIdentifier: deviceTypeIdentifier,
+						runtimeVersion: runtimeVersion
+					};
+				}
+			}
+		}
+
+		return this.availableDevices;
+	}
+
+	private getDeviceByIdentifier(deviceIdentifier: string): any {
+		var fullDeviceIdentifier = util.format("%s.%s", XCode6Simulator.DEVICE_IDENTIFIER_PREFIX, deviceIdentifier);
+		var availableDevices = this.getAvailableDevices();
+		if(!utils.isEmptyDictionary(availableDevices)) {
+			var device = availableDevices[fullDeviceIdentifier];
+			if(device) {
+				return device.device;
+			}
+		}
+
+		throw new Error(util.format("Unable to find device with identifier ", deviceIdentifier));
+	}
+}

lib/iphone-simulator.ts

@@ -8,6 +8,9 @@ import path = require("path");
 import util = require("util");
 
 import options = require("./options");
+import utils = require("./utils");
+import xcode6SimulatorLib = require("./iphone-simulator-xcode-6");
+import xcode5SimulatorLib = require("./iphone-simulator-xcode-5");
 
 var $ = require("NodObjC");
 
@@ -52,17 +55,11 @@ export class iPhoneSimulator implements IiPhoneSimulator {
 
 		var sessionDelegate = $.NSObject.extend("DTiPhoneSimulatorSessionDelegate");
 		sessionDelegate.addMethod("session:didEndWithError:", "v@:@@", function(self: any, sel: any, sess: any, error: any) {
-			console.log("Session ended with error: ");
-			console.log(error);
-			process.exit(1);
+			iPhoneSimulator.logSessionInfo(error, "Session ended without errors.", "Session ended with error ");
+			process.exit(0);
 		});
-		sessionDelegate.addMethod("session:didStart:withError:", "v@:@c@", function(self: any, sel: any, sess: any, did: any, err:any) {
-			if(err) {
-				console.log("Session started with error ", err);
-				process.exit(1);
-			} else {
-				console.log("Session started without errors");
-			}
+		sessionDelegate.addMethod("session:didStart:withError:", "v@:@c@", function(self: any, sel: any, sess: any, did: any, error:any) {
+			iPhoneSimulator.logSessionInfo(error, "Session started without errors.", "Session started with error ");
 		});
 		sessionDelegate.register();
 
@@ -73,22 +70,15 @@ export class iPhoneSimulator implements IiPhoneSimulator {
 		var sdkRoot = options.sdkRoot ? $(options.sdkRoot) : this.getClassByName("DTiPhoneSimulatorSystemRoot")("defaultRoot");
 		config("setSimulatedSystemRoot", sdkRoot);
 
-		var family = 1;
-		if(options.family) {
-			if(options.family.toLowerCase() === "ipad") {
-				family = 2;
-			}
+		var simulator: ISimulator;
+		if(_.contains(config.methods(), "setDevice:")) {
+			simulator = new xcode6SimulatorLib.XCode6Simulator();
+		} else {
+			simulator = new xcode5SimulatorLib.XCode5Simulator();
 		}
-		config("setSimulatedDeviceFamily", $.NSNumber("numberWithInt", family));
 
-		if(options.env) {
-			var env = $.NSMutableDictionary("dictionary");
-			Object.keys(env).forEach(key => {
-				env("setObject", $(env[key]), "forKey", $(key));
-			});
-
-			config("setSimulatedApplicationLaunchEnvironment", env);
-		}
+		simulator.validateDeviceIdentifier();
+		simulator.setSimulatedDevice(config);
 
 		config("setLocalizedClientName", $("ios-sim-portable"));
 
@@ -167,4 +157,13 @@ export class iPhoneSimulator implements IiPhoneSimulator {
 	private getClassByName(className: string): any {
 		return $.classDefinition.getClassByName(className);
 	}
+
+	private static logSessionInfo(error: any, successfulMessage: string, errorMessage: string): void {
+		if(error) {
+			console.log(util.format("%s %s", errorMessage, error));
+			process.exit(1);
+		} else {
+			console.log(successfulMessage);
+		}
+	}
 }

lib/options.ts

@@ -6,6 +6,7 @@ var yargs = require("yargs");
 var knownOptions: any = {
 	"sdk": String,
 	"family": String,
+	"device": String,
 	"stdout": String,
 	"stderr": String,
 	"env": String,

lib/utils.ts

@@ -0,0 +1,8 @@
+export function isEmptyDictionary(dictionary: IDictionary<any>): boolean {
+	return _.keys(dictionary).length === 0;
+}
+
+export function stringify(arr: string[], delimiter?: string): string {
+	delimiter = delimiter || ", ";
+	return arr.join(delimiter);
+}