Improve implementation by moving new functionality to stratigically better places.

Author: e2l3n

lib/declarations.ts

@@ -6,6 +6,7 @@ interface INodePackageManager {
 	cache(packageName: string, version: string, cache?: any): IFuture<IDependencyData>;
 	cacheUnpack(packageName: string, version: string, unpackTarget?: string): IFuture<void>;
 	view(packageName: string, propertyName: string): IFuture<any>;
+	executeNpmCommand(npmCommandName: string, currentWorkingDirectory: string): IFuture<void>;
 }
 
 interface INpmInstallationManager {

lib/node-package-manager.ts

@@ -5,7 +5,8 @@ import Future = require("fibers/future");
 import npm = require("npm");
 
 export class NodePackageManager implements INodePackageManager {
-	constructor(private $logger: ILogger,
+	constructor(private $childProcess: IChildProcess,
+		private $logger: ILogger,
 		private $errors: IErrors,
 		private $fs: IFileSystem,
 		private $lockfile: ILockFile,
@@ -53,6 +54,12 @@ export class NodePackageManager implements INodePackageManager {
 	public view(packageName: string, propertyName: string): IFuture<any> {
 		return this.loadAndExecute("view", [[packageName, propertyName], [false]]);
 	}
+
+	public executeNpmCommand(npmCommandName: string, currentWorkingDirectory: string): IFuture<void> {
+		return (() => {
+			 this.$childProcess.exec(npmCommandName, { cwd: currentWorkingDirectory }).wait();
+		}).future<void>()();
+	}
 
 	private loadAndExecute(commandName: string, args: any[], opts?: { config?: any, subCommandName?: string }): IFuture<any> {
 		return (() => {

lib/services/platform-service.ts

@@ -178,8 +178,6 @@ export class PlatformService implements IPlatformService {
 			this.$pluginsService.ensureAllDependenciesAreInstalled().wait();
 			let tnsModulesDestinationPath = path.join(platformData.appDestinationDirectoryPath, constants.APP_FOLDER_NAME, PlatformService.TNS_MODULES_FOLDER_NAME);
 			this.$broccoliBuilder.prepareNodeModules(tnsModulesDestinationPath, this.$projectData.projectDir, platform, lastModifiedTime).wait();
-			shell.cp("-Rf", path.join(tnsModulesDestinationPath, constants.TNS_CORE_MODULES_NAME, "*"), tnsModulesDestinationPath);
-			this.$fs.deleteDirectory(constants.TNS_CORE_MODULES_NAME).wait();
 
 			// Process platform specific files
 			let directoryPath = path.join(platformData.appDestinationDirectoryPath, constants.APP_FOLDER_NAME);

lib/services/project-service.ts

@@ -18,8 +18,7 @@ export class ProjectService implements IProjectService {
 		private $projectHelper: IProjectHelper,
 		private $projectNameValidator: IProjectNameValidator,
 		private $projectTemplatesService: IProjectTemplatesService,
-		private $options: IOptions,
-		private $childProcess: IChildProcess) { }
+		private $options: IOptions) { }
 
 	public createProject(projectName: string): IFuture<void> {
 		return(() => {
@@ -113,9 +112,7 @@ export class ProjectService implements IProjectService {
 
 			this.$projectDataService.initialize(projectDir);
 			this.$projectDataService.setValue("id", projectId).wait();
-			//Start child process because --save --save-exact option is necessary when installing tns-core-modules
-			//in order to create "dependencies" key in package.json. 
-			this.$childProcess.exec("npm install " + constants.TNS_CORE_MODULES_NAME + " --save --save-exact", { cwd: projectDir }).wait();
+			this.$npm.executeNpmCommand("npm install " + constants.TNS_CORE_MODULES_NAME + " --save --save-exact", projectDir).wait();
 		}).future<void>()();
 	}
 

lib/tools/broccoli/node-modules-dest-copy.ts

@@ -75,6 +75,11 @@ export class DestCopy implements IBroccoliPlugin {
 		if(isPlugin) {
 			this.$pluginsService.prepare(dependency).wait();
 		}
+
+		if (dependency.name == constants.TNS_CORE_MODULES_NAME) {
+			shelljs.cp("-Rf", path.join(this.outputRoot, constants.TNS_CORE_MODULES_NAME, "*"), this.outputRoot);
+			this.$fs.deleteDirectory(path.join(this.outputRoot, constants.TNS_CORE_MODULES_NAME)).wait();
+		} 
 	});
   }
 

test/project-service.ts

@@ -2,6 +2,7 @@
 "use strict";
 
 import yok = require('../lib/common/yok');
+import ChildProcessLib = require("../lib/common/child-process");
 import stubs = require('./stubs');
 
 import ProjectServiceLib = require("../lib/services/project-service");
@@ -99,7 +100,7 @@ class ProjectIntegrationTest {
 
 	private createTestInjector(): void {
 		this.testInjector = new yok.Yok();
-
+		this.testInjector.register("childProcess", ChildProcessLib.ChildProcess);	
 		this.testInjector.register("errors", stubs.ErrorsStub);
 		this.testInjector.register('logger', stubs.LoggerStub);
 		this.testInjector.register("projectService", ProjectServiceLib.ProjectService);
@@ -171,6 +172,8 @@ function createTestInjector() {
 	testInjector.register("httpClient", HttpClientLib.HttpClient);
 	testInjector.register("config", {});
 	testInjector.register("lockfile", stubs.LockFile);
+
+	testInjector.register("childProcess", ChildProcessLib.ChildProcess);
 
 	testInjector.register('projectData', ProjectDataLib.ProjectData);
 	testInjector.register("options", optionsLib.Options);