Validate device and sdkVersion options

Remove unneeded code
Don't handle watch devices and sdks
Polish sdk list

Author: Fatme Havaluova

lib/iphone-simulator-xcode-7.ts

@@ -29,7 +29,12 @@ export class XCode7Simulator implements ISimulator {
 	public getSdks(): IFuture<ISdk[]> {
 		return (() => {
 			let devices = this.simctl.getDevices().wait();
-			return _.map(devices, device => device.runtimeVersion);
+			return _.map(devices, device => {
+				return {
+					displayName: `iOS ${device.runtimeVersion}`,
+					version: device.runtimeVersion
+				};
+			});
 		}).future<ISdk[]>()();
 	}
 

lib/iphone-simulator.ts

@@ -25,16 +25,25 @@ export class iPhoneSimulator implements IiPhoneSimulator {
 		this.simulator = this.createSimulator().wait();
 	}
 
-	public get validDeviceIdentifiers(): string[] {
-		var devices = this.simulator.getDevices().wait();
-		return _.map(devices, device => device.id);
-	}
-
 	public run(applicationPath: string, applicationIdentifier: string): IFuture<void> {
 		if(!fs.existsSync(applicationPath)) {
 			errors.fail("Path does not exist ", applicationPath);
 		}
 
+		if(options.device) {
+			let deviceNames = _.unique(_.map(this.simulator.getDevices().wait(), (device: IDevice) => device.name));
+			if(!_.contains(deviceNames, options.device)) {
+				errors.fail(`Unable to find device ${options.device}. The valid device names are ${deviceNames.join(", ")}`);
+			}
+		}
+
+		if(options.sdkVersion) {
+			let runtimeVersions = _.unique(_.map(this.simulator.getDevices().wait(), (device: IDevice) => device.runtimeVersion));
+			if(!_.contains(runtimeVersions, options.sdkVersion)) {
+				errors.fail(`Unable to find sdk ${options.sdkVersion}. The valid runtime versions are ${runtimeVersions.join(", ")}`);
+			}
+		}
+
 		return this.simulator.run(applicationPath, applicationIdentifier);
 	}
 
@@ -48,9 +57,13 @@ export class iPhoneSimulator implements IiPhoneSimulator {
 	public printSDKS(): IFuture<void> {
 		return (() => {
 			let sdks = this.simulator.getSdks().wait();
-			_.each(sdks, (sdk) => console.log([util.format("    Display Name: %s", sdk.displayName),
-				util.format("    Version: %s", sdk.version),
-				util.format("    Root path: %s", sdk.rootPath)].join(os.EOL)) );
+			_.each(sdks, (sdk) => {
+				let output = `    Display Name: ${sdk.displayName} ${os.EOL}    Version: ${sdk.version} ${os.EOL}`;
+				if(sdk.rootPath) {
+					 output += `    Root path: ${sdk.rootPath} ${os.EOL}`;
+				}
+				console.log(output);
+			});
 		}).future<void>()();
 	}
 

lib/simctl.ts

@@ -61,7 +61,7 @@ export class Simctl implements ISimctl {
 			// so, get the `-- iOS X.X --` line to find the sdk (X.X)
 			// and the rest of the listing in order to later find the devices
 
-			let deviceSectionRegex = /-- (iOS|watchOS) (.+) --(\n    .+)*/mg;
+			let deviceSectionRegex = /-- (iOS) (.+) --(\n    .+)*/mg;
 			let match = deviceSectionRegex.exec(rawDevices);
 
 			let matches: any[] = [];