Merge pull request #3 from telerik/fatme/commands

Missing options and commands

Author: Fatme

lib/command-executor.ts

@@ -19,12 +19,12 @@ export class CommandExecutor implements ICommandExecutor {
 
 	private executeCore(commandName: string, commandArguments: string[]): IFuture<void> {
 		return (() => {
-			var command: ICommand = new (require("./commands/" + commandName).Command)();
-			if(!command) {
-				errors.fail("Unable to resolve commandName %s", commandName);
-			}
-
 			try {
+				var command: ICommand = new (require("./commands/" + commandName).Command)();
+				if(!command) {
+					errors.fail("Unable to resolve commandName %s", commandName);
+				}
+
 				command.execute(commandArguments).wait();
 			} catch(e) {
 				if(options.debug) {

lib/commands/help.ts

@@ -0,0 +1,31 @@
+///<reference path=".././.d.ts"/>
+"use strict";
+
+import fs = require("fs");
+import path = require("path");
+import util = require("util");
+
+export class Command implements ICommand {
+	public execute(args: string[]): IFuture<void> {
+		return (() => {
+			var topic = (args[0] || "").toLowerCase();
+			if (topic === "help") {
+				topic = "";
+			}
+
+			var helpContent = fs.readFileSync(path.join(__dirname, "../../resources/help.txt")).toString();
+
+			var pattern = util.format("--\\[%s\\]--((.|[\\r\\n])+?)--\\[/\\]--", this.escape(topic));
+			var regex = new RegExp(pattern);
+			var match = regex.exec(helpContent);
+			if (match) {
+				var helpText = match[1].trim();
+				console.log(helpText);
+			}
+		}).future<void>()();
+	}
+
+	private escape(s: string): string {
+		return s.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&');
+	}
+}

lib/commands/sdks.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.printSDKS();
+	}
+}

lib/declarations.ts

@@ -3,7 +3,8 @@
 
 interface IiPhoneSimulator {
 	run(appName: string): IFuture<void>;
-	printDeviceTypes(): void;
+	printDeviceTypes(): IFuture<void>;
+	printSDKS(): IFuture<void>;
 }
 
 interface ICommand {
@@ -32,4 +33,11 @@ interface ISimulator {
 interface IExecuteOptions {
 	canRunMainLoop: boolean;
 	appPath?: string;
+}
+
+interface ISdk {
+	displayName: string;
+	version: string;
+	rootPath: string;
+	sdkInfo(): string;
 }

lib/iphone-simulator.ts

@@ -4,6 +4,7 @@
 import child_process = require("child_process");
 import fs = require("fs");
 import Future = require("fibers/future");
+import os = require("os");
 import path = require("path");
 import util = require("util");
 
@@ -35,7 +36,6 @@ export class iPhoneSimulator implements IiPhoneSimulator {
 	}
 
 	public printDeviceTypes(): IFuture<void> {
-
 		var action = () => {
 			var simulator = this.createSimulator();
 			_.each(simulator.validDeviceIdentifiers, (identifier: any) => console.log(identifier));
@@ -44,6 +44,30 @@ export class iPhoneSimulator implements IiPhoneSimulator {
 		return this.execute(action, { canRunMainLoop: false });
 	}
 
+	public printSDKS(): IFuture<void> {
+		var action = () => {
+			var systemRootClass = this.getClassByName("DTiPhoneSimulatorSystemRoot");
+			var roots = systemRootClass("knownRoots");
+			var count = roots("count");
+
+			var sdks: ISdk[] = [];
+			for(var index=0; index < count; index++) {
+				var root = roots("objectAtIndex", index);
+
+				var displayName = root("sdkDisplayName").toString();
+				var version = root("sdkVersion").toString();
+				var rootPath = root("sdkRootPath").toString();
+
+				sdks.push(new Sdk(displayName, version, rootPath));
+			}
+
+			sdks = _.sortBy(sdks, (sdk: ISdk) => sdk.version);
+			_.each(sdks, (sdk: ISdk) => console.log(sdk.sdkInfo() + os.EOL));
+		};
+
+		return this.execute(action, { canRunMainLoop: false });
+	}
+
 	private execute(action: (appPath?: string) => any, opts: IExecuteOptions): IFuture<void> {
 		return (() => {
 			$.importFramework(iPhoneSimulator.FOUNDATION_FRAMEWORK_NAME);
@@ -74,8 +98,11 @@ export class iPhoneSimulator implements IiPhoneSimulator {
 			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, error:any) {
+		sessionDelegate.addMethod("session:didStart:withError:", "v@:@c@", function(self: any, sel: string, session: any, started: boolean, error:any) {
 			iPhoneSimulator.logSessionInfo(error, "Session started without errors.", "Session started with error ");
+			if(options.exit) {
+				process.exit(0);
+			}
 		});
 		sessionDelegate.register();
 
@@ -95,6 +122,14 @@ export class iPhoneSimulator implements IiPhoneSimulator {
 		}
 		simulator.setSimulatedDevice(config);
 
+		if(options.stderr) {
+			config("setSimulatedApplicationStdErrPath", $(options.stderr));
+		}
+
+		if(options.stdout) {
+			config("setSimulatedApplicationStdOutPath", $(options.stdout));
+		}
+
 		config("setLocalizedClientName", $("ios-sim-portable"));
 
 		var sessionError: any = new Buffer("");
@@ -196,4 +231,16 @@ export class iPhoneSimulator implements IiPhoneSimulator {
 
 		return simulator;
 	}
+}
+
+class Sdk implements ISdk {
+	constructor(public displayName: string,
+		public version: string,
+		public rootPath: string) { }
+
+	public sdkInfo(): string {
+		return [util.format("    Display Name: %s", this.displayName),
+			util.format("    Version: %s", this.version),
+			util.format("    Root path: %s", this.rootPath)].join(os.EOL);
+	}
 }

lib/options.ts

@@ -5,11 +5,13 @@ var yargs = require("yargs");
 
 var knownOptions: any = {
 	"debug": Boolean,
+	"exit": Boolean,
 	"device": String,
 	"stdout": String,
 	"stderr": String,
 	"env": String,
-	"args": String
+	"args": String,
+	"help": Boolean
 };
 
 var parsed = {};

resources/help.txt

@@ -0,0 +1,56 @@
+--[]--
+
+Usage:
+    $ ios-sim-portable <command> [command parameters] [--command <options>]
+
+General commands:
+    help <command>       Shows additional information about the commands in this list.
+    launch <App path>    Launch the application at the specified path on the iOS Simulator.
+    device-types         Lists the available device types for current Xcode version.
+    sdks                 Lists the available iOS sdk versions.
+
+General options:
+    --help               Prints help about the selected command.
+
+--[/]--
+
+--[help]--
+
+Usage:
+    $ ios-sim-portable help [<Command>]
+
+Lists the available commands or shows information about the selected command.
+<Command> is any of the available commands as listed by $ ios-sim-portable help.
+
+--[/]--
+
+--[launch]--
+
+Usage:
+    $ ios-sim-portable launch <App path> [--exit]
+
+Launch the application at the specified path on iOS Simulator.
+<App path> - Specifies the path to application(.app file) that you want to run in iOS Simulator.
+
+Options:
+    --exit - If this option is specified, the process is exited after the iOS Simulator is started.
+
+--[/]--
+
+--[device-types]--
+
+Usage:
+    $ ios-sim-portable device-types
+
+Lists the available device types for current XCode version
+
+--[/]--
+
+--[sdks]--
+
+Usage:
+    $ ios-sim-portable sdks
+
+Lists the available iOS sdk versions.
+
+--[/]--