Released v1.1.0. Upgraded ember-cli version and included PR #29

jmurphyau · Jul 29, 2016 · dab1326 · dab1326
1 parent 4f34d17
commit dab1326
Show file tree

Hide file tree

Showing 23 changed files with 415 additions and 434 deletions.
diff --git a/.npmignore b/.npmignore
@@ -1,14 +1,16 @@
-bower_components/
-tests/
-tmp/
-dist/
-
+/bower_components
+/config/ember-try.js
+/dist
+/tests
+/tmp
+**/.gitkeep
 .bowerrc
 .editorconfig
 .ember-cli
+.gitignore
+.jshintrc
+.watchmanconfig
 .travis.yml
-.npmignore
-**/.gitkeep
 bower.json
-Brocfile.js
-testem.json
+ember-cli-build.js
+testem.js
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,7 @@
 ---
 language: node_js
 node_js:
-  - "0.12"
+  - "4"
 
 sudo: false
 
@@ -11,40 +11,41 @@ cache:
 
 env:
   - EMBER_TRY_SCENARIO=default
-  - EMBER_TRY_SCENARIO=ember-1.10.0
-  - EMBER_TRY_SCENARIO=ember-1.10.1
-  - EMBER_TRY_SCENARIO=ember-1.11.0
-  - EMBER_TRY_SCENARIO=ember-1.11.1
-  - EMBER_TRY_SCENARIO=ember-1.11.2
-  - EMBER_TRY_SCENARIO=ember-1.11.3
-  - EMBER_TRY_SCENARIO=ember-1.12.0
-  - EMBER_TRY_SCENARIO=ember-1.12.1
-  - EMBER_TRY_SCENARIO=ember-1.13.0
-  - EMBER_TRY_SCENARIO=ember-1.13.1
-  - EMBER_TRY_SCENARIO=ember-1.13.2
-  - EMBER_TRY_SCENARIO=ember-1.13.3
-  - EMBER_TRY_SCENARIO=ember-1.13.4
-  - EMBER_TRY_SCENARIO=ember-1.13.5
-  - EMBER_TRY_SCENARIO=ember-1.13.6
-  - EMBER_TRY_SCENARIO=ember-1.13.7
-  - EMBER_TRY_SCENARIO=ember-1.13.8
-  - EMBER_TRY_SCENARIO=ember-1.13.9
-  - EMBER_TRY_SCENARIO=ember-1.13.10
+  - EMBER_TRY_SCENARIO=ember-1.10.x
+  - EMBER_TRY_SCENARIO=ember-1.11.x
+  - EMBER_TRY_SCENARIO=ember-1.12.x
+  - EMBER_TRY_SCENARIO=ember-1.13.x
+  - EMBER_TRY_SCENARIO=ember-2.0.x
+  - EMBER_TRY_SCENARIO=ember-2.1.x
+  - EMBER_TRY_SCENARIO=ember-2.2.x
+  - EMBER_TRY_SCENARIO=ember-2.3.x
+  - EMBER_TRY_SCENARIO=ember-2.4.x
+  - EMBER_TRY_SCENARIO=ember-2.5.x
+  - EMBER_TRY_SCENARIO=ember-2.6.x
+  - EMBER_TRY_SCENARIO=ember-2.7.x
+  - EMBER_TRY_SCENARIO=ember-release
+  - EMBER_TRY_SCENARIO=ember-beta
+  - EMBER_TRY_SCENARIO=ember-canary
 
 matrix:
   fast_finish: true
   allow_failures:
-    - env: EMBER_TRY_SCENARIO=ember-1.13.0
+    - env: EMBER_TRY_SCENARIO=ember-1.10.x
+    - env: EMBER_TRY_SCENARIO=ember-1.11.x
+    - env: EMBER_TRY_SCENARIO=ember-1.12.x
+    - env: EMBER_TRY_SCENARIO=ember-1.13.x
+    - env: EMBER_TRY_SCENARIO=ember-canary
 
 before_install:
-  - export PATH=/usr/local/phantomjs-2.0.0/bin:$PATH
-  - "npm config set spin false"
-  - "npm install -g npm@^2"
+  - npm config set spin false
+  - npm install -g bower
+  - npm install phantomjs-prebuilt
 
 install:
-  - npm install -g bower
   - npm install
   - bower install
 
 script:
-  - ember try $EMBER_TRY_SCENARIO test
+  # Usually, it's ok to finish the test scenario without reverting
+  #  to the addon's original dependency state, skipping "cleanup".
+  - ember try $EMBER_TRY_SCENARIO test --skip-cleanup
diff --git a/.watchmanconfig b/.watchmanconfig
@@ -1,3 +1,3 @@
 {
-  "ignore_dirs": ["tmp"]
+  "ignore_dirs": ["tmp", "dist"]
 }
diff --git a/Brocfile.js b/Brocfile.js
diff --git a/LICENSE.md b/LICENSE.md
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015
+Copyright (c) 2016
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

diff --git a/bower.json b/bower.json
@@ -1,18 +1,9 @@
 {
   "name": "ember-get-helper",
   "dependencies": {
-    "ember": "1.13.2",
-    "ember-cli-shims": "ember-cli/ember-cli-shims#0.0.3",
-    "ember-cli-test-loader": "ember-cli-test-loader#0.1.3",
-    "ember-load-initializers": "ember-cli/ember-load-initializers#0.1.4",
-    "ember-qunit": "0.3.3",
-    "ember-qunit-notifications": "0.0.7",
-    "ember-resolver": "~0.1.15",
-    "jquery": "^1.11.1",
-    "loader.js": "ember-cli/loader.js#3.2.0",
-    "qunit": "~1.17.1"
-  },
-  "resolutions": {
-    "ember": "1.13.2"
+    "ember": "~2.6.0",
+    "ember-cli-shims": "0.1.1",
+    "ember-cli-test-loader": "0.2.2",
+    "ember-qunit-notifications": "0.1.0"
   }
 }
diff --git a/config/ember-try.js b/config/ember-try.js
@@ -5,80 +5,77 @@ module.exports = {
       dependencies: { }
     },
     {
-      name: 'ember-1.10.0',
-      dependencies: { 'ember': '1.10.0' }
+      name: 'ember-1.10.x',
+      allowedToFail: true,
+      bower: { dependencies: { 'ember': '1.10.1' } }
     },
     {
-      name: 'ember-1.10.1',
-      dependencies: { 'ember': '1.10.1' }
+      name: 'ember-1.11.x',
+      allowedToFail: true,
+      bower: { dependencies: { 'ember': '1.11.4' } }
     },
     {
-      name: 'ember-1.11.0',
-      dependencies: { 'ember': '1.11.0' }
+      name: 'ember-1.12.x',
+      allowedToFail: true,
+      bower: { dependencies: { 'ember': '1.12.2' } }
     },
     {
-      name: 'ember-1.11.1',
-      dependencies: { 'ember': '1.11.1' }
+      name: 'ember-1.13.x',
+      allowedToFail: true,
+      bower: { dependencies: { 'ember': '1.13.13' } }
     },
     {
-      name: 'ember-1.11.2',
-      dependencies: { 'ember': '1.11.2' }
+      name: 'ember-2.0.x',
+      bower: { dependencies: { 'ember': '2.0.3' } }
     },
     {
-      name: 'ember-1.11.3',
-      dependencies: { 'ember': '1.11.2' }
+      name: 'ember-2.1.x',
+      bower: { dependencies: { 'ember': '2.1.2' } }
     },
     {
-      name: 'ember-1.12.0',
-      dependencies: { 'ember': '1.12.0' }
+      name: 'ember-2.2.x',
+      bower: { dependencies: { 'ember': '2.2.2' } }
     },
     {
-      name: 'ember-1.12.1',
-      dependencies: { 'ember': '1.12.1' }
+      name: 'ember-2.3.x',
+      bower: { dependencies: { 'ember': '2.3.2' } }
     },
     {
-      name: 'ember-1.13.0',
-      dependencies: { 'ember': '1.13.0' }
+      name: 'ember-2.4.x',
+      bower: { dependencies: { 'ember': '2.4.6' } }
     },
     {
-      name: 'ember-1.13.1',
-      dependencies: { 'ember': '1.13.1' }
+      name: 'ember-2.5.x',
+      bower: { dependencies: { 'ember': '2.5.1' } }
     },
     {
-      name: 'ember-1.13.2',
-      dependencies: { 'ember': '1.13.2' }
+      name: 'ember-2.6.x',
+      bower: { dependencies: { 'ember': '2.6.2' } }
     },
     {
-      name: 'ember-1.13.3',
-      dependencies: { 'ember': '1.13.3' }
+      name: 'ember-2.7.x',
+      bower: { dependencies: { 'ember': '2.7.0' } }
     },
     {
-      name: 'ember-1.13.4',
-      dependencies: { 'ember': '1.13.4' }
+      name: 'ember-release',
+      bower: {
+        dependencies: { 'ember': 'components/ember#release' },
+        resolutions: { 'ember': 'release' }
+      }
     },
     {
-      name: 'ember-1.13.5',
-      dependencies: { 'ember': '1.13.5' }
+      name: 'ember-beta',
+      bower: {
+        dependencies: { 'ember': 'components/ember#beta' },
+        resolutions: { 'ember': 'beta' }
+      }
     },
     {
-      name: 'ember-1.13.6',
-      dependencies: { 'ember': '1.13.6' }
-    },
-    {
-      name: 'ember-1.13.7',
-      dependencies: { 'ember': '1.13.7' }
-    },
-    {
-      name: 'ember-1.13.8',
-      dependencies: { 'ember': '1.13.8' }
-    },
-    {
-      name: 'ember-1.13.9',
-      dependencies: { 'ember': '1.13.9' }
-    },
-    {
-      name: 'ember-1.13.10',
-      dependencies: { 'ember': '1.13.10' }
+      name: 'ember-canary',
+      bower: {
+        dependencies: { 'ember': 'components/ember#canary' },
+        resolutions: { 'ember': 'canary' }
+      }
     }
   ]
 };
diff --git a/config/environment.js b/config/environment.js
@@ -1,3 +1,4 @@
+/*jshint node:true*/
 'use strict';
 
 module.exports = function(/* environment, appConfig */) {

diff --git a/ember-cli-build.js b/ember-cli-build.js
@@ -0,0 +1,20 @@
+/*jshint node:true*/
+/* global require, module */
+var EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
+
+module.exports = function(defaults) {
+  var app = new EmberAddon(defaults, {
+    // Add options here
+  });
+
+  /*
+    This build file specifies the options for the dummy test app of this
+    addon, located in `/tests/dummy`
+    This build file does *not* influence how the addon or the app using it
+    behave. You most likely want to be modifying `./index.js` or app's build file
+  */
+
+  if (app.env !== 'production') { app.import('bower_components/ember/ember-template-compiler.js', { type: 'vendor' }); }
+
+  return app.toTree();
+};
diff --git a/index.js b/index.js
@@ -3,6 +3,8 @@
 
 var VersionChecker = require('ember-cli-version-checker');
 
+var hasBeenWarned = false;
+
 module.exports = {
   name: 'ember-get-helper',
 
@@ -17,7 +19,10 @@ module.exports = {
     if (this._checkerForEmber.lt('2.0.0-beta.1')) {
       return this._super.treeFor.apply(this, arguments);
     } else if (this.parent === this.project) {
-      console.warn('ember-get-helper is not required for Ember 2.0.0 and later (a default `get` helper is included with Ember), please remove from your `package.json`.');
+      if (!hasBeenWarned) {
+        console.warn('ember-get-helper is not required for Ember 2.0.0 and later (a default `get` helper is included with Ember), please remove from your `package.json`.');
+        hasBeenWarned = true;
+      }
     }
   }
 };
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ember-get-helper",
-  "version": "1.0.4",
+  "version": "1.1.0",
   "description": "ember-get-helper for Glimmer & the HTMLBars Templating Language.",
   "directories": {
     "doc": "doc",
@@ -18,28 +18,31 @@
   "author": "",
   "license": "MIT",
   "devDependencies": {
-    "broccoli-asset-rev": "^2.0.2",
-    "ember-cli": "0.2.7",
-    "ember-cli-app-version": "0.3.3",
-    "ember-cli-content-security-policy": "0.4.0",
-    "ember-cli-dependency-checker": "^1.0.0",
-    "ember-cli-htmlbars": "0.7.6",
-    "ember-cli-ic-ajax": "0.1.1",
-    "ember-cli-inject-live-reload": "^1.3.0",
-    "ember-cli-qunit": "0.3.13",
-    "ember-cli-uglify": "^1.0.1",
-    "ember-disable-proxy-controllers": "^1.0.0",
-    "ember-export-application-global": "^1.0.2",
-    "ember-disable-prototype-extensions": "^1.0.0",
-    "ember-try": "0.0.7"
+    "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",
+    "ember-cli-sri": "^2.1.0",
+    "ember-cli-uglify": "^1.2.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",
+    "loader.js": "^4.0.1"
   },
   "keywords": [
-    "ember-addon",
-    "ember-helpers"
+    "ember-addon"
   ],
   "dependencies": {
-    "ember-cli-babel": "^5.0.0",
-    "ember-cli-version-checker": "^1.1.3"
+    "ember-cli-version-checker": "^1.1.3",
+    "ember-cli-babel": "^5.1.6"
   },
   "ember-addon": {
     "configPath": "tests/dummy/config"

diff --git a/testem.js b/testem.js
@@ -0,0 +1,13 @@
+/*jshint node:true*/
+module.exports = {
+  "framework": "qunit",
+  "test_page": "tests/index.html?hidepassed",
+  "disable_watching": true,
+  "launch_in_ci": [
+    "PhantomJS"
+  ],
+  "launch_in_dev": [
+    "PhantomJS",
+    "Chrome"
+  ]
+};