need to exclude ourselves when looking up blueprints

blueprints/acceptance-test/index.js

@@ -1,7 +1,10 @@
+var ancestralBlueprint = require('../../lib/utilities/ancestral-blueprint');
+
 module.exports = {
   description: 'Generates an acceptance test for a feature.',
   locals: function() {
-    var blueprint = this.lookupBlueprint('acceptance-test');
+    var blueprint = ancestralBlueprint('acceptance-test', this.project);
+    blueprint.project = this.project;
     return blueprint.locals.apply(blueprint, arguments);
   }
 };

blueprints/adapter-test/index.js

@@ -1,8 +1,10 @@
+var ancestralBlueprint = require('../../lib/utilities/ancestral-blueprint');
+
 module.exports = {
   description: 'Generates an ember-data adapter unit test.',
 
   locals: function() {
-    var blueprint = this.lookupBlueprint('adapter-test');
+    var blueprint = ancestralBlueprint('adapter-test', this.project);
     return blueprint.locals.apply(blueprint, arguments);
   }
 };

blueprints/adapter/index.js

@@ -1,11 +1,13 @@
+var ancestralBlueprint = require('../../lib/utilities/ancestral-blueprint');
+
 module.exports = {
   description: 'Generates an ember-data adapter.',
 
   availableOptions: [
     { name: 'base-class', type: String }
   ],
   locals: function() {
-    var blueprint = this.lookupBlueprint('adapter');
+    var blueprint = ancestralBlueprint('adapter', this.project);
     var locals = blueprint.locals.apply(blueprint, arguments);
     locals.importStatement = locals.importStatement.replace(/;$/, '');
     return locals;

blueprints/addon-import/index.js

@@ -1,13 +1,15 @@
+var ancestralBlueprint = require('../../lib/utilities/ancestral-blueprint');
+
 module.exports = {
   description: 'Generates an import wrapper',
 
   fileMapTokens: function() {
-    var blueprint = this.lookupBlueprint('addon-import');
+    var blueprint = ancestralBlueprint('addon-import', this.project);
     return blueprint.fileMapTokens.apply(blueprint, arguments);
   },
 
   locals: function() {
-    var blueprint = this.lookupBlueprint('addon-import');
+    var blueprint = ancestralBlueprint('addon-import', this.project);
     return blueprint.locals.apply(blueprint, arguments);
   }
 };

blueprints/component-addon/index.js

@@ -1,18 +1,20 @@
+var ancestralBlueprint = require('../../lib/utilities/ancestral-blueprint');
+
 module.exports = {
   description: 'Generates a component. Name must contain a hyphen.',
 
   fileMapTokens: function() {
-    var blueprint = this.lookupBlueprint('component-addon');
+    var blueprint = ancestralBlueprint('component-addon', this.project);
     return blueprint.fileMapTokens.apply(blueprint, arguments);
   },
 
   normalizeEntityName: function() {
-    var blueprint = this.lookupBlueprint('component-addon');
+    var blueprint = ancestralBlueprint('component-addon', this.project);
     return blueprint.normalizeEntityName.apply(blueprint, arguments);
   },
 
   locals: function() {
-    var blueprint = this.lookupBlueprint('component-addon');
+    var blueprint = ancestralBlueprint('component-addon', this.project);
     return blueprint.locals.apply(blueprint, arguments);
   }
 };

blueprints/component-test/index.js

@@ -1,3 +1,5 @@
+var ancestralBlueprint = require('../../lib/utilities/ancestral-blueprint');
+
 var stringUtils = require('../../lib/utilities/string');
 var EOL = require('os').EOL;
 
@@ -19,12 +21,12 @@ module.exports = {
   ],
 
   fileMapTokens: function() {
-    var blueprint = this.lookupBlueprint('component-test');
+    var blueprint = ancestralBlueprint('component-test', this.project);
     return blueprint.fileMapTokens.apply(blueprint, arguments);
   },
 
   locals: function(options) {
-    var blueprint = this.lookupBlueprint('component-test');
+    var blueprint = ancestralBlueprint('component-test', this.project);
     var locals = blueprint.locals.apply(blueprint, arguments);
 
     var dasherizedModuleName = stringUtils.dasherize(options.entity.name);

blueprints/component/index.js

@@ -1,3 +1,5 @@
+var ancestralBlueprint = require('../../lib/utilities/ancestral-blueprint');
+
 module.exports = {
   description: 'Generates a component. Name must contain a hyphen.',
 
@@ -13,17 +15,17 @@ module.exports = {
   ],
 
   fileMapTokens: function() {
-    var blueprint = this.lookupBlueprint('component');
+    var blueprint = ancestralBlueprint('component', this.project);
     return blueprint.fileMapTokens.apply(blueprint, arguments);
   },
 
   normalizeEntityName: function() {
-    var blueprint = this.lookupBlueprint('component');
+    var blueprint = ancestralBlueprint('component', this.project);
     return blueprint.normalizeEntityName.apply(blueprint, arguments);
   },
 
   locals: function() {
-    var blueprint = this.lookupBlueprint('component');
+    var blueprint = ancestralBlueprint('component', this.project);
     var locals = blueprint.locals.apply(blueprint, arguments);
 
     // This is here to work around this bug in ember-cli:

blueprints/helper-test/index.js

@@ -1,8 +1,10 @@
+var ancestralBlueprint = require('../../lib/utilities/ancestral-blueprint');
+
 module.exports = {
   description: 'Generates a helper unit test.',
 
   locals: function() {
-    var blueprint = this.lookupBlueprint('helper-test');
+    var blueprint = ancestralBlueprint('helper-test', this.project);
     return blueprint.locals.apply(blueprint, arguments);
   }
 };

blueprints/helper/index.js

@@ -1,8 +1,10 @@
+var ancestralBlueprint = require('../../lib/utilities/ancestral-blueprint');
+
 module.exports = {
   description: 'Generates a helper function.',
 
   normalizeEntityName: function() {
-    var blueprint = this.lookupBlueprint('helper');
+    var blueprint = ancestralBlueprint('helper', this.project);
     return blueprint.normalizeEntityName.apply(blueprint, arguments);
   }
 };

blueprints/initializer-test/index.js

@@ -1,8 +1,10 @@
+var ancestralBlueprint = require('../../lib/utilities/ancestral-blueprint');
+
 module.exports = {
   description: 'Generates an initializer unit test.',
 
   locals: function() {
-    var blueprint = this.lookupBlueprint('initializer-test');
+    var blueprint = ancestralBlueprint('initializer-test', this.project);
     return blueprint.locals.apply(blueprint, arguments);
   }
 };

blueprints/mixin-test/index.js

@@ -1,8 +1,10 @@
+var ancestralBlueprint = require('../../lib/utilities/ancestral-blueprint');
+
 module.exports = {
   description: 'Generates a mixin unit test.',
 
   locals: function() {
-    var blueprint = this.lookupBlueprint('mixin-test');
+    var blueprint = ancestralBlueprint('mixin-test', this.project);
     return blueprint.locals.apply(blueprint, arguments);
   }
 };

blueprints/model-test/index.js

@@ -1,8 +1,10 @@
+var ancestralBlueprint = require('../../lib/utilities/ancestral-blueprint');
+
 module.exports = {
   description: 'Generates a model unit test.',
 
   locals: function() {
-    var blueprint = this.lookupBlueprint('model-test');
+    var blueprint = ancestralBlueprint('model-test', this.project);
     return blueprint.locals.apply(blueprint, arguments);
   }
 };

blueprints/route-addon/index.js

@@ -1 +1 @@
-module.exports = require('ember-cli/blueprints/route-addon');
+module.exports = require('ember-cli-legacy-blueprints/blueprints/route-addon');

blueprints/route-test/index.js

@@ -1 +1 @@
-module.exports = require('ember-cli/blueprints/route-test');
+module.exports = require('ember-cli-legacy-blueprints/blueprints/route-test');

blueprints/route/index.js

@@ -1,3 +1,5 @@
+var ancestralBlueprint = require('../../lib/utilities/ancestral-blueprint');
+
 var fs         = require('fs-extra');
 var path       = require('path');
 var EOL        = require('os').EOL;
@@ -20,12 +22,12 @@ module.exports = {
   ],
 
   fileMapTokens: function() {
-    var blueprint = this.lookupBlueprint('route')
+    var blueprint = ancestralBlueprint('route', this.project)
     return blueprint.fileMapTokens.apply(blueprint, arguments);
   },
 
   shouldTouchRouter: function(name, options) {
-    return this.lookupBlueprint('route').shouldTouchRouter(name, options);
+    return ancestralBlueprint('route', this.project).shouldTouchRouter(name, options);
   },
 
   afterInstall: function(options) {

blueprints/serializer-test/index.js

@@ -1 +1 @@
-module.exports = require('ember-cli/blueprints/serializer-test');
+module.exports = require('ember-cli-legacy-blueprints/blueprints/serializer-test');

blueprints/service-test/index.js

@@ -1 +1 @@
-module.exports = require('ember-cli/blueprints/service-test');
+module.exports = require('ember-cli-legacy-blueprints/blueprints/service-test');

blueprints/service/index.js

@@ -1 +1 @@
-module.exports = require('ember-cli/blueprints/service');
+module.exports = require('ember-cli-legacy-blueprints/blueprints/service');

blueprints/template/index.js

@@ -1 +1 @@
-module.exports = require('ember-cli/blueprints/template');
+module.exports = require('ember-cli-legacy-blueprints/blueprints/template');

blueprints/test-helper/index.js

@@ -1 +1 @@
-module.exports = require('ember-cli/blueprints/test-helper');
+module.exports = require('ember-cli-legacy-blueprints/blueprints/test-helper');

blueprints/transform-test/index.js

@@ -1 +1 @@
-module.exports = require('ember-cli/blueprints/transform-test');
+module.exports = require('ember-cli-legacy-blueprints/blueprints/transform-test');

blueprints/transform/index.js

@@ -1 +1 @@
-module.exports = require('ember-cli/blueprints/transform');
+module.exports = require('ember-cli-legacy-blueprints/blueprints/transform');

blueprints/util-test/index.js

@@ -1 +1 @@
-module.exports = require('ember-cli/blueprints/util-test');
+module.exports = require('ember-cli-legacy-blueprints/blueprints/util-test');

blueprints/util/index.js

@@ -1 +1 @@
-module.exports = require('ember-cli/blueprints/util');
+module.exports = require('ember-cli-legacy-blueprints/blueprints/util');

blueprints/view-test/index.js

@@ -1 +1 @@
-module.exports = require('ember-cli/blueprints/view-test');
+module.exports = require('ember-cli-legacy-blueprints/blueprints/view-test');

blueprints/view/index.js

@@ -1 +1 @@
-module.exports = require('ember-cli/blueprints/view');
+module.exports = require('ember-cli-legacy-blueprints/blueprints/view');

lib/utilities/ancestral-blueprint.js

@@ -0,0 +1,18 @@
+'use strict';
+
+var Blueprint = require('ember-cli/lib/models/blueprint');
+
+/**
+  Find the non-coffeescript version of the blueprint to bootstrap off
+ */
+module.exports = function(dasherizedName, project) {
+  var projectPaths = project ? project.blueprintLookupPaths() : [];
+
+  projectPaths = projectPaths.filter(function(p) {
+    return !p.match(/ember-cli-coffeescript/);
+  });
+
+  return Blueprint.lookup(dasherizedName, {
+    paths: projectPaths
+  });
+};

package.json

@@ -27,7 +27,7 @@
   "devDependencies": {
     "broccoli-asset-rev": "^2.2.0",
     "ember-ajax": "0.7.1",
-    "ember-cli": "2.4.1",
+    "ember-cli": "2.6.2",
     "ember-cli-app-version": "^1.0.0",
     "ember-cli-babel": "^5.1.5",
     "ember-cli-dependency-checker": "^1.2.0",
@@ -55,6 +55,7 @@
     "broccoli-persistent-filter": "^1.1.0",
     "chalk": "^1.0.0",
     "coffeelint": "^1.6.1",
+    "ember-cli-legacy-blueprints": "^0.1.1",
     "ember-cli-version-checker": "^1.0.1",
     "fs-extra": "^0.11.1",
     "ignore": "^3.0.9",