Merge pull request #4287 from trabus/dummy-generate

[ENHANCEMENT] Add ability to generate blueprints into addon `tests/dummy/app`
ember-cli · Jun 13, 2015 · 80a44a0 · 80a44a0
2 parents d50beac + 2feffd3
commit 80a44a0
Show file tree

Hide file tree

Showing 7 changed files with 827 additions and 6 deletions.
diff --git a/blueprints/component/index.js b/blueprints/component/index.js
@@ -55,7 +55,7 @@ module.exports = {
     var importTemplate = '';
     var contents       = '';
     // if we're in an addon, build import statement
-    if (options.project.isEmberCLIAddon() || options.inRepoAddon) {
+    if (options.project.isEmberCLIAddon() || options.inRepoAddon && !options.inDummy) {
       if(options.pod) {
         templatePath   = './template';
       } else {

diff --git a/blueprints/route/index.js b/blueprints/route/index.js
@@ -35,6 +35,10 @@ module.exports = {
           return path.join('lib', options.inRepoAddon, 'addon');
         }
 
+        if (options.inDummy) {
+          return path.join('tests','dummy','app');
+        }
+
         if (options.inAddon) {
           return 'addon';
         }

diff --git a/lib/commands/generate.js b/lib/commands/generate.js
@@ -23,6 +23,7 @@ module.exports = Command.extend({
     { name: 'dry-run', type: Boolean, default: false, aliases: ['d'] },
     { name: 'verbose', type: Boolean, default: false, aliases: ['v'] },
     { name: 'pod', type: Boolean, default: false, aliases: ['p'] },
+    { name: 'dummy', type: Boolean, default: false, aliases: ['dum','id']},
     { name: 'in-repo-addon', type: String, default: null, aliases: ['in-repo', 'ir']}
   ],
 

diff --git a/lib/models/blueprint.js b/lib/models/blueprint.js
@@ -598,6 +598,9 @@ Blueprint.prototype._fileMapTokens = function(options) {
       if (options.inRepoAddon) {
         return path.join('lib',options.inRepoAddon, 'addon');
       }
+      if (options.inDummy) {
+        return path.join('tests','dummy','app');
+      }
       if (options.inAddon) {
         return 'addon';
       }
@@ -796,6 +799,7 @@ Blueprint.prototype._locals = function(options) {
   var podModulePrefix = this.project.config().podModulePrefix || '';
   var podPath = podModulePrefix.substr(podModulePrefix.lastIndexOf('/') + 1);
   var inAddon = this.project.isEmberCLIAddon() || options.inRepoAddon !== null;
+  var inDummy = this.project.isEmberCLIAddon() ? options.dummy : false;
   var sanitizedModuleName = moduleName.replace(/\//g, '-');
   var customLocals = this.locals(options);
 
@@ -805,6 +809,7 @@ Blueprint.prototype._locals = function(options) {
     hasPathToken: this.hasPathToken,
     inAddon: inAddon,
     inRepoAddon: options.inRepoAddon,
+    inDummy: inDummy,
     blueprintName: this.name,
     originBlueprintName: originBlueprintName,
     dasherizedModuleName: stringUtils.dasherize(moduleName),

diff --git a/lib/tasks/generate-from-blueprint.js b/lib/tasks/generate-from-blueprint.js
@@ -30,6 +30,14 @@ module.exports = Task.extend({
       return Promise.resolve();
     }
 
+    if (options.dummy) {
+      // don't install test or addon reexport for dummy
+      if (this.project.isEmberCLIAddon()) {
+        testBlueprint = null;
+        addonBlueprint = null;
+      }
+    }
+
     var entity = {
       name: options.args[1],
       options: parseOptions(options.args.slice(2))