bugsnag 1.4.2 → 1.5.0

data/.travis.yml

@@ -1,8 +1,13 @@
 language: ruby
+
 rvm:
   - 1.9.3
   - jruby-18mode
   - jruby-19mode
   - rbx-18mode
   - rbx-19mode
-  - 1.8.7
+  - 1.8.7
+
+notifications:
+  hipchat:
+    secure: "OLw2B1ggBDSeyJYgnZ2Ezf2fXbu5BHWSNFEJF38+TB4hYv+Wp3rElROhnyP6IttftLYz68Q8n9SjEUXTX9zXwTNt2fGBHIDwLnjt1uw7BrIOIHCUheOJdPheV2XxdJv9yem5MQ0vF+y33auLpyrA53b+nCbI5UsCXKISLe+C8ME="

data/README.md

@@ -49,6 +49,9 @@ How to Install
     end
     ```
 
+    If you don't configure the api_key, the Bugsnag module will read the `BUGSNAG_API_KEY`
+    environment variable.
+
 4.  **Rack/Sinatra apps only**: Activate the Bugsnag Rack middleware
 
     ```ruby
@@ -323,6 +326,38 @@ config.ignore_user_agents << %r{Chrome}
 By default, `ignore_user_agents` is empty, so exceptions caused by all
 user agents are reported.
 
+###proxy_host
+
+Sets the address of the HTTP proxy that should be used for requests to bugsnag.
+
+```ruby
+config.proxy_host = "10.10.10.10"
+```
+
+###proxy_port
+
+Sets the port of the HTTP proxy that should be used for requests to bugsnag.
+
+```ruby
+config.proxy_port = 1089
+```
+
+###proxy_user
+
+Sets the user that should be used to send requests to the HTTP proxy for requests to bugsnag.
+
+```ruby
+config.proxy_user = "proxy_user"
+```
+
+###proxy_password
+
+Sets the password for the user that should be used to send requests to the HTTP proxy for requests to bugsnag.
+
+```ruby
+config.proxy_password = "proxy_secret_password_here"
+```
+
 ###logger
 
 Sets which logger to use for Bugsnag log messages. In rails apps, this is

data/VERSION

@@ -1 +1 @@
-1.4.2
+1.5.0

data/bugsnag.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = "bugsnag"
-  s.version = "1.4.2"
+  s.name = %q{bugsnag}
+  s.version = "1.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["James Smith"]
-  s.date = "2013-08-06"
-  s.description = "Ruby notifier for bugsnag.com"
-  s.email = "james@bugsnag.com"
+  s.date = %q{2013-08-19}
+  s.description = %q{Ruby notifier for bugsnag.com}
+  s.email = %q{james@bugsnag.com}
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.md"
@@ -60,31 +60,32 @@ Gem::Specification.new do |s|
     "spec/rack_spec.rb",
     "spec/spec_helper.rb"
   ]
-  s.homepage = "http://github.com/bugsnag/bugsnag-ruby"
+  s.homepage = %q{http://github.com/bugsnag/bugsnag-ruby}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.24"
-  s.summary = "Ruby notifier for bugsnag.com"
+  s.rubygems_version = %q{1.3.6}
+  s.summary = %q{Ruby notifier for bugsnag.com}
 
   if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<multi_json>, ["~> 1.0"])
-      s.add_runtime_dependency(%q<httparty>, ["< 1.0", ">= 0.6"])
+      s.add_runtime_dependency(%q<httparty>, [">= 0.6", "< 1.0"])
       s.add_development_dependency(%q<rspec>, ["~> 2.11.0"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.8.4"])
     else
       s.add_dependency(%q<multi_json>, ["~> 1.0"])
-      s.add_dependency(%q<httparty>, ["< 1.0", ">= 0.6"])
+      s.add_dependency(%q<httparty>, [">= 0.6", "< 1.0"])
       s.add_dependency(%q<rspec>, ["~> 2.11.0"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
     end
   else
     s.add_dependency(%q<multi_json>, ["~> 1.0"])
-    s.add_dependency(%q<httparty>, ["< 1.0", ">= 0.6"])
+    s.add_dependency(%q<httparty>, [">= 0.6", "< 1.0"])
     s.add_dependency(%q<rspec>, ["~> 2.11.0"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])
     s.add_dependency(%q<jeweler>, ["~> 1.8.4"])

data/lib/bugsnag/configuration.rb

@@ -19,6 +19,10 @@ module Bugsnag
     attr_accessor :middleware
     attr_accessor :delay_with_resque
     attr_accessor :debug
+    attr_accessor :proxy_host
+    attr_accessor :proxy_port
+    attr_accessor :proxy_user
+    attr_accessor :proxy_password
 
     THREAD_LOCAL_NAME = "bugsnag_req_data"
 
@@ -40,8 +44,6 @@ module Bugsnag
 
     def initialize
       # Set up the defaults
-      self.release_stage = nil
-      self.notify_release_stages = nil
       self.auto_notify = true
       self.use_ssl = false
       self.params_filters = Set.new(DEFAULT_PARAMS_FILTERS)
@@ -49,6 +51,9 @@ module Bugsnag
       self.ignore_user_agents = Set.new(DEFAULT_IGNORE_USER_AGENTS)
       self.endpoint = DEFAULT_ENDPOINT
 
+      # Read the API key from the environment
+      self.api_key = ENV["BUGSNAG_API_KEY"]
+
       # Set up logging
       self.logger = Logger.new(STDOUT)
       self.logger.level = Logger::WARN

data/lib/bugsnag/notification.rb

@@ -79,6 +79,8 @@ module Bugsnag
           ex = nil
         end
       end
+
+      self.class.http_proxy configuration.proxy_host, configuration.proxy_port, configuration.proxy_user, configuration.proxy_password if configuration.proxy_host
     end
 
     # Add a single value as custom data, to this notification

data/spec/notification_spec.rb

@@ -31,6 +31,21 @@ describe Bugsnag::Notification do
     Bugsnag.notify(BugsnagTestException.new("It crashed"))
   end
 
+  it "should use the env variable apiKey" do
+    ENV["BUGSNAG_API_KEY"] = "c9d60ae4c7e70c4b6c4ebd3e8056d2b9"
+
+    Bugsnag.instance_variable_set(:@configuration, Bugsnag::Configuration.new)
+    Bugsnag.configure do |config|
+      config.release_stage = "production"
+    end
+
+    Bugsnag::Notification.should_receive(:deliver_exception_payload) do |endpoint, payload|
+      payload[:apiKey].should be == "c9d60ae4c7e70c4b6c4ebd3e8056d2b9"
+    end
+
+    Bugsnag.notify(BugsnagTestException.new("It crashed"))
+  end
+
   it "should have the right exception class" do
     Bugsnag::Notification.should_receive(:deliver_exception_payload) do |endpoint, payload|
       exception = get_exception_from_payload(payload)
@@ -507,4 +522,56 @@ describe Bugsnag::Notification do
 
     Bugsnag.notify(ex)
   end
+
+  it "should use a proxy host if configured" do
+    Bugsnag.configure do |config|
+      config.proxy_host = "host_name"
+    end
+
+    Bugsnag::Notification.should_receive(:http_proxy) do |*args|
+      args.length.should be == 4
+      args[0].should be == "host_name"
+      args[1].should be == nil
+      args[2].should be == nil
+      args[3].should be == nil
+    end
+
+    Bugsnag.notify("test message")
+  end
+
+  it "should use a proxy host/port if configured" do
+    Bugsnag.configure do |config|
+      config.proxy_host = "host_name"
+      config.proxy_port = 1234
+    end
+
+    Bugsnag::Notification.should_receive(:http_proxy) do |*args|
+      args.length.should be == 4
+      args[0].should be == "host_name"
+      args[1].should be == 1234
+      args[2].should be == nil
+      args[3].should be == nil
+    end
+
+    Bugsnag.notify("test message")
+  end
+
+  it "should use a proxy host/port/user/pass if configured" do
+    Bugsnag.configure do |config|
+      config.proxy_host = "host_name"
+      config.proxy_port = 1234
+      config.proxy_user = "user"
+      config.proxy_password = "password"
+    end
+
+    Bugsnag::Notification.should_receive(:http_proxy) do |*args|
+      args.length.should be == 4
+      args[0].should be == "host_name"
+      args[1].should be == 1234
+      args[2].should be == "user"
+      args[3].should be == "password"
+    end
+
+    Bugsnag.notify("test message")
+  end
 end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: bugsnag
 version: !ruby/object:Gem::Version 
-  hash: 3
-  prerelease: 
+  prerelease: false
   segments: 
   - 1
-  - 4
-  - 2
-  version: 1.4.2
+  - 5
+  - 0
+  version: 1.5.0
 platform: ruby
 authors: 
 - James Smith
@@ -15,92 +14,82 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-08-06 00:00:00 Z
+date: 2013-08-19 00:00:00 -07:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
+  prerelease: false
+  type: :runtime
+  name: multi_json
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
         segments: 
         - 1
         - 0
         version: "1.0"
-  type: :runtime
-  version_requirements: *id001
-  name: multi_json
-  prerelease: false
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
+  prerelease: false
+  type: :runtime
+  name: httparty
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     requirements: 
-    - - <
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
         segments: 
         - 0
         - 6
         version: "0.6"
-  type: :runtime
-  version_requirements: *id002
-  name: httparty
-  prerelease: false
+    - - <
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 0
+        version: "1.0"
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
+  prerelease: false
+  type: :development
+  name: rspec
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 35
         segments: 
         - 2
         - 11
         - 0
         version: 2.11.0
-  type: :development
-  version_requirements: *id003
-  name: rspec
-  prerelease: false
+  requirement: *id003
 - !ruby/object:Gem::Dependency 
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
+  prerelease: false
+  type: :development
+  name: rdoc
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 31
         segments: 
         - 3
         - 12
         version: "3.12"
-  type: :development
-  version_requirements: *id004
-  name: rdoc
-  prerelease: false
+  requirement: *id004
 - !ruby/object:Gem::Dependency 
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
+  prerelease: false
+  type: :development
+  name: jeweler
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 63
         segments: 
         - 1
         - 8
         - 4
         version: 1.8.4
-  type: :development
-  version_requirements: *id005
-  name: jeweler
-  prerelease: false
+  requirement: *id005
 description: Ruby notifier for bugsnag.com
 email: james@bugsnag.com
 executables: []
@@ -153,6 +142,7 @@ files:
 - spec/notification_spec.rb
 - spec/rack_spec.rb
 - spec/spec_helper.rb
+has_rdoc: true
 homepage: http://github.com/bugsnag/bugsnag-ruby
 licenses: 
 - MIT
@@ -162,27 +152,23 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Ruby notifier for bugsnag.com