Add blueprint descriptions to ember help generate

Also display '(overridden)' next to overridden blueprints.

Addresses #1237
Addresses #1274

Pass options through printBasicHelp & printDetailedHelp

Hide overridden blueprints unless verbose flag is set

Add example descriptions to built-in blueprints

Add availableOptions to Blueprint

blueprints/acceptance-test/index.js

@@ -1,4 +1,3 @@
-var Blueprint = require('../../lib/models/blueprint');
-
-module.exports = Blueprint.extend({
-});
+module.exports = {
+  description: 'Generates an acceptance test for a feature.'
+};

blueprints/adapter-test/index.js

@@ -0,0 +1,3 @@
+module.exports = {
+  description: 'Generates an ember-data adapter unit test'
+};

blueprints/adapter/index.js

@@ -1,9 +1,14 @@
 var fs         = require('fs');
 var path       = require('path');
 var stringUtil = require('../../lib/utilities/string');
-var Blueprint  = require('../../lib/models/blueprint');
 
-module.exports = Blueprint.extend({
+module.exports = {
+  description: 'Generates an ember-data adapter.',
+
+  availableOptions: [
+    { name: 'base-class', type: String, default: 'application' }
+  ],
+
   locals: function(options) {
     var baseClass       = 'DS.RESTAdapter';
     var importStatement = 'import DS from \'ember-data\';';
@@ -27,4 +32,4 @@ module.exports = Blueprint.extend({
       baseClass: baseClass
     };
   }
-});
+};

blueprints/addon/index.js

@@ -7,6 +7,8 @@ var assign     = require('lodash-node/modern/objects/assign');
 var uniq       = require('lodash-node/underscore/arrays/uniq');
 
 module.exports = Blueprint.extend({
+  description: 'The default blueprint for ember-cli addons.',
+
   afterInstall: function(options) {
     if (options.dryRun) { return; }
 
@@ -47,6 +49,7 @@ module.exports = Blueprint.extend({
       emberCLIVersion: require('../../package').version
     }
   },
+
   files: function() {
     if (this._files) { return this._files; }
 
@@ -80,6 +83,7 @@ module.exports = Blueprint.extend({
 
     return path;
   },
+
   srcPath: function(file) {
     var filePath = path.resolve(this.path, 'files', file);
     if (fs.existsSync(filePath)) {

blueprints/app/index.js

@@ -1,7 +1,8 @@
-var Blueprint  = require('../../lib/models/blueprint');
 var stringUtil = require('../../lib/utilities/string');
 
-module.exports = Blueprint.extend({
+module.exports = {
+  description: 'The default blueprint for ember-cli projects.',
+
   locals: function(options) {
     var entity    = options.entity;
     var rawName   = entity.name;
@@ -15,4 +16,4 @@ module.exports = Blueprint.extend({
       emberCLIVersion: require('../../package').version
     }
   }
-});
+};

blueprints/blueprint/index.js

@@ -1,4 +1,3 @@
-var Blueprint = require('../../lib/models/blueprint');
-
-module.exports = Blueprint.extend({
-});
+module.exports = {
+  description: 'Generates a blueprint and defintion.'
+};

blueprints/component-test/index.js

@@ -0,0 +1,3 @@
+module.exports = {
+  description: 'Generates a component unit test.'
+};

blueprints/component/index.js

@@ -1,7 +1,9 @@
 var Blueprint = require('../../lib/models/blueprint');
 var SilentError = require('../../lib/errors/silent');
 
-module.exports = Blueprint.extend({
+module.exports = {
+  description: 'Generates a component. Name must contain a hyphen.',
+
   normalizeEntityName: function(entityName) {
     entityName = Blueprint.prototype.normalizeEntityName.apply(this, arguments);
 
@@ -19,4 +21,4 @@ module.exports = Blueprint.extend({
 
     return entityName;
   }
-});
+};

blueprints/controller-test/index.js

@@ -0,0 +1,3 @@
+module.exports = {
+  description: 'Generates a controller unit test.'
+};

blueprints/controller/index.js

@@ -1,4 +1,3 @@
-var Blueprint   = require('../../lib/models/blueprint');
 var SilentError = require('../../lib/errors/silent');
 var chalk       = require('chalk');
 
@@ -8,7 +7,13 @@ var TYPE_MAP = {
   basic: 'Controller'
 };
 
-module.exports = Blueprint.extend({
+module.exports = {
+  description: 'Generates a controller of the given type.',
+
+  availableOptions: [
+    { name: 'type', values: ['generic', 'object', 'array'], default: 'generic' }
+  ],
+
   beforeInstall: function(options) {
     var type = options.type;
 
@@ -31,4 +36,4 @@ module.exports = Blueprint.extend({
       baseClass: baseClass
     };
   }
-});
+};

blueprints/helper-test/index.js

@@ -0,0 +1,3 @@
+module.exports = {
+  description: 'Generates a helper unit test.'
+};

blueprints/helper/index.js

@@ -1,4 +1,3 @@
-var Blueprint = require('../../lib/models/blueprint');
-
-module.exports = Blueprint.extend({
-});
+module.exports = {
+  description: 'Generates a helper function.'
+};

blueprints/http-mock/index.js

@@ -1,6 +1,12 @@
-var Blueprint = require('../../lib/models/blueprint');
+var EOL = require('os').EOL;
+
+module.exports = {
+  description: 'Generates a mock api endpoint in /api prefix.',
+
+  anonymousOptions: [
+    'endpoint-path'
+  ],
 
-module.exports = Blueprint.extend({
   locals: function(options) {
     return {
       path: '/' + options.entity.name.replace(/^\//, '')
@@ -9,4 +15,4 @@ module.exports = Blueprint.extend({
   afterInstall: function() {
     return this.addPackageToProject('connect-restreamer', '^1.0.0');
   }
-});
+};

blueprints/http-proxy/index.js

@@ -1,7 +1,13 @@
-var Blueprint = require('../../lib/models/blueprint');
 var Promise   = require('../../lib/ext/promise');
 
-module.exports = Blueprint.extend({
+module.exports = {
+  description: 'Generates a relative proxy to another server.',
+
+  anonymousOptions: [
+    'local-path',
+    'remote-url'
+  ],
+
   locals: function(options) {
     var proxyUrl = options.args[2];
     return {
@@ -16,4 +22,4 @@ module.exports = Blueprint.extend({
       this.addPackageToProject('connect-restreamer', '^1.0.0')
     ]);
   }
-});
+};

blueprints/initializer-test/index.js

@@ -0,0 +1,3 @@
+module.exports = {
+  description: 'Generates an initialiser unit test.'
+};

blueprints/initializer/index.js

@@ -1,4 +1,3 @@
-var Blueprint = require('../../lib/models/blueprint');
-
-module.exports = Blueprint.extend({
-});
+module.exports = {
+  description: 'Generates an initializer.'
+};

blueprints/mixin-test/index.js

@@ -0,0 +1,3 @@
+module.exports = {
+  description: 'Generates a mixin unit test.'
+};

blueprints/mixin/index.js

@@ -1,4 +1,3 @@
-var Blueprint = require('../../lib/models/blueprint');
-
-module.exports = Blueprint.extend({
-});
+module.exports = {
+  description: 'Generates a mixin.'
+};

blueprints/model-test/index.js

@@ -0,0 +1,3 @@
+module.exports = {
+  description: 'Generates a model unit test.'
+};

blueprints/model/index.js

@@ -1,9 +1,15 @@
-var Blueprint   = require('../../lib/models/blueprint');
 var inflection  = require('inflection');
 var stringUtils = require('../../lib/utilities/string');
 var EOL         = require('os').EOL;
 
-module.exports = Blueprint.extend({
+module.exports = {
+  description: 'Generates an ember-data model.',
+
+  anonymousOptions: [
+    'name',
+    'attr:type'
+  ],
+
   locals: function(options) {
     var attrs = [];
     var needs = [];
@@ -36,7 +42,7 @@ module.exports = Blueprint.extend({
       needs: needs
     };
   }
-});
+};
 
 function dsAttr(name, type) {
   switch (type) {

blueprints/resource/index.js

@@ -3,7 +3,9 @@ var Promise    = require('../../lib/ext/promise');
 var merge      = require('lodash-node/compat/objects/merge');
 var inflection = require('inflection');
 
-module.exports = Blueprint.extend({
+module.exports = {
+  description: 'Generates a model and route.',
+
   install: function(options) {
     return this._process('install', options);
   },
@@ -49,11 +51,12 @@ module.exports = Blueprint.extend({
         name: inflection.singularize(options.entity.name)
       }
     });
+
     var routeOptions = merge({}, options, { type: 'resource' });
 
     return Promise.all([
       this._processBlueprint(type, 'model', modelOptions),
       this._processBlueprint(type, 'route', routeOptions)
     ]);
   }
-});
+};

blueprints/route-test/index.js

@@ -0,0 +1,3 @@
+module.exports = {
+  description: 'Generates a route unit test.'
+};

blueprints/route/index.js

@@ -1,11 +1,16 @@
-var Blueprint   = require('../../lib/models/blueprint');
 var SilentError = require('../../lib/errors/silent');
 var fs          = require('fs-extra');
 var inflection  = require('inflection');
 var path        = require('path');
 var EOL         = require('os').EOL;
 
-module.exports = Blueprint.extend({
+module.exports = {
+  description: 'Generates a route and registers it with the router.',
+
+  availableOptions: [
+    { name: 'type', values: ['route', 'resource'], default: 'route' }
+  ],
+
   beforeInstall: function(options) {
     var type = options.type;
 
@@ -49,7 +54,7 @@ module.exports = Blueprint.extend({
       });
     }
   }
-});
+};
 
 function removeRouteFromRouter(name, options) {
   var type       = options.type || 'route';

blueprints/serializer-test/index.js

@@ -0,0 +1,3 @@
+module.exports = {
+  description: 'Generates a serializer unit test.'
+};

blueprints/serializer/index.js

@@ -1,4 +1,3 @@
-var Blueprint = require('../../lib/models/blueprint');
-
-module.exports = Blueprint.extend({
-});
+module.exports = {
+  description: 'Generates an ember-data serializer.'
+};

blueprints/service-test/index.js

@@ -0,0 +1,3 @@
+module.exports = {
+  description: 'Generates a route unit test.'
+};

blueprints/service/index.js

@@ -1,4 +1,3 @@
-var Blueprint = require('../../lib/models/blueprint');
-
-module.exports = Blueprint.extend({
-});
+module.exports = {
+  description: 'Generates a service and initializer for injections.'
+};

blueprints/template/index.js

@@ -1,4 +1,3 @@
-var Blueprint = require('../../lib/models/blueprint');
-
-module.exports = Blueprint.extend({
-});
+module.exports = {
+  description: 'Generates a template.'
+};

blueprints/transform-test/index.js

@@ -0,0 +1,3 @@
+module.exports = {
+  description: 'Generates a transform unit test.'
+};

blueprints/transform/index.js

@@ -1,4 +1,3 @@
-var Blueprint = require('../../lib/models/blueprint');
-
-module.exports = Blueprint.extend({
-});
+module.exports = {
+  description: 'Generates an ember-data value transform.'
+};

blueprints/util-test/index.js

@@ -0,0 +1,3 @@
+module.exports = {
+  description: 'Generates a util unit test.'
+};

blueprints/util/index.js

@@ -1,4 +1,3 @@
-var Blueprint = require('../../lib/models/blueprint');
-
-module.exports = Blueprint.extend({
-});
+module.exports = {
+  description: 'Generates a simple utility module/function.'
+};

blueprints/view-test/index.js

@@ -0,0 +1,3 @@
+module.exports = {
+  description: 'Generates a view unit test.'
+};

blueprints/view/index.js

@@ -1,4 +1,3 @@
-var Blueprint = require('../../lib/models/blueprint');
-
-module.exports = Blueprint.extend({
-});
+module.exports = {
+  description: 'Generates a view subclass.'
+};