bugsnag 1.5.2 → 1.5.3

data/CHANGELOG.md

@@ -1,6 +1,11 @@
 Changelog
 =========
 
+1.5.3
+-----
+-   Deal with self-referential meta data correctly.
+-   Dont load the environment when performing a deploy with capistrano.
+
 1.5.2
 -----
 -   Dont send rack.request.form_vars as it is a copy of form_hash and it may contain sensitive params.
@@ -178,4 +183,4 @@ Changelog
 
 1.1.0
 -----
--   First public release
+-   First public release

data/README.md

@@ -188,6 +188,17 @@ at_exit do
 end
 ```
 
+Testing Integration
+-------------------
+
+To test that bugsnag is properly configured, you can use the test_exception rake task like this,
+
+```bash
+rake bugsnag:test_exception
+```
+
+A test exception will be sent to your bugsnag dashboard if everything is configured correctly.
+
 Configuration
 -------------
 

data/VERSION

@@ -1 +1 @@
-1.5.2
+1.5.3

data/bugsnag.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bugsnag}
-  s.version = "1.5.2"
+  s.version = "1.5.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["James Smith"]
-  s.date = %q{2013-09-16}
+  s.date = %q{2013-10-07}
   s.description = %q{Ruby notifier for bugsnag.com}
   s.email = %q{james@bugsnag.com}
   s.extra_rdoc_files = [

data/lib/bugsnag/helpers.rb

@@ -10,22 +10,32 @@ module Bugsnag
   module Helpers
     MAX_STRING_LENGTH = 4096
 
-    def self.cleanup_obj(obj, filters = nil)
+    def self.cleanup_obj(obj, filters = nil, seen=Set.new)
       return nil unless obj
 
+      # Protect against recursion of recursable items
+      if obj.is_a?(Hash) || obj.is_a?(Array) || obj.is_a?(Set)
+        return "[RECURSION]" if seen.include? obj
+
+        # We duplicate the seen set here so that no updates by further cleanup_obj calls
+        # are persisted beyond that call.
+        seen = seen.dup
+        seen << obj
+      end
+
       if obj.is_a?(Hash)
         clean_hash = {}
         obj.each do |k,v| 
           if filters && filters.any? {|f| k.to_s.include?(f.to_s)}
             clean_hash[k] = "[FILTERED]"
           else
-            clean_obj = cleanup_obj(v, filters)
+            clean_obj = cleanup_obj(v, filters, seen)
             clean_hash[k] = clean_obj
           end
         end
         clean_hash
       elsif obj.is_a?(Array) || obj.is_a?(Set)
-        obj.map { |el| cleanup_obj(el, filters) }.compact
+        obj.map { |el| cleanup_obj(el, filters, seen) }.compact
       elsif obj.is_a?(Integer) || obj.is_a?(Float) || obj.is_a?(String)
         obj
       else
@@ -86,4 +96,4 @@ module Bugsnag
       end
     end
   end
-end
+end

data/lib/bugsnag/tasks/bugsnag.rake

@@ -1,36 +1,53 @@
 require "bugsnag"
 require "httparty"
 require "multi_json"
+require "net/http"
+require "uri"
 
 namespace :bugsnag do
   desc "Notify Bugsnag of a new deploy."
-  task :deploy => :load do
-    # Fetch and check the api key
-    api_key = ENV["BUGSNAG_API_KEY"] || Bugsnag.configuration.api_key
-    raise RuntimeError.new("No API key found when notifying deploy") if !api_key || api_key.empty?
-
-    # Build the deploy payload
-    payload = {
-      :apiKey => api_key,
-      :releaseStage => ENV["BUGSNAG_RELEASE_STAGE"] || Bugsnag.configuration.release_stage
-    }
-    payload[:appVersion] = ENV["BUGSNAG_APP_VERSION"] if ENV["BUGSNAG_APP_VERSION"]
-    payload[:revision] = ENV["BUGSNAG_REVISION"] if ENV["BUGSNAG_REVISION"]
-    payload[:repository] = ENV["BUGSNAG_REPOSITORY"] if ENV["BUGSNAG_REPOSITORY"]
-    payload[:branch] = ENV["BUGSNAG_BRANCH"] if ENV["BUGSNAG_BRANCH"]
-
+  task :deploy do
     # Post the deploy notification
     begin
+      require 'bugsnag'
+
+      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"]
+
+      begin
+        require Rails.root.join('config/initializers/bugsnag')
+      rescue Exception => e
+        yml_filename = Rails.root.join("config/bugsnag.yml")
+        config = YAML.load_file(yml_filename) if File.exists?(yml_filename)
+        Bugsnag.configure(config[releaseStage] ? config[releaseStage] : config) if config
+      end
+
+      # Fetch and check the api key
+      api_key ||= Bugsnag.configuration.api_key
+      raise RuntimeError.new("No API key found when notifying deploy") if !api_key || api_key.empty?
+
       endpoint = (Bugsnag.configuration.use_ssl ? "https://" : "http://") \
-               + (Bugsnag.configuration.endpoint || Bugsnag::Notification::DEFAULT_ENDPOINT) \
-               + "/deploy"
+                 + (Bugsnag.configuration.endpoint || Bugsnag::Notification::DEFAULT_ENDPOINT) \
+                 + "/deploy"
+      uri = URI.parse(endpoint)
+
+      parameters = {
+        "apiKey" => api_key,
+        "releaseStage" => releaseStage,
+        "appVersion" => appVersion,
+        "revision" => revision,
+        "repository" => repository,
+        "branch" => branch
+      }
+
+      Net::HTTP.post_form(uri, parameters)
 
-      HTTParty.post(endpoint, {
-        :body => Bugsnag::Helpers.dump_json(payload),
-        :headers => {"Content-Type" => "application/json"}
-      })
     rescue Exception => e
-      Bugsnag.log("Deploy notification failed, #{e.inspect}")
+      Bugsnag.warn("Deploy notification failed, #{e.inspect}")
     end
   end
 

data/spec/helper_spec.rb

@@ -1,6 +1,32 @@
 require 'spec_helper'
 
 describe Bugsnag::Helpers do
+  it "should be able to clean up recursive hashes" do
+    a = {:a => {}}
+    a[:a][:b] = a
+    Bugsnag::Helpers.cleanup_obj(a).should == {:a => {:b => "[RECURSION]"}}
+  end
+
+  it "should be able to clean up recursive arrays" do
+    a = []
+    a << a
+    a << "hello"
+    Bugsnag::Helpers.cleanup_obj(a).should == ["[RECURSION]", "hello"]
+  end
+
+  it "should allow multiple copies of the same string" do
+    a = {:name => "bugsnag"}
+    a[:second] = a[:name]
+    Bugsnag::Helpers.cleanup_obj(a).should == {:name => "bugsnag", :second => "bugsnag"}
+  end
+
+  it "should allow multiple copies of the same object" do
+    a = []
+    b = ["hello"]
+    a << b; a << b
+    Bugsnag::Helpers.cleanup_obj(a).should == [["hello"], ["hello"]]
+  end
+
   it "should reduce hash size correctly" do
     meta_data = {
       :key_one => "this should not be truncated",
@@ -61,4 +87,4 @@ describe Bugsnag::Helpers do
 
     url.should == "/dir/page?param1=[FILTERED]&param2=[FILTERED]&param3=value3"
   end
-end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 5
-  - 2
-  version: 1.5.2
+  - 3
+  version: 1.5.3
 platform: ruby
 authors: 
 - James Smith
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-09-16 00:00:00 -07:00
+date: 2013-10-07 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency