Device-types command

Author: Fatme Havaluova

lib/command-executor.ts

@@ -11,12 +11,10 @@ import options = require("./options");
 export class CommandExecutor implements ICommandExecutor {
 
 	public execute(): IFuture<void> {
-		return (() => {
-			var commandName = this.getCommandName();
-			var commandArguments = this.getCommandArguments();
+		var commandName = this.getCommandName();
+		var commandArguments = this.getCommandArguments();
 
-			this.executeCore(commandName, commandArguments).wait();
-		}).future<void>()();
+		return this.executeCore(commandName, commandArguments);
 	}
 
 	private executeCore(commandName: string, commandArguments: string[]): IFuture<void> {

lib/commands/device-types.ts

@@ -0,0 +1,10 @@
+///<reference path=".././.d.ts"/>
+"use strict";
+import iphoneSimulatorLibPath = require("./../iphone-simulator");
+
+export class Command implements ICommand {
+	public execute(args: string[]): IFuture<void> {
+		var iphoneSimulator = new iphoneSimulatorLibPath.iPhoneSimulator();
+		return iphoneSimulator.printDeviceTypes();
+	}
+}

lib/declarations.ts

@@ -3,6 +3,7 @@
 
 interface IiPhoneSimulator {
 	run(appName: string): IFuture<void>;
+	printDeviceTypes(): void;
 }
 
 interface ICommand {
@@ -26,4 +27,9 @@ interface IDictionary<T> {
 interface ISimulator {
 	validDeviceIdentifiers: string[];
 	setSimulatedDevice(config: any): void;
+}
+
+interface IExecuteOptions {
+	canRunMainLoop: boolean;
+	appPath?: string;
 }

lib/iphone-simulator-xcode-6.ts

@@ -9,7 +9,7 @@ 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 DEFAULT_DEVICE_IDENTIFIER = "iPhone-4s";
 
 	private static allowedDeviceIdentifiers = [
 		"iPhone-4s",
@@ -44,7 +44,7 @@ export class XCode6Simulator implements ISimulator {
 	}
 
 	private getAvailableDevices(): IDictionary<IDevice> {
-		if(utils.isEmptyDictionary(this.availableDevices)) {
+		if(_.isEmpty(this.availableDevices)) {
 			var deviceSet = $.classDefinition.getClassByName("SimDeviceSet")("defaultSet");
 			var devices = deviceSet("availableDevices");
 			var count = devices("count");
@@ -68,10 +68,10 @@ 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(!utils.isEmptyDictionary(availableDevices)) {
-			var device = availableDevices[fullDeviceIdentifier];
-			if(device) {
-				return device.device;
+		if(!_.isEmpty(availableDevices)) {
+			var selectedDevice = availableDevices[fullDeviceIdentifier];
+			if(selectedDevice) {
+				return selectedDevice.device;
 			}
 		}
 

lib/iphone-simulator.ts

@@ -27,11 +27,25 @@ export class iPhoneSimulator implements IiPhoneSimulator {
 	private static SIMULATOR_FRAMEWORK_RELATIVE_PATH = "../SharedFrameworks/DVTiPhoneSimulatorRemoteClient.framework";
 
 	public run(appPath: string): IFuture<void> {
-		return (() => {
-			if(!fs.existsSync(appPath)) {
-				errors.fail("Path does not exist ", appPath);
-			}
+		if(!fs.existsSync(appPath)) {
+			errors.fail("Path does not exist ", appPath);
+		}
+
+		return this.execute(this.launch, { canRunMainLoop: true, appPath: appPath});
+	}
+
+	public printDeviceTypes(): IFuture<void> {
+
+		var action = () => {
+			var simulator = this.createSimulator();
+			_.each(simulator.validDeviceIdentifiers, (identifier: any) => console.log(identifier));
+		}
 
+		return this.execute(action, { canRunMainLoop: false });
+	}
+
+	private execute(action: (appPath?: string) => any, opts: IExecuteOptions): IFuture<void> {
+		return (() => {
 			$.importFramework(iPhoneSimulator.FOUNDATION_FRAMEWORK_NAME);
 			$.importFramework(iPhoneSimulator.APPKIT_FRAMEWORK_NAME);
 
@@ -43,17 +57,18 @@ export class iPhoneSimulator implements IiPhoneSimulator {
 			}
 
 			this.loadFrameworks(developerDirectoryPath);
-			this.launch(developerDirectoryPath, appPath);
 
-			$.NSRunLoop("mainRunLoop")("run");
+			action.apply(this, [opts.appPath]);
+
+			if(opts.canRunMainLoop) {
+				$.NSRunLoop("mainRunLoop")("run");
+			}
 
 			pool("release");
 		}).future<void>()();
 	}
 
-	private launch(developerDirectoryPath: string, appPath: string): void {
-		this.loadFrameworks(developerDirectoryPath);
-
+	private launch(appPath: string): void {
 		var sessionDelegate = $.NSObject.extend("DTiPhoneSimulatorSessionDelegate");
 		sessionDelegate.addMethod("session:didEndWithError:", "v@:@@", function(self: any, sel: any, sess: any, error: any) {
 			iPhoneSimulator.logSessionInfo(error, "Session ended without errors.", "Session ended with error ");
@@ -71,13 +86,7 @@ export class iPhoneSimulator implements IiPhoneSimulator {
 		var sdkRoot = options.sdkRoot ? $(options.sdkRoot) : this.getClassByName("DTiPhoneSimulatorSystemRoot")("defaultRoot");
 		config("setSimulatedSystemRoot", sdkRoot);
 
-		var simulator: ISimulator;
-		if(_.contains(config.methods(), "setDevice:")) {
-			simulator = new xcode6SimulatorLib.XCode6Simulator();
-		} else {
-			simulator = new xcode5SimulatorLib.XCode5Simulator();
-		}
-
+		var simulator = this.createSimulator(config);
 		if(options.device) {
 			var validDeviceIdentifiers = simulator.validDeviceIdentifiers;
 			if(!_.contains(validDeviceIdentifiers, options.device)) {
@@ -168,8 +177,23 @@ export class iPhoneSimulator implements IiPhoneSimulator {
 		if(error) {
 			console.log(util.format("%s %s", errorMessage, error));
 			process.exit(1);
+		}
+
+		console.log(successfulMessage);
+	}
+
+	private createSimulator(config?: any): ISimulator {
+		if(!config) {
+			config = this.getClassByName("DTiPhoneSimulatorSessionConfig")("alloc")("init")("autorelease");
+		}
+
+		var simulator: ISimulator;
+		if(_.contains(config.methods(), "setDevice:")) {
+			simulator = new xcode6SimulatorLib.XCode6Simulator();
 		} else {
-			console.log(successfulMessage);
+			simulator = new xcode5SimulatorLib.XCode5Simulator();
 		}
+
+		return simulator;
 	}
 }

lib/utils.ts

@@ -1,7 +1,3 @@
-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);