Remove platform-project-service

Author: Fatme

lib/bootstrap.ts

@@ -11,7 +11,6 @@ $injector.require("projectTemplatesService", "./services/project-templates-servi
 
 $injector.require("platformsData", "./services/platform-service");
 $injector.require("platformService", "./services/platform-service");
-$injector.require("platformProjectService", "./services/platform-project-service");
 
 $injector.requireCommand("create", "./commands/create-project");
 $injector.requireCommand("platform|*list", "./commands/list-platforms");

lib/constants.ts

@@ -3,3 +3,6 @@
 export var APP_FOLDER_NAME = "app";
 export var DEFAULT_PROJECT_ID = "com.telerik.tns.HelloWorld";
 export var DEFAULT_PROJECT_NAME = "HelloNativescript";
+export var APP_RESOURCES_FOLDER_NAME = "App_Resources";
+export var PROJECT_FRAMEWORK_DIR = "framework";
+

lib/definitions/platform.d.ts

@@ -9,7 +9,7 @@ interface IPlatformService {
 
 interface IPlatformData {
 	frameworkPackageName: string;
-	platformProjectService: IPlatformSpecificProjectService;
+	platformProjectService: IPlatformProjectService;
 	projectRoot: string;
 	normalizedPlatformName: string;
 	targetedOS?: string[];

lib/definitions/project.d.ts

@@ -16,15 +16,10 @@ interface IProjectTemplatesService {
 }
 
 interface IPlatformProjectService {
-	createProject(platform: string): IFuture<void>;
-	buildProject(platform: string): IFuture<void>;
-	prepareProject(normalizedPlatformName: string, platforms: string[]): IFuture<void>;
-}
-
-interface IPlatformSpecificProjectService {
 	validate(): IFuture<void>;
 	createProject(projectRoot: string, frameworkDir: string): IFuture<void>;
 	interpolateData(projectRoot: string): void;
-	executePlatformSpecificAction(projectRoot: string): void;
+	afterCreateProject(projectRoot: string): void;
+	prepareProject(normalizedPlatformName: string, platforms: string[]): IFuture<void>;
 	buildProject(projectRoot: string): IFuture<void>;
 }

lib/definitions/shelljs.d.ts

@@ -1,5 +1,5 @@
 declare module "shelljs" {
-	function cp(arg: string, sourcePath: string, destinationPath: string): void;
+	function cp(arg: string, sourcePath: any, destinationPath: string): void;
 	function sed(arg: string, oldValue: any, newValue: string, filePath: string): void;
 	function mv(source: string[], destination: string);
 	function grep(what: any, where: string): any;

lib/node-package-manager.ts

@@ -27,6 +27,19 @@ export class NodePackageManager implements INodePackageManager {
 		return future;
 	}
 
+	public install(packageName: string, pathToSave?: string): IFuture<string> {
+		return (() => {
+			var action = (packageName: string) => {
+				this.installCore(pathToSave || npm.cache, packageName).wait();
+			};
+
+			this.tryExecuteAction(action, packageName).wait();
+
+			return path.join(pathToSave || npm.cache, "node_modules", packageName);
+
+		}).future<string>()();
+	}
+
 	private installCore(where: string, what: string): IFuture<any> {
 		var future = new Future<any>();
 		npm.commands["install"](where, what, (err, data) => {
@@ -50,18 +63,5 @@ export class NodePackageManager implements INodePackageManager {
 			}
 		}).future<void>()();
 	}
-
-	public install(packageName: string, pathToSave?: string): IFuture<string> {
-		return (() => {
-			var action = (packageName: string) => {
-				this.installCore(pathToSave || npm.cache, packageName).wait();
-			};
-
-			this.tryExecuteAction(action, packageName).wait();
-
-			return path.join(pathToSave || npm.cache, "node_modules", packageName);
-
-		}).future<string>()();
-	}
 }
 $injector.register("npm", NodePackageManager);

lib/services/android-project-service.ts

@@ -1,10 +1,12 @@
 ///<reference path="../.d.ts"/>
 import path = require("path");
 import shell = require("shelljs");
+import util = require("util");
 import options = require("./../options");
 import helpers = require("./../common/helpers");
+import constants = require("./../constants");
 
-class AndroidProjectService implements IPlatformSpecificProjectService {
+class AndroidProjectService implements IPlatformProjectService {
 	constructor(private $fs: IFileSystem,
 				private $errors: IErrors,
 				private $logger: ILogger,
@@ -23,26 +25,17 @@ class AndroidProjectService implements IPlatformSpecificProjectService {
 
 	public createProject(projectRoot: string, frameworkDir: string): IFuture<void> {
 		return (() => {
-			var packageName = this.$projectData.projectId;
-			var packageAsPath = packageName.replace(/\./g, path.sep);
+			this.validateAndroidTarget(frameworkDir); // We need framework to be installed to validate android target so we can't call this method in validate()
 
-			var validTarget = this.getTarget(frameworkDir).wait();
-			var output = this.$childProcess.exec('android list targets').wait();
-			if (!output.match(validTarget)) {
-				this.$errors.fail("Please install Android target %s the Android newest SDK). Make sure you have the latest Android tools installed as well. Run \"android\" from your command-line to install/update any missing SDKs or tools.",
-					validTarget.split('-')[1]);
-			}
+			var paths = "assets gen libs res".split(' ').map(p => path.join(frameworkDir, p));
+			shell.cp("-r", paths, projectRoot);
 
-			shell.cp("-r", path.join(frameworkDir, "assets"), projectRoot);
-			shell.cp("-r", path.join(frameworkDir, "gen"), projectRoot);
-			shell.cp("-r", path.join(frameworkDir, "libs"), projectRoot);
-			shell.cp("-r", path.join(frameworkDir, "res"), projectRoot);
-
-			shell.cp("-f", path.join(frameworkDir, ".project"), projectRoot);
-			shell.cp("-f", path.join(frameworkDir, "AndroidManifest.xml"), projectRoot);
-			shell.cp("-f", path.join(frameworkDir, "project.properties"), projectRoot);
+			paths = ".project AndroidManifest.xml project.properties".split(' ').map(p => path.join(frameworkDir, p));
+			shell.cp("-f", paths, projectRoot);
 
 			// Create src folder
+			var packageName = this.$projectData.projectId;
+			var packageAsPath = packageName.replace(/\./g, path.sep);
 			var activityDir = path.join(projectRoot, 'src', packageAsPath);
 			this.$fs.createDirectory(activityDir).wait();
 
@@ -58,12 +51,39 @@ class AndroidProjectService implements IPlatformSpecificProjectService {
 		shell.sed('-i', /__PACKAGE__/, this.$projectData.projectId, path.join(projectRoot, "AndroidManifest.xml"));
 	}
 
-	public executePlatformSpecificAction(projectRoot: string) {
+	public afterCreateProject(projectRoot: string) {
 		var targetApi = this.getTarget(projectRoot).wait();
 		this.$logger.trace("Android target: %s", targetApi);
 		this.runAndroidUpdate(projectRoot, targetApi).wait();
 	}
 
+	public prepareProject(normalizedPlatformName: string, platforms: string[]): IFuture<void> {
+		return (() => {
+			var platform = normalizedPlatformName.toLowerCase();
+			var assetsDirectoryPath = path.join(this.$projectData.platformsDir, platform, "assets");
+			var appResourcesDirectoryPath = path.join(assetsDirectoryPath, constants.APP_FOLDER_NAME, constants.APP_RESOURCES_FOLDER_NAME);
+			shell.cp("-r", path.join(this.$projectData.projectDir, constants.APP_FOLDER_NAME), assetsDirectoryPath);
+
+			if (this.$fs.exists(appResourcesDirectoryPath).wait()) {
+				shell.cp("-r", path.join(appResourcesDirectoryPath, normalizedPlatformName, "*"), path.join(this.$projectData.platformsDir, platform, "res"));
+				this.$fs.deleteDirectory(appResourcesDirectoryPath).wait();
+			}
+
+			var files = helpers.enumerateFilesInDirectorySync(path.join(assetsDirectoryPath, constants.APP_FOLDER_NAME));
+			var platformsAsString = platforms.join("|");
+
+			_.each(files, fileName => {
+				var platformInfo = AndroidProjectService.parsePlatformSpecificFileName(path.basename(fileName), platformsAsString);
+				var shouldExcludeFile = platformInfo && platformInfo.platform !== platform;
+				if (shouldExcludeFile) {
+					this.$fs.deleteFile(fileName).wait();
+				} else if (platformInfo && platformInfo.onDeviceName) {
+					this.$fs.rename(fileName, path.join(path.dirname(fileName), platformInfo.onDeviceName)).wait();
+				}
+			});
+		}).future<void>()();
+	}
+
 	public buildProject(projectRoot: string): IFuture<void> {
 		return (() => {
 			var buildConfiguration = options.release ? "release" : "debug";
@@ -121,6 +141,15 @@ class AndroidProjectService implements IPlatformSpecificProjectService {
 		}
 	}
 
+	private validateAndroidTarget(frameworkDir: string) {
+		var validTarget = this.getTarget(frameworkDir).wait();
+		var output = this.$childProcess.exec('android list targets').wait();
+		if (!output.match(validTarget)) {
+			this.$errors.fail("Please install Android target %s the Android newest SDK). Make sure you have the latest Android tools installed as well. Run \"android\" from your command-line to install/update any missing SDKs or tools.",
+				validTarget.split('-')[1]);
+		}
+	}
+
 	private getTarget(projectRoot: string): IFuture<string> {
 		return (() => {
 			var projectPropertiesFilePath = path.join(projectRoot, "project.properties");
@@ -167,5 +196,17 @@ class AndroidProjectService implements IPlatformSpecificProjectService {
 			}
 		}).future<void>()();
 	}
+
+	private static parsePlatformSpecificFileName(fileName: string, platforms: string): any {
+		var regex = util.format("^(.+?)\.(%s)(\..+?)$", platforms);
+		var parsed = fileName.toLowerCase().match(new RegExp(regex, "i"));
+		if (parsed) {
+			return {
+				platform: parsed[2],
+				onDeviceName: parsed[1] + parsed[3]
+			};
+		}
+		return undefined;
+	}
 }
 $injector.register("androidProjectService", AndroidProjectService);

lib/services/ios-project-service.ts

@@ -1,6 +1,6 @@
 ///<reference path="../.d.ts"/>
 
-class IOSProjectService implements  IPlatformSpecificProjectService {
+class IOSProjectService implements  IPlatformProjectService {
 	public validate(): IFuture<void> {
 		return (() => {
 		}).future<void>()();
@@ -10,14 +10,20 @@ class IOSProjectService implements  IPlatformSpecificProjectService {
 
 	}
 
-	public executePlatformSpecificAction(): void {
+	public afterCreateProject(): void {
 
 	}
 
 	public createProject(): IFuture<void> {
 		return (() => {
 
-		}).future<any>()();
+		}).future<void>()();
+	}
+
+	public prepareProject(normalizedPlatformName: string, platforms: string[]): IFuture<void> {
+		return (() => {
+
+		}).future<void>()();
 	}
 
 	public buildProject(): IFuture<void> {