Merge pull request #2309 from NativeScript/plamen5kov/move_logic

moved caching logic to npminstallation manager

Author: Plamen5kov

lib/declarations.ts

@@ -10,6 +10,7 @@ interface INpmInstallationManager {
 	getLatestVersion(packageName: string): IFuture<string>;
 	getNextVersion(packageName: string): IFuture<string>;
 	getLatestCompatibleVersion(packageName: string): IFuture<string>;
+	getInspectorFromCache(inspectorNpmPackageName: string, projectDir: string): IFuture<string>;
 }
 
 interface INpmInstallOptions {

lib/npm-installation-manager.ts

@@ -6,6 +6,7 @@ export class NpmInstallationManager implements INpmInstallationManager {
 	private static NPM_LOAD_FAILED = "Failed to retrieve data from npm. Please try again a little bit later.";
 
 	constructor(private $npm: INodePackageManager,
+		private $childProcess: IChildProcess,
 		private $logger: ILogger,
 		private $errors: IErrors,
 		private $options: IOptions,
@@ -57,6 +58,39 @@ export class NpmInstallationManager implements INpmInstallationManager {
 		}).future<string>()();
 	}
 
+	public getInspectorFromCache(inspectorNpmPackageName: string, projectDir: string) : IFuture<string> {
+		return (() => {
+			let inspectorPath = path.join(projectDir, "node_modules", inspectorNpmPackageName);
+
+			// local installation takes precedence over cache
+			if(!this.inspectorAlreadyInstalled(inspectorPath).wait()) {
+				let cachepath = this.$childProcess.exec("npm get cache").wait().trim();
+				let version = this.getLatestCompatibleVersion(inspectorNpmPackageName).wait();
+				let pathToPackageInCache = path.join(cachepath, inspectorNpmPackageName, version);
+				let pathToUnzippedInspector = path.join(pathToPackageInCache, "package");
+
+				if(!this.$fs.exists(pathToPackageInCache).wait()) {
+					this.$childProcess.exec(`npm cache add ${inspectorNpmPackageName}@${version}`).wait();
+					let inspectorTgzPathInCache = path.join(pathToPackageInCache, "package.tgz");
+					this.$childProcess.exec(`tar -xf ${inspectorTgzPathInCache} -C ${pathToPackageInCache}`).wait();
+					this.$childProcess.exec(`npm install --prefix ${pathToUnzippedInspector}`).wait();
+				}
+				this.$logger.out("Using inspector from cache.");
+				return pathToUnzippedInspector;
+			}
+			return inspectorPath;
+		}).future<string>()();
+	}
+
+	private inspectorAlreadyInstalled(pathToInspector: string): IFuture<Boolean> {
+		return (() => {
+			if(this.$fs.exists(pathToInspector).wait()) {
+				return true;
+			}
+			return false;
+		}).future<Boolean>()();
+	}
+
 	private installCore(packageName: string, pathToSave: string, version: string, dependencyType: string): IFuture<string> {
 		return (() => {
 			const possiblePackageName= path.resolve(packageName);

lib/services/ios-debug-service.ts

@@ -214,24 +214,7 @@ class IOSDebugService implements IDebugService {
 	private openAppInspector(fileDescriptor: string): IFuture<void> {
 		if (this.$options.client) {
 			return (() => {
-				let inspectorPath = path.join(this.$projectData.projectDir, "node_modules", inspectorNpmPackageName);
-
-				// local installation takes precedence over cache
-				if(!this.inspectorAlreadyInstalled(inspectorPath).wait()) {
-					let cachepath = this.$childProcess.exec("npm get cache").wait().trim();
-					let version = this.$npmInstallationManager.getLatestCompatibleVersion(inspectorNpmPackageName).wait();
-					let pathToPackageInCache = path.join(cachepath, inspectorNpmPackageName, version);
-					let pathToUnzippedInspector = path.join(pathToPackageInCache, "package");
-
-					if(!this.$fs.exists(pathToPackageInCache).wait()) {
-						this.$childProcess.exec(`npm cache add ${inspectorNpmPackageName}@${version}`).wait();
-						let inspectorTgzPathInCache = path.join(pathToPackageInCache, "package.tgz");
-						this.$childProcess.exec(`tar -xf ${inspectorTgzPathInCache} -C ${pathToPackageInCache}`).wait();
-						this.$childProcess.exec(`npm install --prefix ${pathToUnzippedInspector}`).wait();
-					}
-					this.$logger.out("Using inspector from cache.");
-					inspectorPath = pathToUnzippedInspector;
-				}
+				let  inspectorPath = this.$npmInstallationManager.getInspectorFromCache(inspectorNpmPackageName, this.$projectData.projectDir).wait();
 
 				let inspectorSourceLocation = path.join(inspectorPath, inspectorUiDir, "Main.html");
 				let inspectorApplicationPath = path.join(inspectorPath, inspectorAppName);
@@ -245,14 +228,5 @@ class IOSDebugService implements IDebugService {
 			}).future<void>()();
 		}
 	}
-
-	private inspectorAlreadyInstalled(pathToInspector: string): IFuture<Boolean> {
-		return (() => {
-			if(this.$fs.exists(pathToInspector).wait()) {
-				return true;
-			}
-			return false;
-		}).future<Boolean>()();
-	}
 }
 $injector.register("iOSDebugService", IOSDebugService);

test/npm-installation-manager.ts

@@ -9,6 +9,7 @@ import * as OptionsLib from "../lib/options";
 import * as StaticConfigLib from "../lib/config";
 import Future = require("fibers/future");
 import * as yok from "../lib/common/yok";
+import ChildProcessLib = require("../lib/common/child-process");
 
 function createTestInjector(): IInjector {
 	let testInjector = new yok.Yok();
@@ -21,6 +22,7 @@ function createTestInjector(): IInjector {
 	testInjector.register("fs", FsLib.FileSystem);
 	testInjector.register("hostInfo", HostInfoLib.HostInfo);
 	testInjector.register("staticConfig", StaticConfigLib.StaticConfig);
+	testInjector.register("childProcess", ChildProcessLib.ChildProcess);
 
 	testInjector.register("npmInstallationManager", NpmInstallationManagerLib.NpmInstallationManager);
 

test/stubs.ts

@@ -230,6 +230,10 @@ export class NpmInstallationManagerStub implements INpmInstallationManager {
 	getLatestCompatibleVersion(packageName: string): IFuture<string> {
 		return Future.fromResult("");
 	}
+
+	getInspectorFromCache(name: string, projectDir: string): IFuture<string> {
+		return Future.fromResult("");
+	}
 }
 
 export class ProjectDataStub implements IProjectData {