Code review changes

Author: Fatme

lib/bootstrap.ts

@@ -8,12 +8,12 @@ $injector.require("iOSProjectService", "./services/project-service");
 $injector.require("projectTemplatesService", "./services/project-templates-service");
 $injector.require("platformService", "./services/platform-service");
 
-$injector.requireCommand("create", "./commands/create-project-command");
-$injector.requireCommand("platform|*list", "./commands/list-platforms-command");
-$injector.requireCommand("platform|add", "./commands/add-platform-command");
-$injector.requireCommand("run", "./commands/run-command");
-$injector.requireCommand("prepare", "./commands/prepare-command");
-$injector.requireCommand("build", "./commands/build-command");
+$injector.requireCommand("create", "./commands/create-project");
+$injector.requireCommand("platform|*list", "./commands/list-platforms");
+$injector.requireCommand("platform|add", "./commands/add-platform");
+$injector.requireCommand("run", "./commands/run");
+$injector.requireCommand("prepare", "./commands/prepare");
+$injector.requireCommand("build", "./commands/build");
 
 $injector.require("npm", "./node-package-manager");
 $injector.require("propertiesParser", "./properties-parser");

lib/commands/add-platform-command.ts renamed to lib/commands/add-platform.ts

@@ -22,5 +22,5 @@ interface IProjectData {
 
 interface IProjectTemplatesService {
 	defaultTemplatePath: IFuture<string>;
-	getAndroidFrameworkPath(whereToInstall: string): IFuture<string>
+	installAndroidFramework(whereToInstall: string): IFuture<string>
 }

lib/commands/build-command.ts renamed to lib/commands/build.ts

@@ -27,12 +27,12 @@ export class PlatformService implements IPlatformService {
 
 	public addPlatforms(platforms: string[]): IFuture<void> {
 		return (() => {
-			this.$projectService.ensureProject();
-
 			if(!platforms || platforms.length === 0) {
 				this.$errors.fail("No platform specified. Please specify a platform to add");
 			}
 
+			this.$projectService.ensureProject();
+
 			var platformsDir = this.$projectService.projectData.platformsDir;
 			this.$fs.ensureDirectoryExists(platformsDir).wait();
 
@@ -46,12 +46,13 @@ export class PlatformService implements IPlatformService {
 	private addPlatform(platform: string): IFuture<void> {
 		return(() => {
 			platform = platform.split("@")[0];
+
+			this.validatePlatform(platform);
+
 			var platformPath = path.join(this.$projectService.projectData.platformsDir, platform);
 
 			// TODO: Check for version compatability if the platform is in format platform@version. This should be done in PR for semanting versioning
 
-			this.validatePlatform(platform);
-
 			if (this.$fs.exists(platformPath).wait()) {
 				this.$errors.fail("Platform %s already added", platform);
 			}

lib/commands/create-project-command.ts renamed to lib/commands/create-project.ts

@@ -357,7 +357,7 @@ class AndroidProjectService implements IPlatformProjectService {
 
 	private getFrameworkDir(projectData: IProjectData): IFuture<string> {
 		return(() => {
-			var androidFrameworkPath = this.$projectTemplatesService.getAndroidFrameworkPath(path.join(projectData.platformsDir, "android")).wait();
+			var androidFrameworkPath = this.$projectTemplatesService.installAndroidFramework(path.join(projectData.platformsDir, "android")).wait();
 			return path.join(androidFrameworkPath, "framework");
 		}).future<string>()();
 	}