Merge pull request #79 from NativeScript/fatme/fix-messages

Fix the  misleading messages for platform command

Author: Fatme

lib/commands/list-platforms.ts

@@ -8,20 +8,20 @@ export class ListPlatformsCommand implements ICommand {
 
 	execute(args: string[]): IFuture<void> {
 		return (() => {
-			var availablePlatforms = this.$platformService.getAvailablePlatforms().wait();
-			if(availablePlatforms.length > 0) {
-				this.$logger.out("Available platforms: %s", helpers.formatListOfNames(availablePlatforms));
-			} else {
-				this.$logger.out("No available platforms found.");
-			}
-
-			var message = "No installed platforms found.";
 			var installedPlatforms = this.$platformService.getInstalledPlatforms().wait();
-			if (installedPlatforms.length > 0){
-				message = util.format("Installed platforms: %s", helpers.formatListOfNames(installedPlatforms));
-			}
 
-			this.$logger.out(message);
+			if(installedPlatforms.length > 0) {
+				var preparedPlatforms = this.$platformService.getPreparedPlatforms().wait();
+				if(preparedPlatforms.length > 0) {
+					this.$logger.out("The project is prepared for: ", helpers.formatListOfNames(preparedPlatforms, "and"));
+				} else {
+					this.$logger.out("The project is not prepared for any platform");
+				}
+				this.$logger.out("Installed platforms: ", helpers.formatListOfNames(installedPlatforms, "and"));
+			} else {
+				this.$logger.out("Available platforms for this OS: ", helpers.formatListOfNames(this.$platformService.getAvailablePlatforms().wait(), "and"));
+				this.$logger.out("No installed platforms found. Use $ tns platform add");
+			}
 		}).future<void>()();
 	}
 }

lib/definitions/platform.d.ts

@@ -2,6 +2,7 @@ interface IPlatformService {
 	addPlatforms(platforms: string[]): IFuture<void>;
 	getInstalledPlatforms(): IFuture<string[]>;
 	getAvailablePlatforms(): IFuture<string[]>;
+	getPreparedPlatforms(): IFuture<string[]>;
 	removePlatforms(platforms: string[]): IFuture<void>;
 	runPlatform(platform: string): IFuture<void>;
 	preparePlatform(platform: string): IFuture<void>;

lib/definitions/project.d.ts

@@ -22,4 +22,5 @@ interface IPlatformProjectService {
 	afterCreateProject(projectRoot: string): IFuture<void>;
 	prepareProject(platformData: IPlatformData): IFuture<string>;
 	buildProject(projectRoot: string): IFuture<void>;
+	isPlatformPrepared(projectRoot: string): IFuture<boolean>;
 }

lib/services/android-project-service.ts

@@ -112,6 +112,10 @@ class AndroidProjectService implements IPlatformProjectService {
 		}).future<void>()();
 	}
 
+	public isPlatformPrepared(projectRoot: string): IFuture<boolean> {
+		return this.$fs.exists(path.join(projectRoot, "assets", constants.APP_FOLDER_NAME));
+	}
+
 	private spawn(command: string, args: string[]): IFuture<void> {
 		if (hostInfo.isWindows()) {
 			args.unshift('/s', '/c', command);

lib/services/ios-project-service.ts

@@ -146,6 +146,10 @@ class IOSProjectService implements  IPlatformProjectService {
 		}).future<void>()();
 	}
 
+	public isPlatformPrepared(projectRoot: string): IFuture<boolean> {
+		return this.$fs.exists(path.join(projectRoot, this.$projectData.projectName, constants.APP_FOLDER_NAME));
+	}
+
 	private replaceFileContent(file: string): IFuture<void> {
 		return (() => {
 			var fileContent = this.$fs.readText(file).wait();

lib/services/platform-service.ts

@@ -131,6 +131,12 @@ export class PlatformService implements IPlatformService {
 		}).future<string[]>()();
 	}
 
+	public getPreparedPlatforms(): IFuture<string[]> {
+		return (() => {
+			return _.filter(this.$platformsData.platformsNames, p => { return this.isPlatformPrepared(p).wait(); });
+		}).future<string[]>()();
+	}
+
 	public preparePlatform(platform: string): IFuture<void> {
 		return (() => {
 			this.validatePlatformInstalled(platform);
@@ -291,6 +297,11 @@ export class PlatformService implements IPlatformService {
 		}).future<boolean>()();
 	}
 
+	private isPlatformPrepared(platform: string): IFuture<boolean> {
+		var platformData = this.$platformsData.getPlatformData(platform);
+		return platformData.platformProjectService.isPlatformPrepared(platformData.projectRoot);
+	}
+
 	private static parsePlatformSpecificFileName(fileName: string, platforms: string[]): any {
 		var regex = util.format("^(.+?)\.(%s)(\..+?)$", platforms.join("|"));
 		var parsed = fileName.toLowerCase().match(new RegExp(regex, "i"));