Update ember-cli to v2.14.0

Also, fix how to load package's package.json

.editorconfig

@@ -13,22 +13,8 @@ insert_final_newline = true
 indent_style = space
 indent_size = 2
 
-[*.js]
-indent_style = space
-indent_size = 2
-
 [*.hbs]
 insert_final_newline = false
-indent_style = space
-indent_size = 2
-
-[*.css]
-indent_style = space
-indent_size = 2
-
-[*.html]
-indent_style = space
-indent_size = 2
 
 [*.{diff,md}]
 trim_trailing_whitespace = false

.eslintrc.js

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

.gitignore

@@ -1,4 +1,4 @@
-# See http://help.github.com/ignore-files/ for more about ignoring files.
+# See https://help.github.com/ignore-files/ for more about ignoring files.
 
 # compiled output
 /dist
@@ -13,5 +13,11 @@
 /connect.lock
 /coverage/*
 /libpeerconnection.log
-npm-debug.log
+npm-debug.log*
+yarn-error.log
 testem.log
+
+# ember-try
+.node_modules.ember-try/
+bower.json.ember-try
+package.json.ember-try

.npmignore

@@ -8,7 +8,7 @@
 .editorconfig
 .ember-cli
 .gitignore
-.jshintrc
+.eslintrc.js
 .watchmanconfig
 .travis.yml
 bower.json

.travis.yml

@@ -6,13 +6,28 @@ node_js:
 sudo: false
 
 cache:
-  directories:
-    - node_modules
+  yarn: true
+
+env:
+  # we recommend testing LTS's and latest stable release (bonus points to beta/canary)
+  - EMBER_TRY_SCENARIO=ember-release
+  - EMBER_TRY_SCENARIO=node-tests
+
+matrix:
+  fast_finish: true
+  allow_failures:
+    - env: EMBER_TRY_SCENARIO=ember-canary
 
 before_install:
-  - npm config set spin false
-  - npm install -g bower
+  - curl -o- -L https://yarnpkg.com/install.sh | bash
+  - export PATH=$HOME/.yarn/bin:$PATH
+  - yarn global add phantomjs-prebuilt
+  - phantomjs --version
 
 install:
-  - npm install
-  - bower install
+  - yarn install --no-lockfile --non-interactive
+
+script:
+  # Usually, it's ok to finish the test scenario without reverting
+  #  to the addon's original dependency state, skipping "cleanup".
+  - node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO test --skip-cleanup

LICENSE.md

@@ -1,4 +1,4 @@
-Copyright (c) 2016 Santiago Ferreira
+Copyright (c) 2017 Santiago Ferreira
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,5 +1,5 @@
 # ember-addons-inspector
-[![Build Status](https://travis-ci.org/san650/ember-addons-inspector.svg?branch=master)](https://travis-ci.org/san650/ember-addons-inspector)
+[![Build Status](https://travis-ci.org/mvdwg/ember-addons-inspector.svg?branch=master)](https://travis-ci.org/mvdwg/ember-addons-inspector)
 ![Latest version](https://img.shields.io/npm/v/ember-addons-inspector.svg)
 
 Get all the information about the addons registered in your Ember project (addon
@@ -65,7 +65,7 @@ $ ember install ember-addons-inspector
 ### Source code
 
 ```
-$ git clone https://github.com/san650/ember-addons-inspector.git
+$ git clone https://github.com/mvdwg/ember-addons-inspector.git
 ```
 
 ### Running Tests

config/ember-try.js

@@ -1,23 +1,6 @@
-/*jshint node:true*/
+/* eslint-env node */
 module.exports = {
   scenarios: [
-    {
-      name: 'default',
-      bower: {
-        dependencies: { }
-      }
-    },
-    {
-      name: 'ember-1.13',
-      bower: {
-        dependencies: {
-          'ember': '~1.13.0'
-        },
-        resolutions: {
-          'ember': '~1.13.0'
-        }
-      }
-    },
     {
       name: 'ember-release',
       bower: {
@@ -27,28 +10,18 @@ module.exports = {
         resolutions: {
           'ember': 'release'
         }
-      }
-    },
-    {
-      name: 'ember-beta',
-      bower: {
-        dependencies: {
-          'ember': 'components/ember#beta'
-        },
-        resolutions: {
-          'ember': 'beta'
+      },
+      npm: {
+        devDependencies: {
+          'ember-source': null
         }
       }
     },
     {
-      name: 'ember-canary',
+      name: 'node-tests',
+      command: 'npm run nodetest',
       bower: {
-        dependencies: {
-          'ember': 'components/ember#canary'
-        },
-        resolutions: {
-          'ember': 'canary'
-        }
+        dependencies: {}
       }
     }
   ]

config/environment.js

@@ -1,4 +1,4 @@
-/*jshint node:true*/
+/* eslint-env node */
 'use strict';
 
 module.exports = function(/* environment, appConfig */) {

ember-cli-build.js

@@ -1,9 +1,10 @@
-/*jshint node:true*/
-/* global require, module */
-var EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
+/* eslint-env node */
+'use strict';
+
+const EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
 
 module.exports = function(defaults) {
-  var app = new EmberAddon(defaults, {
+  let app = new EmberAddon(defaults, {
     // Add options here
   });
 

index.js

@@ -1,4 +1,4 @@
-/* jshint node: true */
+/* eslint-env node */
 'use strict';
 
 module.exports = {

lib/commands/inspect-all.js

@@ -21,7 +21,7 @@ module.exports = Command.extend({
 
     this.project.addons.forEach(function(addon) {
       // FIXME: How do we get the path to package.json correctly?
-      metadata = new AddonMetadata(addon, path.join(project.root, 'node_modules', (addon.moduleName && addon.moduleName() || addon.name), 'package.json'));
+      metadata = new AddonMetadata(addon, (addon.moduleName && addon.moduleName() || addon.name).trim() + '/package.json');
       addons.push(metadata);
 
       try {

lib/commands/inspect.js

@@ -34,7 +34,7 @@ module.exports = Command.extend({
 
     this.project.addons.forEach(function(addon) {
       // FIXME: How do we get the path to package.json correctly?
-      metadata = new AddonMetadata(addon, path.join(project.root, 'node_modules', (addon.moduleName && addon.moduleName() || addon.name), 'package.json'));
+      metadata = new AddonMetadata(addon, (addon.moduleName && addon.moduleName() || addon.name).trim() + '/package.json');
       addons.push(metadata);
 
       try {

node-tests/acceptance/inspect-test.js

@@ -1,27 +1,25 @@
-var assert = require('assert');
+var assert = require('chai').assert;
 var exec = require('child_process').exec;
 
-function contains(str, value) {
-  return str.indexOf(value) !== -1;
-}
+var PACKAGE = require('ember-ajax/package.json');
 
 describe('Acceptance', function() {
   it('ember inspect:all', function(done) {
     this.timeout(300000);
 
     exec('ember inspect:all', function(_, stdout) {
-      assert.ok(contains(stdout, 'ember-welcome-page (1.0.3)'));
-      assert.ok(contains(stdout, 'Welcome page for Ember-CLI'));
+      assert.include(stdout, PACKAGE.name + ' (' + PACKAGE.version + ')');
+      assert.include(stdout, PACKAGE.description);
       done();
     });
   });
 
-  it('ember inspect ember-welcome-page', function(done) {
+  it('ember inspect ember-source', function(done) {
     this.timeout(300000);
 
     exec('ember inspect:all', function(_, stdout) {
-      assert.ok(contains(stdout, 'ember-welcome-page (1.0.3)'));
-      assert.ok(contains(stdout, 'Welcome page for Ember-CLI'));
+      assert.include(stdout, PACKAGE.name + ' (' + PACKAGE.version + ')');
+      assert.include(stdout, PACKAGE.description);
       done();
     });
   });

package.json

@@ -2,57 +2,57 @@
   "name": "ember-addons-inspector",
   "version": "1.1.0",
   "description": "Inspect the addons included in your Ember application or Ember addon",
-  "homepage": "https://github.com/san650/ember-addons-inspector",
-  "bugs": "https://github.com/san650/ember-addons-inspector/issues",
+  "keywords": [
+    "ember-addon"
+  ],
+  "homepage": "https://github.com/mvdwg/ember-addons-inspector",
+  "bugs": "https://github.com/mvdwg/ember-addons-inspector/issues",
+  "license": "MIT",
+  "author": [
+    "Santiago Ferreira <[email protected]>",
+    "Samanta de Barros",
+    "Diego Acosta <[email protected]>"
+  ],
   "directories": {
     "doc": "doc",
     "test": "tests"
   },
+  "repository": "https://github.com/mvdwg/ember-addons-inspector.git",
   "scripts": {
     "build": "ember build",
+    "nodetest": "mocha node-tests --recursive",
     "start": "ember server",
-    "test": "npm run nodetest",
-    "nodetest": "mocha node-tests --recursive"
+    "test": "npm run nodetest"
   },
-  "repository": "https://github.com/san650/ember-addons-inspector.git",
-  "engines": {
-    "node": ">= 0.10.0"
+  "dependencies": {
+    "chalk": "^1.1.3",
+    "ember-cli-babel": "^6.3.0"
   },
-  "author": [
-    "Santiago Ferreira <[email protected]>",
-    "Samanta de Barros",
-    "Diego Acosta <[email protected]>"
-  ],
-  "license": "MIT",
   "devDependencies": {
-    "broccoli-asset-rev": "^2.4.2",
-    "ember-ajax": "^2.0.1",
-    "ember-cli": "2.6.3",
-    "ember-cli-app-version": "^1.0.0",
-    "ember-cli-dependency-checker": "^1.2.0",
-    "ember-cli-htmlbars": "^1.0.3",
-    "ember-cli-htmlbars-inline-precompile": "^0.3.1",
-    "ember-cli-inject-live-reload": "^1.4.0",
-    "ember-cli-jshint": "^1.0.0",
-    "ember-cli-qunit": "^1.4.0",
-    "ember-cli-release": "^0.2.9",
+    "broccoli-asset-rev": "^2.4.5",
+    "chai": "^4.1.0",
+    "ember-ajax": "^3.0.0",
+    "ember-cli": "~2.14.0",
+    "ember-cli-dependency-checker": "^1.3.0",
+    "ember-cli-eslint": "^3.0.0",
+    "ember-cli-htmlbars": "^2.0.1",
+    "ember-cli-htmlbars-inline-precompile": "^0.4.3",
+    "ember-cli-inject-live-reload": "^1.4.1",
+    "ember-cli-qunit": "^4.0.0",
+    "ember-cli-shims": "^1.1.0",
     "ember-cli-sri": "^2.1.0",
     "ember-cli-uglify": "^1.2.0",
-    "ember-data": "^2.6.0",
-    "ember-disable-prototype-extensions": "^1.1.0",
-    "ember-export-application-global": "^1.0.5",
-    "ember-load-initializers": "^0.5.1",
-    "ember-resolver": "^2.0.3",
-    "ember-welcome-page": "^1.0.1",
-    "loader.js": "^4.0.1",
+    "ember-cli-updater": "1.0.0",
+    "ember-disable-prototype-extensions": "^1.1.2",
+    "ember-export-application-global": "^2.0.0",
+    "ember-load-initializers": "^1.0.0",
+    "ember-resolver": "^4.0.0",
+    "ember-source": "~2.14.0",
+    "loader.js": "^4.2.3",
     "mocha": "^3.0.1"
   },
-  "keywords": [
-    "ember-addon"
-  ],
-  "dependencies": {
-    "chalk": "^1.1.3",
-    "ember-cli-babel": "^5.1.6"
+  "engines": {
+    "node": "^4.5 || 6.* || >= 7.*"
   },
   "ember-addon": {
     "configPath": "tests/dummy/config"

testem.js

@@ -1,13 +1,12 @@
-/*jshint node:true*/
+/* eslint-env node */
 module.exports = {
-  "framework": "qunit",
-  "test_page": "tests/index.html?hidepassed",
-  "disable_watching": true,
-  "launch_in_ci": [
-    "PhantomJS"
+  test_page: 'tests/index.html?hidepassed',
+  disable_watching: true,
+  launch_in_ci: [
+    'PhantomJS'
   ],
-  "launch_in_dev": [
-    "PhantomJS",
-    "Chrome"
+  launch_in_dev: [
+    'PhantomJS',
+    'Chrome'
   ]
 };