bunny 1.1.0.pre2 → 1.1.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 843f81c989d0b413c14b8874bb6f2e4365da3921
-  data.tar.gz: b4fcd0d7a8e3effe884f2b3ecefc2db524aaf545
+  metadata.gz: 73298a109694af83bb99bf84847d60df16207fcf
+  data.tar.gz: 7b5f3f2aa6f0f790fb9384e1ba08924e6ba60063
 SHA512:
-  metadata.gz: dee6d9086ff1654324c354037d1a35875b2ded96a1b0701c9836d5d2e4d41ff83df212ac5efca7643e50c30304f0be360ddbd4f6d64470634348b625a71f0016
-  data.tar.gz: 3fd0c4d92be3121789bf4dc7349583c24de9534cafb3a686fef5e080211c708a02ba15aef7e555c29c2dec2567439f8dcc11c6889da0788e272703b355b3ac28
+  metadata.gz: bede6aee3aa9976eeb91f016bc7214b90756d96b105e3a81c3214e0497a0500f3c5738af97a0674e028bacbcf9c7cde779dcd8ab4afefef2ba59ad539044885c
+  data.tar.gz: cbcacfc53117c4a3a68e78ce0d3a6c4c817c81780cf2a3f0b5f0ed613a56ed5784d743521e0e535a447612522433136de3950720c8846bbbf2cb54b72a0e1223

data/.travis.yml

@@ -3,11 +3,12 @@ bundler_args: --without development
 before_script: "./bin/ci/before_build.sh"
 script: "bundle exec rspec -cfs spec"
 rvm:
+  - "2.1.0-preview2"
   - "2.0"
   - "1.9.3"
-  - "jruby-19mode"
+  - "jruby"
   - "1.9.2"
-  - "rbx-19mode"
+  - "rbx"
   - "1.8.7"
 notifications:
   email: michael@rabbitmq.com
@@ -19,5 +20,6 @@ branches:
     - 0.9.x-stable
 matrix:
   allow_failures:
-    - rvm: rbx-19mode
-    - rvm: 1.8.7
+    - rvm: rbx
+    - rvm: "1.8.7"
+    - rvm: jruby

data/ChangeLog.md

@@ -1,3 +1,42 @@
+## Changes between Bunny 1.1.0.pre2 and 1.1.0.rc1
+
+### Full Channel State Recovery
+
+Channel recovery now involves recovery of publisher confirms and
+transaction modes.
+
+
+### TLS	Without Peer Verification
+
+Bunny now successfully performs	TLS upgrade when peer verification
+is disabled.
+
+Contributed by Jordan Curzon.
+
+### Bunny::Session#with_channel Ensures the Channel is Closed
+
+`Bunny::Session#with_channel` now makes sure the channel is closed
+even if provided block raises an exception
+
+Contributed by Carl Hoerberg.
+
+
+
+### Channel Number = 0 is Rejected
+
+`Bunny::Session#create_channel` will now reject channel number 0.
+
+
+### Single Threaded Mode Fixes
+
+Single threaded mode no longer fails with
+
+```
+undefined method `event_loop'
+```
+
+
+
 ## Changes between Bunny 1.1.0.pre1 and 1.1.0.pre2
 
 ### connection.tune.channel_max No Longer Overflows

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009 – 2013 Chris Duncan, Jakub Stastny aka botanicus,
+Copyright (c) 2009 – 2014 Chris Duncan, Jakub Stastny aka botanicus,
 Michael S. Klishin, Eric Lindvall, Stefan Kaes and contributors.
 
 Permission is hereby granted, free of charge, to any person obtaining

data/README.md

@@ -219,3 +219,7 @@ on GitHub.
 ## License
 
 Released under the MIT license.
+
+
+[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/ruby-amqp/bunny/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
+

data/bunny.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |s|
     map { |mail| Base64.decode64(mail) }
 
   # Dependencies
-  s.add_dependency "amq-protocol", ">= 1.9.0"
+  s.add_dependency "amq-protocol", ">= 1.9.2"
 
   # Files.
   s.has_rdoc = true

data/lib/bunny/channel.rb

@@ -1281,6 +1281,7 @@ module Bunny
         @last_tx_select_ok = wait_on_continuations
       end
       raise_if_continuation_resulted_in_a_channel_error!
+      @tx_mode = true
 
       @last_tx_select_ok
     end
@@ -1350,6 +1351,7 @@ module Bunny
       Bunny::Timeout.timeout(read_write_timeout, ClientTimeout) do
         @last_confirm_select_ok = wait_on_continuations
       end
+      @confirm_mode = true
       raise_if_continuation_resulted_in_a_channel_error!
       @last_confirm_select_ok
     end
@@ -1420,6 +1422,8 @@ module Bunny
       release_all_continuations
 
       recover_prefetch_setting
+      recover_confirm_flag
+      recover_tx_mode
       recover_exchanges
       # this includes recovering bindings
       recover_queues
@@ -1435,6 +1439,22 @@ module Bunny
       basic_qos(@prefetch_count) if @prefetch_count
     end
 
+    # Recovers publisher confirms mode. Used by the Automatic Network Failure
+    # Recovery feature.
+    #
+    # @api plugin
+    def recover_confirm_mode
+      confirm_select if @confirm_mode
+    end
+
+    # Recovers transaction mode. Used by the Automatic Network Failure
+    # Recovery feature.
+    #
+    # @api plugin
+    def recover_tx_mode
+      tx_select if @tx_mode
+    end
+
     # Recovers exchanges. Used by the Automatic Network Failure
     # Recovery feature.
     #
@@ -1681,7 +1701,7 @@ module Bunny
           @threads_waiting_on_basic_get_continuations.delete(t)
         end
       else
-        connection.event_loop.run_once until @basic_get_continuations.length > 0
+        connection.reader_loop.run_once until @basic_get_continuations.length > 0
 
         @basic_get_continuations.pop
       end
@@ -1699,7 +1719,7 @@ module Bunny
           @threads_waiting_on_confirms_continuations.delete(t)
         end
       else
-        connection.event_loop.run_once until @confirms_continuations.length > 0
+        connection.reader_loop.run_once until @confirms_continuations.length > 0
 
         @confirms_continuations.pop
       end

data/lib/bunny/consumer_work_pool.rb

@@ -82,10 +82,10 @@ module Bunny
 
           begin
             callable.call
-          rescue Exception => e
-            # TODO
-            puts e.class.name
-            puts e.message
+          rescue ::Exception => e
+            # TODO: use connection logger
+            $stderr.puts e.class.name
+            $stderr.puts e.message
           end
         end
       end

data/lib/bunny/session.rb

@@ -273,6 +273,8 @@ module Bunny
     #
     # @return [Bunny::Channel] Newly opened channel
     def create_channel(n = nil, consumer_pool_size = 1)
+      raise ArgumentError, "channel number 0 is reserved in the protocol and cannot be used" if 0 == n
+
       if n && (ch = @channels[n])
         ch
       else
@@ -307,8 +309,11 @@ module Bunny
     # @return [Bunny::Session] self
     def with_channel(n = nil)
       ch = create_channel(n)
-      yield ch
-      ch.close if ch.open?
+      begin
+        yield ch
+      ensure
+        ch.close if ch.open?
+      end
 
       self
     end

data/lib/bunny/transport.rb

@@ -368,7 +368,14 @@ module Bunny
       # setting TLS/SSL version only works correctly when done
       # vis set_params. MK.
       ctx.set_params(:ssl_version => @opts.fetch(:tls_protocol, DEFAULT_TLS_PROTOCOL))
-      ctx.set_params(:verify_mode => OpenSSL::SSL::VERIFY_PEER|OpenSSL::SSL::VERIFY_FAIL_IF_NO_PEER_CERT) if @verify_peer
+     
+      verify_mode = if @verify_peer
+        OpenSSL::SSL::VERIFY_PEER|OpenSSL::SSL::VERIFY_FAIL_IF_NO_PEER_CERT
+      else
+        OpenSSL::SSL::VERIFY_NONE
+      end
+
+      ctx.set_params(:verify_mode => verify_mode)
 
       ctx
     end

data/lib/bunny/version.rb

@@ -2,5 +2,5 @@
 
 module Bunny
   # @return [String] Version of the library
-  VERSION = "1.1.0.pre2"
+  VERSION = "1.1.0.rc1"
 end

data/spec/higher_level_api/integration/channel_open_spec.rb

@@ -21,6 +21,15 @@ describe Bunny::Channel, "when opened" do
     end
   end
 
+  context "with an explicitly provided id = 0" do
+    it "raises ArgumentError" do
+      connection.should be_connected
+      expect {
+        connection.create_channel(0)
+      }.to raise_error(ArgumentError)
+    end
+  end
+
 
   context "with explicitly provided id" do
     it "uses that id and is successfully opened" do

data/spec/higher_level_api/integration/publisher_confirms_spec.rb

@@ -38,4 +38,40 @@ describe Bunny::Channel do
       ch.close
     end
   end
+
+
+  context "with a single-threaded connection" do
+    let(:connection) do
+      c = Bunny.new(:user => "bunny_gem", :password => "bunny_password", :vhost => "bunny_testbed", :continuation_timeout => 10000, :threaded => false)
+      c.start
+      c
+    end
+
+
+    context "when publishing with confirms enabled" do
+      it "increments delivery index" do
+        ch = connection.create_channel
+        ch.should_not be_using_publisher_confirmations
+
+        ch.confirm_select
+        ch.should be_using_publisher_confirmations
+
+        q  = ch.queue("", :exclusive => true)
+        x  = ch.default_exchange
+
+        n.times do
+          x.publish("xyzzy", :routing_key => q.name)
+        end
+
+        ch.next_publish_seq_no.should == n + 1
+        ch.wait_for_confirms.should be_true
+        sleep 0.25
+
+        q.message_count.should == n
+        q.purge
+
+        ch.close
+      end
+    end
+  end
 end

data/spec/higher_level_api/integration/with_channel_spec.rb

@@ -0,0 +1,25 @@
+require "spec_helper"
+
+describe Bunny::Channel, "#with_channel" do
+  let(:connection) do
+    c = Bunny.new(:user => "bunny_gem", :password => "bunny_password", :vhost => "bunny_testbed")
+    c.start
+    c
+  end
+
+  after :each do
+    connection.close if connection.open?
+  end
+
+  it "closes if the block throws an exception" do
+    ch = nil
+    begin
+      connection.with_channel do |wch|
+        ch = wch
+        raise Exception.new
+      end
+    rescue Exception
+    end
+    ch.should be_closed
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bunny
 version: !ruby/object:Gem::Version
-  version: 1.1.0.pre2
+  version: 1.1.0.rc1
 platform: ruby
 authors:
 - Chris Duncan
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-25 00:00:00.000000000 Z
+date: 2014-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amq-protocol
@@ -20,14 +20,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.9.0
+        version: 1.9.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.9.0
+        version: 1.9.2
 description: Easy to use, feature complete Ruby client for RabbitMQ 2.0 and later
   versions.
 email:
@@ -178,6 +178,7 @@ files:
 - spec/higher_level_api/integration/tls_connection_spec.rb
 - spec/higher_level_api/integration/tx_commit_spec.rb
 - spec/higher_level_api/integration/tx_rollback_spec.rb
+- spec/higher_level_api/integration/with_channel_spec.rb
 - spec/issues/issue100_spec.rb
 - spec/issues/issue141_spec.rb
 - spec/issues/issue78_spec.rb
@@ -273,6 +274,7 @@ test_files:
 - spec/higher_level_api/integration/tls_connection_spec.rb
 - spec/higher_level_api/integration/tx_commit_spec.rb
 - spec/higher_level_api/integration/tx_rollback_spec.rb
+- spec/higher_level_api/integration/with_channel_spec.rb
 - spec/issues/issue100_spec.rb
 - spec/issues/issue141_spec.rb
 - spec/issues/issue78_spec.rb