Fix run command

Fix run command by setting correct platform.

Author: rosen-vladimirov

lib/commands/debug.ts

@@ -37,8 +37,7 @@ export class DebugPlatformCommand implements ICommand {
 
 		const selectedDeviceForDebug = await this.getDeviceForDebug();
 
-		const { deviceDescriptors, liveSyncInfo } = await this.$liveSyncCommandHelper.getDevicesLiveSyncInfo(args, [selectedDeviceForDebug]);
-		await this.$debugLiveSyncService.liveSync(deviceDescriptors, liveSyncInfo);
+		await this.$liveSyncCommandHelper.getDevicesLiveSyncInfo([selectedDeviceForDebug], this.$debugLiveSyncService, this.platform);
 	}
 
 	public async getDeviceForDebug(): Promise<Mobile.IDevice> {

lib/commands/run.ts

@@ -2,8 +2,8 @@ import { ERROR_NO_VALID_SUBCOMMAND_FORMAT } from "../common/constants";
 import { cache } from "../common/decorators";
 
 export class RunCommandBase implements ICommand {
-	protected platform: string;
 
+	public platform: string;
 	constructor(protected $platformService: IPlatformService,
 		protected $liveSyncService: ILiveSyncService,
 		protected $projectData: IProjectData,
@@ -59,8 +59,7 @@ export class RunCommandBase implements ICommand {
 		await this.$devicesService.detectCurrentlyAttachedDevices();
 		let devices = this.$devicesService.getDeviceInstances();
 		devices = devices.filter(d => !this.platform || d.deviceInfo.platform.toLowerCase() === this.platform.toLowerCase());
-		const { deviceDescriptors, liveSyncInfo } = await this.$liveSyncCommandHelper.getDevicesLiveSyncInfo(args, devices);
-		await this.$liveSyncService.liveSync(deviceDescriptors, liveSyncInfo);
+		await this.$liveSyncCommandHelper.getDevicesLiveSyncInfo(devices, this.$liveSyncService, this.platform);
 	}
 }
 
@@ -70,7 +69,9 @@ export class RunIosCommand implements ICommand {
 
 	@cache()
 	private get runCommand(): RunCommandBase {
-		return this.$injector.resolve<RunCommandBase>(RunCommandBase);
+		const runCommand = this.$injector.resolve<RunCommandBase>(RunCommandBase);
+		runCommand.platform = this.platform;
+		return runCommand;
 	}
 
 	public allowedParameters: ICommandParameter[] = [];
@@ -92,7 +93,7 @@ export class RunIosCommand implements ICommand {
 			this.$errors.fail(`Applications for platform ${this.$devicePlatformsConstants.iOS} can not be built on this OS`);
 		}
 
-		return this.runCommand.executeCore([this.$platformsData.availablePlatforms.iOS]);
+		return this.runCommand.executeCore(args);
 	}
 
 	public async canExecute(args: string[]): Promise<boolean> {
@@ -106,7 +107,9 @@ export class RunAndroidCommand implements ICommand {
 
 	@cache()
 	private get runCommand(): RunCommandBase {
-		return this.$injector.resolve<RunCommandBase>(RunCommandBase);
+		const runCommand = this.$injector.resolve<RunCommandBase>(RunCommandBase);
+		runCommand.platform = this.platform;
+		return runCommand;
 	}
 
 	public allowedParameters: ICommandParameter[] = [];
@@ -124,11 +127,12 @@ export class RunAndroidCommand implements ICommand {
 	}
 
 	public async execute(args: string[]): Promise<void> {
-		return this.runCommand.executeCore([this.$platformsData.availablePlatforms.Android]);
+		return this.runCommand.executeCore(args);
 	}
 
 	public async canExecute(args: string[]): Promise<boolean> {
 		await this.runCommand.canExecute(args);
+
 		if (!this.$platformService.isPlatformSupportedForOS(this.$devicePlatformsConstants.Android, this.$projectData)) {
 			this.$errors.fail(`Applications for platform ${this.$devicePlatformsConstants.Android} can not be built on this OS`);
 		}

lib/definitions/livesync.d.ts

@@ -256,10 +256,5 @@ interface IDevicePathProvider {
 }
 
 interface ILiveSyncCommandHelper {
-	getDevicesLiveSyncInfo(args: string[], devices: Mobile.IDevice[]): Promise<IDevicesDescriptorsLiveSyncInfo>;
-}
-
-interface IDevicesDescriptorsLiveSyncInfo {
-	deviceDescriptors: ILiveSyncDeviceInfo[]
-	liveSyncInfo: ILiveSyncInfo
+	getDevicesLiveSyncInfo(devices: Mobile.IDevice[], liveSyncService: ILiveSyncService, platform: string): Promise<void>;
 }

lib/services/livesync/livesync-command-helper.ts

@@ -1,16 +1,28 @@
 export class LiveSyncCommandHelper implements ILiveSyncCommandHelper {
-	protected platform: string;
 
 	constructor(protected $platformService: IPlatformService,
 		protected $projectData: IProjectData,
 		protected $options: IOptions,
 		protected $devicesService: Mobile.IDevicesService,
 		private $iosDeviceOperations: IIOSDeviceOperations,
-		private $mobileHelper: Mobile.IMobileHelper) {
+		private $mobileHelper: Mobile.IMobileHelper,
+		private $platformsData: IPlatformsData) {
 	}
 
-	public async getDevicesLiveSyncInfo(args: string[], devices: Mobile.IDevice[]): Promise<IDevicesDescriptorsLiveSyncInfo> {
+	public async getDevicesLiveSyncInfo(devices: Mobile.IDevice[], liveSyncService: ILiveSyncService, platform: string): Promise<void> {
 		await this.$devicesService.detectCurrentlyAttachedDevices();
+
+		const workingWithiOSDevices = !platform || this.$mobileHelper.isiOSPlatform(platform);
+		const shouldKeepProcessAlive = this.$options.watch || !this.$options.justlaunch;
+		if (workingWithiOSDevices && shouldKeepProcessAlive) {
+			this.$iosDeviceOperations.setShouldDispose(false);
+		}
+
+		if (this.$options.release || this.$options.bundle) {
+			await this.runInReleaseMode(platform);
+			return;
+		}
+
 		// Now let's take data for each device:
 		const deviceDescriptors: ILiveSyncDeviceInfo[] = devices
 			.map(d => {
@@ -40,41 +52,35 @@ export class LiveSyncCommandHelper implements ILiveSyncCommandHelper {
 				return info;
 			});
 
-		const workingWithiOSDevices = !this.platform || this.$mobileHelper.isiOSPlatform(this.platform);
-		const shouldKeepProcessAlive = this.$options.watch || !this.$options.justlaunch;
-		if (workingWithiOSDevices && shouldKeepProcessAlive) {
-			this.$iosDeviceOperations.setShouldDispose(false);
-		}
-
-		// TODO: test it, might have isuues with `tns run` (no args)
-		if (this.$options.release || this.$options.bundle) {
-			const runPlatformOptions: IRunPlatformOptions = {
-				device: this.$options.device,
-				emulator: this.$options.emulator,
-				justlaunch: this.$options.justlaunch
-			};
-
-			const deployOptions = _.merge<IDeployPlatformOptions>({
-				projectDir: this.$projectData.projectDir,
-				clean: true,
-			}, this.$options.argv);
-
-			await this.$platformService.deployPlatform(args[0], this.$options, deployOptions, this.$projectData, this.$options);
-			await this.$platformService.startApplication(args[0], runPlatformOptions, this.$projectData.projectId);
-			this.$platformService.trackProjectType(this.$projectData);
-		}
-
 		const liveSyncInfo: ILiveSyncInfo = {
 			projectDir: this.$projectData.projectDir,
 			skipWatcher: !this.$options.watch,
 			watchAllFiles: this.$options.syncAllFiles,
 			clean: this.$options.clean
 		};
 
-		return {
-			deviceDescriptors,
-			liveSyncInfo
+		await liveSyncService.liveSync(deviceDescriptors, liveSyncInfo);
+
+	}
+
+	private async runInReleaseMode(platform: string): Promise<void> {
+		const runPlatformOptions: IRunPlatformOptions = {
+			device: this.$options.device,
+			emulator: this.$options.emulator,
+			justlaunch: this.$options.justlaunch
 		};
+
+		const deployOptions = _.merge<IDeployPlatformOptions>({
+			projectDir: this.$projectData.projectDir,
+			clean: true,
+		}, this.$options.argv);
+
+		const availablePlatforms = platform ? [platform] : _.values<string>(this.$platformsData.availablePlatforms);
+		for (const currentPlatform of availablePlatforms) {
+			await this.$platformService.deployPlatform(currentPlatform, this.$options, deployOptions, this.$projectData, this.$options);
+			await this.$platformService.startApplication(currentPlatform, runPlatformOptions, this.$projectData.projectId);
+			this.$platformService.trackProjectType(this.$projectData);
+		}
 	}
 }
 

test/debug.ts

@@ -69,8 +69,8 @@ function createTestInjector(): IInjector {
 	testInjector.register("prompter", {});
 	testInjector.registerCommand("debug|android", DebugAndroidCommand);
 	testInjector.register("liveSyncCommandHelper", {
-		getDevicesLiveSyncInfo: async (): Promise<IDevicesDescriptorsLiveSyncInfo> => {
-			return { deviceDescriptors: [], liveSyncInfo: null };
+		getDevicesLiveSyncInfo: async (): Promise<void> => {
+			return null;
 		}
 	});