Fix PR comments

Author: TsvetanMilanov

.npmignore

@@ -18,7 +18,6 @@ bin/nativescript
 bin/*.cmd
 
 lib/**/*.ts
-!lib/**/*.d.ts
 lib/**/*.js.map
 
 test/

lib/declarations.d.ts

@@ -18,6 +18,11 @@ interface IProcessInfo {
 	exitCode?: number;
 }
 
+interface ISpawnFromEventOptions {
+	spawnOptions?: any;
+	ignoreError?: boolean;
+}
+
 interface IDictionary<T> {
 	[key: string]: T
 }

lib/definitions/bluebird.d.ts

@@ -1,15 +1,14 @@
-import * as Promise from "bluebird";
 import { ChildProcess } from "./wrappers/child-process";
 import { SysInfo } from "./sys-info";
 
-let childProcess = new ChildProcess();
-let sysInfo = new SysInfo(childProcess);
+const childProcess = new ChildProcess();
+const sysInfo = new SysInfo(childProcess);
 
-function getJavaVersion(): Promise<string> {
+const getJavaVersion = (): Promise<string> => {
 	return sysInfo.getJavaVersion();
 };
 
-function getJavaCompilerVersion(): Promise<string> {
+const getJavaCompilerVersion = (): Promise<string> => {
 	return sysInfo.getJavaCompilerVersion();
 };
 

lib/index.ts

@@ -1,56 +1,40 @@
 import { ChildProcess } from "./wrappers/child-process";
-import * as Promise from "bluebird";
 import * as path from "path";
 
 export class SysInfo {
 	// Different java has different format for `java -version` command.
 	private static JAVA_VERSION_REGEXP = /(?:openjdk|java) version \"((?:\d+\.)+(?:\d+))/i;
 
-	// For other versions of java javac version output is not on first line.
-	// Thus can't use ^ for starts with in regex.
-	private static JAVA_COMPILER_VERSION_REGEXP = /javac (.*)/i;
+	private static JAVA_COMPILER_VERSION_REGEXP = /^javac (.*)/im;
 
 	private javaVerCache: string;
 	private javaCompilerVerCache: string;
 
 	constructor(private childProcess: ChildProcess) { }
 
-	public getJavaVersion(): Promise<string> {
+	public async getJavaVersion(): Promise<string> {
 		if (!this.javaVerCache) {
-			return new Promise<string>((resolve, reject) => {
-				this.childProcess.spawnFromEvent("java", ["-version"], "exit")
-					.then((spawnResult) => {
-						this.javaVerCache = SysInfo.JAVA_VERSION_REGEXP.exec(spawnResult.stderr)[1];
-						resolve(this.javaVerCache);
-					})
-					.catch((err) => {
-						this.javaVerCache = null;
-						resolve(this.javaVerCache);
-					});
-			});
+			const spawnResult = await this.childProcess.spawnFromEvent("java", ["-version"], "exit", { ignoreError: true });
+			const matches = spawnResult && SysInfo.JAVA_VERSION_REGEXP.exec(spawnResult.stderr);
+			this.javaVerCache = matches && matches[1];
 		}
 
-		return Promise.resolve(this.javaVerCache);
+		return this.javaVerCache;
 	}
 
-	public getJavaCompilerVersion(): Promise<string> {
+	public async getJavaCompilerVersion(): Promise<string> {
 		if (!this.javaCompilerVerCache) {
-			return new Promise<string>((resolve, reject) => {
-				let javaCompileExecutableName = "javac";
-				let javaHome = process.env.JAVA_HOME;
-				let pathToJavaCompilerExecutable = javaHome ? path.join(javaHome, "bin", javaCompileExecutableName) : javaCompileExecutableName;
-				this.childProcess.exec(`"${pathToJavaCompilerExecutable}" -version`)
-					.then((output) => {
-						this.javaCompilerVerCache = output ? SysInfo.JAVA_COMPILER_VERSION_REGEXP.exec(output.stderr)[1] : null;
-						resolve(this.javaCompilerVerCache);
-					})
-					.catch((err) => {
-						this.javaCompilerVerCache = null;
-						resolve(this.javaCompilerVerCache);
-					});
-			});
+			const javaCompileExecutableName = "javac";
+			const javaHome = process.env.JAVA_HOME;
+			const pathToJavaCompilerExecutable = javaHome ? path.join(javaHome, "bin", javaCompileExecutableName) : javaCompileExecutableName;
+			try {
+				const output = await this.childProcess.exec(`"${pathToJavaCompilerExecutable}" -version`);
+				this.javaCompilerVerCache = SysInfo.JAVA_COMPILER_VERSION_REGEXP.exec(output.stderr)[1];
+			} catch (err) {
+				this.javaCompilerVerCache = null;
+			}
 		}
 
-		return Promise.resolve(this.javaCompilerVerCache);
+		return this.javaCompilerVerCache;
 	}
 }

lib/sys-info.ts

@@ -1,10 +1,10 @@
 import * as childProcess from "child_process";
-import * as Promise from "bluebird";
 
 export class ChildProcess {
-	public spawnFromEvent(command: string, args: string[], event: string, options?: childProcess.SpawnOptions, ignoreError: boolean = false): Promise<IProcessInfo> {
+	public spawnFromEvent(command: string, args: string[], event: string, options?: ISpawnFromEventOptions): Promise<IProcessInfo> {
 		return new Promise<IProcessInfo>((resolve, reject) => {
-			let commandChildProcess = childProcess.spawn(command, args, options);
+			options = options || {};
+			const commandChildProcess = childProcess.spawn(command, args, options.spawnOptions);
 			let capturedOut = "";
 			let capturedErr = "";
 
@@ -21,14 +21,14 @@ export class ChildProcess {
 			}
 
 			commandChildProcess.on(event, (arg: any) => {
-				let exitCode = typeof arg === "number" ? arg : arg && arg.code;
-				let result = {
+				const exitCode = typeof arg === "number" ? arg : arg && arg.code;
+				const result = {
 					stdout: capturedOut,
 					stderr: capturedErr,
 					exitCode: exitCode
 				};
 
-				if (ignoreError) {
+				if (options.ignoreError) {
 					resolve(result);
 				} else {
 					if (exitCode === 0) {
@@ -39,21 +39,21 @@ export class ChildProcess {
 							errorMessage += ` Error output: \n ${capturedErr}`;
 						}
 
-						throw new Error(errorMessage);
+						reject(errorMessage);
 					}
 				}
 			});
 
 			commandChildProcess.once("error", (err: Error) => {
-				if (ignoreError) {
-					let result = {
+				if (options.ignoreError) {
+					const result = {
 						stdout: capturedOut,
 						stderr: err.message,
 						exitCode: (<any>err).code
 					};
 					resolve(result);
 				} else {
-					throw err;
+					reject(err);
 				}
 			});
 		});
@@ -63,10 +63,10 @@ export class ChildProcess {
 		return new Promise<IProcessInfo>((resolve, reject) => {
 			childProcess.exec(command, options, (err, stdout, stderr) => {
 				if (err) {
-					throw err;
+					reject(err);
 				}
 
-				let result: IProcessInfo = {
+				const result: IProcessInfo = {
 					stdout,
 					stderr
 				};

lib/wrappers/child-process.ts

@@ -23,6 +23,7 @@
   },
   "homepage": "https://github.com/NativeScript/nativescript-doctor#readme",
   "devDependencies": {
+    "@types/mocha": "2.2.32",
     "grunt": "1.0.1",
     "grunt-contrib-clean": "1.0.0",
     "grunt-contrib-watch": "1.0.0",
@@ -35,7 +36,5 @@
     "tslint": "3.15.1",
     "typescript": "2.0.3"
   },
-  "dependencies": {
-    "bluebird": "3.4.6"
-  }
+  "dependencies": {}
 }