Create project file, basic android project service + improvements

Author: Fatme

lib/bootstrap.ts

@@ -3,8 +3,13 @@ require("./common/bootstrap");
 $injector.require("nativescript-cli", "./nativescript-cli");
 
 $injector.require("projectService", "./services/project-service");
+$injector.require("androidProjectService", "./services/project-service");
+$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/platform-command");
+$injector.requireCommand("platform|add", "./commands/platform-command");
 
 $injector.require("npm", "./node-package-manager");

lib/commands/platform-command.ts

@@ -1,11 +1,21 @@
 ///<reference path="../.d.ts"/>
 
+export class ListPlatformsCommand implements ICommand {
+	constructor(private $platformService: IPlatformService) { }
+
+	execute(args: string[]): IFuture<void> {
+		return (() => {
+		}).future<void>()();
+	}
+}
+$injector.registerCommand("platform|*list", ListPlatformsCommand);
+
 export class AddPlatformCommand implements ICommand {
     constructor(private $platformService: IPlatformService) { }
 
     execute(args: string[]): IFuture<void> {
         return (() => {
-            this.$platformService.add(args[0]).wait();
+            this.$platformService.addPlatforms(args).wait();
         }).future<void>()();
     }
 }

lib/common

@@ -1,8 +1,8 @@
 interface IPlatformService {
-    addPlatforms(platforms: string[]): Future<any>;
+    addPlatforms(platforms: string[]): IFuture<any>;
 }
 
 interface IPlatformCapabilities {
-    targetedOS: string[];
+    targetedOS?: string[];
     frameworkUrl: string;
 }

lib/definitions/platform.d.ts

@@ -1,11 +1,24 @@
 interface IProjectService {
 	createProject(projectName: string, projectId: string): IFuture<void>;
+	createPlatformSpecificProject(platform: string): IFuture<void>;
+	ensureProject(): void;
     projectData: IProjectData;
 }
 
+interface IAndroidProjectService {
+	createProject(projectData: IProjectData): IFuture<void>;
+}
+
+interface IiOSProjectService {
+	createProject(projectData: IProjectData): IFuture<void>;
+}
+
 interface IProjectData {
     projectDir: string;
     platformsDir: string;
+	projectFilePath: string;
+	projectId?: string;
+	projectName?: string;
 }
 
 interface IProjectTemplatesService {

lib/definitions/project.d.ts

@@ -2,4 +2,5 @@ declare module "shelljs" {
 	function cp(arg: string, sourcePath: string, 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/definitions/shelljs.d.ts

@@ -1,16 +1,16 @@
 ///<reference path=".d.ts"/>
+"use strict";
 
-import Fiber = require("fibers");
-import Future = require("fibers/future");
 import path = require("path");
 
+require("./common/extensions");
 require("./bootstrap");
 require("./options");
 
 import errors = require("./common/errors");
 errors.installUncaughtExceptionListener();
 
-$injector.register("config", {"CI_LOGGER": false});
+$injector.register("config", {"CI_LOGGER": false, PROJECT_FILE_NAME: ".tnsproject", "DEBUG": true});
 
 var dispatcher = $injector.resolve("dispatcher");
 dispatcher.runMainFiber();

lib/nativescript-cli.ts

@@ -1,11 +1,14 @@
 ///<reference path="../.d.ts"/>
 
+import path = require("path");
+import helpers = require("./../common/helpers");
+
 export class PlatformService implements IPlatformService {
     constructor(private $errors: IErrors,
         private $fs: IFileSystem,
         private $projectService: IProjectService) { }
 
-    private platformCapabilities: {[key: string]: IPlatformCapabilities} = {
+    private platformCapabilities: { [key: string]: IPlatformCapabilities } = {
         ios: {
             targetedOS: ['darwin'],
             frameworkUrl: ""
@@ -19,52 +22,57 @@ export class PlatformService implements IPlatformService {
         return this.platformCapabilities[platform];
     }
 
-    private isValidPlatform(platform: string) {
-        return !this.platformCapabilities[platform.toLowerCase()];
-    }
-
-    public addPlatforms(platforms: string[]): Future<any> {
+    public addPlatforms(platforms: string[]): IFuture<any> {
         return (() => {
-            if(!platforms) {
+			this.$projectService.ensureProject();
+
+            if(!platforms || platforms.length === 0) {
                 this.$errors.fail("No platform specified. Please specify a platform to add");
             }
 
             var platformsDir = this.$projectService.projectData.platformsDir;
             if(!this.$fs.exists(platformsDir).wait()) {
-                this.$fs.createDirectory(platformsDir);
+                this.$fs.createDirectory(platformsDir).wait();
             }
 
             _.each(platforms, platform => {
-                this.addPlatform(platform);
+                this.addPlatform(platform.toLowerCase()).wait();
             });
 
         }).future<any>()();
     }
 
-    private addPlatform(platform: string) {
-        platform = platform.split("@")[0];
-        var platformPath = path.join(this.$projectService.projectData.platformsDir, platform);
+    private addPlatform(platform: string): IFuture<void> {
+		return(() => {
+			platform = platform.split("@")[0];
+			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
+			// TODO: Check for version compatability if the platform is in format platform@version. This should be done in PR for semanting versioning
 
-        if(!this.isValidPlatform(platform)) {
-            this.$errors.fail("");
-        }
+			if (!this.isValidPlatform(platform)) {
+				this.$errors.fail("Invalid platform %s. Valid platforms are %s.", platform, helpers.formatListOfNames(_.keys(this.platformCapabilities)));
+			}
 
-        if(!this.isPlatformSupportedForOS(platform)) {
-            this.$errors.fail("Applications for platform %s can not be built on this OS - %s", platform, process.platform);
-        }
+			if (!this.isPlatformSupportedForOS(platform)) {
+				this.$errors.fail("Applications for platform %s can not be built on this OS - %s", platform, process.platform);
+			}
 
-        if(this.$fs.exists(platformPath)) {
-            this.$errors.fail("Platform %s already added", platform);
-        }
+			if (this.$fs.exists(platformPath).wait()) {
+				this.$errors.fail("Platform %s already added", platform);
+			}
 
-        // TODO: This should be downloaded from npm
-        // Copy platform specific files in platforms dir
+			// Copy platform specific files in platforms dir
+			this.$projectService.createPlatformSpecificProject(platform).wait();
+
+		}).future<void>()();
     }
 
-    private isPlatformSupportedForOS(platform: string): boolean {
-        var platformCapabilities = this.getCapabilities(platform) || {};
+	private isValidPlatform(platform: string) {
+		return this.platformCapabilities[platform];
+	}
+
+	private isPlatformSupportedForOS(platform: string): boolean {
+        var platformCapabilities = this.getCapabilities(platform);
         var targetedOS = platformCapabilities.targetedOS;
 
         if(!targetedOS || targetedOS.indexOf("*") >= 0 || targetedOS.indexOf(process.platform) >= 0) {
@@ -73,4 +81,5 @@ export class PlatformService implements IPlatformService {
 
         return false;
     }
-}
+}
+$injector.register("platformService", PlatformService);