Move OS compatibility check to commands

Author: nadyaA

lib/commands/appstore-list.ts

@@ -7,9 +7,19 @@ export class ListiOSApps implements ICommand {
 constructor(private $injector: IInjector,
 private $itmsTransporterService: IITMSTransporterService,
 private $logger: ILogger,
-private $prompter: IPrompter) { }
+private $projectData: IProjectData,
+private $devicePlatformsConstants: Mobile.IDevicePlatformsConstants,
+private $platformService: IPlatformService,
+private $errors: IErrors,
+private $prompter: IPrompter) {
+this.$projectData.initializeProjectData();
+ }
 
 public async execute(args: string[]): Promise<void> {
+if (!this.$platformService.isPlatformSupportedForOS(this.$devicePlatformsConstants.iOS, this.$projectData)) {
+this.$errors.fail("Applications for platform %s can not be built on this OS - %s", this.$devicePlatformsConstants.iOS, process.platform);
+}
+
 let username = args[0],
 password = args[1];
 

lib/commands/appstore-upload.ts

@@ -7,7 +7,6 @@ export class PublishIOS implements ICommand {
 new StringCommandParameter(this.$injector), new StringCommandParameter(this.$injector)];
 
 constructor(private $errors: IErrors,
-private $hostInfo: IHostInfo,
 private $injector: IInjector,
 private $itmsTransporterService: IITMSTransporterService,
 private $logger: ILogger,
@@ -100,8 +99,8 @@ export class PublishIOS implements ICommand {
 }
 
 public async canExecute(args: string[]): Promise<boolean> {
-if (!this.$hostInfo.isDarwin) {
-this.$errors.failWithoutHelp("This command is only available on Mac OS X.");
+if (!this.$platformService.isPlatformSupportedForOS(this.$devicePlatformsConstants.iOS, this.$projectData)) {
+this.$errors.fail("Applications for platform %s can not be built on this OS - %s", this.$devicePlatformsConstants.iOS, process.platform);
 }
 
 return true;

lib/commands/build.ts

@@ -2,6 +2,7 @@ export class BuildCommandBase {
 constructor(protected $options: IOptions,
 protected $projectData: IProjectData,
 protected $platformsData: IPlatformsData,
+protected $devicePlatformsConstants: Mobile.IDevicePlatformsConstants,
 protected $platformService: IPlatformService) {
 this.$projectData.initializeProjectData();
 }
@@ -35,17 +36,23 @@ export class BuildIosCommand extends BuildCommandBase implements ICommand {
 public allowedParameters: ICommandParameter[] = [];
 
 constructor(protected $options: IOptions,
+private $errors: IErrors,
 $projectData: IProjectData,
 $platformsData: IPlatformsData,
+$devicePlatformsConstants: Mobile.IDevicePlatformsConstants,
 $platformService: IPlatformService) {
-super($options, $projectData, $platformsData, $platformService);
+super($options, $projectData, $platformsData, $devicePlatformsConstants, $platformService);
 }
 
 public async execute(args: string[]): Promise<void> {
 return this.executeCore([this.$platformsData.availablePlatforms.iOS]);
 }
 
 public canExecute(args: string[]): Promise<boolean> {
+if (!this.$platformService.isPlatformSupportedForOS(this.$devicePlatformsConstants.iOS, this.$projectData)) {
+this.$errors.fail("Applications for platform %s can not be built on this OS - %s", this.$devicePlatformsConstants.iOS, process.platform);
+}
+
 return args.length === 0 && this.$platformService.validateOptions(this.$options.provision, this.$projectData, this.$platformsData.availablePlatforms.iOS);
 }
 }
@@ -56,18 +63,23 @@ export class BuildAndroidCommand extends BuildCommandBase implements ICommand {
 public allowedParameters: ICommandParameter[] = [];
 
 constructor(protected $options: IOptions,
+private $errors: IErrors,
 $projectData: IProjectData,
 $platformsData: IPlatformsData,
-private $errors: IErrors,
+$devicePlatformsConstants: Mobile.IDevicePlatformsConstants,
 $platformService: IPlatformService) {
-super($options, $projectData, $platformsData, $platformService);
+super($options, $projectData, $platformsData, $devicePlatformsConstants, $platformService);
 }
 
 public async execute(args: string[]): Promise<void> {
 return this.executeCore([this.$platformsData.availablePlatforms.Android]);
 }
 
 public async canExecute(args: string[]): Promise<boolean> {
+if (!this.$platformService.isPlatformSupportedForOS(this.$devicePlatformsConstants.Android, this.$projectData)) {
+this.$errors.fail("Applications for platform %s can not be built on this OS - %s", this.$devicePlatformsConstants.Android, process.platform);
+}
+
 if (this.$options.release && (!this.$options.keyStorePath || !this.$options.keyStorePassword || !this.$options.keyStoreAlias || !this.$options.keyStoreAliasPassword)) {
 this.$errors.fail("When producing a release build, you need to specify all --key-store-* options.");
 }

lib/commands/clean-app.ts

@@ -1,7 +1,7 @@
 export class CleanAppCommandBase {
 constructor(protected $options: IOptions,
 protected $projectData: IProjectData,
-private $platformService: IPlatformService) {
+protected $platformService: IPlatformService) {
 this.$projectData.initializeProjectData();
 }
 
@@ -14,7 +14,9 @@ export class CleanAppCommandBase {
 
 export class CleanAppIosCommand extends CleanAppCommandBase implements ICommand {
 constructor(protected $options: IOptions,
+private $devicePlatformsConstants: Mobile.IDevicePlatformsConstants,
 private $platformsData: IPlatformsData,
+private $errors: IErrors,
 $platformService: IPlatformService,
 $projectData: IProjectData) {
 super($options, $projectData, $platformService);
@@ -23,6 +25,9 @@ export class CleanAppIosCommand extends CleanAppCommandBase implements ICommand
 public allowedParameters: ICommandParameter[] = [];
 
 public async execute(args: string[]): Promise<void> {
+if (!this.$platformService.isPlatformSupportedForOS(this.$devicePlatformsConstants.iOS, this.$projectData)) {
+this.$errors.fail("Applications for platform %s can not be built on this OS - %s", this.$devicePlatformsConstants.iOS, process.platform);
+}
 return super.execute([this.$platformsData.availablePlatforms.iOS]);
 }
 }
@@ -33,13 +38,18 @@ export class CleanAppAndroidCommand extends CleanAppCommandBase implements IComm
 public allowedParameters: ICommandParameter[] = [];
 
 constructor(protected $options: IOptions,
+private $devicePlatformsConstants: Mobile.IDevicePlatformsConstants,
 private $platformsData: IPlatformsData,
+private $errors: IErrors,
 $platformService: IPlatformService,
 $projectData: IProjectData) {
 super($options, $projectData, $platformService);
 }
 
 public async execute(args: string[]): Promise<void> {
+if (!this.$platformService.isPlatformSupportedForOS(this.$devicePlatformsConstants.iOS, this.$projectData)) {
+this.$errors.fail("Applications for platform %s can not be built on this OS - %s", this.$devicePlatformsConstants.iOS, process.platform);
+}
 return super.execute([this.$platformsData.availablePlatforms.Android]);
 }
 }

lib/commands/debug.ts

@@ -84,11 +84,12 @@ export abstract class DebugPlatformCommand implements ICommand {
 }
 
 export class DebugIOSCommand extends DebugPlatformCommand {
-constructor(protected $logger: ILogger,
+constructor(private $errors: IErrors,
+private $devicePlatformsConstants: Mobile.IDevicePlatformsConstants,
+$logger: ILogger,
 $iOSDebugService: IPlatformDebugService,
 $devicesService: Mobile.IDevicesService,
 $injector: IInjector,
-$devicePlatformsConstants: Mobile.IDevicePlatformsConstants,
 $config: IConfiguration,
 $usbLiveSyncService: ILiveSyncService,
 $debugDataService: IDebugDataService,
@@ -106,6 +107,10 @@ export class DebugIOSCommand extends DebugPlatformCommand {
 }
 
 public async canExecute(args: string[]): Promise<boolean> {
+if (!this.$platformService.isPlatformSupportedForOS(this.$devicePlatformsConstants.iOS, this.$projectData)) {
+this.$errors.fail("Applications for platform %s can not be built on this OS - %s", this.$devicePlatformsConstants.iOS, process.platform);
+}
+
 return await super.canExecute(args) && await this.$platformService.validateOptions(this.$options.provision, this.$projectData, this.$platformsData.availablePlatforms.iOS);
 }
 
@@ -119,11 +124,12 @@ export class DebugIOSCommand extends DebugPlatformCommand {
 $injector.registerCommand("debug|ios", DebugIOSCommand);
 
 export class DebugAndroidCommand extends DebugPlatformCommand {
-constructor($logger: ILogger,
+constructor(private $errors: IErrors,
+private $devicePlatformsConstants: Mobile.IDevicePlatformsConstants,
+$logger: ILogger,
 $androidDebugService: IPlatformDebugService,
 $devicesService: Mobile.IDevicesService,
 $injector: IInjector,
-$devicePlatformsConstants: Mobile.IDevicePlatformsConstants,
 $config: IConfiguration,
 $usbLiveSyncService: ILiveSyncService,
 $debugDataService: IDebugDataService,
@@ -135,6 +141,10 @@ export class DebugAndroidCommand extends DebugPlatformCommand {
 }
 
 public async canExecute(args: string[]): Promise<boolean> {
+if (!this.$platformService.isPlatformSupportedForOS(this.$devicePlatformsConstants.Android, this.$projectData)) {
+this.$errors.fail("Applications for platform %s can not be built on this OS - %s", this.$devicePlatformsConstants.Android, process.platform);
+}
+
 return await super.canExecute(args) && await this.$platformService.validateOptions(this.$options.provision, this.$projectData, this.$platformsData.availablePlatforms.Android);
 }
 }

lib/commands/run.ts

@@ -51,6 +51,8 @@ export class RunIosCommand extends RunCommandBase implements ICommand {
 
 constructor($platformService: IPlatformService,
 private $platformsData: IPlatformsData,
+private $devicePlatformsConstants: Mobile.IDevicePlatformsConstants,
+private $errors: IErrors,
 $usbLiveSyncService: ILiveSyncService,
 $projectData: IProjectData,
 $options: IOptions,
@@ -59,6 +61,10 @@ export class RunIosCommand extends RunCommandBase implements ICommand {
 }
 
 public async execute(args: string[]): Promise<void> {
+if (!this.$platformService.isPlatformSupportedForOS(this.$devicePlatformsConstants.iOS, this.$projectData)) {
+this.$errors.fail("Applications for platform %s can not be built on this OS - %s", this.$devicePlatformsConstants.iOS, process.platform);
+}
+
 return this.executeCore([this.$platformsData.availablePlatforms.iOS]);
 }
 
@@ -74,11 +80,12 @@ export class RunAndroidCommand extends RunCommandBase implements ICommand {
 
 constructor($platformService: IPlatformService,
 private $platformsData: IPlatformsData,
+private $devicePlatformsConstants: Mobile.IDevicePlatformsConstants,
+private $errors: IErrors,
 $usbLiveSyncService: ILiveSyncService,
 $projectData: IProjectData,
 $options: IOptions,
-$emulatorPlatformService: IEmulatorPlatformService,
-private $errors: IErrors) {
+$emulatorPlatformService: IEmulatorPlatformService) {
 super($platformService, $usbLiveSyncService, $projectData, $options, $emulatorPlatformService);
 }
 
@@ -87,6 +94,10 @@ export class RunAndroidCommand extends RunCommandBase implements ICommand {
 }
 
 public async canExecute(args: string[]): Promise<boolean> {
+if (!this.$platformService.isPlatformSupportedForOS(this.$devicePlatformsConstants.Android, this.$projectData)) {
+this.$errors.fail("Applications for platform %s can not be built on this OS - %s", this.$devicePlatformsConstants.Android, process.platform);
+}
+
 if (this.$options.release && (!this.$options.keyStorePath || !this.$options.keyStorePassword || !this.$options.keyStoreAlias || !this.$options.keyStoreAliasPassword)) {
 this.$errors.fail("When producing a release build, you need to specify all --key-store-* options.");
 }

lib/definitions/platform.d.ts

@@ -125,10 +125,14 @@ interface IPlatformService extends NodeJS.EventEmitter {
 
 /**
  * Ensures the passed platform is a valid one (from the supported ones)
- * and that it can be built on the current OS
  */
 validatePlatform(platform: string, projectData: IProjectData): void;
 
+/**
+ * Ensures that passed platform can be built on the current OS
+ */
+isPlatformSupportedForOS(platform: string, projectData: IProjectData): boolean;
+
 /**
  * Returns information about the latest built application for device in the current project.
  * @param {IPlatformData} platformData Data describing the current platform.

lib/services/platform-service.ts

@@ -679,11 +679,6 @@ export class PlatformService extends EventEmitter implements IPlatformService {
 if (!this.isValidPlatform(platform, projectData)) {
 this.$errors.fail("Invalid platform %s. Valid platforms are %s.", platform, helpers.formatListOfNames(this.$platformsData.platformsNames));
 }
-
-//TODO: move to commands.
-// if (!this.isPlatformSupportedForOS(platform, projectData)) {
-//	this.$errors.fail("Applications for platform %s can not be built on this OS - %s", platform, process.platform);
-// }
 }
 
 public validatePlatformInstalled(platform: string, projectData: IProjectData): void {
@@ -708,7 +703,7 @@ export class PlatformService extends EventEmitter implements IPlatformService {
 return this.$platformsData.getPlatformData(platform, projectData);
 }
 
-private isPlatformSupportedForOS(platform: string, projectData: IProjectData): boolean {
+public isPlatformSupportedForOS(platform: string, projectData: IProjectData): boolean {
 let targetedOS = this.$platformsData.getPlatformData(platform, projectData).targetedOS;
 let res = !targetedOS || targetedOS.indexOf("*") >= 0 || targetedOS.indexOf(process.platform) >= 0;
 return res;

test/stubs.ts

@@ -665,6 +665,10 @@ export class PlatformServiceStub extends EventEmitter implements IPlatformServic
 
 }
 
+isPlatformSupportedForOS(platform: string, projectData: IProjectData): boolean {
+return true;
+}
+
 public getLatestApplicationPackageForDevice(platformData: IPlatformData): IApplicationPackage {
 return null;
 }