Fix all the things

.gitignore

@@ -15,3 +15,17 @@
 /libpeerconnection.log
 npm-debug.log
 testem.log
+
+# linking ember-browserify here, so addon-discovery bug is worked-around.
+# linking the dir, so as:
+#  * not to create a cycyle
+#  * use the correct version of ember-browserify
+#  * use symlinks when possible, but correctly fallback to junctions on windows
+#  (if no symlinks are used)
+#  * symlinked files turn out to be realpathSync'd before being loaded into
+#    node, which means this should nicely trick node. Atleast in posix, although
+#    in windows this may also be true with junctions... Ultimately this is just
+#    for testing, and its working around a potential addon-discovery bug which
+#    will hopefully soon be addressed.
+tests/dummy/lib/modern/node_modules/ember-browserify/lib
+tests/dummy/lib/outdated/node_modules/ember-browserify/lib

.travis.yml

@@ -1,10 +1,39 @@
 ---
 language: node_js
 sudo: false
-before_install:
-  - npm install -g npm@2
-  - npm install -g npm
+node_js:
+  - "0.12"
+  - node
+
+cache:
+  directories:
+    - node_modules
+
+env:
+  # we recommend testing LTS's and latest stable release (bonus points to beta/canary)
+  - EMBER_TRY_SCENARIO=ember-1.13
+  - EMBER_TRY_SCENARIO=ember-lts-2.4
+  - EMBER_TRY_SCENARIO=ember-release
+  - EMBER_TRY_SCENARIO=ember-beta
+  - EMBER_TRY_SCENARIO=ember-canary
+
 matrix:
-  include:
-  - node_js: '0.12'
-  - node_js: node
+  fast_finish: true
+  allow_failures:
+    - env: EMBER_TRY_SCENARIO=ember-canary
+
+before_install:
+  - npm config set spin false
+  - npm install -g bower
+  - bower --version
+  - npm install phantomjs-prebuilt
+  - node_modules/phantomjs-prebuilt/bin/phantomjs --version
+
+install:
+  - npm install
+  - bower install
+
+script:
+  # Usually, it's ok to finish the test scenario without reverting
+  #  to the addon's original dependency state, skipping "cleanup".
+  - ember try:one $EMBER_TRY_SCENARIO test --skip-cleanup

.vscode/launch.json

@@ -0,0 +1,25 @@
+{
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "Mocha",
+      "type": "node",
+      "request": "launch",
+      "program": "${workspaceRoot}/node_modules/mocha/bin/_mocha",
+      "stopOnEntry": false,
+      "args": ["node-tests"],
+      "cwd": "${workspaceRoot}",
+      "preLaunchTask": null,
+      "runtimeExecutable": null,
+      "runtimeArgs": [
+        "--nolazy"
+      ],
+      "env": {
+        "NODE_ENV": "development"
+      },
+      "externalConsole": false,
+      "sourceMaps": false,
+      "outDir": null
+    }
+  ]
+}

appveyor.yml

@@ -18,7 +18,7 @@ install:
 test_script:
   # Output useful info for debugging.
   - npm version
-  - cmd: npm test
+  - cmd: npm run node-test
 
 # Don't actually build.
 build: off

bin/install-ember-addons.js

@@ -0,0 +1,17 @@
+#!/usr/bin/env node
+
+var symlinkOrCopy = require('symlink-or-copy');
+var path = require('path');
+var rimraf = require('rimraf');
+var fs = require('fs');
+
+['modern', 'outdated'].forEach(function(inRepoAddon) {
+  var source = path.resolve(__dirname, '..', 'lib/');
+  var target = path.resolve(__dirname, '..', 'tests/dummy/lib', inRepoAddon, 'node_modules/ember-browserify/lib/');
+
+  console.log('rimraf', target);
+  rimraf.sync(target);
+
+  console.log('symlink', source, target)
+  symlinkOrCopy.sync(source, target);
+});

bower.json

@@ -0,0 +1,7 @@
+{
+  "name": "ember-browserify",
+  "dependencies": {
+    "ember": "~2.8.0",
+    "ember-cli-shims": "0.1.1"
+  }
+}

config/ember-try.js

@@ -0,0 +1,60 @@
+/*jshint node:true*/
+module.exports = {
+  scenarios: [
+    {
+      name: 'ember-1.13',
+      bower: {
+        dependencies: {
+          'ember': '~1.13.0'
+        },
+        resolutions: {
+          'ember': '~1.13.0'
+        }
+      }
+    },
+    {
+      name: 'ember-lts-2.4',
+      bower: {
+        dependencies: {
+          'ember': 'components/ember#lts-2-4'
+        },
+        resolutions: {
+          'ember': 'lts-2-4'
+        }
+      }
+    },
+    {
+      name: 'ember-release',
+      bower: {
+        dependencies: {
+          'ember': 'components/ember#release'
+        },
+        resolutions: {
+          'ember': 'release'
+        }
+      }
+    },
+    {
+      name: 'ember-beta',
+      bower: {
+        dependencies: {
+          'ember': 'components/ember#beta'
+        },
+        resolutions: {
+          'ember': 'beta'
+        }
+      }
+    },
+    {
+      name: 'ember-canary',
+      bower: {
+        dependencies: {
+          'ember': 'components/ember#canary'
+        },
+        resolutions: {
+          'ember': 'canary'
+        }
+      }
+    }
+  ]
+};

config/environment.js

@@ -0,0 +1,6 @@
+/*jshint node:true*/
+'use strict';
+
+module.exports = function(/* environment, appConfig */) {
+  return { };
+};

ember-cli-build.js

@@ -0,0 +1,18 @@
+/*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
+  */
+
+  return app.toTree();
+};

lib/.jshintrc

@@ -0,0 +1,4 @@
+{
+  "node": true,
+  "browser": false
+}

lib/caching-browserify.js

@@ -1,11 +1,12 @@
+'use strict';
+
 var fs = require('fs');
 var path = require('path');
-var browserify = require('browserify');
 var helpers = require('broccoli-kitchen-sink-helpers');
 var RSVP = require('rsvp');
 var CoreObject = require('core-object');
 var mapSeries = require('promise-map-series');
-var merge    = require('lodash').merge;
+var merge = require('lodash.merge');
 var rimraf = require('rimraf');
 var symlinkOrCopy = require('symlink-or-copy');
 var quickTemp = require('quick-temp');
@@ -16,7 +17,7 @@ var debug = require('debug')('ember-browserify:caching-browserify');
 var through = require('through2');
 
 module.exports = CoreObject.extend({
-  init: function(inputTree, options){
+  init: function(inputTree, options) {
     if (!options) {
       options = {};
     }
@@ -28,11 +29,12 @@ module.exports = CoreObject.extend({
     this.fullPaths = typeof options.fullPaths !== 'undefined' ? options.fullPaths : true;
     this.outputFile = options.outputFile || 'browserify/browserify.js';
     this.cache = {};
+
     quickTemp.makeOrRemake(this, '_inputStaging');
     quickTemp.makeOrRemake(this, '_destDir');
   },
 
-  description: 'ember-browserify',
+  description: 'CachingBrowserify',
 
   cleanup: function() {
     if (this._destDir) {
@@ -46,25 +48,32 @@ module.exports = CoreObject.extend({
     }
   },
 
+  toString: function() {
+    return '[' + this.description + ']';
+  },
+
   read: function (readTree) {
     var self = this;
-    return readTree(this.inputTree).then(function(inDir){
-      return self.checkCache(inDir).then(function(cacheValid){
+
+    return readTree(this.inputTree).then(function(inDir) {
+      return self.checkCache(inDir).then(function(cacheValid) {
         if (!self._outputCache || !cacheValid) {
           return self._rebuild(inDir);
         }
       });
-    }).then(function(){
+    }).then(function() {
       rimraf.sync(self._destDir);
       symlinkOrCopy.sync(self._outputCache, self._destDir);
-      return self.watchNodeModules(readTree).then(function(){
+
+      return self.watchNodeModules(readTree).then(function() {
         return self._destDir;
       });
     });
   },
 
   _rebuild: function(inDir){
     var self = this;
+
     this._watchModules = Object.create(null);
 
     // _inputStaging needs to stay at the same path, because the
@@ -74,7 +83,8 @@ module.exports = CoreObject.extend({
 
     symlinkOrCopy.sync(inDir + '/' + this.inFile, this._inputStaging + '/' + this.inFile);
     quickTemp.makeOrRemake(this, '_outputCache');
-    return this.updateCache(this._outputCache).catch(function(err){
+
+    return this.updateCache(this._outputCache).catch(function(err) {
       rimraf.sync(self._outputCache);
       delete self._outputCache;
       throw err;
@@ -98,10 +108,10 @@ module.exports = CoreObject.extend({
       debug: this.enableSourcemap
     }, this.browserifyOptions);
 
-    var b = browserify(opts);
+    var b = require('browserify')(opts);
     ['transforms', 'externals', 'ignores', 'includes'].forEach(function(thing) {
       if (!opts[thing]) { return; }
-      opts[thing].forEach(function(args){
+      opts[thing].forEach(function(args) {
         if (!Array.isArray(args)) {
           args = [args];
         }
@@ -114,9 +124,10 @@ module.exports = CoreObject.extend({
         b = b[thing.replace(/s$/, '')].apply(b, args);
       });
     });
+
     b.add('./' + self.inFile);
 
-    b.on('package', function(pkg){
+    b.on('package', function(pkg) {
       // browserify *used to* reliably put the package's directory in
       // pkg.__dirname. But as of browser-resolve 1.7.0 that isn't
       // true, and we sometimes get a value here like
@@ -137,7 +148,7 @@ module.exports = CoreObject.extend({
       self._watchModules[pkgDir] = true;
     });
 
-    b.on('dep', function (dep) {
+    b.on('dep', function(dep) {
       dep.source = derequire(dep.source);
       if (typeof dep.id === 'string') {
         self.cache[dep.id] = dep;
@@ -158,7 +169,7 @@ module.exports = CoreObject.extend({
       // to prevent unwanted interactions with other code when concatenated
       // See https://github.com/ef4/ember-browserify/issues/63
       // and https://github.com/substack/node-browserify/issues/806
-      b.pipeline.get('wrap').push(through.obj(function (row, enc, next) {
+      b.pipeline.get('wrap').push(through.obj(function(row, enc, next) {
         var contents = row.toString();
         if (contents[contents.length - 1] === ')') {
           contents += ';';
@@ -178,14 +189,18 @@ module.exports = CoreObject.extend({
     var self = this;
     fs.mkdirSync(path.dirname(outPath));
     var start = Date.now();
-    return new RSVP.Promise(function (resolve, reject) {
-      self.bundler().bundle(function (err, data) {
-        debug('bundle in: %dms', Date.now() - start);
-        if (err) {
-          reject(err);
-        } else {
-          fs.writeFileSync(outPath, data);
-          resolve(destDir);
+    return new RSVP.Promise(function(resolve, reject) {
+      self.bundler().bundle(function(err, data) {
+        try {
+          debug('bundle in: %dms', Date.now() - start);
+          if (err) {
+            reject(err);
+          } else {
+            fs.writeFileSync(outPath, data);
+            resolve(destDir);
+          }
+        } catch(e) {
+          reject(e);
         }
       });
     });
@@ -195,7 +210,7 @@ module.exports = CoreObject.extend({
     var self = this;
     var root = self.normalizePath(self.root);
 
-    return mapSeries(Object.keys(self._watchModules), function(dir){
+    return mapSeries(Object.keys(self._watchModules), function(dir) {
       if (!root || root.indexOf(self.normalizePath(dir)) !== 0){
         return readTree(dir);
       }