Code review changes

Fatme · Fatme · commit d17afa99a32d · 2014-07-15T16:46:41.000+03:00
diff --git a/lib/bootstrap.ts b/lib/bootstrap.ts
@@ -9,10 +9,11 @@ $injector.require("projectTemplatesService", "./services/project-templates-servi
 $injector.require("platformService", "./services/platform-service");
 
 $injector.requireCommand("create", "./commands/create-project-command");
-$injector.requireCommand("platform|*list", "./commands/platform-command");
-$injector.requireCommand("platform|add", "./commands/platform-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/run-command");
-$injector.requireCommand("build", "./commands/run-command");
+$injector.requireCommand("prepare", "./commands/prepare-command");
+$injector.requireCommand("build", "./commands/build-command");
 
 $injector.require("npm", "./node-package-manager");
+$injector.require("propertiesParser", "./properties-parser");
diff --git a/lib/commands/add-platform-command.ts b/lib/commands/add-platform-command.ts
@@ -0,0 +1,12 @@
+///<reference path="../.d.ts"/>
+
+export class AddPlatformCommand implements ICommand {
+	constructor(private $platformService: IPlatformService) { }
+
+	execute(args: string[]): IFuture<void> {
+		return (() => {
+			this.$platformService.addPlatforms(args).wait();
+		}).future<void>()();
+	}
+}
+$injector.registerCommand("platform|add", AddPlatformCommand);
diff --git a/lib/commands/build-command.ts b/lib/commands/build-command.ts
@@ -0,0 +1,12 @@
+///<reference path="../.d.ts"/>
+
+export class BuildCommand implements ICommand {
+	constructor(private $platformService: IPlatformService) { }
+
+	execute(args: string[]): IFuture<void> {
+		return (() => {
+			this.$platformService.buildPlatform(args[0]).wait();
+		}).future<void>()();
+	}
+}
+$injector.registerCommand("build", BuildCommand);
diff --git a/lib/commands/list-platforms-command.ts b/lib/commands/list-platforms-command.ts
@@ -17,13 +17,4 @@ export class ListPlatformsCommand implements ICommand {
 }
 $injector.registerCommand("platform|*list", ListPlatformsCommand);
 
-export class AddPlatformCommand implements ICommand {
-	constructor(private $platformService: IPlatformService) { }
 
-	execute(args: string[]): IFuture<void> {
-		return (() => {
-			this.$platformService.addPlatforms(args).wait();
-		}).future<void>()();
-	}
-}
-$injector.registerCommand("platform|add", AddPlatformCommand);
diff --git a/lib/commands/prepare-command.ts b/lib/commands/prepare-command.ts
@@ -0,0 +1,12 @@
+///<reference path="../.d.ts"/>
+
+export class PrepareCommand implements ICommand {
+	constructor(private $platformService: IPlatformService) { }
+
+	execute(args: string[]): IFuture<void> {
+		return (() => {
+			this.$platformService.preparePlatform(args[0]).wait();
+		}).future<void>()();
+	}
+}
+$injector.registerCommand("prepare", PrepareCommand);
diff --git a/lib/commands/run-command.ts b/lib/commands/run-command.ts
@@ -10,25 +10,3 @@ export class RunCommand implements ICommand {
 	}
 }
 $injector.registerCommand("run", RunCommand);
-
-export class PrepareCommand implements ICommand {
-	constructor(private $platformService: IPlatformService) { }
-
-	execute(args: string[]): IFuture<void> {
-		return (() => {
-			this.$platformService.preparePlatform(args[0]).wait();
-		}).future<void>()();
-	}
-}
-$injector.registerCommand("prepare", PrepareCommand);
-
-export class BuildCommand implements ICommand {
-	constructor(private $platformService: IPlatformService) { }
-
-	execute(args: string[]): IFuture<void> {
-		return (() => {
-			this.$platformService.buildPlatform(args[0]).wait();
-		}).future<void>()();
-	}
-}
-$injector.registerCommand("build", BuildCommand);
diff --git a/lib/common b/lib/common
@@ -1 +1 @@
-Subproject commit f9ef935cd5e1f4ea757bb13263e622777efc679c
+Subproject commit bf623084a0db43e34b8883f02e8281ec1f8675ac
diff --git a/lib/declarations.ts b/lib/declarations.ts
@@ -1,5 +1,9 @@
 interface INodePackageManager {
-    cache: string;
-    load(config?: any): IFuture<void>;
-    install(where: string, what: string): IFuture<any>;
+	cache: string;
+	load(config?: any): IFuture<void>;
+	install(where: string, what: string): IFuture<any>;
+}
+
+interface IPropertiesParser {
+	createEditor(filePath: string): IFuture<any>;
 }
diff --git a/lib/definitions/project.d.ts b/lib/definitions/project.d.ts
@@ -7,15 +7,11 @@ interface IProjectService {
 	projectData: IProjectData;
 }
 
-interface IAndroidProjectService {
+interface IPlatformProjectService {
 	createProject(projectData: IProjectData): IFuture<void>;
 	buildProject(projectData: IProjectData): IFuture<void>;
 }
 
-interface IiOSProjectService {
-	createProject(projectData: IProjectData): IFuture<void>;
-}
-
 interface IProjectData {
 	projectDir: string;
 	platformsDir: string;
diff --git a/lib/definitions/properties-parser.d.ts b/lib/definitions/properties-parser.d.ts
@@ -0,0 +1,3 @@
+declare module "properties-parser" {
+	function createEditor(path: string, callback: (err: IErrors, data: any) => void);
+}
diff --git a/lib/nativescript-cli.ts b/lib/nativescript-cli.ts
@@ -10,7 +10,7 @@ require("./options");
 import errors = require("./common/errors");
 errors.installUncaughtExceptionListener();
 
-$injector.register("config", {"CI_LOGGER": false, PROJECT_FILE_NAME: ".tnsproject", "DEBUG": true});
+$injector.register("config", {"CI_LOGGER": false, PROJECT_FILE_NAME: ".tnsproject", "DEBUG": process.env.NATIVESCRIPT_DEBUG});
 
 var dispatcher = $injector.resolve("dispatcher");
 dispatcher.runMainFiber();
diff --git a/lib/properties-parser.ts b/lib/properties-parser.ts
@@ -0,0 +1,20 @@
+///<reference path=".d.ts"/>
+
+import propertiesParser = require("properties-parser");
+import Future = require("fibers/future");
+
+export class PropertiesParser implements IPropertiesParser {
+	public createEditor(filePath: string) {
+		var future = new Future<any>();
+		propertiesParser.createEditor(filePath,  (err, data) => {
+			if(err) {
+				future.throw(err);
+			} else {
+				future.return(data);
+			}
+		});
+
+		return future;
+	}
+}
+$injector.register("propertiesParser", PropertiesParser);
diff --git a/lib/services/platform-service.ts b/lib/services/platform-service.ts
@@ -34,9 +34,7 @@ export class PlatformService implements IPlatformService {
 			}
 
 			var platformsDir = this.$projectService.projectData.platformsDir;
-			if(!this.$fs.exists(platformsDir).wait()) {
-				this.$fs.createDirectory(platformsDir).wait();
-			}
+			this.$fs.ensureDirectoryExists(platformsDir).wait();
 
 			_.each(platforms, platform => {
 				this.addPlatform(platform.toLowerCase()).wait();
@@ -104,7 +102,7 @@ export class PlatformService implements IPlatformService {
 		}).future<void>()();
 	}
 
-	private validatePlatform(platform): void {
+	private validatePlatform(platform: string): void {
 		if (!this.isValidPlatform(platform)) {
 			this.$errors.fail("Invalid platform %s. Valid platforms are %s.", platform, helpers.formatListOfNames(this.platformNames));
 		}
diff --git a/lib/services/project-service.ts b/lib/services/project-service.ts
@@ -13,21 +13,21 @@ export class ProjectService implements IProjectService {
 	public static APP_FOLDER_NAME = "app";
 	public static PROJECT_FRAMEWORK_DIR = "framework";
 
-	private cachedProjectDir: string = "";
+	private cachedProjectDir: string = null;
 	public projectData: IProjectData = null;
 
 	constructor(private $logger: ILogger,
 		private $errors: IErrors,
 		private $fs: IFileSystem,
 		private $projectTemplatesService: IProjectTemplatesService,
-		private $androidProjectService: IAndroidProjectService,
-		private $iOSProjectService: IiOSProjectService,
+		private $androidProjectService: IPlatformProjectService,
+		private $iOSProjectService: IPlatformProjectService,
 		private $config) {
 		this.projectData = this.getProjectData().wait();
 	}
 
 	private get projectDir(): string {
-		if(this.cachedProjectDir !== "") {
+		if(this.cachedProjectDir) {
 			return this.cachedProjectDir;
 		}
 
@@ -190,14 +190,17 @@ export class ProjectService implements IProjectService {
 
 	private executePlatformSpecificAction(platform, functionName: string): IFuture<void> {
 		return (() => {
+			var projectService = null;
 			switch (platform) {
 				case "android":
-					this.executeFunctionByName(functionName, this.$androidProjectService, [this.projectData]).wait();
+					projectService = this.$androidProjectService;
 					break;
 				case "ios":
-					this.executeFunctionByName(functionName, this.$iOSProjectService, [this.projectData]).wait();
+					projectService = this.$iOSProjectService;
 					break;
 			}
+
+			this.executeFunctionByName(functionName, projectService, [this.projectData]).wait();
 		}).future<void>()();
 	}
 
@@ -235,25 +238,26 @@ export class ProjectService implements IProjectService {
 }
 $injector.register("projectService", ProjectService);
 
-class AndroidProjectService implements IAndroidProjectService {
-	private cachedFrameworkDir: string = "";
+class AndroidProjectService implements IPlatformProjectService {
+	private cachedFrameworkDir: string = null;
 
 	constructor(private $fs: IFileSystem,
 		private $errors: IErrors,
 		private $logger: ILogger,
 		private $childProcess: IChildProcess,
-		private $projectTemplatesService: IProjectTemplatesService) { }
+		private $projectTemplatesService: IProjectTemplatesService,
+		private $propertiesParser: IPropertiesParser) { }
 
 	public createProject(projectData: IProjectData): IFuture<void> {
 		return (() => {
 			var packageName = projectData.projectId;
 			var projectDir = path.join(projectData.projectDir, "platforms", "android");
 
-			var targetApi = this.getTarget().wait();
-
 			this.validatePackageName(packageName);
 			this.validateProjectName(projectData.projectName);
 
+			var targetApi = this.getTarget().wait();
+
 			this.checkRequirements().wait();
 
 			// Log the values for project
@@ -274,8 +278,9 @@ class AndroidProjectService implements IAndroidProjectService {
 			shell.cp("-f", path.join(this.frameworkDir.wait(), "AndroidManifest.xml"), projectDir);
 
 			// Interpolate the activity name and package
-			shell.sed('-i', /__NAME__/, projectData.projectName, path.join(projectDir, 'res', 'values', 'strings.xml'));
-			shell.sed('-i', /__TITLE_ACTIVITY__/, projectData.projectName, path.join(projectDir, 'res', 'values', 'strings.xml'));
+			var stringsFilePath = path.join(projectDir, 'res', 'values', 'strings.xml');
+			shell.sed('-i', /__NAME__/, projectData.projectName, stringsFilePath);
+			shell.sed('-i', /__TITLE_ACTIVITY__/, projectData.projectName, stringsFilePath);
 			shell.sed('-i', /__NAME__/, projectData.projectName, path.join(projectDir, '.project'));
 			shell.sed('-i', /__PACKAGE__/, packageName, path.join(projectDir, "AndroidManifest.xml"));
 
@@ -292,7 +297,7 @@ class AndroidProjectService implements IAndroidProjectService {
 		}).future<void>()();
 	}
 
-	private runAndroidUpdate(projectPath: string, targetApi): IFuture<void> {
+	private runAndroidUpdate(projectPath: string, targetApi: string): IFuture<void> {
 		return (() => {
 			this.$childProcess.exec("android update project --subprojects --path " + projectPath + " --target " +  targetApi).wait();
 		}).future<void>()();
@@ -324,7 +329,7 @@ class AndroidProjectService implements IAndroidProjectService {
 
 	private get frameworkDir(): IFuture<string> {
 		return(() => {
-			if(this.cachedFrameworkDir === "") {
+			if(!this.cachedFrameworkDir) {
 				var androidFrameworkPath = this.$projectTemplatesService.androidFrameworkPath.wait();
 				this.cachedFrameworkDir = path.join(androidFrameworkPath, ProjectService.PROJECT_FRAMEWORK_DIR);
 			}
@@ -337,9 +342,10 @@ class AndroidProjectService implements IAndroidProjectService {
 	private getTarget(): IFuture<string> {
 		return (() => {
 			var projectPropertiesFilePath = path.join(this.frameworkDir.wait(), "project.properties");
+
 			if (this.$fs.exists(projectPropertiesFilePath).wait()) {
-				var target = shell.grep(/target=android-[\d+]/, projectPropertiesFilePath);
-				return target.split('=')[1].replace('\n', '').replace('\r', '').replace(' ', ''); // Target should be in following format: target=android-XX
+				var properties = this.$propertiesParser.createEditor(projectPropertiesFilePath).wait();
+				return properties.get("target");
 			}
 
 			return "";
@@ -398,11 +404,17 @@ class AndroidProjectService implements IAndroidProjectService {
  }
 $injector.register("androidProjectService", AndroidProjectService);
 
-class iOSProjectService implements  IiOSProjectService {
+class iOSProjectService implements  IPlatformProjectService {
 	public createProject(projectData: IProjectData): IFuture<void> {
 		return (() => {
 
 		}).future<any>()();
 	}
+
+	public buildProject(projectData: IProjectData): IFuture<void> {
+		return (() => {
+
+		}).future<void>()();
+	}
 }
 $injector.register("iOSProjectService", iOSProjectService);
diff --git a/lib/services/project-templates-service.ts b/lib/services/project-templates-service.ts
@@ -26,7 +26,7 @@ export class ProjectTemplatesService implements IProjectTemplatesService {
 		return this.downloadNpmPackage(ProjectTemplatesService.NPM_ANDROID_BRIDGE_NAME);
 	}
 
-	private downloadNpmPackage(packageName): IFuture<string> {
+	private downloadNpmPackage(packageName: string): IFuture<string> {
 		return (() => {
 			try {
 				this.$npm.load().wait();
diff --git a/package.json b/package.json
@@ -31,7 +31,8 @@
 		"underscore": "1.5.2",
 		"unzip": "0.1.9",
 		"yargs": "1.2.2",
-		"npm": "1.4.10"
+		"npm": "1.4.10",
+		"properties-parser": "0.2.3"
 	},
 	"analyze": true,
 	"devDependencies": {

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+declare module "properties-parser" {`
	`2`	`+ function createEditor(path: string, callback: (err: IErrors, data: any) => void);`
	`3`	`+}`