From 8ed341c5ecb3ee322ec320e9b70753eaf1579ed7 Mon Sep 17 00:00:00 2001
From: Peter Kanev <pip3r4o@gmail.com>
Date: Mon, 13 Feb 2017 16:06:07 +0200
Subject: [PATCH] implement rollback of package.json contents of project if
 platform/plugin installation fails

throw error when npm-installation-manager install fails
---
 lib/node-package-manager.ts      | 5 ++++-
 lib/npm-installation-manager.ts  | 7 ++-----
 lib/services/platform-service.ts | 3 ++-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/lib/node-package-manager.ts b/lib/node-package-manager.ts
index 84be6105c8..a6b0dd47dc 100644
--- a/lib/node-package-manager.ts
+++ b/lib/node-package-manager.ts
@@ -17,7 +17,8 @@ export class NodePackageManager implements INodePackageManager {
 			config["ignore-scripts"] = true;
 		}
 
-		let jsonContentBefore = this.$fs.readJson(path.join(pathToSave, "package.json"));
+		let packageJsonPath = path.join(pathToSave, "package.json");
+		let jsonContentBefore = this.$fs.readJson(packageJsonPath);
 		let dependenciesBefore = _.keys(jsonContentBefore.dependencies).concat(_.keys(jsonContentBefore.devDependencies));
 
 		let flags = this.getFlagsString(config, true);
@@ -47,6 +48,8 @@ export class NodePackageManager implements INodePackageManager {
 				this.$logger.warn(err.message);
 			} else {
 				// All other errors should be handled by the caller code.
+				// Revert package.json contents to preserve valid state
+				this.$fs.writeJson(packageJsonPath, jsonContentBefore);
 				throw err;
 			}
 		}
diff --git a/lib/npm-installation-manager.ts b/lib/npm-installation-manager.ts
index 2b3ac9581d..efef44a091 100644
--- a/lib/npm-installation-manager.ts
+++ b/lib/npm-installation-manager.ts
@@ -3,12 +3,9 @@ import * as semver from "semver";
 import * as constants from "./constants";
 
 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,
 		private $fs: IFileSystem,
 		private $staticConfig: IStaticConfig) {
@@ -35,7 +32,6 @@ export class NpmInstallationManager implements INpmInstallationManager {
 	}
 
 	public async install(packageName: string, projectDir: string, opts?: INpmInstallOptions): Promise<any> {
-
 		try {
 			let packageToInstall = this.$options.frameworkPath || packageName;
 			let pathToSave = projectDir;
@@ -45,7 +41,8 @@ export class NpmInstallationManager implements INpmInstallationManager {
 			return await this.installCore(packageToInstall, pathToSave, version, dependencyType);
 		} catch (error) {
 			this.$logger.debug(error);
-			this.$errors.fail("%s. Error: %s", NpmInstallationManager.NPM_LOAD_FAILED, error);
+
+			throw new Error(error);
 		}
 	}
 
diff --git a/lib/services/platform-service.ts b/lib/services/platform-service.ts
index 6cf23bbe45..aabf8fcf5e 100644
--- a/lib/services/platform-service.ts
+++ b/lib/services/platform-service.ts
@@ -91,9 +91,10 @@ export class PlatformService implements IPlatformService {
 		}
 
 		let spinner = new clui.Spinner("Installing " + packageToInstall);
+		let projectDir = this.$projectData.projectDir;
 		try {
 			spinner.start();
-			let downloadedPackagePath = await this.$npmInstallationManager.install(packageToInstall, this.$projectData.projectDir, npmOptions);
+			let downloadedPackagePath = await this.$npmInstallationManager.install(packageToInstall, projectDir, npmOptions);
 			let frameworkDir = path.join(downloadedPackagePath, constants.PROJECT_FRAMEWORK_FOLDER_NAME);
 			frameworkDir = path.resolve(frameworkDir);