Merge pull request #6 from mwisner/feat/ember-try

Ember Try

.circleci/config.yml

@@ -15,11 +15,13 @@ jobs:
             ##
             - checkout
 
+            # Bower is required because of https://github.com/ember-cli/ember-try/issues/141
             - run:
                 name: Install node global dependencies
                 command: |
                   sudo npm install -g yarn \
                     ember-cli \
+                    bower \
                     greenkeeper-lockfile
             ##
             # NPM
@@ -49,7 +51,7 @@ jobs:
             - run:
                 name: Run Ember Tests
                 command: |
-                  ember test
+                  ember try:each
 
             # Used for https://greenkeeper.io/ support
             - run:

.gitignore

@@ -21,3 +21,5 @@ testem.log
 .node_modules.ember-try/
 bower.json.ember-try
 package.json.ember-try
+bower.json
+package-lock.json

.travis.yml

@@ -6,15 +6,33 @@ node_js:
 sudo: false
 dist: trusty
 
+cache:
+  yarn: true
+  directories:
+    - node_modules
+
 addons:
   chrome: stable
 
 env:
-  - JOBS=1 # https://github.com/emberjs/ember.js/issues/15641
+  global:
+    - JOBS=1 # https://github.com/emberjs/ember.js/issues/15641
+  matrix:
+    - EMBER_TRY_SCENARIO=ember-lts-2.4
+    - EMBER_TRY_SCENARIO=ember-lts-2.8
+    - EMBER_TRY_SCENARIO=ember-release
+    - EMBER_TRY_SCENARIO=ember-beta
+    - EMBER_TRY_SCENARIO=ember-canary
+    - EMBER_TRY_SCENARIO=ember-default
 
-cache:
-  directories:
-    - $HOME/.npm
+matrix:
+  fast_finish: true
 
 before_install:
   - npm config set spin false
+  - yarn global add bower # https://github.com/ember-cli/ember-try/issues/141
+
+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

README.md

@@ -25,7 +25,5 @@ execution where possible.
 PRs welcome for new CI tools.
 
 # TODO
-- ember-exam? 
-- ember-try?
-
+- ember-exam?
 

config/ember-try.js

@@ -0,0 +1,92 @@
+/* eslint-env node */
+module.exports = {
+  useYarn: true,
+  scenarios: [
+    {
+      name: 'ember-lts-2.4',
+      bower: {
+        dependencies: {
+          'ember': 'components/ember#lts-2-4'
+        },
+        resolutions: {
+          'ember': 'lts-2-4'
+        }
+      },
+      npm: {
+        devDependencies: {
+          'ember-source': null
+        }
+      }
+    },
+    {
+      name: 'ember-lts-2.8',
+      bower: {
+        dependencies: {
+          'ember': 'components/ember#lts-2-8'
+        },
+        resolutions: {
+          'ember': 'lts-2-8'
+        }
+      },
+      npm: {
+        devDependencies: {
+          'ember-source': null
+        }
+      }
+    },
+    {
+      name: 'ember-release',
+      bower: {
+        dependencies: {
+          'ember': 'components/ember#release'
+        },
+        resolutions: {
+          'ember': 'release'
+        }
+      },
+      npm: {
+        devDependencies: {
+          'ember-source': null
+        }
+      }
+    },
+    {
+      name: 'ember-beta',
+      bower: {
+        dependencies: {
+          'ember': 'components/ember#beta'
+        },
+        resolutions: {
+          'ember': 'beta'
+        }
+      },
+      npm: {
+        devDependencies: {
+          'ember-source': null
+        }
+      }
+    },
+    {
+      name: 'ember-canary',
+      bower: {
+        dependencies: {
+          'ember': 'components/ember#canary'
+        },
+        resolutions: {
+          'ember': 'canary'
+        }
+      },
+      npm: {
+        devDependencies: {
+          'ember-source': null
+        }
+      }
+    },
+    {
+      name: 'ember-default',
+      npm: {
+        devDependencies: {}
+      }
+    }
+  ]
+};

package.json

@@ -17,6 +17,7 @@
   },
   "devDependencies": {
     "bootstrap": "4.0.0-alpha.6",
+    "bower": "^1.8.0",
     "broccoli-asset-rev": "^2.4.5",
     "ember-ajax": "^3.0.0",
     "ember-api-actions": "^0.1.7",

yarn.lock

@@ -1120,8 +1120,8 @@ [email protected]:
     tether "^1.4.0"
 
 bower-config@^1.3.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/bower-config/-/bower-config-1.4.0.tgz#16c38c1135f8071c19f25938d61b0d8cbf18d3f1"
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/bower-config/-/bower-config-1.4.1.tgz#85fd9df367c2b8dbbd0caa4c5f2bad40cd84c2cc"
   dependencies:
     graceful-fs "^4.1.3"
     mout "^1.0.0"
@@ -1133,6 +1133,10 @@ [email protected]:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/bower-endpoint-parser/-/bower-endpoint-parser-0.2.2.tgz#00b565adbfab6f2d35addde977e97962acbcb3f6"
 
+bower@^1.8.0:
+  version "1.8.2"
+  resolved "https://registry.yarnpkg.com/bower/-/bower-1.8.2.tgz#adf53529c8d4af02ef24fb8d5341c1419d33e2f7"
+
 brace-expansion@^1.0.0, brace-expansion@^1.1.7:
   version "1.1.8"
   resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.8.tgz#c07b211c7c952ec1f8efd51a77ef0d1d3990a292"