beetle 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c6b1de828dca7a94962097fa30763c18944837e8
-  data.tar.gz: b52dcbee0773bfa70d22f204942e97398262dbd0
+  metadata.gz: 3d8b222ecf61bf82a5c7969fb525aa19a42aa2d7
+  data.tar.gz: 2058829e3453e484cf1d226c01fcfe8c50b32fda
 SHA512:
-  metadata.gz: f33209c5bbf8125e84713bb19837c14cf19ca508d46b7c24f9496abb9969edfd423d9f38a064ba8a4cf0d72520ea4e73e02251c827732efe4894a3bf1cfb2687
-  data.tar.gz: 17b50f9b57f777843f41960a6129e686b4191b2b3e5557f21c931ad6ed37341a0c7fa8b681044bc1c7bce1f75b85416ce62304ba79e78e6cf84dc16d278f529d
+  metadata.gz: f91ee3a7c83f9f3823b43a5e0cae3447c5d9fe11c7b7eca32469d0bb7f1a7fe7df435fe1e172b5a916cd16fe7c656cd30cb530d12b2d88d091037a01b7b814f7
+  data.tar.gz: b10f5d7895227dade91634ff95468a28a75393f14629704fa3dd7f4d43472c0a8374ff47804408c1059e45f557582c79e58e0590e39d8801ef675fc1ec7dc08a

data/RELEASE_NOTES.rdoc

@@ -1,5 +1,9 @@
 = Release Notes
 
+== Version 1.0.1
+
+* don't try to connect on publisher shutdown
+
 == Version 1.0.0
 
 * introduced semantic versioning

data/lib/beetle/publisher.rb

@@ -153,6 +153,10 @@ module Beetle
       @bunnies[@server] ||= new_bunny
     end
 
+    def bunny?
+      @bunnies[@server]
+    end
+
     def new_bunny
       b = Bunny.new(
         :host           => current_host,
@@ -217,23 +221,22 @@ module Beetle
     end
 
     def stop!(exception=nil)
-      begin
-        Beetle::Timer.timeout(1) do
-          logger.debug "Beetle: closing connection from publisher to #{server}"
-          if exception
-            bunny.__send__ :close_socket
-          else
-            bunny.stop
-          end
+      return unless bunny?
+      Beetle::Timer.timeout(1) do
+        logger.debug "Beetle: closing connection from publisher to #{server}"
+        if exception
+          bunny.__send__ :close_socket
+        else
+          bunny.stop
         end
-      rescue Exception => e
-        logger.warn "Beetle: error closing down bunny #{e}"
-        Beetle::reraise_expectation_errors!
-      ensure
-        @bunnies[@server] = nil
-        @exchanges[@server] = {}
-        @queues[@server] = {}
       end
+    rescue Exception => e
+      logger.warn "Beetle: error closing down bunny: #{e}"
+      Beetle::reraise_expectation_errors!
+    ensure
+      @bunnies[@server] = nil
+      @exchanges[@server] = {}
+      @queues[@server] = {}
     end
   end
 end

data/lib/beetle/version.rb

@@ -1,3 +1,3 @@
 module Beetle
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/test/beetle/publisher_test.rb

@@ -42,6 +42,7 @@ module Beetle
     test "stop! should shut down bunny and clean internal data structures" do
       b = mock("bunny")
       b.expects(:stop).raises(Exception.new)
+      @pub.expects(:bunny?).returns(true)
       @pub.expects(:bunny).returns(b)
       @pub.send(:stop!)
       assert_equal({}, @pub.send(:exchanges))
@@ -49,6 +50,15 @@ module Beetle
       assert_nil @pub.instance_variable_get(:@bunnies)[@pub.server]
     end
 
+    test "stop! should not create a new bunny " do
+      @pub.expects(:bunny?).returns(false)
+      @pub.expects(:bunny).never
+      @pub.send(:stop!)
+      assert_equal({}, @pub.send(:exchanges))
+      assert_equal({}, @pub.send(:queues))
+      assert_nil @pub.instance_variable_get(:@bunnies)[@pub.server]
+    end
+
   end
 
   class PublisherPublishingTest < Minitest::Test
@@ -403,9 +413,11 @@ module Beetle
       s = sequence("shutdown")
       bunny = mock("bunny")
       @pub.expects(:set_current_server).with("localhost:1111").in_sequence(s)
+      @pub.expects(:bunny?).returns(true).in_sequence(s)
       @pub.expects(:bunny).returns(bunny).in_sequence(s)
       bunny.expects(:stop).in_sequence(s)
       @pub.expects(:set_current_server).with("localhost:2222").in_sequence(s)
+      @pub.expects(:bunny?).returns(true).in_sequence(s)
       @pub.expects(:bunny).returns(bunny).in_sequence(s)
       bunny.expects(:stop).in_sequence(s)
       @pub.stop

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beetle
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Stefan Kaes