Fix broken device option

Author: Fatme Havaluova

lib/declarations.ts

@@ -17,7 +17,8 @@ interface ICommandExecutor {
 
 interface IDevice {
 	device: any; // NodObjC wrapper to device
-	deviceTypeIdentifier: string;
+	deviceIdentifier: string;
+	fullDeviceIdentifier: string;
 	runtimeVersion: string;
 }
 
@@ -27,6 +28,7 @@ interface IDictionary<T> {
 
 interface ISimulator {
 	validDeviceIdentifiers: string[];
+	deviceIdentifiersInfo: string[];
 	setSimulatedDevice(config: any): void;
 }
 

lib/iphone-simulator-xcode-5.js

@@ -26,6 +26,10 @@ export class XCode5Simulator implements ISimulator {
 		return _.keys(XCode5Simulator.allowedDeviceIdentifiers);
 	}
 
+	public get deviceIdentifiersInfo(): string[] {
+		return _.keys(XCode5Simulator.allowedDeviceIdentifiers);
+	}
+
 	public setSimulatedDevice(config:any): void {
 		config("setSimulatedDeviceInfoName", $(this.deviceIdentifier));
 	}

lib/iphone-simulator-xcode-5.ts

@@ -13,62 +13,69 @@ export class XCode6Simulator implements ISimulator {
 	private static DEFAULT_DEVICE_IDENTIFIER = "iPhone-4s";
 
 
-	private availableDevices: IDictionary<IDevice>;
+	private availableDevices: IDictionary<IDevice[]>;
 
 	constructor() {
 		this.availableDevices = Object.create(null);
 	}
 
 	public get validDeviceIdentifiers(): string[] {
-		var simDeviceSet = $.classDefinition.getClassByName("SimDeviceSet");
-		var devicesInfo: string[] = [];
-
-		if(simDeviceSet) {
-			var deviceSet = simDeviceSet("defaultSet");
-			var devices = deviceSet("availableDevices");
-
-			var count = devices("count");
-			for(var index=0; index < count; index++) {
-				var device = devices("objectAtIndex", index);
-
-				var deviceIdentifier = device("deviceType")("identifier").toString();
-				var deviceIdentifierPrefixIndex = deviceIdentifier.indexOf(XCode6Simulator.DEFAULT_DEVICE_IDENTIFIER);
-				var deviceIdentifierWithoutPrefix = deviceIdentifier.substring(deviceIdentifierPrefixIndex + XCode6Simulator.DEVICE_IDENTIFIER_PREFIX.length + 2);
-
-				var runtimeVersion = device("runtime")("versionString").toString();
-				var deviceInfo = [util.format("Device Identifier: %s", deviceIdentifierWithoutPrefix),
-					util.format("Runtime Version: %s", runtimeVersion)].join(os.EOL);
-				devicesInfo.push(deviceInfo + os.EOL);
-			}
-		}
+		var devices = this.getDevicesInfo();
+		return _.map(devices, device => device.deviceIdentifier);
+	}
 
-		return devicesInfo;
+	public get deviceIdentifiersInfo(): string[] {
+		var devices = this.getDevicesInfo();
+		return _.map(devices, device => util.format("Device Identifier: %s. %sRuntime Version: %s %s", device.fullDeviceIdentifier, os.EOL, device.runtimeVersion, os.EOL));
 	}
 
 	public setSimulatedDevice(config: any): void {
 		var device = this.getDeviceByIdentifier(this.deviceIdentifier);
 		config("setDevice", device);
 	}
 
+	private getDevicesInfo(): IDevice[] {
+		var availableDeviceIdentifiers = this.getAvailableDevices();
+		var keys = _.keys(availableDeviceIdentifiers);
+		var result: IDevice[] = [];
+
+		_.each(keys, deviceIdentifier => {
+			var devices = availableDeviceIdentifiers[deviceIdentifier];
+			_.each(devices, device => result.push(device));
+		});
+
+		return result;
+	}
+
 	private get deviceIdentifier(): string {
 		return options.device || XCode6Simulator.DEFAULT_DEVICE_IDENTIFIER;
 	}
 
-	private getAvailableDevices(): IDictionary<IDevice> {
+	private getAvailableDevices(): IDictionary<IDevice[]> {
 		if(_.isEmpty(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 deviceIdentifier = device("deviceType")("identifier").toString();
+					var deviceIdentifierPrefixIndex = deviceIdentifier.indexOf(XCode6Simulator.DEVICE_IDENTIFIER_PREFIX);
+					var deviceIdentifierWithoutPrefix = deviceIdentifier.substring(deviceIdentifierPrefixIndex + XCode6Simulator.DEVICE_IDENTIFIER_PREFIX.length + 1);
+
 					var runtimeVersion = device("runtime")("versionString").toString();
-					this.availableDevices[deviceTypeIdentifier] = {
+
+					if(!this.availableDevices[deviceIdentifier]) {
+						this.availableDevices[deviceIdentifier] = [];
+					}
+
+					this.availableDevices[deviceIdentifier].push({
 						device: device,
-						deviceTypeIdentifier: deviceTypeIdentifier,
+						deviceIdentifier: deviceIdentifierWithoutPrefix,
+						fullDeviceIdentifier: this.buildFullDeviceIdentifier(deviceIdentifier),
 						runtimeVersion: runtimeVersion
-					};
+					});
 				}
 			}
 		}
@@ -77,15 +84,19 @@ export class XCode6Simulator implements ISimulator {
 	}
 
 	private getDeviceByIdentifier(deviceIdentifier: string): any {
-		var fullDeviceIdentifier = util.format("%s.%s", XCode6Simulator.DEVICE_IDENTIFIER_PREFIX, deviceIdentifier);
 		var availableDevices = this.getAvailableDevices();
 		if(!_.isEmpty(availableDevices)) {
+			var fullDeviceIdentifier = this.buildFullDeviceIdentifier(deviceIdentifier);
 			var selectedDevice = availableDevices[fullDeviceIdentifier];
 			if(selectedDevice) {
-				return selectedDevice.device;
+				return selectedDevice[0].device;
 			}
 		}
 
 		errors.fail("Unable to find device with identifier ", deviceIdentifier);
 	}
+
+	private buildFullDeviceIdentifier(deviceIdentifier: string): string {
+		return util.format("%s.%s", XCode6Simulator.DEVICE_IDENTIFIER_PREFIX, deviceIdentifier);
+	}
 }

lib/iphone-simulator-xcode-6.js

@@ -40,7 +40,7 @@ export class iPhoneSimulator implements IiPhoneSimulator {
 	public printDeviceTypes(): IFuture<void> {
 		var action = () => {
 			var simulator = this.createSimulator();
-			_.each(simulator.validDeviceIdentifiers, (identifier: any) => console.log(identifier));
+			_.each(simulator.deviceIdentifiersInfo, (identifier: any) => console.log(identifier));
 		}
 
 		return this.execute(action, { canRunMainLoop: false });

lib/iphone-simulator-xcode-6.ts

@@ -1,6 +1,6 @@
 {
   "name": "ios-sim-portable",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "description": "",
   "main": "./lib/ios-sim.js",
   "scripts": {