Merge branch 'master' into issue-template

Author: Brocco

docs/documentation/generate/service.md

@@ -10,6 +10,6 @@
 
 `--flat` Flag to indicate if a dir is created.
 
-`--module` (`-m`) Allows specification of the declaring module.
+`--module` (`-m`) Allows you to specify the module where the service should be provided
 
-`--spec` Specifies if a spec file is generated.
+`--spec` Specifies if a spec file is generated.

docs/documentation/home.md

@@ -50,7 +50,7 @@ End-to-end tests are run via [Protractor](https://angular.github.io/protractor/)
 * [ng e2e](e2e)
 * [ng build](build)
 * [ng get/ng set](config)
-* [ng docs](docs)
+* [ng doc](doc)
 * [ng eject](eject)
 
 ### Additional Information

packages/@angular/cli/blueprints/component/index.ts

@@ -12,6 +12,27 @@ const getFiles = Blueprint.prototype.files;
 const stringUtils = require('ember-cli-string-utils');
 const astUtils = require('../../utilities/ast-utils');
 
+const viewEncapsulationMap: any = {
+  'emulated': 'Emulated',
+  'native': 'Native',
+  'none': 'None'
+};
+
+const changeDetectionMap: any = {
+  'default': 'Default',
+  'onpush': 'OnPush'
+};
+
+function correctCase(options: any) {
+  if (options.viewEncapsulation) {
+    options.viewEncapsulation = viewEncapsulationMap[options.viewEncapsulation.toLowerCase()];
+  }
+
+  if (options.changeDetection) {
+    options.changeDetection = changeDetectionMap[options.changeDetection.toLowerCase()];
+  }
+}
+
 export default Blueprint.extend({
   description: '',
 
@@ -146,6 +167,8 @@ export default Blueprint.extend({
     options.changeDetection = options.changeDetection !== undefined ?
       options.changeDetection : CliConfig.getValue('defaults.component.changeDetection');
 
+    correctCase(options);
+
     return {
       dynamicPath: this.dynamicPath.dir.replace(this.dynamicPath.appRoot, ''),
       flat: options.flat,

packages/@angular/cli/blueprints/module/files/__path__/__name__-routing.module.ts

@@ -5,7 +5,6 @@ const routes: Routes = [];
 
 @NgModule({
   imports: [RouterModule.forChild(routes)],
-  exports: [RouterModule],
-  providers: []
+  exports: [RouterModule]
 })
 export class <%= classifiedModuleName %>RoutingModule { }

packages/@angular/cli/blueprints/ng/files/README.md

@@ -3,6 +3,7 @@
 This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version <%= version %>.
 
 ## Development server
+
 Run `ng serve` for a dev server. Navigate to `http://localhost:4200/`. The app will automatically reload if you change any of the source files.
 
 ## Code scaffolding

packages/@angular/cli/blueprints/ng/files/__path__/app/app-routing.module.ts

@@ -10,7 +10,6 @@ const routes: Routes = [
 
 @NgModule({
   imports: [RouterModule.forRoot(routes)],
-  exports: [RouterModule],
-  providers: []
+  exports: [RouterModule]
 })
 export class AppRoutingModule { }

packages/@angular/cli/blueprints/ng/files/gitignore

@@ -37,6 +37,6 @@ testem.log
 /e2e/*.js
 /e2e/*.map
 
-#System Files
+# System Files
 .DS_Store
 Thumbs.db

packages/@angular/cli/commands/generate.ts

@@ -57,6 +57,7 @@ const aliasMap: { [alias: string]: string } = {
   'c': 'component',
   'd': 'directive',
   'e': 'enum',
+  'g': 'guard',
   'i': 'interface',
   'm': 'module',
   'p': 'pipe',

tests/e2e/tests/generate/component/component-flag-case.ts

@@ -0,0 +1,15 @@
+import {join} from 'path';
+import {ng} from '../../../utils/process';
+import {expectFileToMatch} from '../../../utils/fs';
+
+
+export default function() {
+  const compDir = join('src', 'app', 'test');
+
+  return Promise.resolve()
+    .then(() => ng('generate', 'component', 'test', '-cd', 'onpush', '-ve', 'emulated'))
+    .then(() => expectFileToMatch(join(compDir, 'test.component.ts'),
+      /changeDetection: ChangeDetectionStrategy.OnPush/))
+    .then(() => expectFileToMatch(join(compDir, 'test.component.ts'),
+      /encapsulation: ViewEncapsulation.Emulated/));
+}