Fix to get ember version from ember-source

.gitignore

@@ -6,10 +6,8 @@
 
 # dependencies
 /node_modules
-/bower_components
 
 # misc
-/.sass-cache
 /connect.lock
 /coverage/*
 /libpeerconnection.log

.npmignore

@@ -1,17 +1,12 @@
-/bower_components
-/config/ember-try.js
 /dist
-/tests
 /tmp
 **/.gitkeep
-.bowerrc
 .editorconfig
 .ember-cli
 .gitignore
 .eslintrc.js
 .watchmanconfig
 .travis.yml
-bower.json
 ember-cli-build.js
 testem.js
 /.idea

.travis.yml

@@ -1,7 +1,7 @@
 ---
 language: node_js
 node_js:
-  - "4"
+  - "6"
 
 sudo: false
 
@@ -13,13 +13,10 @@ before_install:
   - npm config set spin false
   - curl -o- -L https://yarnpkg.com/install.sh | bash
   - export PATH=$HOME/.yarn/bin:$PATH
-  - yarn global add bower
   - yarn --version
-  - bower --version
 
 install:
   - yarn install
-  - bower install
 
 script:
   - yarn run nodetest

fastboot-tests/fixtures/second/.eslintrc.js

@@ -0,0 +1,13 @@
+module.exports = {
+  root: true,
+  parserOptions: {
+    ecmaVersion: 6,
+    sourceType: 'module'
+  },
+  extends: 'eslint:recommended',
+  env: {
+    browser: true
+  },
+  rules: {
+  }
+};

fastboot-tests/second-test.js

@@ -6,7 +6,7 @@ const setupTest = require('../lib/tests/setup');
 describe('second', function() {
   setupTest('second', {
     installPackages: {
-      'ember-bootstrap': 'kaliber5/ember-bootstrap#master' // @todo replace with release
+      'ember-bootstrap': '1.0.0-alpha.10'
     }
   });
 

lib/util/app-manager.js

@@ -43,8 +43,7 @@ class AppManager {
         return app.run('npm', 'install')
           .then(() => {
             // run default blueprints of installed packages
-            return RSVP.all(Object.keys(packages).map((pkgName) => app.runEmberCommand('generate', pkgName)))
-              .catch(() => {});
+            return RSVP.all(Object.keys(packages).map((pkgName) => app.runEmberCommand('generate', pkgName).catch(() => {})));
           });
       })
       .then(function() {

lib/util/utilities.js

@@ -3,13 +3,33 @@
 const fs = require('fs-extra');
 const path = require('path');
 
-function readAddonEmberVersion() {
+function readAddonEmberVersionFromBower() {
   let bowerJSONPath = path.join(findAddonPath(), 'bower.json');
   let bowerJSON = fs.readJsonSync(bowerJSONPath);
 
   return bowerJSON.dependencies['ember'];
 }
 
+function readAddonEmberVersionFromNpm() {
+  let packageJSONPath = path.join(findAddonPath(), 'package.json');
+  let packageJSON = fs.readJsonSync(packageJSONPath);
+
+  return packageJSON.devDependencies['ember-source'] || packageJSON.dependencies['ember-source'];
+}
+
+function readAddonEmberVersion() {
+  let emberVersion;
+  try {
+    emberVersion = readAddonEmberVersionFromNpm();
+    if (!emberVersion) {
+      emberVersion = readAddonEmberVersionFromBower();
+    }
+  }
+  catch (e) {}
+
+  return emberVersion;
+}
+
 function findAddonPath() {
   return process.cwd();
 }