bunny 0.7.6 → 0.7.8

data/CHANGELOG

@@ -1,3 +1,11 @@
+= Version 0.7.8
+
+ * test suite cleanup (eliminated some race conditions related to queue.message_count)
+
+= Version 0.7.7
+
+ * avoid warnings caused by duplicating code from the amq-client gem
+
 = Version 0.7.6
 
  * API mismatch between Timer/SystemTimer on Ruby 1.9 vs Ruby 1.8 is resolved.

data/Rakefile

@@ -1,26 +1,14 @@
 # encoding: utf-8
 
-desc "Run AMQP 0-8 rspec tests"
-task :spec08 do
-  require 'rspec/core/rake_task'
-  puts "===== Running 0-8 tests ====="
-  RSpec::Core::RakeTask.new("spec08") do |t|
-    t.pattern = "spec/spec_08/*_spec.rb"
-    t.rspec_opts = ['--color']
-  end
-end
+require "bundler/gem_tasks"
 
-desc "Run AMQP 0-9 rspec tests"
-task :spec09 do
+desc "Run rspec tests"
+task :spec do
   require 'rspec/core/rake_task'
-  puts "===== Running 0-9 tests ====="
-  RSpec::Core::RakeTask.new("spec09") do |t|
-    t.pattern = "spec/spec_09/*_spec.rb"
-    t.rspec_opts = ['--color']
+  RSpec::Core::RakeTask.new("spec") do |t|
+    t.pattern = "spec/spec_*/*_spec.rb"
+    t.rspec_opts = ['--color', '--format doc']
   end
 end
 
-task :default => [ :spec08 ]
-
-desc "Run all rspec tests"
-task :all => [:spec08, :spec09]
+task :default => [ :spec ]

data/bunny.gemspec

@@ -39,7 +39,6 @@ Gem::Specification.new do |s|
     require "changelog"
     s.post_install_message = CHANGELOG.new.version_changes
   rescue LoadError
-    warn "You have to install the changelog gem for post install message."
   end
 
   # RubyForge

data/lib/bunny/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Bunny
-  VERSION = "0.7.6"
+  VERSION = "0.7.8"
 end

data/lib/qrack/client.rb

@@ -1,6 +1,12 @@
 # encoding: utf-8
 
-require "qrack/amq-client-url"
+begin
+  # try loading AMQ::Client::Setttings form the amq client gem, if it has been already loaded
+  # this avoids "warning: already initialized constant AMQP_PORTS"
+  require "amq/client/settings"
+rescue LoadError
+  require "qrack/amq-client-url"
+end
 
 module Qrack
 

data/spec/spec_08/bunny_spec.rb

@@ -17,6 +17,15 @@ describe Bunny do
     @b.start
   end
 
+  after(:each) do
+    begin
+      @b.stop
+    rescue Exception
+    ensure
+      @b = nil
+    end
+  end
+
   it "should connect to an AMQP server" do
     @b.status.should == :connected
   end

data/spec/spec_08/connection_spec.rb

@@ -13,10 +13,10 @@ describe Bunny do
 
   it "should be able to open a TCPSocket with a timeout" do
     b = Bunny.new(:spec => "0.8")
-    connect_timeout = 1
-    lambda { 
+    connect_timeout = 5
+    lambda {
       Bunny::Timer::timeout(connect_timeout, Qrack::ConnectionTimeout) do
-        TCPSocket.new(b.host, b.port) 
+        TCPSocket.new(b.host, b.port)
       end
     }.should_not raise_error(Exception)
   end

data/spec/spec_08/exchange_spec.rb

@@ -17,6 +17,15 @@ describe 'Exchange' do
     @b.start
   end
 
+  after(:each) do
+    begin
+      @b.stop
+    rescue Exception
+    ensure
+      @b = nil
+    end
+  end
+
   it "should raise an error if instantiated as non-existent type" do
     lambda { @b.exchange('bogus_ex', :type => :bogus) }.should raise_error(Bunny::ForcedConnectionCloseError)
     @b.status.should == :not_connected

data/spec/spec_08/queue_spec.rb

@@ -16,11 +16,25 @@ describe 'Queue' do
     Bunny.should_receive(:deprecation_warning).with("Qrack::Queue#publish", "0.8", anything).exactly(n).times
   end
 
+  def message_count(queue, sleep_time = 0.1)
+    sleep sleep_time
+    queue.message_count
+  end
+
   before(:each) do
     @b = Bunny.new
     @b.start
   end
 
+  after(:each) do
+    begin
+      @b.stop
+    rescue Exception
+    ensure
+      @b = nil
+    end
+  end
+
   it "should ignore the :nowait option when instantiated" do
     q = @b.queue('test0', :nowait => true)
   end
@@ -65,7 +79,7 @@ describe 'Queue' do
     q = @b.queue('test1')
     expect_deprecation_warning_for_publishing_on_queue(q)
     q.publish('This is a test message')
-    q.message_count.should == 1
+    message_count(q).should == 1
   end
 
   it "should be able to pop a message complete with header and delivery details" do
@@ -75,7 +89,7 @@ describe 'Queue' do
     msg[:header].should be_an_instance_of(Bunny::Protocol::Header)
     msg[:payload].should == 'This is a test message'
     msg[:delivery_details].should be_an_instance_of(Hash)
-    q.message_count.should == 0
+    message_count(q).should == 0
   end
 
   it "should be able to pop a message and just get the payload" do
@@ -84,7 +98,7 @@ describe 'Queue' do
     q.publish('This is another test message')
     msg = q.pop[:payload]
     msg.should == 'This is another test message'
-    q.message_count.should == 0
+    message_count(q).should == 0
   end
 
   it "should be able to pop a message where body length exceeds max frame size" do
@@ -108,15 +122,15 @@ describe 'Queue' do
     q = @b.queue('test1')
     expect_deprecation_warning_for_publishing_on_queue(q, 5)
     5.times {q.publish('This is another test message')}
-    q.message_count.should == 5
+    message_count(q).should == 5
     lambda {q.purge(:queue => 'bogus')}.should raise_error(Bunny::ForcedChannelCloseError)
   end
 
   it "should be able to be purged to remove all of its messages" do
     q = @b.queue('test1')
-    q.message_count.should == 5
+    message_count(q).should == 5
     q.purge.should == :purge_ok
-    q.message_count.should == 0
+    message_count(q).should == 0
   end
 
   it "should return an empty message when popping an empty queue" do
@@ -132,9 +146,9 @@ describe 'Queue' do
     q = @b.queue('test1')
     expect_deprecation_warning_for_publishing_on_queue(q, 5)
     5.times {q.publish('Yet another test message')}
-    q.message_count.should == 5
+    message_count(q).should == 5
     q.subscribe(:message_max => 0)
-    q.message_count.should == 5
+    message_count(q).should == 5
     q.purge.should == :purge_ok
   end
 
@@ -142,7 +156,7 @@ describe 'Queue' do
     q = @b.queue('test1')
     expect_deprecation_warning_for_publishing_on_queue(q, 5)
     5.times {q.publish('Yet another test message')}
-    q.message_count.should == 5
+    message_count(q).should == 5
     q.subscribe(:message_max => 5)
   end
 
@@ -151,9 +165,9 @@ describe 'Queue' do
     @b.qos()
     expect_deprecation_warning_for_publishing_on_queue(q, 10)
     10.times {q.publish('Yet another test message')}
-    q.message_count.should == 10
+    message_count(q).should == 10
     q.subscribe(:message_max => 5, :ack => true)
-    q.message_count.should == 5
+    message_count(q).should == 5
     q.purge.should == :purge_ok
   end
 

data/spec/spec_09/amqp_url_spec.rb

@@ -13,6 +13,7 @@ describe Bunny do
     it "handles port properly" do
       bunny = Bunny.new("amqp://dev.rabbitmq.com:1212")
       bunny.port.should eql(1212)
+      bunny.stop
     end
   end
 end

data/spec/spec_09/bunny_spec.rb

@@ -17,6 +17,15 @@ describe Bunny do
     @b.start
   end
 
+  after(:each) do
+    begin
+      @b.stop
+    rescue Exception
+    ensure
+      @b = nil
+    end
+  end
+
   it "should connect to an AMQP server" do
     @b.status.should == :connected
   end

data/spec/spec_09/connection_spec.rb

@@ -18,10 +18,10 @@ describe Bunny do
 
   it "should be able to open a TCPSocket with a timeout" do
     b = Bunny.new(:spec => "0.9")
-    connect_timeout = 1
-    lambda { 
+    connect_timeout = 5
+    lambda {
       Bunny::Timer::timeout(connect_timeout, Qrack::ConnectionTimeout) do
-        TCPSocket.new(b.host, b.port) 
+        TCPSocket.new(b.host, b.port)
       end
     }.should_not raise_error(Exception)
   end

data/spec/spec_09/exchange_spec.rb

@@ -17,6 +17,15 @@ describe 'Exchange' do
     @b.start
   end
 
+  after(:each) do
+    begin
+      @b.stop
+    rescue Exception
+    ensure
+      @b = nil
+    end
+  end
+
   it "should raise an error if instantiated as non-existent type" do
     lambda { @b.exchange('bogus_ex', :type => :bogus) }.should raise_error(Bunny::ForcedConnectionCloseError)
     @b.status.should == :not_connected

data/spec/spec_09/queue_spec.rb

@@ -19,6 +19,20 @@ describe 'Queue' do
     @default_exchange = @b.exchange("")
   end
 
+  after(:each) do
+    begin
+      @b.stop
+    rescue Exception
+    ensure
+      @b = nil
+    end
+  end
+
+  def message_count(queue, sleep_time = 0.1)
+    sleep sleep_time
+    queue.message_count
+  end
+
   it "should ignore the :nowait option when instantiated" do
     q = @b.queue('test0', :nowait => true)
   end
@@ -67,7 +81,7 @@ describe 'Queue' do
     msg[:header].should be_an_instance_of(Bunny::Protocol09::Header)
     msg[:payload].should == 'This is a test message'
     msg[:delivery_details].should be_an_instance_of(Hash)
-    q.message_count.should == 0
+    message_count(q).should == 0
   end
 
   it "should be able to pop a message and just get the payload" do
@@ -75,7 +89,7 @@ describe 'Queue' do
     @default_exchange.publish('This is another test message', :key => 'test1')
     msg = q.pop[:payload]
     msg.should == 'This is another test message'
-    q.message_count.should == 0
+    message_count(q).should == 0
   end
 
   it "should be able to pop a message where body length exceeds max frame size" do
@@ -96,15 +110,15 @@ describe 'Queue' do
   it "should raise an error if purge fails" do
     q = @b.queue('test1')
     5.times { @default_exchange.publish('This is another test message', :key => 'test1') }
-    q.message_count.should == 5
+    message_count(q).should == 5
     lambda {q.purge(:queue => 'bogus')}.should raise_error(Bunny::ForcedChannelCloseError)
   end
 
   it "should be able to be purged to remove all of its messages" do
     q = @b.queue('test1')
-    q.message_count.should == 5
+    message_count(q).should == 5
     q.purge.should == :purge_ok
-    q.message_count.should == 0
+    message_count(q).should == 0
   end
 
   it "should return an empty message when popping an empty queue" do
@@ -118,16 +132,16 @@ describe 'Queue' do
   it "should stop subscription without processing messages if max specified is 0" do
     q = @b.queue('test1')
     5.times { @default_exchange.publish('Yet another test message', :key => 'test1') }
-    q.message_count.should == 5
+    message_count(q).should == 5
     q.subscribe(:message_max => 0)
-    q.message_count.should == 5
+    message_count(q).should == 5
     q.purge.should == :purge_ok
   end
 
   it "should stop subscription after processing number of messages specified > 0" do
     q = @b.queue('test1')
     5.times { @default_exchange.publish('Yet another test message', :key => 'test1') }
-    q.message_count.should == 5
+    message_count(q).should == 5
     q.subscribe(:message_max => 5)
   end
 
@@ -135,9 +149,9 @@ describe 'Queue' do
     q = @b.queue('test1')
     @b.qos()
     10.times { @default_exchange.publish('Yet another test message', :key => 'test1') }
-    q.message_count.should == 10
+    message_count(q).should == 10
     q.subscribe(:message_max => 5, :ack => true)
-    q.message_count.should == 5
+    message_count(q).should == 5
     q.purge.should == :purge_ok
   end
 

metadata

@@ -1,15 +1,10 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: bunny
-version: !ruby/object:Gem::Version 
-  hash: 15
+version: !ruby/object:Gem::Version
+  version: 0.7.8
   prerelease: 
-  segments: 
-  - 0
-  - 7
-  - 6
-  version: 0.7.6
 platform: ruby
-authors: 
+authors:
 - Chris Duncan
 - Eric Lindvall
 - Jakub Stastny aka botanicus
@@ -18,25 +13,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-09-21 00:00:00 +04:00
+date: 2011-10-11 00:00:00.000000000 +02:00
 default_executable: 
 dependencies: []
-
-description: A synchronous Ruby AMQP client that enables interaction with AMQP-compliant brokers.
-email: 
+description: A synchronous Ruby AMQP client that enables interaction with AMQP-compliant
+  brokers.
+email:
 - celldee@gmail.com
 - eric@5stops.com
 - stastny@101ideas.cz
 - michael@novemberain.com
 - skaes@railsexpress.de
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.textile
-files: 
+files:
 - .gitignore
 - .rspec
 - .travis.yml
@@ -107,39 +99,32 @@ files:
 has_rdoc: true
 homepage: http://github.com/ruby-amqp/bunny
 licenses: []
-
-post_install_message: "[\e[32mVersion 0.7.6\e[0m] API mismatch between Timer/SystemTimer on Ruby 1.9 vs Ruby 1.8 is resolved.\n"
-rdoc_options: 
+post_install_message: ! "[\e[32mVersion 0.7.8\e[0m] test suite cleanup (eliminated
+  some race conditions related to queue.message_count)\n"
+rdoc_options:
 - --main
 - README.rdoc
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: bunny-amqp
 rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Synchronous Ruby AMQP 0.9.1 client
-test_files: 
+test_files:
 - spec/spec_08/bunny_spec.rb
 - spec/spec_08/connection_spec.rb
 - spec/spec_08/exchange_spec.rb