bugsnag 1.8.6 → 1.8.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 42328a87ecae5b0b9f8783cb436def3208642965
-  data.tar.gz: 8f0fe5750eda3260e15c8d115c9da1ecd02819df
+  metadata.gz: d1ded05b67617d43a3ec3d4201f289268e557532
+  data.tar.gz: f555a022921c989415992c649dde17f669c4ee2d
 SHA512:
-  metadata.gz: 0be6f3d3356d2c83ba7a27ba561b48e34ed3eca080206404edc0a1a0532f912fbb2a21c8e9d4465ae927e9687c447f71eabd7d38dc5af25efb0bed0d01225967
-  data.tar.gz: ca79d5f904850806c255623f0d0e890596b3e2eb003d8e09ef3436d8e356a605c80d1f4ea4cee6c92d022ab1975985a8e769191aa9f5a540276ab658b38d07b0
+  metadata.gz: dc89fe2fe2a176e82b130159968bafa9ccba23408ec648dd76a4a1fa81bae287866fce45aad2cbf53e7a16aa0c2db7fadc0819bde435b11bbde2db892af28841
+  data.tar.gz: 7c8e42b005712c3817a48c79641396cbb01975d5ff4ee0ddb39a35354ed1db75bad4df9a7643c8c31df2e0f3ff85d43487fc2e120a9ecdfdfa66f74ee577e3e4

data/.gitignore

@@ -16,7 +16,8 @@ Gemfile.lock
 pkg
 *.gem
 
-# Have editor/IDE/OS specific files you need to ignore? Consider using a global gitignore: 
+vendor
+# Have editor/IDE/OS specific files you need to ignore? Consider using a global gitignore:
 #
 # * Create a file at ~/.gitignore
 # * Include files you want ignored

data/CHANGELOG.md

@@ -1,6 +1,13 @@
 Changelog
 =========
 
+1.8.7
+-----
+
+- fix capistrano when `rake` is not set. #87
+- fix capistrano when `Rails` is not loaded. #85
+- various cleanup
+
 1.8.6
 -----
 

data/README.md

@@ -470,6 +470,17 @@ rescue => e
 end
 ```
 
+### Grouping hash
+
+If you want to override Bugsnag's grouping algorithm, you can specify a grouping hash key as a parameter to `Bugsnag.notify`:
+
+```ruby
+rescue => e
+  Bugsnag.notify e, grouping_hash: "this-is-my-grouping-hash"
+end
+```
+
+All errors with the same groupingHash will be grouped together within the bugsnag dashboard.
 
 Deploy Tracking
 ---------------
@@ -515,23 +526,18 @@ additional deploy information:
     The release stage (eg, production, staging) currently being deployed.
     This is set automatically from your Bugsnag settings or rails/rack
     environment.
-
 -   **BUGSNAG_API_KEY** -
     Your Bugsnag API key. This is set automatically from your Bugsnag
     settings in your app.
-
 -   **BUGSNAG_REPOSITORY** -
     The repository from which you are deploying the code. This is set
     automatically if you are using capistrano.
-
 -   **BUGSNAG_BRANCH** -
     The source control branch from which you are deploying the code.
     This is set automatically if you are using capistrano.
-
 -   **BUGSNAG_REVISION** -
     The source control revision for the code you are currently deploying.
     This is set automatically if you are using capistrano.
-
 -   **BUGSNAG_APP_VERSION** -
     The app version of the code you are currently deploying. Only set this
     if you tag your releases with [semantic version numbers](http://semver.org/)

data/VERSION

@@ -1 +1 @@
-1.8.6
+1.8.7

data/bugsnag.gemspec

@@ -22,12 +22,13 @@ Gem::Specification.new do |s|
   if RUBY_VERSION < "1.9"
     # Use ruby 1.8 compatible httparty
     s.add_runtime_dependency 'httparty', ["< 0.12.0", ">= 0.6"]
+    s.add_development_dependency "rake", "~> 10.1.1"
   else
     s.add_runtime_dependency 'httparty', ["< 1.0", ">= 0.6"]
+    s.add_development_dependency 'rake'
   end
 
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'rdoc'
-  s.add_development_dependency 'rake'
 end
 

data/lib/bugsnag/notification.rb

@@ -59,6 +59,11 @@ module Bugsnag
       self.severity = @overrides[:severity]
       @overrides.delete :severity
 
+      if @overrides.key? :grouping_hash
+        self.grouping_hash = @overrides[:grouping_hash]
+        @overrides.delete :grouping_hash
+      end
+
       if @overrides.key? :api_key
         self.api_key = @overrides[:api_key]
         @overrides.delete :api_key
@@ -143,6 +148,14 @@ module Bugsnag
       @severity || "error"
     end
 
+    def grouping_hash=(grouping_hash)
+      @grouping_hash = grouping_hash
+    end
+
+    def grouping_hash
+      @grouping_hash || nil
+    end
+
     def api_key=(api_key)
       @api_key = api_key
     end
@@ -183,7 +196,7 @@ module Bugsnag
           end
         end
 
-        [:user_id, :context, :user].each do |symbol|
+        [:user_id, :context, :user, :grouping_hash].each do |symbol|
           if @overrides[symbol]
             self.send("#{symbol}=", @overrides[symbol])
             @overrides.delete symbol
@@ -205,6 +218,7 @@ module Bugsnag
           :user => @user,
           :exceptions => exception_list,
           :severity => self.severity,
+          :groupingHash => self.grouping_hash,
           :metaData => Bugsnag::Helpers.cleanup_obj(generate_meta_data(@exceptions, @overrides), @configuration.params_filters)
         }.reject {|k,v| v.nil? }
 

data/lib/bugsnag/tasks/bugsnag.cap

@@ -44,7 +44,9 @@ namespace :bugsnag do
 
       within release_path do
         with rails_env: rails_env do
-          execute rake, "bugsnag:deploy #{new_env.map{|k,v| "#{k}=#{v}"}.join(" ")}"
+          params = "bugsnag:deploy #{new_env.map{|k,v| "#{k}=#{v}"}.join(" ")}"
+          rake = fetch(:rake, "rake")
+          execute rake, params
         end
       end
 
@@ -53,3 +55,4 @@ namespace :bugsnag do
   end
 
 end
+# vi:ft=ruby

data/lib/bugsnag/tasks/bugsnag.rake

@@ -1,4 +1,5 @@
 require "bugsnag"
+require "pathname"
 require "httparty"
 require "multi_json"
 require "net/http"
@@ -11,17 +12,20 @@ namespace :bugsnag do
     begin
       require 'bugsnag'
 
-      api_key = ENV["BUGSNAG_API_KEY"]
+      api_key      = ENV["BUGSNAG_API_KEY"]
       releaseStage = ENV["BUGSNAG_RELEASE_STAGE"] || "production"
-      appVersion = ENV["BUGSNAG_APP_VERSION"]
-      revision = ENV["BUGSNAG_REVISION"]
-      repository = ENV["BUGSNAG_REPOSITORY"]
-      branch = ENV["BUGSNAG_BRANCH"]
+      appVersion   = ENV["BUGSNAG_APP_VERSION"]
+      revision     = ENV["BUGSNAG_REVISION"]
+      repository   = ENV["BUGSNAG_REPOSITORY"]
+      branch       = ENV["BUGSNAG_BRANCH"]
 
-      begin
-        require Rails.root.join('config/initializers/bugsnag')
-      rescue Exception => e
-        yml_filename = Rails.root.join("config","bugsnag.yml")
+      # TODO: more reliable ways to infer this are needed
+      path = defined?(Rails.root) ? Rails.root : Pathname.pwd
+      initializer = path + 'config/initializers/bugsnag'
+      if File.exist?(initializer)
+        require initializer
+      else
+        yml_filename = path + 'config/bugsnag.yml'
         config = YAML.load_file(yml_filename) if File.exists?(yml_filename)
         Bugsnag.configure(config[releaseStage] ? config[releaseStage] : config) if config
       end
@@ -65,7 +69,7 @@ namespace :bugsnag do
   end
 
   desc "Send a test exception to Bugsnag."
-  task :test_exception => :load do 
+  task :test_exception => :load do
     begin
       raise RuntimeError.new("Bugsnag test exception")
     rescue => e
@@ -80,7 +84,7 @@ namespace :bugsnag do
 end
 
 task :load do
-  begin 
+  begin
     Rake::Task["environment"].invoke
   rescue
   end

data/spec/helper_spec.rb

@@ -1,33 +1,33 @@
 require 'spec_helper'
 
 describe Bugsnag::Helpers do
-  it "should be able to clean up recursive hashes" do
+  it "cleans up recursive hashes" do
     a = {:a => {}}
     a[:a][:b] = a
-    Bugsnag::Helpers.cleanup_obj(a).should == {:a => {:b => "[RECURSION]"}}
+    expect(Bugsnag::Helpers.cleanup_obj(a)).to eq({:a => {:b => "[RECURSION]"}})
   end
 
-  it "should be able to clean up recursive arrays" do
+  it "cleans up recursive arrays" do
     a = []
     a << a
     a << "hello"
-    Bugsnag::Helpers.cleanup_obj(a).should == ["[RECURSION]", "hello"]
+    expect(Bugsnag::Helpers.cleanup_obj(a)).to eq(["[RECURSION]", "hello"])
   end
 
-  it "should allow multiple copies of the same string" do
+  it "allows multiple copies of the same string" do
     a = {:name => "bugsnag"}
     a[:second] = a[:name]
-    Bugsnag::Helpers.cleanup_obj(a).should == {:name => "bugsnag", :second => "bugsnag"}
+    expect(Bugsnag::Helpers.cleanup_obj(a)).to eq({:name => "bugsnag", :second => "bugsnag"})
   end
 
-  it "should allow multiple copies of the same object" do
+  it "allows multiple copies of the same object" do
     a = []
     b = ["hello"]
     a << b; a << b
-    Bugsnag::Helpers.cleanup_obj(a).should == [["hello"], ["hello"]]
+    expect(Bugsnag::Helpers.cleanup_obj(a)).to eq([["hello"], ["hello"]])
   end
 
-  it "should reduce hash size correctly" do
+  it "reduces hash size correctly" do
     meta_data = {
       :key_one => "this should not be truncated",
       :key_two => ""
@@ -35,56 +35,56 @@ describe Bugsnag::Helpers do
 
     1000.times {|i| meta_data[:key_two] += "this should be truncated " }
 
-    meta_data[:key_two].length.should > 4096
+    expect(meta_data[:key_two].length).to be > 4096
 
     meta_data_return = Bugsnag::Helpers.reduce_hash_size meta_data
 
-    meta_data_return[:key_one].length.should == 28
-    meta_data_return[:key_one].should == "this should not be truncated"
+    expect(meta_data_return[:key_one].length).to eq(28)
+    expect(meta_data_return[:key_one]).to eq("this should not be truncated")
 
-    meta_data_return[:key_two].length.should == 4107
-    meta_data_return[:key_two].match(/\[TRUNCATED\]$/).nil?.should == false
+    expect(meta_data_return[:key_two].length).to eq(4107)
+    expect(meta_data_return[:key_two].match(/\[TRUNCATED\]$/).nil?).to eq(false)
 
-    meta_data[:key_two].length.should > 4096
-    meta_data[:key_two].match(/\[TRUNCATED\]$/).nil?.should == true
+    expect(meta_data[:key_two].length).to be > 4096
+    expect(meta_data[:key_two].match(/\[TRUNCATED\]$/).nil?).to eq(true)
 
-    meta_data[:key_one].length.should == 28
-    meta_data[:key_one].should == "this should not be truncated"
+    expect(meta_data[:key_one].length).to eq(28)
+    expect(meta_data[:key_one]).to eq("this should not be truncated")
   end
 
-  it "should work with no filters configured" do
+  it "works with no filters configured" do
     url = Bugsnag::Helpers.cleanup_url "/dir/page?param1=value1&param2=value2"
 
-    url.should == "/dir/page?param1=value1&param2=value2"
+    expect(url).to eq("/dir/page?param1=value1&param2=value2")
   end
 
-  it "should not filter with no get params" do
+  it "does not filter with no get params" do
     url = Bugsnag::Helpers.cleanup_url "/dir/page"
 
-    url.should == "/dir/page"
+    expect(url).to eq("/dir/page")
   end
 
-  it "should leave a url alone if no filters match" do
+  it "leaves a url alone if no filters match" do
     url = Bugsnag::Helpers.cleanup_url "/dir/page?param1=value1&param2=value2", ["param3"]
 
-    url.should == "/dir/page?param1=value1&param2=value2"
+    expect(url).to eq("/dir/page?param1=value1&param2=value2")
   end
 
-  it "should filter a single get param" do
+  it "filters a single get param" do
     url = Bugsnag::Helpers.cleanup_url "/dir/page?param1=value1&param2=value2", ["param1"]
 
-    url.should == "/dir/page?param1=[FILTERED]&param2=value2"
+    expect(url).to eq("/dir/page?param1=[FILTERED]&param2=value2")
   end
 
-  it "should filter a get param that contains a filtered term" do
+  it "filters a get param that contains a filtered term" do
     url = Bugsnag::Helpers.cleanup_url '/dir/page?param1=value1&param2=value2&bla=yes', ["param"]
 
-    url.should == "/dir/page?param1=[FILTERED]&param2=[FILTERED]&bla=yes"
+    expect(url).to eq("/dir/page?param1=[FILTERED]&param2=[FILTERED]&bla=yes")
   end
 
-  it "should filter multiple matches" do
+  it "filters multiple matches" do
     url = Bugsnag::Helpers.cleanup_url "/dir/page?param1=value1&param2=value2&param3=value3", ["param1", "param2"]
 
-    url.should == "/dir/page?param1=[FILTERED]&param2=[FILTERED]&param3=value3"
+    expect(url).to eq("/dir/page?param1=[FILTERED]&param2=[FILTERED]&param3=value3")
   end
 end

data/spec/middleware_spec.rb

@@ -1,12 +1,12 @@
 require 'spec_helper'
 
 describe Bugsnag::MiddlewareStack do
-  it "should run before_bugsnag_notify callbacks, adding a tab" do
-    Bugsnag::Notification.should_receive(:deliver_exception_payload) do |endpoint, payload|
+  it "runs before_bugsnag_notify callbacks, adding a tab" do
+    expect(Bugsnag::Notification).to receive(:deliver_exception_payload) do |endpoint, payload|
       event = get_event_from_payload(payload)
-      event[:metaData][:some_tab].should_not be_nil
-      event[:metaData][:some_tab][:info].should be == "here"
-      event[:metaData][:some_tab][:data].should be == "also here"
+      expect(event[:metaData][:some_tab]).not_to be_nil
+      expect(event[:metaData][:some_tab][:info]).to eq("here")
+      expect(event[:metaData][:some_tab][:data]).to eq("also here")
     end
     
     callback_run_count = 0
@@ -19,15 +19,15 @@ describe Bugsnag::MiddlewareStack do
     }
 
     Bugsnag.notify(BugsnagTestException.new("It crashed"))
-    callback_run_count.should be == 1
+    expect(callback_run_count).to eq(1)
   end
   
-  it "should run before_bugsnag_notify callbacks, adding custom data" do
-    Bugsnag::Notification.should_receive(:deliver_exception_payload) do |endpoint, payload|
+  it "runs before_bugsnag_notify callbacks, adding custom data" do
+    expect(Bugsnag::Notification).to receive(:deliver_exception_payload) do |endpoint, payload|
       event = get_event_from_payload(payload)
-      event[:metaData][:custom].should_not be_nil
-      event[:metaData][:custom][:info].should be == "here"
-      event[:metaData][:custom][:data].should be == "also here"
+      expect(event[:metaData][:custom]).not_to be_nil
+      expect(event[:metaData][:custom][:info]).to eq("here")
+      expect(event[:metaData][:custom][:data]).to eq("also here")
     end
     
     callback_run_count = 0
@@ -39,17 +39,17 @@ describe Bugsnag::MiddlewareStack do
     }
 
     Bugsnag.notify(BugsnagTestException.new("It crashed"))
-    callback_run_count.should be == 1
+    expect(callback_run_count).to eq(1)
   end
 
-  it "should run before_bugsnag_notify callbacks, setting the user" do
-    Bugsnag::Notification.should_receive(:deliver_exception_payload) do |endpoint, payload|
+  it "runs before_bugsnag_notify callbacks, setting the user" do
+    expect(Bugsnag::Notification).to receive(:deliver_exception_payload) do |endpoint, payload|
       event = get_event_from_payload(payload)
-      event[:user].should_not be_nil
-      event[:user][:id].should be == "here"
-      event[:user][:email].should be == "also here"
-      event[:user][:name].should be == "also here too"
-      event[:user][:random_key].should be == "also here too too"
+      expect(event[:user]).not_to be_nil
+      expect(event[:user][:id]).to eq("here")
+      expect(event[:user][:email]).to eq("also here")
+      expect(event[:user][:name]).to eq("also here too")
+      expect(event[:user][:random_key]).to eq("also here too too")
     end
     
     callback_run_count = 0
@@ -59,15 +59,15 @@ describe Bugsnag::MiddlewareStack do
     }
 
     Bugsnag.notify(BugsnagTestException.new("It crashed"))
-    callback_run_count.should be == 1
+    expect(callback_run_count).to eq(1)
   end
   
-  it "overrides should override data set in before_notify" do
-    Bugsnag::Notification.should_receive(:deliver_exception_payload) do |endpoint, payload|
+  it "overrides data set in before_notify" do
+    expect(Bugsnag::Notification).to receive(:deliver_exception_payload) do |endpoint, payload|
       event = get_event_from_payload(payload)
-      event[:metaData][:custom].should_not be_nil
-      event[:metaData][:custom][:info].should be == "here2"
-      event[:metaData][:custom][:data].should be == "also here"
+      expect(event[:metaData][:custom]).not_to be_nil
+      expect(event[:metaData][:custom][:info]).to eq("here2")
+      expect(event[:metaData][:custom][:data]).to eq("also here")
     end
     
     callback_run_count = 0
@@ -79,24 +79,22 @@ describe Bugsnag::MiddlewareStack do
     }
 
     Bugsnag.notify(BugsnagTestException.new("It crashed"), {:info => "here2"})
-    callback_run_count.should be == 1
+    expect(callback_run_count).to eq(1)
   end
   
-  it "should have no before or after callbacks by default" do
-    Bugsnag::Notification.should_receive(:deliver_exception_payload) do |endpoint, payload|
+  it "does not have have before or after callbacks by default" do
+    expect(Bugsnag::Notification).to receive(:deliver_exception_payload) do |endpoint, payload|
       event = get_event_from_payload(payload)
-      event[:metaData].should have(0).items
+      expect(event[:metaData].size).to eq(0)
     end
     
-    Bugsnag.before_notify_callbacks.should have(0).items
-    Bugsnag.after_notify_callbacks.should have(0).items
+    expect(Bugsnag.before_notify_callbacks.size).to eq(0)
+    expect(Bugsnag.after_notify_callbacks.size).to eq(0)
     Bugsnag.notify(BugsnagTestException.new("It crashed"))
   end
   
-  it "should run after_bugsnag_notify callbacks" do
-    Bugsnag::Notification.should_receive(:deliver_exception_payload) do |endpoint, payload|
-      event = get_event_from_payload(payload)
-    end
+  it "runs after_bugsnag_notify callbacks" do
+    expect(Bugsnag::Notification).to receive(:deliver_exception_payload)
     
     callback_run_count = 0
     Bugsnag.after_notify_callbacks << lambda {|notif|
@@ -105,10 +103,10 @@ describe Bugsnag::MiddlewareStack do
 
     Bugsnag.notify(BugsnagTestException.new("It crashed"))
     
-    callback_run_count.should be == 1
+    expect(callback_run_count).to eq(1)
   end
 
-  it "should not execute disabled bugsnag middleware" do
+  it "does not execute disabled bugsnag middleware" do
     callback_run_count = 0
     Bugsnag.configure do |config|
       config.middleware.disable(Bugsnag::Middleware::Callbacks)
@@ -119,6 +117,6 @@ describe Bugsnag::MiddlewareStack do
     }
     
     Bugsnag.notify(BugsnagTestException.new("It crashed"))
-    callback_run_count.should be == 0
+    expect(callback_run_count).to eq(0)
   end
-end
+end