bugsnag 2.6.1 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 03c6229af994d490629b40b1e38c22f2a60a9377
-  data.tar.gz: c854283dfae8b5eeb9028340fa08b90c1449c8f7
+  metadata.gz: 0d479bf3d15d3a4185dfca6ac8c399babd8a1f0f
+  data.tar.gz: 6ea73f53d27cba623b393fea905a964b21b1e217
 SHA512:
-  metadata.gz: f3ed228a6c795b107f1d81d5e9d2dfcd2b29b5d73d3b9c988fc0547d439d1ce90997846e1a966e341acb53050aa2223e4ac1555c9c588e0aeddd3eb90c59c1c6
-  data.tar.gz: d35f27707d883e6b1b23f0c51ed5d15fbe013d249a40aac68707699d9c4678960a913e5e9af600d6e17e9d7a9bad52a92d51811bf5060e1758d939d55853dcf4
+  metadata.gz: 27994f415bc764ddb82ef036549dc49eca2b05a66aa3a802a9163791d6da30cfe8594c5c81445047530e5a10c3cc76ce4fe76e5b8a141351a81a029d940c709c
+  data.tar.gz: 61885434f5f97dae81e95db08405a8ae27c1076e3a2312ebd4234372845594f8ee3e8768865ad0b830d58545445a626e32a1efbc3659c8d7038b8f0a89daf1f9

data/CHANGELOG.md

@@ -1,6 +1,13 @@
 Changelog
 =========
 
+2.7.0
+-----
+-   Fix configuration of http timeouts
+-   Fix configuration of http proxies
+-   Remove dependency on httparty
+-   Allow for symbols in rack env
+
 2.6.1
 -----
 -   Fix Ruby 1.8 payload delivery bug (thanks @colin!)

data/VERSION

@@ -1 +1 @@
-2.6.1
+2.7.0

data/bugsnag.gemspec

@@ -20,11 +20,8 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'multi_json', ["~> 1.0"]
 
   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
 
@@ -33,4 +30,3 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'pry'
   s.add_development_dependency 'webmock'
 end
-

data/lib/bugsnag/capistrano.rb

@@ -1,4 +1,3 @@
-require "httparty"
 require "multi_json"
 require "bugsnag/deploy"
 

data/lib/bugsnag/delivery/synchronous.rb

@@ -1,13 +1,15 @@
+require "net/https"
+require "uri"
+
 module Bugsnag
   module Delivery
     class Synchronous
       HEADERS = {"Content-Type" => "application/json"}
-      TIMEOUT = 5
 
       class << self
-        def deliver(url, body)
+        def deliver(url, body, configuration)
           begin
-            response = HTTParty.post(url, {:body => body, :headers => HEADERS, :timeout => TIMEOUT})
+            response = request(url, body, configuration)
             Bugsnag.debug("Notification to #{url} finished, response was #{response.code}, payload was #{body}")
           rescue StandardError => e
             # KLUDGE: Since we don't re-raise http exceptions, this breaks rspec
@@ -17,6 +19,29 @@ module Bugsnag
             Bugsnag.warn(e.backtrace)
           end
         end
+
+        private
+
+        def request(url, body, configuration)
+          uri = URI.parse(url)
+          http = Net::HTTP.new(uri.host, uri.port, configuration.proxy_host, configuration.proxy_port, configuration.proxy_user, configuration.proxy_password)
+          http.read_timeout = configuration.timeout
+          http.open_timeout = configuration.timeout
+
+          if uri.scheme == "https"
+            http.use_ssl = true
+            # the default in 1.9+, but required for 1.8
+            http.verify_mode = OpenSSL::SSL::VERIFY_PEER
+          end
+
+          request = Net::HTTP::Post.new(path(uri), HEADERS)
+          request.body = body
+          http.request(request)
+        end
+
+        def path(uri)
+          uri.path == "" ? "/" : uri.path
+        end
       end
     end
   end

data/lib/bugsnag/delivery/thread_queue.rb

@@ -7,14 +7,14 @@ module Bugsnag
       STOP = Object.new
 
       class << self
-        def deliver(url, body)
+        def deliver(url, body, configuration)
           if queue.length > MAX_OUTSTANDING_REQUESTS
             Bugsnag.warn("Dropping notification, #{queue.length} outstanding requests")
             return
           end
 
           # Add delivery to the worker thread
-          queue.push proc { super(url, body) }
+          queue.push proc { super(url, body, configuration) }
 
           # Make sure the worker thread is started
           ensure_worker_thread_started

data/lib/bugsnag/deploy.rb

@@ -1,25 +1,25 @@
-require "net/http"
-require "uri"
 require "bugsnag"
 
 module Bugsnag
   class Deploy
     def self.notify(opts = {})
-      opts[:api_key] ||= Bugsnag.configuration.api_key
-      opts[:release_stage] ||= "production"
-      opts[:endpoint] ||= Bugsnag.configuration.endpoint
-      opts[:use_ssl] = Bugsnag.configuration.use_ssl if opts[:use_ssl] == nil
-      opts[:proxy_host] ||= Bugsnag.configuration.proxy_host
-      opts[:proxy_port] ||= Bugsnag.configuration.proxy_port
-      opts[:proxy_user] ||= Bugsnag.configuration.proxy_user
-      opts[:proxy_password] ||= Bugsnag.configuration.proxy_password
 
-      endpoint = (opts[:use_ssl] ? "https://" : "http://") + opts[:endpoint] + "/deploy"
+      configuration = Bugsnag.configuration.dup
+
+      # update configuration based on parameters passed in
+      [:api_key, :app_version, :release_stage, :endpoint, :use_ssl,
+       :proxy_host, :proxy_port, :proxy_user, :proxy_password].each do |param|
+        unless opts[param].nil?
+          configuration.send :"#{param}=", opts[param]
+        end
+      end
+
+      endpoint = (configuration.use_ssl ? "https://" : "http://") + configuration.endpoint + "/deploy"
 
       parameters = {
-        "apiKey" => opts[:api_key],
-        "releaseStage" => opts[:release_stage],
-        "appVersion" => opts[:app_version],
+        "apiKey" => configuration.api_key,
+        "releaseStage" => configuration.release_stage,
+        "appVersion" => configuration.app_version,
         "revision" => opts[:revision],
         "repository" => opts[:repository],
         "branch" => opts[:branch]
@@ -27,19 +27,8 @@ module Bugsnag
 
       raise RuntimeError.new("No API key found when notifying of deploy") if !parameters["apiKey"] || parameters["apiKey"].empty?
 
-      uri = URI.parse(endpoint)
-      req = Net::HTTP::Post.new(uri.path)
-      req.set_form_data(parameters)
-      http = Net::HTTP.new(
-        uri.host,
-        uri.port,
-        opts[:proxy_host],
-        opts[:proxy_port],
-        opts[:proxy_user],
-        opts[:proxy_password]
-      )
-      http.use_ssl = true if opts[:use_ssl]
-      http.request(req)
+      payload_string = Bugsnag::Helpers.dump_json(parameters)
+      Bugsnag::Delivery::Synchronous.deliver(endpoint, payload_string, configuration)
     end
   end
 end

data/lib/bugsnag/helpers.rb

@@ -1,11 +1,3 @@
-module HTTParty
-  class Parser
-    def json
-      Bugsnag::Helpers.load_json(body)
-    end
-  end
-end
-
 module Bugsnag
   module Helpers
     MAX_STRING_LENGTH = 4096

data/lib/bugsnag/middleware/rack_request.rb

@@ -28,7 +28,7 @@ module Bugsnag::Middleware
         headers = {}
 
         env.each_pair do |key, value|
-          if key.start_with?("HTTP_")
+          if key.to_s.start_with?("HTTP_")
             header_key = key[5..-1]
           elsif ["CONTENT_TYPE", "CONTENT_LENGTH"].include?(key)
             header_key = key

data/lib/bugsnag/notification.rb

@@ -1,11 +1,8 @@
-require "httparty"
 require "multi_json"
 require "pathname"
 
 module Bugsnag
   class Notification
-    include HTTParty
-
     NOTIFIER_NAME = "Ruby Bugsnag Notifier"
     NOTIFIER_VERSION = Bugsnag::VERSION
     NOTIFIER_URL = "http://www.bugsnag.com"
@@ -40,7 +37,7 @@ module Bugsnag
           payload_string = Bugsnag::Helpers.dump_json(payload)
         end
 
-        Bugsnag::Delivery[delivery_method || configuration.delivery_method].deliver(url, payload_string)
+        Bugsnag::Delivery[delivery_method || configuration.delivery_method].deliver(url, payload_string, configuration)
       end
     end
 
@@ -101,9 +98,6 @@ 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
-      self.class.default_timeout(configuration.timeout) if configuration.timeout
     end
 
     # Add a single value as custom data, to this notification

data/spec/integration_spec.rb

@@ -31,4 +31,56 @@ describe 'Bugsnag' do
 
     expect(request['events'][0]['exceptions'][0]['message']).to eq('yo')
   end
+
+  it 'should send deploys over the wire' do
+    Bugsnag.configure do |config|
+      config.endpoint = "localhost:#{server.config[:Port]}"
+      config.use_ssl = false
+    end
+    WebMock.allow_net_connect!
+
+    Bugsnag::Deploy.notify :app_version => '1.1.1'
+
+    expect(request['appVersion']).to eq('1.1.1')
+  end
+
+  describe 'with a proxy' do
+    proxy = nil
+    pqueue = Queue.new
+
+    before do
+      proxy = WEBrick::HTTPServer.new :Port => 0, :Logger => WEBrick::Log.new("/dev/null"), :AccessLog => []
+      proxy.mount_proc '/' do |req, res|
+        pqueue.push req
+        res.status = 200
+        res.body = "OK\n"
+      end
+      Thread.new{ proxy.start }
+    end
+    after do
+      proxy.stop
+    end
+
+    let(:proxied_request) { pqueue.pop }
+
+    it 'should use a proxy when configured' do
+      Bugsnag.configure do |config|
+
+        config.endpoint = "localhost:#{server.config[:Port]}"
+        config.use_ssl = false
+
+        config.proxy_host = 'localhost'
+        config.proxy_port = proxy.config[:Port]
+        config.proxy_user = 'conrad'
+        config.proxy_password = '$ecret'
+      end
+
+      Bugsnag.notify 'oy'
+
+      r = proxied_request
+
+      expect(r.header['proxy-authorization'].first).to eq("Basic Y29ucmFkOiRlY3JldA==")
+      expect(r.request_line).to eq("POST http://localhost:#{server.config[:Port]}/ HTTP/1.1\r\n")
+    end
+  end
 end

data/spec/notification_spec.rb

@@ -645,71 +645,6 @@ describe Bugsnag::Notification do
     }
   end
 
-  it "uses a proxy host if configured" do
-    Bugsnag.configure do |config|
-      config.proxy_host = "host_name"
-    end
-
-    expect(Bugsnag::Notification).to receive(:http_proxy) do |*args|
-      expect(args.length).to eq(4)
-      expect(args[0]).to eq("host_name")
-      expect(args[1]).to eq(nil)
-      expect(args[2]).to eq(nil)
-      expect(args[3]).to eq(nil)
-    end
-
-    notify_test_exception
-  end
-
-  it "uses a proxy host/port if configured" do
-    Bugsnag.configure do |config|
-      config.proxy_host = "host_name"
-      config.proxy_port = 1234
-    end
-
-    expect(Bugsnag::Notification).to receive(:http_proxy) do |*args|
-      expect(args.length).to eq(4)
-      expect(args[0]).to eq("host_name")
-      expect(args[1]).to eq(1234)
-      expect(args[2]).to eq(nil)
-      expect(args[3]).to eq(nil)
-    end
-
-    notify_test_exception
-  end
-
-  it "uses 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
-
-    expect(Bugsnag::Notification).to receive(:http_proxy) do |*args|
-      expect(args.length).to eq(4)
-      expect(args[0]).to eq("host_name")
-      expect(args[1]).to eq(1234)
-      expect(args[2]).to eq("user")
-      expect(args[3]).to eq("password")
-    end
-
-    notify_test_exception
-  end
-
-  it "sets the timeout time to the value in the configuration" do
-    Bugsnag.configure do |config|
-      config.timeout = 10
-    end
-
-    expect(Bugsnag::Notification).to receive(:default_timeout) do |*args|
-      expect(args.length).to eq(1)
-      expect(args[0]).to eq(10)
-    end
-
-    notify_test_exception
-  end
-
   it "should fix invalid utf8" do
     invalid_data = "fl\xc3ff"
     invalid_data.force_encoding('BINARY') if invalid_data.respond_to?(:force_encoding)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bugsnag
 version: !ruby/object:Gem::Version
-  version: 2.6.1
+  version: 2.7.0
 platform: ruby
 authors:
 - James Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-17 00:00:00.000000000 Z
+date: 2015-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -24,26 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: httparty
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.6'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement