Support device option for Xcode 5 or older

Author: Fatme Havaluova

lib/iphone-simulator-xcode-5.ts

@@ -2,31 +2,38 @@
 "use strict";
 
 import options = require("./options");
+import utils = require("./utils");
 import util = require("util");
 
+var $ = require("NodObjC");
 
 export class XCode5Simulator implements ISimulator {
 
-	private static DEFAULT_DEVICE_IDENTIFIER = "Resizable-iPad";
+	private static DEFAULT_DEVICE_IDENTIFIER = "iPhone";
 
-	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)"
-	];
+	private static allowedDeviceIdentifiers: IDictionary<string> = {
+		"iPhone": "iPhone",
+		"iPhone-Retina-3.5-inch": "iPhone Retina (3.5-inch)",
+		"iPhone-Retina-4-inch": "iPhone Retina (4-inch)",
+		"iPhone-Retina-4-inch-64-bit": "iPhone Retina (4-inch 64-bit)",
+		"iPad": "iPad",
+		"iPad-Retina": "iPad Retina",
+		"iPad-Retina-64-bit": "iPad Retina (64-bit)"
+	}
 
 	public validateDeviceIdentifier(): void {
+		var identifiers: string[] =  _.keys(XCode5Simulator.allowedDeviceIdentifiers);
+		if(!_.contains(identifiers, options.device)) {
+			throw new Error(util.format("Invalid device identifier %s. Valid device identifiers are %s.", options.device, utils.stringify(identifiers)));
+		}
 	}
 
 	public setSimulatedDevice(config:any): void {
-		config("setSimulatedDeviceInfoName", this.deviceIdentifier);
+		config("setSimulatedDeviceInfoName", $(this.deviceIdentifier));
 	}
 
-	private get deviceIdentifier() {
-		return options.devie || XCode5Simulator.DEFAULT_DEVICE_IDENTIFIER;
+	private get deviceIdentifier(): string {
+		var identifier = options.device || XCode5Simulator.DEFAULT_DEVICE_IDENTIFIER;
+		return XCode5Simulator.allowedDeviceIdentifiers[identifier];
 	}
 }

lib/iphone-simulator-xcode-6.ts

@@ -30,8 +30,8 @@ export class XCode6Simulator implements ISimulator {
 	}
 
 	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)));
+		if(!_.contains(XCode6Simulator.allowedDeviceIdentifiers, options.device)) {
+			throw new Error(util.format("Invalid device identifier %s. Valid device identifiers are %s.", options.device, utils.stringify(XCode6Simulator.allowedDeviceIdentifiers)));
 		}
 	}
 

lib/iphone-simulator.ts

@@ -77,7 +77,9 @@ export class iPhoneSimulator implements IiPhoneSimulator {
 			simulator = new xcode5SimulatorLib.XCode5Simulator();
 		}
 
-		simulator.validateDeviceIdentifier();
+		if(options.device) {
+			simulator.validateDeviceIdentifier();
+		}
 		simulator.setSimulatedDevice(config);
 
 		config("setLocalizedClientName", $("ios-sim-portable"));