Merge pull request #56 from NativeScript/tachev/expose-java

feat: expose the local java path

Author: Dimitar Tachev

lib/sys-info.ts

@@ -23,6 +23,7 @@ export class SysInfo implements NativeScriptDoctor.ISysInfo {
 	private monoVerRegExp = /version (\d+[.]\d+[.]\d+) /gm;
 
 	private javaCompilerVerCache: string;
+	private javaPathCache: string;
 	private javaVerCache: string;
 	private javaVerJavaHomeCache: string;
 	private javaVerPathCache: string;
@@ -75,6 +76,13 @@ export class SysInfo implements NativeScriptDoctor.ISysInfo {
 		});
 	}
 
+	public getJavaPath(): Promise<string> {
+		return this.getValueForProperty(() => this.javaPathCache, async (): Promise<string> => {
+			const javaPath = (await this.getJavaExecutablePathFromJavaHome(Constants.JAVA_EXECUTABLE_NAME)) || (await this.getJavaExecutablePathFromPath(Constants.JAVA_EXECUTABLE_NAME));
+			return javaPath;
+		});
+	}
+
 	public getJavaVersionFromPath(): Promise<string> {
 		return this.getValueForProperty(() => this.javaVerPathCache, (): Promise<string> => {
 			return this.getVersionOfJavaExecutableFromPath(Constants.JAVA_EXECUTABLE_NAME, SysInfo.JAVA_VERSION_REGEXP);
@@ -509,6 +517,7 @@ export class SysInfo implements NativeScriptDoctor.ISysInfo {
 			result.dotNetVer = await this.hostInfo.dotNetVersion();
 			result.javacVersion = await this.getJavaCompilerVersion();
 			result.javaVersion = await this.getJavaVersion();
+			result.javaPath = await this.getJavaPath();
 			result.adbVer = await this.getAdbVersion(config && config.androidToolsInfo && config.androidToolsInfo.pathToAdb);
 			result.androidInstalled = await this.isAndroidInstalled();
 			result.monoVer = await this.getMonoVersion();
@@ -521,6 +530,16 @@ export class SysInfo implements NativeScriptDoctor.ISysInfo {
 
 	private async getVersionOfJavaExecutableFromJavaHome(javaExecutableName: string, regExp: RegExp): Promise<string> {
 		let javaExecutableVersion: string = null;
+		const javaExecutablePath = this.getJavaExecutablePathFromJavaHome(javaExecutableName);
+		if (javaExecutablePath) {
+			javaExecutableVersion = await this.getVersionOfJavaExecutable(javaExecutablePath, regExp);
+		}
+
+		return javaExecutableVersion;
+	}
+
+	private getJavaExecutablePathFromJavaHome(javaExecutableName: string): string {
+		let javaExecutablePath: string = null;
 
 		try {
 			const javaHome = process.env["JAVA_HOME"];
@@ -529,25 +548,36 @@ export class SysInfo implements NativeScriptDoctor.ISysInfo {
 			if (javaHome) {
 				const pathToJavaExecutable = path.join(javaHome, "bin", javaExecutableFile);
 				if (this.fileSystem.exists(pathToJavaExecutable)) {
-					javaExecutableVersion = await this.getVersionOfJavaExecutable(pathToJavaExecutable, regExp);
+					javaExecutablePath = pathToJavaExecutable;
 				}
 			}
 		} catch (err) { /* intentionally left blank */ }
 
-		return javaExecutableVersion;
+		return javaExecutablePath;
 	}
 
 	private async getVersionOfJavaExecutableFromPath(javaExecutableName: string, regExp: RegExp): Promise<string> {
 		let javaExecutableVersion: string = null;
 
+		const javaExecutablePath = await this.getJavaExecutablePathFromPath(javaExecutableName);
+		if (javaExecutablePath) {
+			javaExecutableVersion = await this.getVersionOfJavaExecutable(javaExecutablePath, regExp);
+		}
+
+		return javaExecutableVersion;
+	}
+
+	private async getJavaExecutablePathFromPath(javaExecutableName: string): Promise<string> {
+		let javaExecutablePath: string = null;
+
 		try {
 			const detectionCommand = this.hostInfo.isWindows ? "where" : "which";
 			// if this command succeeds, we have javac in the PATH. In case it is not there, it will throw an error.
 			await this.childProcess.exec(`${detectionCommand} ${javaExecutableName}`);
-			javaExecutableVersion = await this.getVersionOfJavaExecutable(javaExecutableName, regExp);
+			javaExecutablePath = javaExecutableName;
 		} catch (err) { /* intentionally left blank */ }
 
-		return javaExecutableVersion;
+		return javaExecutablePath;
 	}
 
 	private async getVersionOfJavaExecutable(executable: string, regExp: RegExp): Promise<string> {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "nativescript-doctor",
-  "version": "1.11.1",
+  "version": "1.12.0",
   "description": "Library that helps identifying if the environment can be used for development of {N} apps.",
   "main": "lib/index.js",
   "types": "./typings/nativescript-doctor.d.ts",
@@ -53,4 +53,4 @@
     "winreg": "1.2.2",
     "yauzl": "2.10.0"
   }
-}
+}

test/android-local-build-requirements.ts

@@ -30,6 +30,7 @@ describe("androidLocalBuildRequirements", () => {
 				getJavaVersion: async (): Promise<string> => results.hasOwnProperty("getJavaVersion") ? results.getJavaCompilerVersion : "8.0.0",
 				getJavaVersionFromJavaHome: async (): Promise<string> => results.hasOwnProperty("getJavaVersionFromJavaHome") ? results.getJavaCompilerVersion : "8.0.0",
 				getJavaVersionFromPath: async (): Promise<string> => results.hasOwnProperty("getJavaVersionFromPath") ? results.getJavaCompilerVersion : "8.0.0",
+				getJavaPath: async (): Promise<string> => undefined,
 				getAdbVersion: async (pathToAdb?: string): Promise<string> => results.hasOwnProperty("getAdbVersion") ? results.getAdbVersion : "1.0.39",
 				getXcodeVersion: async (): Promise<string> => undefined,
 				getNodeVersion: async (): Promise<string> => undefined,

typings/interfaces.ts

@@ -15,6 +15,12 @@ declare module NativeScriptDoctor {
 		 */
 		getJavaVersion(): Promise<string>;
 
+		/**
+		 * Returns the currently installed Java path based on JAVA_HOME and PATH..
+		 * @return {Promise<string>} The currently installed Java path.
+		 */
+		getJavaPath(): Promise<string>;
+
 		/**
 		 * Gets JAVA version based on the executable in PATH.
 		 * @return {Promise<string>}
@@ -340,6 +346,11 @@ declare module NativeScriptDoctor {
 		 * @type {string}
 		 */
 		javaVersion: string;
+		/**
+		 * java path based on JAVA_HOME and PATH.
+		 * @type {string}
+		 */
+		javaPath: string;
 		/**
 		 * true if the Android SDK Tools are installed and configured correctly.
 		 * @type {boolean}