* Add errors.ts

* Show callstack only if --debug option is specified

Author: Fatme Havaluova

lib/command-executor.ts

@@ -1,25 +1,41 @@
 ///<reference path="./.d.ts"/>
 "use strict";
 
+import Future = require("fibers/future");
 import util = require("util");
+require("colors");
+
+import errors = require("./errors");
 import options = require("./options");
 
 export class CommandExecutor implements ICommandExecutor {
 
 	public execute(): IFuture<void> {
-		var commandName = this.getCommandName();
-		var commandArguments = this.getCommandArguments();
+		return (() => {
+			var commandName = this.getCommandName();
+			var commandArguments = this.getCommandArguments();
 
-		return this.executeCore(commandName, commandArguments);
+			this.executeCore(commandName, commandArguments).wait();
+		}).future<void>()();
 	}
 
 	private executeCore(commandName: string, commandArguments: string[]): IFuture<void> {
-		var command = new (require("./commands/" + commandName).Command)();
-		if(!command) {
-			throw new Error(util.format("Unable to resolve commandName %s", commandName));
-		}
-
-		return command.execute(commandArguments);
+		return (() => {
+			var command: ICommand = new (require("./commands/" + commandName).Command)();
+			if(!command) {
+				errors.fail("Unable to resolve commandName %s", commandName);
+			}
+
+			try {
+				command.execute(commandArguments).wait();
+			} catch(e) {
+				if(options.debug) {
+					throw e;
+				} else {
+					console.log( "\x1B[31;1m" + e.message + "\x1B[0m");
+				}
+			}
+		}).future<void>()();
 	}
 
 	private getCommandArguments(): string[] {

lib/declarations.ts

@@ -24,6 +24,6 @@ interface IDictionary<T> {
 }
 
 interface ISimulator {
-	validateDeviceIdentifier(): void;
+	validDeviceIdentifiers: string[];
 	setSimulatedDevice(config: any): void;
 }

lib/errors.ts

@@ -0,0 +1,9 @@
+///<reference path="./.d.ts"/>
+"use strict";
+
+import util = require("util");
+
+export function fail(errorMessage: string, ...args: string[]) {
+	args.unshift(errorMessage);
+	throw new Error(util.format.apply(null, args));
+}

lib/ios-sim.ts

@@ -10,6 +10,7 @@ import commandExecutorLibPath = require("./command-executor");
 var fiber = Fiber(() => {
 	var commandExecutor: ICommandExecutor = new commandExecutorLibPath.CommandExecutor();
 	commandExecutor.execute().wait();
+	Future.assertNoFutureLeftBehind();
 });
 
 fiber.run();

lib/iphone-simulator-xcode-5.ts

@@ -1,6 +1,7 @@
 ///<reference path="./.d.ts"/>
 "use strict";
 
+import errors = require("./errors");
 import options = require("./options");
 import utils = require("./utils");
 import util = require("util");
@@ -21,11 +22,8 @@ export class XCode5Simulator implements ISimulator {
 		"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 get validDeviceIdentifiers(): string[] {
+		return _.keys(XCode5Simulator.allowedDeviceIdentifiers);
 	}
 
 	public setSimulatedDevice(config:any): void {

lib/iphone-simulator-xcode-6.ts

@@ -1,5 +1,6 @@
 ///<reference path="./.d.ts"/>
 "use strict";
+import errors = require("./errors");
 import options = require("./options");
 import utils = require("./utils");
 import util = require("util");
@@ -29,10 +30,8 @@ export class XCode6Simulator implements ISimulator {
 		this.availableDevices = Object.create(null);
 	}
 
-	public validateDeviceIdentifier(): void {
-		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)));
-		}
+	public get validDeviceIdentifiers(): string[] {
+		return XCode6Simulator.allowedDeviceIdentifiers;
 	}
 
 	public setSimulatedDevice(config: any): void {
@@ -76,6 +75,6 @@ export class XCode6Simulator implements ISimulator {
 			}
 		}
 
-		throw new Error(util.format("Unable to find device with identifier ", deviceIdentifier));
+		errors.fail("Unable to find device with identifier ", deviceIdentifier);
 	}
 }

lib/iphone-simulator.ts

@@ -7,6 +7,7 @@ import Future = require("fibers/future");
 import path = require("path");
 import util = require("util");
 
+import errors = require("./errors");
 import options = require("./options");
 import utils = require("./utils");
 import xcode6SimulatorLib = require("./iphone-simulator-xcode-6");
@@ -28,7 +29,7 @@ export class iPhoneSimulator implements IiPhoneSimulator {
 	public run(appPath: string): IFuture<void> {
 		return (() => {
 			if(!fs.existsSync(appPath)) {
-				throw new Error(util.format("Path does not exist ", appPath));
+				errors.fail("Path does not exist ", appPath);
 			}
 
 			$.importFramework(iPhoneSimulator.FOUNDATION_FRAMEWORK_NAME);
@@ -38,7 +39,7 @@ export class iPhoneSimulator implements IiPhoneSimulator {
 
 			var developerDirectoryPath = this.findDeveloperDirectory().wait();
 			if(!developerDirectoryPath) {
-				throw new Error("Unable to find developer directory");
+				errors.fail("Unable to find developer directory");
 			}
 
 			this.loadFrameworks(developerDirectoryPath);
@@ -78,7 +79,10 @@ export class iPhoneSimulator implements IiPhoneSimulator {
 		}
 
 		if(options.device) {
-			simulator.validateDeviceIdentifier();
+			var validDeviceIdentifiers = simulator.validDeviceIdentifiers;
+			if(!_.contains(validDeviceIdentifiers, options.device)) {
+				errors.fail("Invalid device identifier %s. Valid device identifiers are %s.", options.device, utils.stringify(validDeviceIdentifiers));
+			}
 		}
 		simulator.setSimulatedDevice(config);
 
@@ -93,7 +97,7 @@ export class iPhoneSimulator implements IiPhoneSimulator {
 		session("setDelegate", delegate);
 
 		if(!session("requestStartWithConfig", config, "timeout", timeout, "error", sessionError)) {
-			throw new Error(util.format("Could not start simulator session ", sessionError));
+			errors.fail("Could not start simulator session ", sessionError);
 		}
 	}
 
@@ -108,7 +112,7 @@ export class iPhoneSimulator implements IiPhoneSimulator {
 		var platformsError: string = null;
 		var dvtPlatformClass = this.getClassByName("DVTPlatform");
 		if(!dvtPlatformClass("loadAllPlatformsReturningError", platformsError)) {
-			throw new Error(util.format("Unable to loadAllPlatformsReturningError ", platformsError));
+			errors.fail("Unable to loadAllPlatformsReturningError ", platformsError);
 		}
 
 		var simulatorFrameworkPath = path.join(developerDirectoryPath, iPhoneSimulator.SIMULATOR_FRAMEWORK_RELATIVE_PATH_LEGACY);
@@ -121,7 +125,7 @@ export class iPhoneSimulator implements IiPhoneSimulator {
 	private loadFramework(frameworkPath: string) {
 		var bundle =  $.NSBundle("bundleWithPath", $(frameworkPath));
 		if(!bundle("load")) {
-			throw new Error(util.format("Unable to load ", frameworkPath));
+			errors.fail("Unable to load ", frameworkPath);
 		}
 	}
 

lib/options.ts

@@ -4,8 +4,7 @@
 var yargs = require("yargs");
 
 var knownOptions: any = {
-	"sdk": String,
-	"family": String,
+	"debug": Boolean,
 	"device": String,
 	"stdout": String,
 	"stderr": String,

package.json

@@ -21,6 +21,7 @@
   },
   "homepage": "https://github.com/telerik/ios-sim-portable",
   "dependencies": {
+    "colors": "0.6.2",
     "fibers": "https://github.com/icenium/node-fibers/tarball/master",
     "NodObjC": "https://github.com/telerik/NodObjC/tarball/master",
     "underscore": "1.6.0",