bunny 1.0.0.pre4 → 1.0.0.pre5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c1668fc7a45c060f60a853a68eab96a4f3a18b56
-  data.tar.gz: 36139657c1d1333fbc97cf070d588e4fe8bd2927
+  metadata.gz: 1727f4dbfca01835cbc22019086dda09c7696033
+  data.tar.gz: 3ef0c8e3ea1a1f3b9dbe7ec00a171d30c196ec98
 SHA512:
-  metadata.gz: dde418ea8694ed3c7755552d8f8eb43ca3afe3d8063ecf05e1fc359b8705fa6ef8c148a463d65426bbfa1dafea14979a4b0e9439296b106684b33dd590bf0d02
-  data.tar.gz: b825a7c0f8e3e0cdf1a44f46a4d6eac297a6f356f9e4ec153b3dc4301a499923eccf22e26c9a4079502d428f9a32887378f86669cd33cd9091e0597c00d9a639
+  metadata.gz: ba745b6f58a1eeca8f3064c3f11d17df8b2b306d0ccdcb83dd9d109b312b5408d6f83bd9e0735a5e077ea7290995dc4ef2392b1fd6753aa7ec55cc6ae570d41a
+  data.tar.gz: 6debdd81bc52d31937e78cab8fcfa6922d2df2143c27b6e698b2b5f5a5e42826e22e7bfe8d551a3479cc118417cde5e8e6863f3a587c9c8f8424e4f4b2b7daea

data/.travis.yml

@@ -7,6 +7,7 @@ rvm:
   - "jruby-19mode"
   - "1.9.2"
   - "rbx-19mode"
+  - "1.8.7"
 notifications:
   email: michael@rabbitmq.com
 services:
@@ -18,3 +19,4 @@ branches:
 matrix:
   allow_failures:
     - rvm: rbx-19mode
+    - rvm: 1.8.7

data/ChangeLog.md

@@ -1,3 +1,23 @@
+## Changes between Bunny 1.0.0.pre4 and 1.0.0.pre5
+
+### Bunny::Session.parse_uri
+
+`Bunny::Session.parse_uri` is a new method that parses
+connection URIs into hashes that `Bunny::Session#initialize`
+accepts.
+
+``` ruby
+Bunny::Session.parse_uri("amqp://user:pwd@broker.eng.megacorp.local/myapp_qa")
+```
+
+### Default Paths for TLS/SSL CA's on All OS'es
+
+Bunny now uses OpenSSL to detect default TLS/SSL CA's paths, extending
+this feature to OS'es other than Linux.
+
+Contributed by Jingwen Owen Ou.
+
+
 ## Changes between Bunny 1.0.0.pre3 and 1.0.0.pre4
 
 ### Default Paths for TLS/SSL CA's on Linux

data/lib/bunny.rb

@@ -9,6 +9,7 @@ require "amq/protocol/extensions"
 require "bunny/framing"
 require "bunny/exceptions"
 require "bunny/socket"
+require "bunny/timeout"
 
 begin
   require "openssl"
@@ -33,20 +34,6 @@ module Bunny
   # AMQP protocol version Bunny implements
   PROTOCOL_VERSION = AMQ::Protocol::PROTOCOL_VERSION
 
-  # unifies Ruby standard library's Timeout (which is not accurate on
-  # Ruby 1.8 and has other issues) and SystemTimer (the gem)
-  Timer = if RUBY_VERSION < "1.9"
-            begin
-              require "bunny/system_timer"
-              Bunny::SystemTimer
-            rescue LoadError
-              Timeout
-            end
-          else
-            Timeout
-          end
-
-
   #
   # API
   #

data/lib/bunny/channel.rb

@@ -602,7 +602,7 @@ module Bunny
 
       @connection.send_frame(AMQ::Protocol::Basic::Qos.encode(@id, 0, prefetch_count, global))
 
-      Bunny::Timer.timeout(read_write_timeout, ClientTimeout) do
+      Bunny::Timeout.timeout(read_write_timeout, ClientTimeout) do
         @last_basic_qos_ok = wait_on_continuations
       end
       raise_if_continuation_resulted_in_a_channel_error!
@@ -621,7 +621,7 @@ module Bunny
       raise_if_no_longer_open!
 
       @connection.send_frame(AMQ::Protocol::Basic::Recover.encode(@id, requeue))
-      Bunny::Timer.timeout(read_write_timeout, ClientTimeout) do
+      Bunny::Timeout.timeout(read_write_timeout, ClientTimeout) do
         @last_basic_recover_ok = wait_on_continuations
       end
       raise_if_continuation_resulted_in_a_channel_error!
@@ -823,7 +823,7 @@ module Bunny
           arguments))
 
       begin
-        Bunny::Timer.timeout(read_write_timeout, ClientTimeout) do
+        Bunny::Timeout.timeout(read_write_timeout, ClientTimeout) do
           @last_basic_consume_ok = wait_on_continuations
         end
       rescue Exception => e
@@ -873,7 +873,7 @@ module Bunny
           consumer.arguments))
 
       begin
-        Bunny::Timer.timeout(read_write_timeout, ClientTimeout) do
+        Bunny::Timeout.timeout(read_write_timeout, ClientTimeout) do
           @last_basic_consume_ok = wait_on_continuations
         end
       rescue Exception => e
@@ -908,7 +908,7 @@ module Bunny
     def basic_cancel(consumer_tag)
       @connection.send_frame(AMQ::Protocol::Basic::Cancel.encode(@id, consumer_tag, false))
 
-      Bunny::Timer.timeout(read_write_timeout, ClientTimeout) do
+      Bunny::Timeout.timeout(read_write_timeout, ClientTimeout) do
         @last_basic_cancel_ok = wait_on_continuations
       end
 
@@ -982,7 +982,7 @@ module Bunny
           opts[:if_unused],
           opts[:if_empty],
           false))
-      Bunny::Timer.timeout(read_write_timeout, ClientTimeout) do
+      Bunny::Timeout.timeout(read_write_timeout, ClientTimeout) do
         @last_queue_delete_ok = wait_on_continuations
       end
       raise_if_continuation_resulted_in_a_channel_error!
@@ -1002,7 +1002,7 @@ module Bunny
 
       @connection.send_frame(AMQ::Protocol::Queue::Purge.encode(@id, name, false))
 
-      Bunny::Timer.timeout(read_write_timeout, ClientTimeout) do
+      Bunny::Timeout.timeout(read_write_timeout, ClientTimeout) do
         @last_queue_purge_ok = wait_on_continuations
       end
       raise_if_continuation_resulted_in_a_channel_error!
@@ -1038,7 +1038,7 @@ module Bunny
           opts[:routing_key],
           false,
           opts[:arguments]))
-      Bunny::Timer.timeout(read_write_timeout, ClientTimeout) do
+      Bunny::Timeout.timeout(read_write_timeout, ClientTimeout) do
         @last_queue_bind_ok = wait_on_continuations
       end
 
@@ -1073,7 +1073,7 @@ module Bunny
           exchange_name,
           opts[:routing_key],
           opts[:arguments]))
-      Bunny::Timer.timeout(read_write_timeout, ClientTimeout) do
+      Bunny::Timeout.timeout(read_write_timeout, ClientTimeout) do
         @last_queue_unbind_ok = wait_on_continuations
       end
 
@@ -1112,7 +1112,7 @@ module Bunny
           false,
           false,
           opts[:arguments]))
-      Bunny::Timer.timeout(read_write_timeout, ClientTimeout) do
+      Bunny::Timeout.timeout(read_write_timeout, ClientTimeout) do
         @last_exchange_declare_ok = wait_on_continuations
       end
 
@@ -1137,7 +1137,7 @@ module Bunny
           name,
           opts[:if_unused],
           false))
-      Bunny::Timer.timeout(read_write_timeout, ClientTimeout) do
+      Bunny::Timeout.timeout(read_write_timeout, ClientTimeout) do
         @last_exchange_delete_ok = wait_on_continuations
       end
 
@@ -1181,7 +1181,7 @@ module Bunny
           opts[:routing_key],
           false,
           opts[:arguments]))
-      Bunny::Timer.timeout(read_write_timeout, ClientTimeout) do
+      Bunny::Timeout.timeout(read_write_timeout, ClientTimeout) do
         @last_exchange_bind_ok = wait_on_continuations
       end
 
@@ -1225,7 +1225,7 @@ module Bunny
           opts[:routing_key],
           false,
           opts[:arguments]))
-      Bunny::Timer.timeout(read_write_timeout, ClientTimeout) do
+      Bunny::Timeout.timeout(read_write_timeout, ClientTimeout) do
         @last_exchange_unbind_ok = wait_on_continuations
       end
 
@@ -1253,7 +1253,7 @@ module Bunny
       raise_if_no_longer_open!
 
       @connection.send_frame(AMQ::Protocol::Channel::Flow.encode(@id, active))
-      Bunny::Timer.timeout(read_write_timeout, ClientTimeout) do
+      Bunny::Timeout.timeout(read_write_timeout, ClientTimeout) do
         @last_channel_flow_ok = wait_on_continuations
       end
       raise_if_continuation_resulted_in_a_channel_error!
@@ -1274,7 +1274,7 @@ module Bunny
       raise_if_no_longer_open!
 
       @connection.send_frame(AMQ::Protocol::Tx::Select.encode(@id))
-      Bunny::Timer.timeout(read_write_timeout, ClientTimeout) do
+      Bunny::Timeout.timeout(read_write_timeout, ClientTimeout) do
         @last_tx_select_ok = wait_on_continuations
       end
       raise_if_continuation_resulted_in_a_channel_error!
@@ -1289,7 +1289,7 @@ module Bunny
       raise_if_no_longer_open!
 
       @connection.send_frame(AMQ::Protocol::Tx::Commit.encode(@id))
-      Bunny::Timer.timeout(read_write_timeout, ClientTimeout) do
+      Bunny::Timeout.timeout(read_write_timeout, ClientTimeout) do
         @last_tx_commit_ok = wait_on_continuations
       end
       raise_if_continuation_resulted_in_a_channel_error!
@@ -1304,7 +1304,7 @@ module Bunny
       raise_if_no_longer_open!
 
       @connection.send_frame(AMQ::Protocol::Tx::Rollback.encode(@id))
-      Bunny::Timer.timeout(read_write_timeout, ClientTimeout) do
+      Bunny::Timeout.timeout(read_write_timeout, ClientTimeout) do
         @last_tx_rollback_ok = wait_on_continuations
       end
       raise_if_continuation_resulted_in_a_channel_error!
@@ -1344,7 +1344,7 @@ module Bunny
       @confirms_callback = callback
 
       @connection.send_frame(AMQ::Protocol::Confirm::Select.encode(@id, false))
-      Bunny::Timer.timeout(read_write_timeout, ClientTimeout) do
+      Bunny::Timeout.timeout(read_write_timeout, ClientTimeout) do
         @last_confirm_select_ok = wait_on_continuations
       end
       raise_if_continuation_resulted_in_a_channel_error!

data/lib/bunny/concurrent/continuation_queue.rb

@@ -21,7 +21,7 @@ module Bunny
 
       def poll(timeout_in_ms = nil)
         if timeout_in_ms
-          Bunny::Timer.timeout(timeout_in_ms / 1000, Timeout::Error) do
+          Bunny::Timeout.timeout(timeout_in_ms / 1000, Timeout::Error) do
             @q.pop
           end
         else

data/lib/bunny/exchange.rb

@@ -141,7 +141,7 @@ module Bunny
     end
 
 
-    # Deletes the exchange unless it is a default exchange
+    # Deletes the exchange unless it is predeclared
     #
     # @param [Hash] opts Options
     #

data/lib/bunny/session.rb

@@ -98,18 +98,23 @@ module Bunny
     # @option connection_string_or_opts [String] :password ("guest") Password
     # @option connection_string_or_opts [String] :vhost ("/") Virtual host to use
     # @option connection_string_or_opts [Integer] :heartbeat (600) Heartbeat interval. 0 means no heartbeat.
+    # @option connection_string_or_opts [Boolean] :tls (false) Should TLS/SSL be used?
+    # @option connection_string_or_opts [String] :tls_cert (nil) Path to client TLS/SSL certificate file (.pem)
+    # @option connection_string_or_opts [String] :tls_key (nil) Path to client TLS/SSL private key file (.pem)
+    # @option connection_string_or_opts [Array<String>] :tls_ca_certificates Array of paths to TLS/SSL CA files (.pem), by default detected from OpenSSL configuration
     #
     # @option optz [String] :auth_mechanism ("PLAIN") Authentication mechanism, PLAIN or EXTERNAL
     # @option optz [String] :locale ("PLAIN") Locale RabbitMQ should use
     #
     # @see http://rubybunny.info/articles/connecting.html Connecting to RabbitMQ guide
+    # @see http://rubybunny.info/articles/tls.html TLS/SSL guide
     # @api public
     def initialize(connection_string_or_opts = Hash.new, optz = Hash.new)
       opts = case (ENV["RABBITMQ_URL"] || connection_string_or_opts)
              when nil then
                Hash.new
              when String then
-               AMQ::Settings.parse_amqp_url(connection_string_or_opts)
+               self.class.parse_uri(connection_string_or_opts)
              when Hash then
                connection_string_or_opts
              end.merge(optz)
@@ -195,6 +200,8 @@ module Bunny
     # @private
     attr_reader :mutex_impl
 
+    # Provides a way to fine tune the socket used by connection.
+    # Accepts a block that the socket will be yielded to.
     def configure_socket(&block)
       raise ArgumentError, "No block provided!" if block.nil?
 
@@ -270,7 +277,7 @@ module Bunny
       if @transport.open?
         close_all_channels
 
-        Bunny::Timer.timeout(@transport.disconnect_timeout, ClientTimeout) do
+        Bunny::Timeout.timeout(@transport.disconnect_timeout, ClientTimeout) do
           self.close_connection(true)
         end
 
@@ -375,6 +382,14 @@ module Bunny
       @blocked
     end
 
+    # Parses an amqp[s] URI into a hash that {Bunny::Session#initialize} accepts.
+    #
+    # @param [String] uri amqp or amqps URI to parse
+    # @return [Hash] Parsed URI as a hash
+    def self.parse_uri(uri)
+      AMQ::Settings.parse_amqp_url(uri)
+    end
+
 
     #
     # Implementation
@@ -409,7 +424,7 @@ module Bunny
     # @private
     def close_all_channels
       @channels.reject {|n, ch| n == 0 || !ch.open? }.each do |_, ch|
-        Bunny::Timer.timeout(@transport.disconnect_timeout, ClientTimeout) { ch.close }
+        Bunny::Timeout.timeout(@transport.disconnect_timeout, ClientTimeout) { ch.close }
       end
     end
 
@@ -674,7 +689,7 @@ module Bunny
           # a native method that cannot be (easily) interrupted.
           # So we use this ugly hack or else our test suite takes forever
           # to run on JRuby (a new connection is opened/closed per example). MK.
-          if RUBY_ENGINE == "jruby"
+          if defined?(JRUBY_VERSION)
             sleep 0.075
           else
             @reader_loop.join

data/lib/bunny/timeout.rb

@@ -0,0 +1,18 @@
+module Bunny
+  # Unifies Ruby standard library's Timeout (which is not accurate on
+  # Ruby 1.8) and SystemTimer (the gem)
+  Timeout = if RUBY_VERSION < "1.9"
+              begin
+                require "bunny/system_timer"
+                Bunny::SystemTimer
+              rescue LoadError
+                Timeout
+              end
+            else
+              Timeout
+            end
+
+  # Backwards compatibility
+  # @private
+  Timer = Timeout
+end

data/lib/bunny/transport.rb

@@ -41,11 +41,14 @@ module Bunny
       @tls_certificate       = opts[:tls_certificate] || opts[:ssl_cert_string]
       @tls_key               = opts[:tls_key]         || opts[:ssl_key_string]
       @tls_certificate_store = opts[:tls_certificate_store]
+
+      default_ca_file = ENV[OpenSSL::X509::DEFAULT_CERT_FILE_ENV] || OpenSSL::X509::DEFAULT_CERT_FILE
+      default_ca_path = ENV[OpenSSL::X509::DEFAULT_CERT_DIR_ENV] || OpenSSL::X509::DEFAULT_CERT_DIR
       @tls_ca_certificates   = opts.fetch(:tls_ca_certificates, [
-        '/etc/ssl/certs/ca-certificates.crt', # Ubuntu/Debian
-        '/etc/ssl/certs/ca-bundle.crt', # Amazon Linux
-        '/etc/ssl/ca-bundle.pem', # OpenSUSE
-        '/etc/pki/tls/certs/ca-bundle.crt' # Fedora/RHEL
+        default_ca_file,
+        File.join(default_ca_path, 'ca-certificates.crt'), # Ubuntu/Debian
+        File.join(default_ca_path, 'ca-bundle.crt'), # Amazon Linux & Fedora/RHEL
+        File.join(default_ca_path, 'ca-bundle.pem') # OpenSUSE
       ])
       @verify_peer           = opts[:verify_ssl] || opts[:verify_peer]
 
@@ -109,7 +112,7 @@ module Bunny
     def write(data)
       begin
         if @read_write_timeout
-          Bunny::Timer.timeout(@read_write_timeout, Bunny::ClientTimeout) do
+          Bunny::Timeout.timeout(@read_write_timeout, Bunny::ClientTimeout) do
             if open?
               @writes_mutex.synchronize { @socket.write(data) }
               @socket.flush
@@ -247,7 +250,7 @@ module Bunny
 
     def initialize_socket
       begin
-        @socket = Bunny::Timer.timeout(@connect_timeout, ConnectionTimeout) do
+        @socket = Bunny::Timeout.timeout(@connect_timeout, ConnectionTimeout) do
           Bunny::Socket.open(@host, @port,
                              :keepalive      => @opts[:keepalive],
                              :socket_timeout => @connect_timeout)
@@ -345,6 +348,7 @@ module Bunny
 
     def initialize_tls_certificate_store(certs)
       certs = certs.select { |path| File.readable? path }
+      @logger.debug "Using CA certificates at #{certs.join(', ')}"
       if certs.empty?
         @logger.error "No CA certificates found, add one with :tls_ca_certificates"
       end

data/lib/bunny/version.rb

@@ -2,5 +2,5 @@
 
 module Bunny
   # @return [String] Version of the library
-  VERSION = "1.0.0.pre4"
+  VERSION = "1.0.0.pre5"
 end

data/spec/higher_level_api/integration/tls_connection_spec.rb

@@ -86,4 +86,46 @@ unless ENV["CI"]
       ch.close
     end
   end
+
+
+  describe "TLS connection to RabbitMQ with a connection string" do
+    let(:connection) do
+      c = Bunny.new("amqps://bunny_gem:bunny_password@127.0.0.1/bunny_testbed",
+        :tls_cert              => "spec/tls/client_cert.pem",
+        :tls_key               => "spec/tls/client_key.pem",
+        :tls_ca_certificates   => ["./spec/tls/cacert.pem"])
+      c.start
+      c
+    end
+
+    after :each do
+      connection.close
+    end
+
+    it "provides the same API as a regular connection" do
+      connection.should be_tls
+      ch = connection.create_channel
+
+      q  = ch.queue("", :exclusive => true)
+      x  = ch.default_exchange
+
+      x.publish("xyzzy", :routing_key => q.name).
+        publish("xyzzy", :routing_key => q.name).
+        publish("xyzzy", :routing_key => q.name).
+        publish("xyzzy", :routing_key => q.name)
+
+      sleep 0.5
+      q.message_count.should == 4
+
+      i = 0
+      q.subscribe do |delivery_info, _, payload|
+        i += 1
+      end
+      sleep 1.0
+      i.should == 4
+      q.message_count.should == 0
+
+      ch.close
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bunny
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre4
+  version: 1.0.0.pre5
 platform: ruby
 authors:
 - Chris Duncan
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-24 00:00:00.000000000 Z
+date: 2013-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amq-protocol
@@ -124,6 +124,7 @@ files:
 - lib/bunny/ssl_socket.rb
 - lib/bunny/system_timer.rb
 - lib/bunny/test_kit.rb
+- lib/bunny/timeout.rb
 - lib/bunny/transport.rb
 - lib/bunny/version.rb
 - lib/bunny/versioned_delivery_tag.rb