Import blueprints from ember-cli

.npmignore

@@ -0,0 +1 @@
+node-tests/

.travis.yml

@@ -73,4 +73,5 @@ env:
     - TEST_SUITE=built-tests EMBER_ENV=production DISABLE_JSCS=true DISABLE_JSHINT=true
     - TEST_SUITE=old-jquery-and-extend-prototypes
     - TEST_SUITE=node DISABLE_JSCS=true DISABLE_JSHINT=true
+    - TEST_SUITE=blueprints
     - TEST_SUITE=sauce

bin/run-tests.js

@@ -158,6 +158,11 @@ switch (process.env.TEST_SUITE) {
     console.log('suite: node');
     require('./run-node-tests');
     return;
+  case 'blueprints':
+    console.log('suite: blueprints');
+    require('../node-tests/nodetest-runner');
+    server.close();
+    return;
   case 'sauce':
     console.log('suite: sauce');
     require('./run-sauce-tests');

blueprints/-addon-import.js

@@ -0,0 +1,54 @@
+/*jshint node:true*/
+
+var stringUtil  = require('ember-cli-string-utils');
+var path        = require('path');
+var inflector   = require('inflection');
+
+module.exports = {
+  description: 'Generates an import wrapper.',
+
+  fileMapTokens: function() {
+    return {
+      __name__: function(options) {
+        if (options.pod && options.hasPathToken) {
+          return options.locals.blueprintName;
+        }
+        return options.dasherizedModuleName;
+      },
+      __path__: function(options) {
+        if (options.pod && options.hasPathToken) {
+          return path.join(options.podPath, options.dasherizedModuleName);
+        }
+        return inflector.pluralize(options.locals.blueprintName);
+      },
+      __root__: function(options) {
+        if (options.inRepoAddon) {
+          return path.join('lib', options.inRepoAddon, 'app');
+        }
+        return 'app';
+      }
+    };
+  },
+
+  locals: function(options) {
+    var addonRawName       = options.inRepoAddon ? options.inRepoAddon : options.project.name();
+    var addonName          = stringUtil.dasherize(addonRawName);
+    var fileName           = stringUtil.dasherize(options.entity.name);
+    var blueprintName      = options.originBlueprintName;
+    var modulePathSegments = [addonName, inflector.pluralize(options.originBlueprintName), fileName];
+
+    if (blueprintName.match(/-addon/)) {
+      blueprintName = blueprintName.substr(0,blueprintName.indexOf('-addon'));
+      modulePathSegments = [addonName, inflector.pluralize(blueprintName), fileName];
+    }
+
+    if (options.pod) {
+      modulePathSegments = [addonName, fileName, blueprintName];
+    }
+
+    return {
+      modulePath: modulePathSegments.join('/'),
+      blueprintName: blueprintName
+    };
+  }
+};

blueprints/acceptance-test/index.js

@@ -0,0 +1,29 @@
+/*jshint node:true*/
+
+var testInfo    = require('ember-cli-test-info');
+var pathUtil    = require('ember-cli-path-utils');
+var stringUtils = require('ember-cli-string-utils');
+var existsSync  = require('exists-sync');
+var path        = require('path');
+var useTestFrameworkDetector = require('../test-framework-detector');
+
+module.exports = useTestFrameworkDetector({
+  description: 'Generates an acceptance test for a feature.',
+
+  locals: function(options) {
+    var testFolderRoot = stringUtils.dasherize(options.project.name());
+
+    if (options.project.isEmberCLIAddon()) {
+      testFolderRoot = pathUtil.getRelativeParentPath(options.entity.name, -1, false);
+    }
+
+    var destroyAppExists =
+      existsSync(path.join(this.project.root, '/tests/helpers/destroy-app.js'));
+
+    return {
+      testFolderRoot: testFolderRoot,
+      friendlyTestName: testInfo.name(options.entity.name, 'Acceptance', null),
+      destroyAppExists: destroyAppExists
+    };
+  }
+});

blueprints/acceptance-test/mocha-files/tests/acceptance/__name__-test.js

@@ -0,0 +1,25 @@
+/* jshint expr:true */
+import { describe, it, beforeEach, afterEach } from 'mocha';
+import { expect } from 'chai';
+import startApp from '../helpers/start-app';
+<% if (destroyAppExists) { %>import destroyApp from '../helpers/destroy-app';<% } else { %>import Ember from 'ember';<% } %>
+
+describe('<%= friendlyTestName %>', function() {
+  let application;
+
+  beforeEach(function() {
+    application = startApp();
+  });
+
+  afterEach(function() {
+    <% if (destroyAppExists) { %>destroyApp(application);<% } else { %>Ember.run(application, 'destroy');<% } %>
+  });
+
+  it('can visit /<%= dasherizedModuleName %>', function() {
+    visit('/<%= dasherizedModuleName %>');
+
+    andThen(function() {
+      expect(currentURL()).to.equal('/<%= dasherizedModuleName %>');
+    });
+  });
+});

blueprints/acceptance-test/qunit-files/tests/acceptance/__name__-test.js

@@ -0,0 +1,12 @@
+import { test } from 'qunit';
+import moduleForAcceptance from '<%= testFolderRoot %>/tests/helpers/module-for-acceptance';
+
+moduleForAcceptance('<%= friendlyTestName %>');
+
+test('visiting /<%= dasherizedModuleName %>', function(assert) {
+  visit('/<%= dasherizedModuleName %>');
+
+  andThen(function() {
+    assert.equal(currentURL(), '/<%= dasherizedModuleName %>');
+  });
+});

blueprints/component-addon/files/__root__/__path__/__name__.js

@@ -0,0 +1 @@
+export { default } from '<%= modulePath %>';

blueprints/component-addon/index.js

@@ -0,0 +1,56 @@
+/*jshint node:true*/
+
+var stringUtil         = require('ember-cli-string-utils');
+var validComponentName = require('ember-cli-valid-component-name');
+var getPathOption      = require('ember-cli-get-component-path-option');
+var path               = require('path');
+var normalizeEntityName = require('ember-cli-normalize-entity-name');
+
+module.exports = {
+  description: 'Generates a component. Name must contain a hyphen.',
+
+  fileMapTokens: function() {
+    return {
+      __path__: function(options) {
+        if (options.pod) {
+          return path.join(options.podPath, options.locals.path, options.dasherizedModuleName);
+        }
+        return 'components';
+      },
+      __name__: function(options) {
+        if (options.pod) {
+          return 'component';
+        }
+        return options.dasherizedModuleName;
+      },
+      __root__: function(options) {
+        if (options.inRepoAddon) {
+          return path.join('lib', options.inRepoAddon, 'app');
+        }
+        return 'app';
+      }
+    };
+  },
+
+  normalizeEntityName: function(entityName) {
+    entityName = normalizeEntityName(entityName);
+
+    return validComponentName(entityName);
+  },
+
+  locals: function(options) {
+    var addonRawName   = options.inRepoAddon ? options.inRepoAddon : options.project.name();
+    var addonName      = stringUtil.dasherize(addonRawName);
+    var fileName       = stringUtil.dasherize(options.entity.name);
+    var importPathName       = [addonName, 'components', fileName].join('/');
+
+    if (options.pod) {
+      importPathName = [addonName, 'components', fileName,'component'].join('/');
+    }
+
+    return {
+      modulePath: importPathName,
+      path: getPathOption(options)
+    };
+  }
+};

blueprints/component-test/index.js

@@ -0,0 +1,68 @@
+/*jshint node:true*/
+
+var path          = require('path');
+var testInfo      = require('ember-cli-test-info');
+var stringUtil    = require('ember-cli-string-utils');
+var isPackageMissing = require('ember-cli-is-package-missing');
+var getPathOption = require('ember-cli-get-component-path-option');
+var useTestFrameworkDetector = require('../test-framework-detector');
+
+module.exports = useTestFrameworkDetector({
+  description: 'Generates a component integration or unit test.',
+
+  availableOptions: [
+    {
+      name: 'test-type',
+      type: ['integration', 'unit'],
+      default: 'integration',
+      aliases:[
+        { 'i': 'integration'},
+        { 'u': 'unit'},
+        { 'integration': 'integration' },
+        { 'unit': 'unit' }
+      ]
+    }
+  ],
+
+  fileMapTokens: function() {
+    return {
+      __testType__: function(options) {
+        return options.locals.testType || 'integration';
+      },
+      __path__: function(options) {
+        if (options.pod) {
+          return path.join(options.podPath, options.locals.path, options.dasherizedModuleName);
+        }
+        return 'components';
+      }
+    };
+  },
+  locals: function(options) {
+    var dasherizedModuleName = stringUtil.dasherize(options.entity.name);
+    var componentPathName = dasherizedModuleName;
+    var testType = options.testType || 'integration';
+    var friendlyTestDescription = testInfo.description(options.entity.name, 'Integration', 'Component');
+
+    if (options.pod && options.path !== 'components' && options.path !== '') {
+      componentPathName = [options.path, dasherizedModuleName].join('/');
+    }
+
+    if (options.testType === 'unit') {
+      friendlyTestDescription = testInfo.description(options.entity.name, 'Unit', 'Component');
+    }
+
+    return {
+      path: getPathOption(options),
+      testType: testType,
+      componentPathName: componentPathName,
+      friendlyTestDescription: friendlyTestDescription
+    };
+  },
+  afterInstall: function(options) {
+    if (!options.dryRun && options.testType === 'integration' && isPackageMissing(this, 'ember-cli-htmlbars-inline-precompile')) {
+      return this.addPackagesToProject([
+        { name: 'ember-cli-htmlbars-inline-precompile', target: '^0.3.1' }
+      ]);
+    }
+  }
+});

blueprints/component-test/mocha-files/tests/__testType__/__path__/__test__.js

@@ -0,0 +1,32 @@
+/* jshint expr:true */
+import { expect } from 'chai';
+import { describeComponent, it } from 'ember-mocha';<% if (testType === 'integration') { %>
+import hbs from 'htmlbars-inline-precompile';<% } %>
+
+describeComponent('<%= componentPathName %>', '<%= friendlyTestDescription %>',
+  {
+    <% if (testType === 'integration' ) { %>integration: true<% } else if(testType === 'unit') { %>// Specify the other units that are required for this test
+    // needs: ['component:foo', 'helper:bar'],
+    unit: true<% } %>
+  },
+  function() {
+    it('renders', function() {
+      <% if (testType === 'integration' ) { %>// Set any properties with this.set('myProperty', 'value');
+      // Handle any actions with this.on('myAction', function(val) { ... });
+      // Template block usage:
+      // this.render(hbs`
+      //   {{#<%= dasherizedModuleName %>}}
+      //     template content
+      //   {{/<%= dasherizedModuleName %>}}
+      // `);
+
+      this.render(hbs`{{<%= dasherizedModuleName %>}}`);
+      expect(this.$()).to.have.length(1);<% } else if(testType === 'unit') { %>// creates the component instance
+      let component = this.subject();
+      // renders the component on the page
+      this.render();
+      expect(component).to.be.ok;
+      expect(this.$()).to.have.length(1);<% } %>
+    });
+  }
+);

blueprints/component-test/qunit-files/tests/__testType__/__path__/__test__.js

@@ -0,0 +1,31 @@
+import { moduleForComponent, test } from 'ember-qunit';<% if (testType === 'integration') { %>
+import hbs from 'htmlbars-inline-precompile';<% } %>
+
+moduleForComponent('<%= componentPathName %>', '<%= friendlyTestDescription %>', {
+  <% if (testType === 'integration' ) { %>integration: true<% } else if(testType === 'unit') { %>// Specify the other units that are required for this test
+  // needs: ['component:foo', 'helper:bar'],
+  unit: true<% } %>
+});
+
+test('it renders', function(assert) {
+  <% if (testType === 'integration' ) { %>// Set any properties with this.set('myProperty', 'value');
+  // Handle any actions with this.on('myAction', function(val) { ... });
+
+  this.render(hbs`{{<%= componentPathName %>}}`);
+
+  assert.equal(this.$().text().trim(), '');
+
+  // Template block usage:
+  this.render(hbs`
+    {{#<%= componentPathName %>}}
+      template block text
+    {{/<%= componentPathName %>}}
+  `);
+
+  assert.equal(this.$().text().trim(), 'template block text');<% } else if(testType === 'unit') { %>
+  // Creates the component instance
+  /*let component =*/ this.subject();
+  // Renders the component to the page
+  this.render();
+  assert.equal(this.$().text().trim(), '');<% } %>
+});

blueprints/component/files/__root__/__path__/__name__.js

@@ -0,0 +1,4 @@
+import Ember from 'ember';
+<%= importTemplate %>
+export default Ember.Component.extend({<%= contents %>
+});

blueprints/component/files/__root__/__templatepath__/__templatename__.hbs

@@ -0,0 +1 @@
+{{yield}}