Fix Ember, Angular plugins

Author: benvinegar

Gruntfile.js

@@ -25,11 +25,11 @@ module.exports = function(grunt) {
     // custom browserify transformer to re-write plugins to
     // self-register with Raven via addPlugin
     function AddPluginBrowserifyTransformer() {
-        return function (file, options) {
+        return function (file) {
             return through(function (buf, enc, next) {
                 buf = buf.toString('utf8');
                 if (/plugins/.test(file)) {
-                    buf += "\nRaven.addPlugin(module.exports);";
+                    buf += "\nrequire('../src/singleton').addPlugin(module.exports);";
                 }
                 this.push(buf);
                 next();
@@ -69,6 +69,8 @@ module.exports = function(grunt) {
     };
 
     var pluginCombinations = combine(grunt.file.expand('plugins/*.js'));
+
+    var pluginCombinations = [['plugins/ember.js']];
     var pluginConcatFiles = _.reduce(pluginCombinations, function (dict, comb) {
         var key = _.map(comb, function (plugin) {
             return path.basename(plugin, '.js');
@@ -100,9 +102,11 @@ module.exports = function(grunt) {
             },
             plugins: {
                 files: pluginConcatFiles,
-                transform: [
-                    [ new AddPluginBrowserifyTransformer() ]
-                ]
+                options: {
+                    transform: [
+                        [ new AddPluginBrowserifyTransformer() ]
+                    ]
+                }
             },
             test: {
                 src: 'test/**/*.test.js',

plugins/angular.js

@@ -13,7 +13,7 @@ function install() {
     /*jshint validthis:true*/
     var Raven = this;
     function RavenProvider() {
-        this.$get = ['$window', function($window, $log) {
+        this.$get = ['$window', function($window) {
             return Raven;
         }];
     }
@@ -58,6 +58,4 @@ function install() {
     });
 }
 
-module.exports = {
-    install: install
-};
+module.exports = install;

plugins/ember.js

@@ -29,6 +29,4 @@ function install(Ember) {
     });
 }
 
-module.exports = {
-    install: install
-};
+module.exports = install;

src/raven.js

@@ -149,12 +149,18 @@ Raven.prototype = {
      * @return {Raven}
      */
     install: function() {
+        var self = this;
         if (this.isSetup() && !this._isRavenInstalled) {
-            TraceKit.report.subscribe(this._handleStackInfo);
+            TraceKit.report.subscribe(function () {
+                // maintain 'self'
+                self._handleStackInfo.apply(self, arguments);
+            });
 
             // Install all of the plugins
             each(this._plugins, function(_, plugin) {
-                plugin();
+                var args = plugin.slice(1);
+                plugin = plugin[0];
+                plugin.apply(self, args);
             });
 
             this._isRavenInstalled = true;
@@ -316,9 +322,11 @@ Raven.prototype = {
     },
 
     addPlugin: function(plugin /*arg1, arg2, ... argN*/) {
-        this._plugins.push(plugin);
+        var rest = Array.prototype.slice.call(arguments, 1);
         if (this._isRavenInstalled) {
-            plugin.install.apply(this, Array.prototype.slice.call(arguments, 1));
+            plugin.install.apply(this, rest);
+        } else {
+            this._plugins.push([plugin].concat(rest));
         }
         return this;
     },