Implement run and emulate commands as hierarchical

Author: Fatme Havaluova

lib/bootstrap.ts

@@ -31,7 +31,8 @@ $injector.requireCommand("debug", "./commands/debug");
 $injector.requireCommand("prepare", "./commands/prepare");
 $injector.requireCommand("build", "./commands/build");
 $injector.requireCommand("deploy", "./commands/deploy");
-$injector.requireCommand("emulate", "./commands/emulate");
+$injector.requireCommand("emulate|android", "./commands/emulate");
+$injector.requireCommand("emulate|ios", "./commands/emulate");
 
 $injector.require("npm", "./node-package-manager");
 $injector.require("lockfile", "./lockfile");

lib/commands/emulate.ts

@@ -1,12 +1,38 @@
 ///<reference path="../.d.ts"/>
 "use strict";
 
-export class EmulateCommand implements ICommand {
-	constructor(private $platformService: IPlatformService,
-		private $platformCommandParameter: ICommandParameter) { }
+export class EmulateCommandBase {
+	constructor(private $platformService: IPlatformService) { }
 
-	execute(args: string[]): IFuture<void> { return this.$platformService.deployOnEmulator(args[0]); }
+	executeCore(args: string[]): IFuture<void> {
+		return this.$platformService.deployOnEmulator(args[0]);
+	}
+}
+
+export class EmulateIosCommand extends  EmulateCommandBase implements ICommand {
+	constructor($platformService: IPlatformService,
+		private $platformsData: IPlatformsData) {
+		super($platformService);
+	}
+
+	public allowedParameters: ICommandParameter[] = [];
+
+	public execute(args: string[]): IFuture<void> {
+		return this.executeCore([this.$platformsData.availablePlatforms.iOS]);
+	}
+}
+$injector.registerCommand("emulate|ios", EmulateIosCommand);
+
+export class EmulateAndroidCommand extends EmulateCommandBase implements ICommand {
+	constructor($platformService: IPlatformService,
+		private $platformsData: IPlatformsData) {
+		super($platformService);
+	}
+
+	public allowedParameters: ICommandParameter[] = [];
 
-	allowedParameters = [this.$platformCommandParameter];
+	public execute(args: string[]): IFuture<void> {
+		return this.executeCore([this.$platformsData.availablePlatforms.Android]);
+	}
 }
-$injector.registerCommand("emulate", EmulateCommand);
+$injector.registerCommand("emulate|android", EmulateAndroidCommand);

lib/commands/run.ts

@@ -1,16 +1,38 @@
 ///<reference path="../.d.ts"/>
 "use strict";
 
-export class RunCommand implements ICommand {
-	constructor(private $platformService: IPlatformService,
-		private $platformCommandParameter: ICommandParameter) { }
-
-	execute(args: string[]): IFuture<void> {
-		return (() => {
-			this.$platformService.runPlatform(args[0]).wait();
-		}).future<void>()();
+export class RunCommandBase {
+	constructor(private $platformService: IPlatformService) { }
+
+	public executeCore(args: string[]): IFuture<void> {
+		return this.$platformService.runPlatform(args[0]);
+	}
+}
+
+export class RunIosCommand extends RunCommandBase implements ICommand {
+	constructor($platformService: IPlatformService,
+		private $platformsData: IPlatformsData) {
+		super($platformService);
+	}
+
+	public allowedParameters: ICommandParameter[] = [];
+
+	public execute(args: string[]): IFuture<void> {
+		return this.executeCore([this.$platformsData.availablePlatforms.iOS]);
+	}
+}
+$injector.registerCommand("run|ios", RunIosCommand);
+
+export class RunAndroidCommand extends RunCommandBase implements ICommand {
+	constructor($platformService: IPlatformService,
+		private $platformsData: IPlatformsData) {
+		super($platformService);
 	}
 
-	allowedParameters = [this.$platformCommandParameter];
+	public allowedParameters: ICommandParameter[] = [];
+
+	public execute(args: string[]): IFuture<void> {
+		return this.executeCore([this.$platformsData.availablePlatforms.Android]);
+	}
 }
-$injector.registerCommand("run", RunCommand);
+$injector.registerCommand("run|android", RunAndroidCommand);

lib/common

@@ -5,8 +5,8 @@ interface IPlatformService {
 	getPreparedPlatforms(): IFuture<string[]>;
 	removePlatforms(platforms: string[]): IFuture<void>;
 	updatePlatforms(platforms: string[]): IFuture<void>;
-    runPlatform(platform: string): IFuture<void>;
-    debugPlatform(platform: string): IFuture<void>;
+	runPlatform(platform: string): IFuture<void>;
+	debugPlatform(platform: string): IFuture<void>;
 	preparePlatform(platform: string): IFuture<void>;
 	buildPlatform(platform: string): IFuture<void>;
 	deployOnDevice(platform: string): IFuture<void>;
@@ -30,6 +30,7 @@ interface IPlatformData {
 }
 
 interface IPlatformsData {
+	availablePlatforms: any;
 	platformsNames: string[];
 	getPlatformData(platform: string): IPlatformData;
 }

lib/definitions/platform.d.ts

@@ -20,5 +20,12 @@ export class PlatformsData implements IPlatformsData {
 	public getPlatformData(platform: string): IPlatformData {
 		return this.platformsData[platform];
 	}
+
+	public get availablePlatforms(): any {
+		return {
+			iOS: "ios",
+			Android: "android"
+		};
+	}
 }
 $injector.register("platformsData", PlatformsData);

lib/platforms-data.ts

@@ -63,6 +63,10 @@ class PlatformsData implements IPlatformsData {
 
 		return null;
 	}
+	
+	public get availablePlatforms(): any {
+		return undefined;
+	}
 }
 
 function createTestInjector() {

test/platform-commands.ts

@@ -211,6 +211,10 @@ export class PlatformsDataStub implements IPlatformsData {
 			frameworkFilesExtensions: []
 		};
 	}
+
+	public get availablePlatforms(): any {
+		return undefined;
+	}
 }
 
 export class PlatformProjectServiceStub implements IPlatformProjectService {