airbrake 3.0.8 → 3.0.9

data/CHANGELOG

@@ -1,7 +1,20 @@
+Version 3.0.9 - Thu Dec 15 23:51:38 +0100 2011
+===============================================================================
+
+David Palm (2):
+      Merge pull request #45 from spagalloco/patch-1
+      Pulls in ideas from https://github.com/kidsalsa/airbrake/commit/54982ba83bd6c577a0835b9ba5936c690029244c#L0R2 BUT
+        - moves #ca_bundle_path to Airbrake::Configuration
+        - moves #local_cert_path to Airbrake::Configuration
+        - adds #use_system_ssl_cert_chain? alias to Airbrake::Configuration
+        - makes Airbrake.configure return the created sender (in addition to yielding)
+        - stops airbrake deploy tasks duplicate code form the configuration class
+        - cleanup unused expectations from tests
+
 Version 3.0.8 - Sun Dec 11 22:14:18 +0100 2011
 ===============================================================================
 
-David Palm (15):
+David Palm (1):
       Use OpenSSL::X509::DEFAULT_CERT_FILE to connect only if configured to by setting use_system_ssl_cert_chain to true
 
 Version 3.0.7 - Sun Dec 11 21:04:08 +0100 2011
@@ -625,3 +638,4 @@ Nick Quaranto (3):
 
 
 
+

data/README.md

@@ -13,7 +13,7 @@ For help with using Airbrake and this notifier visit [our support site](http://h
 
 For discussion of Airbrake development check out the [mailing list](http://groups.google.com/group/hoptoad-notifier-dev).
 
-For SSL verification see the [Resources](resources/README.md).
+For SSL verification see the [Resources](https://github.com/airbrake/airbrake/blob/master/resources/README.md).
 
 Rails Installation
 ------------------
@@ -430,7 +430,7 @@ Credits
 
 Airbrake is maintained and funded by [thoughtbot, inc](http://thoughtbot.com/community)
 
-Thank you to all [the contributors](https://github.com/thoughtbot/airbrake/contributors)!
+Thank you to all [the contributors](https://github.com/airbrake/airbrake/contributors)!
 
 The names and logos for thoughtbot are trademarks of thoughtbot, inc.
 

data/lib/airbrake.rb

@@ -80,6 +80,7 @@ module Airbrake
       yield(configuration)
       self.sender = Sender.new(configuration)
       report_ready unless silent
+      self.sender
     end
 
     # The configuration object.

data/lib/airbrake/configuration.rb

@@ -123,6 +123,7 @@ module Airbrake
                       'AbstractController::ActionNotFound']
 
     alias_method :secure?, :secure
+    alias_method :use_system_ssl_cert_chain?, :use_system_ssl_cert_chain
 
     def initialize
       @secure                   = false
@@ -235,9 +236,20 @@ module Airbrake
       warn 'config.environment_filters has been deprecated and has no effect.'
       []
     end
+    
+    def ca_bundle_path
+      if use_system_ssl_cert_chain? && File.exist?(OpenSSL::X509::DEFAULT_CERT_FILE)
+        OpenSSL::X509::DEFAULT_CERT_FILE
+      else
+        local_cert_path # ca-bundle.crt built from source, see resources/README.md
+      end
+    end
 
-    private
+    def local_cert_path
+      File.expand_path(File.join("..", "..", "..", "resources", "ca-bundle.crt"), __FILE__)
+    end
 
+  private
     def default_port
       if secure?
         443

data/lib/airbrake/sender.rb

@@ -1,7 +1,7 @@
 module Airbrake
   # Sends out the notice to Airbrake
   class Sender
-
+    
     NOTICES_URI = '/notifier_api/v2/notices/'.freeze
     HTTP_ERRORS = [Timeout::Error,
                    Errno::EINVAL,
@@ -58,13 +58,6 @@ module Airbrake
       nil
     end
 
-
-    # Local certificate path.
-    #
-    def self.local_cert_path
-      File.expand_path(File.join("..", "..", "..", "resources", "ca-bundle.crt"), __FILE__)
-    end
-
     attr_reader :proxy_host,
                 :proxy_port,
                 :proxy_user,
@@ -107,12 +100,13 @@ module Airbrake
       if secure?
         http.use_ssl     = true
 
-        if use_system_ssl_cert_chain? && File.exist?(OpenSSL::X509::DEFAULT_CERT_FILE)
-          http.ca_file     = OpenSSL::X509::DEFAULT_CERT_FILE
-        else
-          http.ca_file     = Sender.local_cert_path # ca-bundle.crt built from source, see resources/README.md
-        end
-        http.verify_mode = OpenSSL::SSL::VERIFY_PEER
+        # if use_system_ssl_cert_chain? && File.exist?(OpenSSL::X509::DEFAULT_CERT_FILE)
+        #   http.ca_file     = OpenSSL::X509::DEFAULT_CERT_FILE
+        # else
+        #   http.ca_file     = Sender.local_cert_path # ca-bundle.crt built from source, see resources/README.md
+        # end
+        http.ca_file      = Airbrake.configuration.ca_bundle_path
+        http.verify_mode  = OpenSSL::SSL::VERIFY_PEER
       else
         http.use_ssl     = false
       end

data/lib/airbrake/version.rb

@@ -1,3 +1,3 @@
 module Airbrake
-  VERSION = '3.0.8'
+  VERSION = "3.0.9"
 end

data/lib/airbrake_tasks.rb

@@ -25,20 +25,26 @@ module AirbrakeTasks
     end
 
     dry_run = opts.delete(:dry_run)
-    params = {'api_key' => opts.delete(:api_key) ||
-                             Airbrake.configuration.api_key}
+    params = {'api_key' => opts.delete(:api_key) || Airbrake.configuration.api_key}
     opts.each {|k,v| params["deploy[#{k}]"] = v }
 
     host = Airbrake.configuration.host || 'airbrake.io'
-    port = Airbrake.configuration.port || (Airbrake.configuration.secure ? 443 : 80)
+    port = Airbrake.configuration.port
 
     proxy = Net::HTTP.Proxy(Airbrake.configuration.proxy_host,
                             Airbrake.configuration.proxy_port,
                             Airbrake.configuration.proxy_user,
                             Airbrake.configuration.proxy_pass)
     http = proxy.new(host, port)
-    http.use_ssl = Airbrake.configuration.secure
 
+    
+
+    # Handle Security
+    if Airbrake.configuration.secure?
+      http.use_ssl  = true
+      http.ca_file  = Airbrake.configuration.ca_bundle_path
+    end
+    
     post = Net::HTTP::Post.new("/deploys.txt")
     post.set_form_data(params)
   

data/test/airbrake_tasks_test.rb

@@ -39,12 +39,11 @@ class AirbrakeTasksTest < Test::Unit::TestCase
 
       context "given an optional HTTP proxy and valid options" do
         setup do
-          @response         = stub("response", :body => "stub body")
-          @http_proxy       = stub("proxy",    :request => @response)
+          @response         = stub("response",    :body => "stub body")
+          @http_proxy       = stub("proxy",       :request => @response)
           @http_proxy_class = stub("proxy_class", :new => @http_proxy)
-          @post             = stub("post",     :set_form_data => nil)
+          @post             = stub("post",        :set_form_data => nil)
 
-          @http_proxy.expects(:use_ssl=).with(Airbrake.configuration.secure)
           Net::HTTP.expects(:Proxy).
             with(Airbrake.configuration.proxy_host,
                  Airbrake.configuration.proxy_port,
@@ -61,7 +60,7 @@ class AirbrakeTasksTest < Test::Unit::TestCase
 
           should "return true without performing any actual request" do
             assert_equal true, @output
-            assert_received(@http_proxy, :request) do|expects|
+            assert_received(@http_proxy, :request) do |expects|
               expects.never
             end
           end
@@ -141,13 +140,11 @@ class AirbrakeTasksTest < Test::Unit::TestCase
         before_should "post to the custom host" do
           @post             = stub("post",     :set_form_data => nil)
           @http_proxy       = stub("proxy",    :request => @response)
-          @http_proxy.expects(:use_ssl=).with(Airbrake.configuration.secure)
+          
           @http_proxy_class = stub("proxy_class", :new => @http_proxy)
           @http_proxy_class.expects(:new).with("custom.host", 80).returns(@http_proxy)
           Net::HTTP.expects(:Proxy).with(any_parameters).returns(@http_proxy_class)
           Net::HTTP::Post.expects(:new).with("/deploys.txt").returns(@post)
-          # URI.stubs(:parse).with('http://custom.host/deploys.txt').returns(:uri)
-          # Net::HTTP.expects(:post_form).with(:uri, kind_of(Hash)).returns(successful_response)
           @post.expects(:set_form_data).with(kind_of(Hash))
           @http_proxy.expects(:request).with(any_parameters).returns(successful_response)
         end

data/test/sender_test.rb

@@ -7,9 +7,9 @@ class SenderTest < Test::Unit::TestCase
   end
 
   def build_sender(opts = {})
-    config = Airbrake::Configuration.new
-    opts.each {|opt, value| config.send(:"#{opt}=", value) }
-    sender = Airbrake::Sender.new(config)
+    Airbrake.configure do |conf|
+      opts.each {|opt, value| conf.send(:"#{opt}=", value) }
+    end
   end
 
   def send_exception(args = {})
@@ -171,7 +171,7 @@ class SenderTest < Test::Unit::TestCase
       send_exception(:secure => true)
       assert(real_http.use_ssl?)
       assert_equal(OpenSSL::SSL::VERIFY_PEER,        real_http.verify_mode)
-      assert_equal(Airbrake::Sender.local_cert_path, real_http.ca_file)
+      assert_equal(Airbrake.configuration.local_cert_path, real_http.ca_file)
     end
     
     should "use the default DEFAULT_CERT_FILE if asked to" do
@@ -182,7 +182,7 @@ class SenderTest < Test::Unit::TestCase
       assert(sender.use_system_ssl_cert_chain?)
 
       http    = sender.send(:setup_http_connection)
-      assert_not_equal http.ca_file, Airbrake::Sender.local_cert_path
+      assert_not_equal http.ca_file, config.local_cert_path
     end
     
     should "verify the connection when the use_ssl option is set (VERIFY_PEER)" do
@@ -195,13 +195,13 @@ class SenderTest < Test::Unit::TestCase
       sender  = build_sender(:secure => true)
       http    = sender.send(:setup_http_connection)
       
-      assert_equal(Airbrake::Sender.local_cert_path, http.ca_file)
+      assert_equal(Airbrake.configuration.local_cert_path, http.ca_file)
 
       File.stubs(:exist?).with(OpenSSL::X509::DEFAULT_CERT_FILE).returns(true)
       sender  = build_sender(:secure => true, :use_system_ssl_cert_chain => true)
       http    = sender.send(:setup_http_connection)
       
-      assert_not_equal(Airbrake::Sender.local_cert_path, http.ca_file)
+      assert_not_equal(Airbrake.configuration.local_cert_path, http.ca_file)
       assert_equal(OpenSSL::X509::DEFAULT_CERT_FILE, http.ca_file)
     end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: airbrake
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 3
   - 0
-  - 8
-  version: 3.0.8
+  - 9
+  version: 3.0.9
 platform: ruby
 authors: 
 - thoughtbot, inc
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-11 00:00:00 Z
+date: 2011-12-15 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: builder