Merge pull request #2068 from NativeScript/KristinaKoeva/InspectorVersion

Support frameworkPath when installing tns-ios-inspector

Author: dtopuzov

lib/npm-installation-manager.ts

@@ -181,7 +181,7 @@ export class NpmInstallationManager implements INpmInstallationManager {
 	private installCore(packageName: string, pathToSave: string, version: string): IFuture<string> {
 		return (() => {
 			if (this.$options.frameworkPath) {
-				this.npmInstall(packageName, pathToSave, version).wait();
+				this.npmInstall(this.$options.frameworkPath, pathToSave, version).wait();
 				let pathToNodeModules = path.join(pathToSave, "node_modules");
 				let folders = this.$fs.readDirectory(pathToNodeModules).wait();
 

lib/services/ios-debug-service.ts

@@ -1,13 +1,11 @@
 import * as iOSDevice from "../common/mobile/ios/device/ios-device";
 import * as net from "net";
 import * as path from "path";
-import * as semver from "semver";
 import {ChildProcess} from "child_process";
 import byline = require("byline");
 
 const inspectorBackendPort = 18181;
 const inspectorAppName = "NativeScript Inspector.app";
-const inspectorZipName = "NativeScript Inspector.zip";
 const inspectorNpmPackageName = "tns-ios-inspector";
 const inspectorUiDir = "WebInspectorUI/";
 const TIMEOUT_SECONDS = 90;
@@ -209,75 +207,15 @@ class IOSDebugService implements IDebugService {
 
 	private openDebuggingClient(fileDescriptor: string): IFuture<void> {
 		return (() => {
-			let frameworkVersion = this.getProjectFrameworkVersion().wait();
-			let inspectorPath = this.getInspectorPath(frameworkVersion).wait();
-			let inspectorSourceLocation: string;
-			let cmd: string = null;
-
-			if (semver.lt(frameworkVersion, "1.2.0")) {
-				cmd = `open -a Safari "${inspectorSourceLocation}"`;
-			} else {
-				let inspectorApplicationDir: string;
-				if (semver.lt(frameworkVersion, "1.6.0")) {
-					inspectorApplicationDir = inspectorPath;
-					inspectorSourceLocation = path.join(inspectorPath, "Safari/Main.html");
-				} else {
-					inspectorApplicationDir = path.join(inspectorPath, "..");
-					inspectorSourceLocation = path.join(inspectorPath, "Main.html");
-				}
-
-				let inspectorApplicationPath = path.join(inspectorApplicationDir, inspectorAppName);
-				if (!this.$fs.exists(inspectorApplicationPath).wait()) {
-					this.$fs.unzip(path.join(inspectorApplicationDir, inspectorZipName), inspectorApplicationDir).wait();
-				}
-				cmd = `open -a '${inspectorApplicationPath}' --args '${inspectorSourceLocation}' '${this.$projectData.projectName}' '${fileDescriptor}'`;
-			}
+			let inspectorPath = this.$npmInstallationManager.install(inspectorNpmPackageName).wait();
+			let inspectorSourceLocation = path.join(inspectorPath, inspectorUiDir, "Main.html");
+			let inspectorApplicationPath = path.join(inspectorPath, inspectorAppName);
 
+			let cmd = `open -a '${inspectorApplicationPath}' --args '${inspectorSourceLocation}' '${this.$projectData.projectName}' '${fileDescriptor}'`;
 			this.$childProcess.exec(cmd).wait();
 		}).future<void>()();
 	}
 
-	private getProjectFrameworkVersion(): IFuture<string> {
-		return (() => {
-			this.$projectDataService.initialize(this.$projectData.projectDir);
-			let platformData = this.$platformsData.getPlatformData(this.platform);
-			return this.$projectDataService.getValue(platformData.frameworkPackageName).wait().version;
-		}).future<string>()();
-	}
-
-	private getInspectorPath(frameworkVersion: string): IFuture<string> {
-		if (semver.lt(frameworkVersion, "1.6.0")) {
-			return this.getInspectorPathFromTnsIosPackage(frameworkVersion);
-		} else {
-			return this.getInspectorPathFromInspectorPackage();
-		}
-	}
-
-	private getInspectorPathFromInspectorPackage(): IFuture<string> {
-		return (() => {
-			let inspectorPackage = this.$npmInstallationManager.install(inspectorNpmPackageName).wait();
-			let inspectorPath = path.join(inspectorPackage, inspectorUiDir);
-			return inspectorPath;
-		}).future<string>()();
-	}
-
-	private getInspectorPathFromTnsIosPackage(frameworkVersion: string): IFuture<string> {
-		return (() => {
-			let tnsIosPackage = "";
-			if (this.$options.frameworkPath) {
-				if (this.$fs.getFsStats(this.$options.frameworkPath).wait().isFile()) {
-					this.$errors.failWithoutHelp("frameworkPath option must be path to directory which contains tns-ios framework");
-				}
-				tnsIosPackage = path.resolve(this.$options.frameworkPath);
-			} else {
-				let platformData = this.$platformsData.getPlatformData(this.platform);
-				tnsIosPackage = this.$npmInstallationManager.install(platformData.frameworkPackageName, { version: frameworkVersion }).wait();
-			}
-			let inspectorPath = path.join(tnsIosPackage, inspectorUiDir);
-			return inspectorPath;
-		}).future<string>()();
-	}
-
 	private getReadyForAttachTimeout(timeoutInMilliseconds?: number): number {
 		let timeout = timeoutInMilliseconds || this.$utils.getMilliSecondsTimeout(TIMEOUT_SECONDS);
 		let readyForAttachTimeout = timeout / 10;

lib/services/platform-service.ts

@@ -82,9 +82,7 @@ export class PlatformService implements IPlatformService {
 				pathToSave: path.join(this.$projectData.platformsDir, platform)
 			};
 
-			if (this.$options.frameworkPath) {
-				packageToInstall = this.$options.frameworkPath;
-			} else {
+			if (!this.$options.frameworkPath) {
 				packageToInstall = platformData.frameworkPackageName;
 				npmOptions["version"] = version;
 			}