PR comments

Author: Fatme Havaluova

lib/ios-sim.ts

@@ -16,12 +16,9 @@ var fiber = Fiber(() => {
 fiber.run();
 
 function getSimulator(): IFuture<ISimulator> {
-	return (() => {
-		let libraryPath = require("./iphone-simulator");
-		let obj = new libraryPath.iPhoneSimulator();
-		let simulator = obj.createSimulator().wait();
-		return simulator;
-	}).future<ISimulator>()();
+	let libraryPath = require("./iphone-simulator");
+	let obj = new libraryPath.iPhoneSimulator();
+	return obj.createSimulator();
 }
 
 global.publicApi = {};
@@ -64,7 +61,6 @@ Object.defineProperty(global.publicApi, "getInstalledApplications", {
 			let simulator = getSimulator().wait();
 			let installedApplications: IApplication[] = simulator.getInstalledApplications.apply(simulator, args).wait();
 			let result = _.map(installedApplications, application => application.appIdentifier);
-			console.log("RESULT!!!!! ", result);
 			return result;
 		}
 	}

lib/iphone-simulator-common.ts

@@ -43,13 +43,13 @@ export function printDeviceLog(deviceId: string): void {
 	let childProcess = require("child_process").spawn("tail", ['-f', '-n', '1', logFilePath]);
 	if (childProcess.stdout) {
 		childProcess.stdout.on("data", (data: NodeBuffer) => {
-			console.log(data.toString());
+			process.stdout.write(data.toString());
 		});
 	}
 
 	if (childProcess.stderr) {
 		childProcess.stderr.on("data", (data: string) => {
-			console.error(data.toString());
+			process.stdout.write(data.toString());
 		});
 	}
 }

lib/iphone-simulator-xcode-6.ts

@@ -73,11 +73,10 @@ export class XCode6Simulator extends iPhoneSimulatorBaseLib.IPhoneInteropSimulat
 		return this.simctl.launch(deviceId, appIdentifier);
 	}
 
-	public stopApplication(deviceId: string, appIdentifier: string): IFuture<string> {
+	public stopApplication(deviceId: string, cfBundleExecutable: string): IFuture<string> {
 		try {
-			return childProcess.exec(`killall ${appIdentifier.split(".")[2]}.app`);
+			return childProcess.exec(`killall ${cfBundleExecutable}.app`);
 		} catch(e) {
-			//this.$logger.trace("Unable to kill simulator: " + e);
 		}
 	}
 

lib/iphone-simulator-xcode-7.ts

@@ -110,11 +110,10 @@ export class XCode7Simulator implements ISimulator {
 		return this.simctl.launch(deviceId, appIdentifier);
 	}
 
-	public stopApplication(deviceId: string, appIdentifier: string): IFuture<string> {
+	public stopApplication(deviceId: string, cfBundleExecutable: string): IFuture<string> {
 		try {
-			return childProcess.exec(`killall ${appIdentifier.split(".")[2]}`, {skipError: true});
+			return childProcess.exec(`killall ${cfBundleExecutable}`, {skipError: true});
 		} catch(e) {
-			//this.$logger.trace("Unable to kill simulator: " + e);
 		}
 	}
 

package.json

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