tns install <module> command should do npm install "nativescript-dev-<module>" --save-dev

tailsu · tailsu · commit ddee152a68ba · 2015-10-28T17:31:11.000+02:00
* dedicated grunt watch for compilation
* execute 'prepare' hook
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -57,7 +57,7 @@ module.exports = function(grunt) {
 				}
 			},
 		},
-		
+
 		tslint: {
             build: {
                 files: {
@@ -68,7 +68,7 @@ module.exports = function(grunt) {
                 }
             }
         },
-		
+
 		watch: {
 			devall: {
 				files: ["lib/**/*.ts", 'test/**/*.ts', "!lib/common/node_modules/**/*.ts"],
@@ -80,6 +80,16 @@ module.exports = function(grunt) {
 					atBegin: true,
 					interrupt: true
 				}
+			},
+			ts: {
+				files: ["lib/**/*.ts", 'test/**/*.ts', "!lib/common/node_modules/**/*.ts"],
+				tasks: [
+					'ts:devall'
+				],
+				options: {
+					atBegin: true,
+					interrupt: true
+				}
 			}
 		},
 
@@ -106,7 +116,7 @@ module.exports = function(grunt) {
 			npm_test: {
 				command: "npm test"
 			}
-	
+
 		},
 
 		copy: {
diff --git a/docs/man_pages/project/configuration/install.md b/docs/man_pages/project/configuration/install.md
@@ -3,18 +3,20 @@ install
 
 Usage | Synopsis
 ---|---
-General | `$ tns install [--path]`
+General | `$ tns install [module] [--path]`
 
-Installs all platforms and dependencies described in the `package.json` file in the current directory.
+When executed without a `module` argument - install all platforms and dependencies described in the `package.json` file in the current directory.
 
-<% if(isHtml) { %> 
-The `package.json` file must be a valid `package.json` describing the configuration of a NativeScript project. If missing or corrupted, you can recreate the file by running `$ tns init` in the directory of a NativeScript project. 
+When a `module` argument is given - install the specified npm module. If `module` is a path to an existing directory, then the npm module from that path is installed. If `module` does not refer to an existing directory, then the module with the name `nativescript-dev-<module>` is installed from the npm registry. This command is intended for installing NativeScript-related development modules. For example, by executing `tns install typescript`, TypeScript support is installed into the project. Look for modules in the npm registry whose name starts with `nativescript-dev` to discover other development modules for NativeScript.
+
+<% if(isHtml) { %>
+The `package.json` file must be a valid `package.json` describing the configuration of a NativeScript project. If missing or corrupted, you can recreate the file by running `$ tns init` in the directory of a NativeScript project.
 <% } %>
 
 ### Options
 * `--path` - Specifies the directory which contains the `package.json` file, if different from the current directory.
 
-<% if(isHtml) { %> 
+<% if(isHtml) { %>
 ### Related Commands
 
 Command | Description
diff --git a/lib/commands/install.ts b/lib/commands/install.ts
@@ -1,19 +1,28 @@
 ///<reference path="../.d.ts"/>
 "use strict";
 
+import * as path from 'path';
+
 export class InstallCommand implements ICommand {
 	constructor(private $platformsData: IPlatformsData,
 		private $platformService: IPlatformService,
 		private $projectData: IProjectData,
 		private $projectDataService: IProjectDataService,
 		private $pluginsService: IPluginsService,
-		private $logger: ILogger) { }
+		private $logger: ILogger,
+		private $fs: IFileSystem,
+		private $stringParameter: ICommandParameter,
+		private $npm: INodePackageManager) { }
 
 	public enableHooks = false;
 
-	public allowedParameters: ICommandParameter[] = [];
+	public allowedParameters: ICommandParameter[] = [this.$stringParameter];
 
 	public execute(args: string[]): IFuture<void> {
+		return args[0] ? this.installModule(args[0]) : this.installProjectDependencies();
+	}
+
+	private installProjectDependencies(): IFuture<void> {
 		return (() => {
 			let error: string = "";
 
@@ -23,19 +32,32 @@ export class InstallCommand implements ICommand {
 			_.each(this.$platformsData.platformsNames, platform => {
 				let platformData = this.$platformsData.getPlatformData(platform);
 				let frameworkPackageData = this.$projectDataService.getValue(platformData.frameworkPackageName).wait();
-				if(frameworkPackageData && frameworkPackageData.version) {
+				if (frameworkPackageData && frameworkPackageData.version) {
 					try {
 						this.$platformService.addPlatforms([`${platform}@${frameworkPackageData.version}`]).wait();
-					} catch(err) {
+					} catch (err) {
 						error += err;
 					}
 				}
 			});
 
-			if(error) {
+			if (error) {
 				this.$logger.error(error);
 			}
+		}).future<void>()();
+	}
+
+	private installModule(moduleName: string): IFuture<void> {
+		return (() => {
+			let projectDir = this.$projectData.projectDir;
+			process.env['TNS_PROJECT_DIR'] = projectDir;
+			process.env['TNS_HOOKS_DIR'] = path.join(projectDir, 'hooks');
+
+			if (!this.$fs.exists(moduleName).wait()) {
+				moduleName = 'nativescript-dev-' + moduleName;
+			}
 
+			this.$npm.install(moduleName, projectDir, { 'save-dev': true }).wait();
 		}).future<void>()();
 	}
 }
diff --git a/lib/common b/lib/common
@@ -1 +1 @@
-Subproject commit a4c9747cce9ec4ae6abfa16ced1fd44dab5a022f
+Subproject commit 317d386bc8d772410374786a345d77abe5d653c5
diff --git a/lib/config.ts b/lib/config.ts
@@ -37,6 +37,10 @@ export class StaticConfig extends staticConfigBaseLibPath.StaticConfigBase imple
 		this.RESOURCE_DIR_PATH = path.join(this.RESOURCE_DIR_PATH, "../../resources");
 	}
 
+	public get disableHooks() {
+		return true;
+	}
+
 	public get SYS_REQUIREMENTS_LINK(): string {
 		let linkToSysRequirements: string;
 		switch(process.platform) {
diff --git a/lib/services/platform-service.ts b/lib/services/platform-service.ts
@@ -19,6 +19,7 @@ export class PlatformService implements IPlatformService {
 		private $projectData: IProjectData,
 		private $projectDataService: IProjectDataService,
 		private $prompter: IPrompter,
+		private $hooksService: IHooksService,
 		private $commandsService: ICommandsService,
 		private $options: IOptions,
 		private $broccoliBuilder: IBroccoliBuilder,
@@ -147,6 +148,7 @@ export class PlatformService implements IPlatformService {
 		}).future<string[]>()();
 	}
 
+	@helpers.hook('prepare')
 	public preparePlatform(platform: string): IFuture<void> {
 		return (() => {
 			this.validatePlatform(platform);
diff --git a/test/platform-commands.ts b/test/platform-commands.ts
@@ -120,6 +120,7 @@ function createTestInjector() {
 		}
 	});
 	testInjector.register("projectFilesManager", ProjectFilesManagerLib.ProjectFilesManager);
+	testInjector.register("hooksService", stubs.HooksServiceStub);
 
 	return testInjector;
 }
diff --git a/test/platform-service.ts b/test/platform-service.ts
@@ -52,6 +52,7 @@ function createTestInjector() {
 		}
 	});
 	testInjector.register("projectFilesManager", ProjectFilesManagerLib.ProjectFilesManager);
+	testInjector.register("hooksService", stubs.HooksServiceStub);
 
 	return testInjector;
 }
diff --git a/test/stubs.ts b/test/stubs.ts
@@ -383,13 +383,11 @@ export class ProjectTemplatesService implements IProjectTemplatesService {
 }
 
 export class HooksServiceStub implements IHooksService {
-	initialize(commandName: string): void {
-	}
-	executeBeforeHooks(): IFuture<void> {
-		return (() => { }).future<void>()();
+	executeBeforeHooks(commandName: string): IFuture<void> {
+		return Future.fromResult();
 	}
-	executeAfterHooks(): IFuture<void> {
-		return (() => { }).future<void>()();
+	executeAfterHooks(commandName: string): IFuture<void> {
+		return Future.fromResult();
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -120,6 +120,7 @@ function createTestInjector() {`
`120`	`120`	`}`
`121`	`121`	`});`
`122`	`122`	`testInjector.register("projectFilesManager", ProjectFilesManagerLib.ProjectFilesManager);`
	`123`	`+ testInjector.register("hooksService", stubs.HooksServiceStub);`
`123`	`124`
`124`	`125`	`return testInjector;`
`125`	`126`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,7 @@ function createTestInjector() {`
`52`	`52`	`}`
`53`	`53`	`});`
`54`	`54`	`testInjector.register("projectFilesManager", ProjectFilesManagerLib.ProjectFilesManager);`
	`55`	`+ testInjector.register("hooksService", stubs.HooksServiceStub);`
`55`	`56`
`56`	`57`	`return testInjector;`
`57`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -383,13 +383,11 @@ export class ProjectTemplatesService implements IProjectTemplatesService {`
`383`	`383`	`}`
`384`	`384`
`385`	`385`	`export class HooksServiceStub implements IHooksService {`
`386`		`- initialize(commandName: string): void {`
`387`		`- }`
`388`		`- executeBeforeHooks(): IFuture<void> {`
`389`		`- return (() => { }).future<void>()();`
	`386`	`+ executeBeforeHooks(commandName: string): IFuture<void> {`
	`387`	`+ return Future.fromResult();`
`390`	`388`	`}`
`391`		`- executeAfterHooks(): IFuture<void> {`
`392`		`- return (() => { }).future<void>()();`
	`389`	`+ executeAfterHooks(commandName: string): IFuture<void> {`
	`390`	`+ return Future.fromResult();`
`393`	`391`	`}`
`394`	`392`	`}`
`395`	`393`