From 72da2c7bd2f0b66322e0c7279aaf7e3b8308cf96 Mon Sep 17 00:00:00 2001
From: Toma Nikolov <toma.nikolov@telerik.com>
Date: Fri, 30 Jun 2017 16:54:37 +0300
Subject: [PATCH] Error handling fixes.

---
 lib/node-package-manager.ts     |  3 +--
 lib/npm-installation-manager.ts | 14 ++++++++------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/lib/node-package-manager.ts b/lib/node-package-manager.ts
index 0538c9cef9..f506855a4c 100644
--- a/lib/node-package-manager.ts
+++ b/lib/node-package-manager.ts
@@ -104,7 +104,7 @@ export class NodePackageManager implements INodePackageManager {
 		try {
 			viewResult = await this.$childProcess.exec(`npm view ${packageName} ${flags}`);
 		} catch (e) {
-			this.$errors.failWithoutHelp(e);
+			this.$errors.failWithoutHelp(e.message);
 		}
 		return JSON.parse(viewResult);
 	}
@@ -221,7 +221,6 @@ export class NodePackageManager implements INodePackageManager {
 
 			if (childProcess.stderr) {
 				childProcess.stderr.on("data", (data: string) => {
-					console.error(data.toString());
 					capturedErr += data;
 				});
 			}
diff --git a/lib/npm-installation-manager.ts b/lib/npm-installation-manager.ts
index 34fbe7b5ac..89b698470e 100644
--- a/lib/npm-installation-manager.ts
+++ b/lib/npm-installation-manager.ts
@@ -42,7 +42,7 @@ export class NpmInstallationManager implements INpmInstallationManager {
 		} catch (error) {
 			this.$logger.debug(error);
 
-			throw new Error(error);
+			throw error;
 		}
 	}
 
@@ -91,11 +91,9 @@ export class NpmInstallationManager implements INpmInstallationManager {
 		if (this.$fs.exists(possiblePackageName)) {
 			packageName = possiblePackageName;
 		}
-		if (packageName.indexOf(".tgz") >= 0) {
-			version = null;
-		}
+
 		// check if the packageName is url or local file and if it is, let npm install deal with the version
-		if (this.isURL(packageName) || this.$fs.exists(packageName)) {
+		if (this.isURL(packageName) || this.$fs.exists(packageName) || this.isTgz(packageName)) {
 			version = null;
 		} else {
 			version = version || await this.getLatestCompatibleVersion(packageName);
@@ -108,7 +106,11 @@ export class NpmInstallationManager implements INpmInstallationManager {
 		return pathToInstalledPackage;
 	}
 
-	private isURL(str: string) {
+	private isTgz(packageName: string): boolean {
+		return packageName.indexOf(".tgz") >= 0;
+	}
+
+	private isURL(str: string): boolean {
 		let urlRegex = '^(?!mailto:)(?:(?:http|https|ftp)://)(?:\\S+(?::\\S*)?@)?(?:(?:(?:[1-9]\\d?|1\\d\\d|2[01]\\d|22[0-3])(?:\\.(?:1?\\d{1,2}|2[0-4]\\d|25[0-5])){2}(?:\\.(?:[0-9]\\d?|1\\d\\d|2[0-4]\\d|25[0-4]))|(?:(?:[a-z\\u00a1-\\uffff0-9]+-?)*[a-z\\u00a1-\\uffff0-9]+)(?:\\.(?:[a-z\\u00a1-\\uffff0-9]+-?)*[a-z\\u00a1-\\uffff0-9]+)*(?:\\.(?:[a-z\\u00a1-\\uffff]{2,})))|localhost)(?::\\d{2,5})?(?:(/|\\?|#)[^\\s]*)?$';
 		let url = new RegExp(urlRegex, 'i');
 		return str.length < 2083 && url.test(str);