Merge pull request #103 from NativeScript/fatme/platform-update-command

Fatme · Fatme · commit a47370681f44 · 2014-09-18T14:38:38.000+03:00
Update platform command
diff --git a/lib/bootstrap.ts b/lib/bootstrap.ts
@@ -2,14 +2,15 @@ require("./common/bootstrap");
 
 $injector.require("nativescript-cli", "./nativescript-cli");
 
-$injector.require("projectData", "./services/project-service");
+$injector.require("projectData", "./project-data");
+$injector.require("projectDataService", "./services/project-data-service");
 $injector.require("projectService", "./services/project-service");
 $injector.require("androidProjectService", "./services/android-project-service");
 $injector.require("iOSProjectService", "./services/ios-project-service");
 
 $injector.require("projectTemplatesService", "./services/project-templates-service");
 
-$injector.require("platformsData", "./services/platform-service");
+$injector.require("platformsData", "./platforms-data");
 $injector.require("platformService", "./services/platform-service");
 
 $injector.require("userSettingsService", "./services/user-settings-service");
@@ -21,6 +22,7 @@ $injector.requireCommand("create", "./commands/create-project");
 $injector.requireCommand("platform|*list", "./commands/list-platforms");
 $injector.requireCommand("platform|add", "./commands/add-platform");
 $injector.requireCommand("platform|remove", "./commands/remove-platform");
+$injector.requireCommand("platform|update", "./commands/update-platform");
 $injector.requireCommand("run", "./commands/run");
 $injector.requireCommand("prepare", "./commands/prepare");
 $injector.requireCommand("build", "./commands/build");
diff --git a/lib/commands/update-platform.ts b/lib/commands/update-platform.ts
@@ -0,0 +1,12 @@
+///<reference path="../.d.ts"/>
+
+export class UpdatePlatformCommand implements ICommand {
+	constructor(private $platformService: IPlatformService) { }
+
+	execute(args: string[]): IFuture<void> {
+		return (() => {
+			this.$platformService.updatePlatforms(args).wait();
+		}).future<void>()();
+	}
+}
+$injector.registerCommand("platform|update", UpdatePlatformCommand);
diff --git a/lib/common b/lib/common
@@ -1 +1 @@
-Subproject commit d1e3ee553028228606f6460ec9a5cd1c2fe3a16c
+Subproject commit 8993c2ba3f62bbfb7011d531f8d6b83d405327a8
diff --git a/lib/declarations.ts b/lib/declarations.ts
@@ -1,7 +1,9 @@
 interface INodePackageManager {
-	cache: string;
+	getCacheRootPath(): IFuture<string>;
+	addToCache(packageName: string): IFuture<void>;
 	load(config?: any): IFuture<void>;
 	install(packageName: string, options?: INpmInstallOptions): IFuture<string>;
+	getLatestVersion(packageName: string): IFuture<string>;
 }
 
 interface INpmInstallOptions {
diff --git a/lib/definitions/npm.d.ts b/lib/definitions/npm.d.ts
@@ -1,5 +1,5 @@
  declare module "npm" {
-	var cache: string;
+	var cache: any;
 	var commands: { [index: string]: any };
 	function load(config: Object, callback: (err: any, data: any) => void): void;
 }
diff --git a/lib/definitions/platform.d.ts b/lib/definitions/platform.d.ts
@@ -4,6 +4,7 @@ interface IPlatformService {
 	getAvailablePlatforms(): IFuture<string[]>;
 	getPreparedPlatforms(): IFuture<string[]>;
 	removePlatforms(platforms: string[]): IFuture<void>;
+	updatePlatforms(platforms: string[]): IFuture<void>;
 	runPlatform(platform: string): IFuture<void>;
 	preparePlatform(platform: string): IFuture<void>;
 	buildPlatform(platform: string): IFuture<void>;
@@ -21,6 +22,7 @@ interface IPlatformData {
 	emulatorBuildOutputPath?: string;
 	validPackageNamesForDevice: string[];
 	validPackageNamesForEmulator?: string[];
+	frameworkFilesExtensions: string[];
 	targetedOS?: string[];
 }
 
diff --git a/lib/definitions/project.d.ts b/lib/definitions/project.d.ts
@@ -10,6 +10,12 @@ interface IProjectData {
 	projectId?: string;
 }
 
+interface IProjectDataService {
+	initialize(projectDir: string): void;
+	getValue(propertyName: string): IFuture<any>;
+	setValue(key: string, value: any): IFuture<void>;
+}
+
 interface IProjectTemplatesService {
 	defaultTemplatePath: IFuture<string>;
 }
@@ -23,4 +29,4 @@ interface IPlatformProjectService {
 	prepareProject(platformData: IPlatformData): IFuture<string>;
 	buildProject(projectRoot: string): IFuture<void>;
 	isPlatformPrepared(projectRoot: string): IFuture<boolean>;
-}
+}
diff --git a/lib/definitions/semver.d.ts b/lib/definitions/semver.d.ts
@@ -2,6 +2,7 @@
 declare module "semver" {
 	function gt(version1: string, version2: string): boolean;
 	function lt(version1: string, version2: string): boolean;
+	function eq(version1: string, version2: string): boolean;
 	function valid(version: string): boolean;
 	function inc(version: string, release: string): string;
 	function inc(version: string, release: "major"): string;
diff --git a/lib/node-package-manager.ts b/lib/node-package-manager.ts
@@ -13,14 +13,29 @@ export class NodePackageManager implements INodePackageManager {
 	private static NPM_LOAD_FAILED = "Failed to retrieve data from npm. Please try again a little bit later.";
 	private static NPM_REGISTRY_URL = "http://registry.npmjs.org/";
 
+	private versionsCache: IDictionary<string[]>;
+	private isLoaded: boolean;
+
 	constructor(private $logger: ILogger,
 		private $errors: IErrors,
 		private $httpClient: Server.IHttpClient,
 		private $staticConfig: IStaticConfig,
-		private $fs: IFileSystem) { }
+		private $fs: IFileSystem) {
+		this.versionsCache = {};
+	}
 
-	public get cache(): string {
-		return npm.cache;
+	public getCacheRootPath(): IFuture<string> {
+		return (() => {
+			this.load().wait();
+			return npm.cache;
+		}).future<string>()();
+	}
+
+	public addToCache(packageName: string): IFuture<void> {
+		return (() => {
+			this.load().wait();
+			this.addToCacheCore(packageName).wait();
+		}).future<void>()();
 	}
 
 	public load(config?: any): IFuture<void> {
@@ -39,6 +54,7 @@ export class NodePackageManager implements INodePackageManager {
 		return (() => {
 			try {
 				this.load().wait(); // It's obligatory to execute load before whatever npm function
+
 				var packageToInstall = packageName;
 				var pathToSave = (opts && opts.pathToSave) || npm.cache;
 				var version = (opts && opts.version) || null;
@@ -62,6 +78,14 @@ export class NodePackageManager implements INodePackageManager {
 		}).future<string>()();
 	}
 
+	public getLatestVersion(packageName: string): IFuture<string> {
+		return (() => {
+			var versions = this.getAvailableVersions(packageName).wait();
+			versions = _.sortBy(versions, (ver: string) => { return ver; });
+			return versions.reverse()[0];
+		}).future<string>()();
+	}
+
 	private installCore(packageName: string, pathToSave: string, isSemanticVersioningDisabled: boolean): IFuture<void> {
 		var currentVersion = this.$staticConfig.version;
 		if(!semver.valid(currentVersion)) {
@@ -89,12 +113,28 @@ export class NodePackageManager implements INodePackageManager {
 		return future;
 	}
 
+	private addToCacheCore(packageName: string): IFuture<void> {
+		var future = new Future<void>();
+		npm.commands["cache"].add(packageName, (err: Error, data: any) => {
+			if(err) {
+				future.throw(err);
+			} else {
+				future.return();
+			}
+		});
+		return future;
+	}
+
 	private getAvailableVersions(packageName: string): IFuture<string[]> {
 		return (() => {
-			var url = NodePackageManager.NPM_REGISTRY_URL + packageName;
-			var response = this.$httpClient.httpRequest(url).wait().body;
-			var json = JSON.parse(response);
-			return _.keys(json.versions);
+			if(!this.versionsCache[packageName]) {
+				var url = NodePackageManager.NPM_REGISTRY_URL + packageName;
+				var response = this.$httpClient.httpRequest(url).wait().body;
+				var json = JSON.parse(response);
+				this.versionsCache[packageName] = _.keys(json.versions);
+			}
+
+			return this.versionsCache[packageName];
 		}).future<string[]>()();
 	}
 
diff --git a/lib/platforms-data.ts b/lib/platforms-data.ts
@@ -0,0 +1,24 @@
+///<reference path=".d.ts"/>
+"use strict";
+
+export class PlatformsData implements IPlatformsData {
+	private platformsData : { [index: string]: any } = {};
+
+	constructor($androidProjectService: IPlatformProjectService,
+		$iOSProjectService: IPlatformProjectService) {
+
+		this.platformsData = {
+			ios: $iOSProjectService.platformData,
+			android: $androidProjectService.platformData
+		}
+	}
+
+	public get platformsNames() {
+		return Object.keys(this.platformsData);
+	}
+
+	public getPlatformData(platform: string): IPlatformData {
+		return this.platformsData[platform];
+	}
+}
+$injector.register("platformsData", PlatformsData);
diff --git a/lib/project-data.ts b/lib/project-data.ts
@@ -0,0 +1,40 @@
+///<reference path=".d.ts"/>
+"use strict";
+
+import path = require("path");
+
+export class ProjectData implements IProjectData {
+	public projectDir: string;
+	public platformsDir: string;
+	public projectFilePath: string;
+	public projectId: string;
+	public projectName: string;
+
+	constructor(private $fs: IFileSystem,
+		private $errors: IErrors,
+		private $projectHelper: IProjectHelper,
+		private $staticConfig: IStaticConfig) {
+		this.initializeProjectData().wait();
+	}
+
+	private initializeProjectData(): IFuture<void> {
+		return(() => {
+			var projectDir = this.$projectHelper.projectDir;
+			// If no project found, projectDir should be null
+			if(projectDir) {
+				this.projectDir = projectDir;
+				this.projectName = path.basename(projectDir);
+				this.platformsDir = path.join(projectDir, "platforms");
+				this.projectFilePath = path.join(projectDir, this.$staticConfig.PROJECT_FILE_NAME);
+
+				if (this.$fs.exists(this.projectFilePath).wait()) {
+					var fileContent = this.$fs.readJson(this.projectFilePath).wait();
+					this.projectId = fileContent.id;
+				}
+			} else {
+				this.$errors.fail("No project found at or above '%s' and neither was a --path specified.", process.cwd());
+			}
+		}).future<void>()();
+	}
+}
+$injector.register("projectData", ProjectData);
diff --git a/lib/services/android-project-service.ts b/lib/services/android-project-service.ts
@@ -5,17 +5,20 @@ import util = require("util");
 import options = require("./../options");
 import constants = require("./../constants");
 import hostInfo = require("../common/host-info");
+import helpers = require("./../common/helpers");
 
 class AndroidProjectService implements IPlatformProjectService {
 	private targetApi: string;
 
-	constructor(private $fs: IFileSystem,
+	constructor(private $androidEmulatorServices: Mobile.IEmulatorPlatformServices,
+		private $childProcess: IChildProcess,
 		private $errors: IErrors,
+		private $fs: IFileSystem,
 		private $logger: ILogger,
-		private $childProcess: IChildProcess,
 		private $projectData: IProjectData,
-		private $propertiesParser: IPropertiesParser,
-		private $androidEmulatorServices: Mobile.IEmulatorPlatformServices) { }
+		private $propertiesParser: IPropertiesParser) {
+
+	}
 
 	public get platformData(): IPlatformData {
 		return {
@@ -28,7 +31,8 @@ class AndroidProjectService implements IPlatformProjectService {
 			validPackageNamesForDevice: [
 				util.format("%s-%s.%s", this.$projectData.projectName, "debug", "apk"),
 				util.format("%s-%s.%s", this.$projectData.projectName, "release", "apk")
-			]
+			],
+			frameworkFilesExtensions: [".jar", ".dat"]
 		};
 	}
 
@@ -116,6 +120,10 @@ class AndroidProjectService implements IPlatformProjectService {
 		return this.$fs.exists(path.join(projectRoot, "assets", constants.APP_FOLDER_NAME));
 	}
 
+	public getFrameworkFilesExtensions(): string[] {
+		return [".jar", ".dat"];
+	}
+
 	private spawn(command: string, args: string[]): IFuture<void> {
 		if (hostInfo.isWindows()) {
 			args.unshift('/s', '/c', command);
diff --git a/lib/services/ios-project-service.ts b/lib/services/ios-project-service.ts
@@ -34,6 +34,7 @@ class IOSProjectService implements  IPlatformProjectService {
 			validPackageNamesForEmulator: [
 				this.$projectData.projectName + ".app"
 			],
+			frameworkFilesExtensions: [".a", ".h", ".bin"],
 			targetedOS: ['darwin']
 		};
 	}
diff --git a/lib/services/platform-service.ts b/lib/services/platform-service.ts
diff --git a/lib/services/project-data-service.ts b/lib/services/project-data-service.ts
diff --git a/lib/services/project-service.ts b/lib/services/project-service.ts
diff --git a/resources/help.txt b/resources/help.txt
diff --git a/test/platform-service.ts b/test/platform-service.ts
diff --git a/test/stubs.ts b/test/stubs.ts

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`declare module "npm" {`
`2`		`- var cache: string;`
	`2`	`+ var cache: any;`
`3`	`3`	`var commands: { [index: string]: any };`
`4`	`4`	`function load(config: Object, callback: (err: any, data: any) => void): void;`
`5`	`5`	`}`