bunny 1.7.1 → 2.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c6e1ab5b64d51e0a5723b686711573c11a39cf5a
-  data.tar.gz: f8700621a089b0f6cd594c7f2fc1d6677cd321aa
+  metadata.gz: 7035cf94d8295c49d7e57deb2143be7ed1b6a465
+  data.tar.gz: 0387323f9a4029809fbe05c5160731c2a9839ccc
 SHA512:
-  metadata.gz: 0682d6723a1530cfcb39b384027108ea306206fc7c275b86961d8fed701f7363688cd9cac888e97b890463bbff126194a04954dbc3821c6dd9463586182c81c5
-  data.tar.gz: 79e3f21253c27c279050a7c5d730a4d65e2ae122f72a64b7830e0d07c56cc108063c791f1b00b1ae9eea997088e2bcbe2d758bcb46d1ea0d65e62f004b4bc5be
+  metadata.gz: 0a4ab1f554f8445a4d7a283ba182a2c6b8244c5371295cd81478c24da0daaf00a71eeb477dfc1bd14dcb22f9b5ef28de938672edc8907a17fae3d0ac07c18b1c
+  data.tar.gz: 68cc7911d99ee0161f3c09383d06f88ba482c4a0ab3e04f21049cdd94bbdac46e108598dde44ebff97a3671994a54679602a44727001363f2770ca8935e922be

data/.travis.yml

@@ -1,7 +1,7 @@
 language: ruby
 bundler_args: --without development
 before_script: "./bin/ci/before_build"
-script: "bundle exec rspec -cfs spec"
+script: "bundle exec rspec -cf documentation spec"
 rvm:
   - "2.1.0"
   - "2.0"

data/CONTRIBUTING.md

@@ -0,0 +1,14 @@
+## Pre-requisites
+
+The project uses Bundler for dependency management and requires RabbitMQ `3.4+` to be running
+locally. Prior to running the tests, configure the RabbitMQ permissions
+by running `./bin/ci/before_script`. Make
+sure you have those two installed and then run tests:
+
+    bundle install
+    bundle exec rspec -cfd spec/    
+
+## Pull Requests
+
+Then create a branch and make your changes on it. Once you are done with your changes and all
+tests pass, write a [good, detailed commit message](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html) submit a pull request on GitHub.

data/ChangeLog.md

@@ -1,11 +1,12 @@
-## Changes between Bunny 1.7.0 and 1.7.1
+## Changes between Bunny 1.7.0 and 1.8.0
 
-### amq-protocol Dependendency Locked to 1.9.x
+### Reduced Timeout Use
 
-Since `amq-protocol` 2.0 requires Ruby 2.0 or later, 1.7.x versions of Bunny
-must use `1.9.2`.
+`Bunny::ContinuationQueue#poll` no longer relies on Ruby's `Timeout` which has
+numerous issues, including starting a new "interruptor" thread per operation,
+which is far from efficient.
 
-GH issue: [#336](https://github.com/ruby-amqp/bunny/issues/336).
+Contributed by Joe Eli McIlvain.
 
 ### Logger Output Remains Consistent
 
@@ -15,6 +16,13 @@ Behaviour remains unchainged when the internally initialized logger is used.
 
 Contributed by Justin Carter.
 
+### prefetch_count is Limited to 65535
+
+Since `basic.qos`'s `prefetch_count` field is of type `short` in the protocol,
+Bunny must enforce its maximum allowed value to `2^16 - 1` to avoid
+confusing issues due to overflow.
+
+
 
 ## Changes between Bunny 1.6.0 and 1.7.0
 
@@ -136,6 +144,13 @@ Connection shuffling and robustness improvements.
 
 Contributed by Andre Foeken (Nedap).
 
+### Default Channel Removed
+
+Breaks compatibility with Bunny 0.8.x.
+
+`Bunny:Session#default_channel` was removed. Please open channels explicitly now,
+as all the examples in the docs do.
+
 
 ## Changes between Bunny 1.3.0 and 1.4.0
 
@@ -549,7 +564,7 @@ Bunny now will use the following TLS/SSL CA's paths on Linux by default:
 and will log a warning if no CA files are available via default paths
 or `:tls_ca_certificates`.
 
-Contributed by Carl Hörberg.
+Contributed by Carl Hörberg.
 
 ### Consumers Can Be Re-Registered From Bunny::Consumer#handle_cancellation
 

data/Gemfile

@@ -34,7 +34,7 @@ group :development do
 end
 
 group :test do
-  gem "rspec", "~> 2.13.0"
+  gem "rspec", "~> 3.2.0"
   gem "rabbitmq_http_api_client", "~> 1.2.0"
 end
 

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009 – 2014 Chris Duncan, Jakub Stastny aka botanicus,
+Copyright (c) 2009 – 2015 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

@@ -12,8 +12,8 @@ have any heavyweight dependencies.
 
 ## What is Bunny Good For?
 
-One can use amqp gem to make Ruby applications interoperate with other
-applications (both Ruby and not). Complexity and size may vary from
+One can use Bunny to make Ruby applications interoperate with other
+applications (both built in Ruby and not). Complexity and size may vary from
 simple work queues to complex multi-stage data processing workflows that involve
 many applications built with all kinds of technologies.
 
@@ -46,9 +46,9 @@ Specific examples:
 
 ## Supported Ruby Versions
 
-Bunny 0.9 and more recent versions support
+Modern Bunny versions support
 
- * CRuby 2.1, CRuby 2.0, 1.9.3, 1.9.2, and 1.8.7
+ * CRuby 2.2, 2.1, 2.0, 1.9.3, and 1.8.7
  * Rubinius 2.0+
 
 Bunny works sufficiently well on JRuby but there are known
@@ -59,7 +59,7 @@ use [March Hare](http://rubymarchhare.info).
 ## Supported RabbitMQ Versions
 
 Bunny `1.5.0` (including previews) and later versions only support RabbitMQ `3.3+`.
-Bunny `1.4.x` and supports RabbitMQ 2.x and 3.x.
+Bunny `1.4.x` and earlier supports RabbitMQ 2.x and 3.x.
 
 
 ## Project Maturity
@@ -95,7 +95,7 @@ gem install bunny
 To use Bunny in a project managed with Bundler:
 
 ``` ruby
-gem "bunny", "~> 1.4.0"
+gem "bunny", ">= 1.7.0"
 ```
 
 
@@ -177,7 +177,6 @@ To subscribe for announcements of releases, important changes and so on, please
 More detailed announcements can be found in the blogs
 
 * [RabbitMQ Ruby clients blog](http://blog.rubyrabbitmq.info)
-* [Bunny Blog](http://bunnyamqp.wordpress.com)
 
 
 ### Reporting Issues
@@ -191,32 +190,36 @@ try to explain what behavior you expected and why. Bonus points for
 contributing failing test cases.
 
 
-### Running the specs
+### Running the Specs
 
 The cleanest way to get the specs running is by starting a clean rabbitmq server
 node on your machine specifically for the bunny specs.
 
-Make sure you have a recent version of RabbitMQ (> 3.2) and run the following command
+Make sure you have a recent version of RabbitMQ (> 3.4) and run the following command
 from the base directory of the gem:
 
-`RABBITMQ_NODENAME=bunny RABBITMQ_CONFIG_FILE=./spec/config/rabbitmq RABBITMQ_ENABLED_PLUGINS_FILE=./spec/config/enabled_plugins rabbitmq-server`
+```
+RABBITMQ_NODENAME=bunny RABBITMQ_CONFIG_FILE=./spec/config/rabbitmq RABBITMQ_ENABLED_PLUGINS_FILE=./spec/config/enabled_plugins rabbitmq-server
+```
 
-> The specs use the Rabbitmq management plugin and require an SSL port to be available. The config files in the spec/config directory enable these. Please note that this config uses verify_none because the certificates are expired.
+The specs use the RabbitMQ management plugin and require a TLS port to be available. The config files in the spec/config directory enable these.
 
 Next up you'll need to prepare your node for the specs (Only once):
 
-`RABBITMQ_NODENAME=bunny ./bin/ci/before_build.sh`
+```
+RABBITMQ_NODENAME=bunny ./bin/ci/before_build
+```
 
 And then run the specs:
 
-`RABBITMQ_NODENAME=bunny rspec`
+```
+RABBITMQ_NODENAME=bunny rspec
+```
 
 ## Other Ruby RabbitMQ Clients
 
-Other widely used Ruby RabbitMQ clients are [March
-Hare](http://rubymarchhare.info) (JRuby-only) and [amqp
-gem](http://rubyamqp.info).  Both are mature libraries and require
-RabbitMQ 2.x or 3.x.
+The other widely used Ruby RabbitMQ client is [March Hare](http://rubymarchhare.info) (JRuby-only).
+It's a mature library that require RabbitMQ 3.3.x or later.
 
 
 ## Contributing
@@ -227,13 +230,13 @@ First, clone the repository and run
 
 then set up RabbitMQ vhosts with
 
-    ./bin/ci/before_build.sh
+    ./bin/ci/before_build
 
 (if needed, set `RABBITMQCTL` env variable to point to `rabbitmqctl` you want to use)
 
 and then run tests with
 
-    CI=true ./bin/rspec -cfs spec
+    CI=true ./bin/rspec -cf documentation spec
 
 After that create a branch and make your changes on it. Once you are done with your changes and all tests pass, submit a pull request
 on GitHub.
@@ -242,7 +245,3 @@ 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.2"
+  s.add_dependency "amq-protocol", ">= 1.9.2"
 
   # Files.
   s.has_rdoc = true

data/lib/bunny/channel.rb

@@ -246,6 +246,14 @@ module Bunny
       @status == :closed
     end
 
+    def to_s
+      oid = ("0x%x" % (self.object_id << 1))
+      "<#{self.class.name}:#{oid} number=#{@channel.id} @open=#{open?} connection=#{@connection.to_s}>"
+    end
+
+    def inspect
+      to_s
+    end
 
     #
     # @group Backwards compatibility with 0.8.0
@@ -615,6 +623,9 @@ module Bunny
       @last_basic_get_response
     end
 
+    # prefetch_count is of type short in the protocol. MK.
+    MAX_PREFETCH_COUNT = (2 ** 16) - 1
+
     # Controls message delivery rate using basic.qos AMQP 0.9.1 method.
     #
     # @param [Integer] prefetch_count How many messages can consumers on this channel be given at a time
@@ -626,6 +637,7 @@ module Bunny
     # @api public
     def basic_qos(count, global = false)
       raise ArgumentError.new("prefetch count must be a positive integer, given: #{prefetch_count}") if count < 0
+      raise ArgumentError.new("prefetch count must be no greater than #{MAX_PREFETCH_COUNT}, given: #{prefetch_count}") if count > MAX_PREFETCH_COUNT
       raise_if_no_longer_open!
 
       @connection.send_frame(AMQ::Protocol::Basic::Qos.encode(@id, 0, count, global))

data/lib/bunny/concurrent/continuation_queue.rb

@@ -6,36 +6,53 @@ module Bunny
     #
     # @private
     class ContinuationQueue
-      def initialize(*args, &block)
-        @q = ::Queue.new(*args)
+      def initialize
+        @q    = []
+        @lock = ::Mutex.new
+        @cond = ::ConditionVariable.new
       end
 
-      def push(*args)
-        @q.push(*args)
+      def push(item)
+        @lock.synchronize do
+          @q.push(item)
+          @cond.signal
+        end
       end
       alias << push
 
       def pop
-        @q.pop
+        poll
       end
 
       def poll(timeout_in_ms = nil)
-        if timeout_in_ms
-          Bunny::Timeout.timeout(timeout_in_ms / 1000.0, ::Timeout::Error) do
-            @q.pop
+        timeout = timeout_in_ms ? timeout_in_ms / 1000.0 : nil
+
+        @lock.synchronize do
+          if @q.empty?
+            @cond.wait(@lock, timeout)
+            raise ::Timeout::Error if @q.empty?
           end
-        else
-          @q.pop
+          item = @q.shift
+          @cond.signal
+
+          item
         end
       end
 
       def clear
-        @q.clear
+        @lock.synchronize do
+          @q.clear
+        end
+      end
+
+      def empty?
+        @q.empty?
       end
 
-      def method_missing(selector, *args, &block)
-        @q.__send__(selector, *args, &block)
+      def size
+        @q.size
       end
+      alias length size
     end
   end
 end

data/lib/bunny/exchange.rb

@@ -245,11 +245,6 @@ module Bunny
       @channel.exchange_declare(@name, @type, @options)
     end
 
-    # @private
-    def self.add_default_options(name, opts, block)
-      { :exchange => name, :nowait => (block.nil? && !name.empty?) }.merge(opts)
-    end
-
     # @private
     def self.add_default_options(name, opts)
       # :nowait is always false for Bunny

data/lib/bunny/jruby/socket.rb

@@ -5,8 +5,7 @@ module Bunny
     # TCP socket extension that uses Socket#readpartial to avoid excessive CPU
     # burn after some time. See issue #165.
     # @private
-    module Socket
-      include Bunny::Socket
+    class Socket < Bunny::Socket
 
       # Reads given number of bytes with an optional timeout
       #

data/lib/bunny/queue.rb

@@ -88,6 +88,15 @@ module Bunny
       @arguments
     end
 
+    def to_s
+      oid = ("0x%x" % (self.object_id << 1))
+      "<#{self.class.name}:#{oid} @name=\"#{name}\" channel=#{@channel.to_s} @durable=#{@durable} @auto_delete=#{@auto_delete} @exclusive=#{@exclusive} @arguments=#{@arguments}>"
+    end
+
+    def inspect
+      to_s
+    end
+
     # Binds queue to an exchange
     #
     # @param [Bunny::Exchange,String] exchange Exchange to bind to

data/lib/bunny/session.rb

@@ -284,19 +284,15 @@ module Bunny
           self.start_reader_loop if threaded?
 
         rescue TCPConnectionFailed => e
-
           @logger.warn e.message
-
           self.initialize_transport
-
-          @logger.warn "Retrying connection on next host in line: #{@transport.host}:#{@transport.port}"
+          @logger.warn "Will try to connect to the next endpoint in line: #{@transport.host}:#{@transport.port}"
 
           return self.start
         rescue
           @status_mutex.synchronize { @status = :not_connected }
           raise
         end
-
       rescue HostListDepleted
         self.reset_host_index
         @status_mutex.synchronize { @status = :not_connected }
@@ -940,7 +936,12 @@ module Bunny
     # @return [String]
     # @api public
     def to_s
-      "#<#{self.class.name}:#{object_id} #{@user}@#{host}:#{@port}, vhost=#{@vhost}, hosts=[#{@hosts.join(',')}]>"
+      oid = ("0x%x" % (self.object_id << 1))
+      "#<#{self.class.name}:#{oid} #{@user}@#{host}:#{@port}, vhost=#{@vhost}, hosts=[#{@hosts.join(',')}]>"
+    end
+
+    def inspect
+      to_s
     end
 
     protected

data/lib/bunny/version.rb

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

data/spec/higher_level_api/integration/basic_ack_spec.rb

@@ -19,11 +19,11 @@ describe Bunny::Channel, "#ack" do
 
       x.publish("bunneth", :routing_key => q.name)
       sleep 0.5
-      q.message_count.should == 1
+      expect(q.message_count).to eq 1
       delivery_details, properties, content = q.pop(:manual_ack => true)
 
       ch.ack(delivery_details.delivery_tag, true)
-      q.message_count.should == 0
+      expect(q.message_count).to eq 0
 
       ch.close
     end
@@ -42,9 +42,9 @@ describe Bunny::Channel, "#ack" do
 
       x.publish("bunneth", :routing_key => q.name)
       sleep 0.5
-      lambda do
+      expect do
         q.message_count
-      end.should raise_error(Bunny::ChannelAlreadyClosed)
+      end.to raise_error(Bunny::ChannelAlreadyClosed)
     end
   end
 
@@ -56,7 +56,7 @@ describe Bunny::Channel, "#ack" do
 
       x.publish("bunneth", :routing_key => q.name)
       sleep 0.5
-      q.message_count.should == 1
+      expect(q.message_count).to eq 1
       _, _, content = q.pop(:manual_ack => true)
 
       ch.on_error do |ch, channel_close|
@@ -65,7 +65,7 @@ describe Bunny::Channel, "#ack" do
       ch.ack(82, true)
       sleep 0.25
 
-      @channel_close.reply_code.should == AMQ::Protocol::PreconditionFailed::VALUE
+      expect(@channel_close.reply_code).to eq AMQ::Protocol::PreconditionFailed::VALUE
     end
   end
 
@@ -77,7 +77,7 @@ describe Bunny::Channel, "#ack" do
 
       x.publish("bunneth", :routing_key => q.name)
       sleep 0.5
-      q.message_count.should == 1
+      expect(q.message_count).to eq 1
 
       orig_stderr = $stderr
       $stderr = StringIO.new
@@ -85,12 +85,12 @@ describe Bunny::Channel, "#ack" do
       delivery_details, properties, content = q.pop(:ack => true)
 
       $stderr.rewind
-      $stderr.string.chomp.should eq("[DEPRECATION] `:ack` is deprecated.  Please use `:manual_ack` instead.\n[DEPRECATION] `:ack` is deprecated.  Please use `:manual_ack` instead.")
+      expect($stderr.string.chomp).to eq("[DEPRECATION] `:ack` is deprecated.  Please use `:manual_ack` instead.\n[DEPRECATION] `:ack` is deprecated.  Please use `:manual_ack` instead.")
 
       $stderr = orig_stderr
 
       ch.ack(delivery_details.delivery_tag, true)
-      q.message_count.should == 0
+      expect(q.message_count).to eq 0
 
       ch.close
     end