sensu-transport 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2496679cd2381c318009355b8053bc5a6538b38c
-  data.tar.gz: 0ef31ba66257db7ca775231bcd57fcd08558cdb5
+  metadata.gz: 243e8eb1bf19bad3b76515bcebad17dcaf132534
+  data.tar.gz: a193c06b33d7b5d33b3e72cc4aafc1a1f7117ee5
 SHA512:
-  metadata.gz: eb087f8e880e4e756d592d801fa781b32f38f3c19fe0aaaec87933e95c97ba84d4a8e649991f72ea6d1ae4623ddb96807830b6b8e6c6107371bab01d32a4a9f6
-  data.tar.gz: 87a36f325889d9bdb440d301d03dcbd56d8249ecc62e9d9e91beb740ec1793204f378945c05451f7ab0029b0b3a4aee0da2823a1c5ef7f4c9d49e617494d76b2
+  metadata.gz: a1096bd23af4e5ad5166ca99477b02da0144e7370b3f72131e56bbfb8ff990d140e2bf5fa44a55752e48ae5c5d2dafc359fc24c89f58b69fe40bf7e6ef486dcf
+  data.tar.gz: 4597ad573b8c4edd1193d2d43520976e89cc55d3b147a4ea09b5457b568e0879615aaf6e7468d674b3639f0ef4dd5444e5866190e71d69d84f1ff0f52a3f4b38

data/lib/sensu/transport/rabbitmq.rb

@@ -49,7 +49,8 @@ module Sensu
       end
 
       def close
-        @connection.close
+        callback = Proc.new { @connection.close }
+        connected? ? callback.call : EM.next_tick(callback)
       end
 
       def publish(exchange_type, exchange_name, message, options={}, &callback)

data/sensu-transport.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "sensu-transport"
-  spec.version       = "0.0.6"
+  spec.version       = "0.0.7"
   spec.authors       = ["Sean Porter"]
   spec.email         = ["portertech@gmail.com"]
   spec.summary       = "The Sensu transport abstraction library"

data/spec/base_spec.rb

@@ -9,31 +9,31 @@ describe "Sensu::Transport::Base" do
   end
 
   it "provides a transport API (noop)" do
-    @transport.should respond_to(:on_error, :before_reconnect, :after_reconnect,
-                                 :connect, :reconnect, :connected?, :close,
-                                 :publish, :subscribe, :unsubscribe,
-                                 :acknowledge, :ack, :stats)
+    expect(@transport).to respond_to(:on_error, :before_reconnect, :after_reconnect,
+                                     :connect, :reconnect, :connected?, :close,
+                                     :publish, :subscribe, :unsubscribe,
+                                     :acknowledge, :ack, :stats)
   end
 
   it "behaves as expected" do
     callback = Proc.new { true }
-    @transport.on_error(&callback).should be_an_instance_of(Proc)
-    @transport.before_reconnect(&callback).should be_an_instance_of(Proc)
-    @transport.after_reconnect(&callback).should be_an_instance_of(Proc)
-    @transport.connect.should eq(nil)
-    @transport.connect({}).should eq(nil)
-    @transport.reconnect.should eq(nil)
-    @transport.connected?.should eq(false)
-    @transport.close.should eq(nil)
-    @transport.publish("foo", "bar", "baz").should eq(nil)
-    @transport.publish("foo", "bar", "baz", {}, &callback).should eq(true)
-    @transport.subscribe("foo", "bar", nil, {}, &callback).should eq(true)
-    @transport.unsubscribe.should eq(nil)
-    @transport.unsubscribe(&callback).should eq(true)
-    @transport.acknowledge({}).should eq(nil)
-    @transport.ack({}).should eq(nil)
-    @transport.acknowledge({}, &callback).should eq(true)
-    @transport.ack({}, &callback).should eq(true)
-    @transport.stats("foo", &callback).should eq(true)
+    expect(@transport.on_error(&callback)).to be_kind_of(Proc)
+    expect(@transport.before_reconnect(&callback)).to be_an_instance_of(Proc)
+    expect(@transport.after_reconnect(&callback)).to be_an_instance_of(Proc)
+    expect(@transport.connect).to eq(nil)
+    expect(@transport.connect({})).to eq(nil)
+    expect(@transport.reconnect).to eq(nil)
+    expect(@transport.connected?).to eq(false)
+    expect(@transport.close).to eq(nil)
+    expect(@transport.publish("foo", "bar", "baz")).to eq(nil)
+    expect(@transport.publish("foo", "bar", "baz", {}, &callback)).to eq(true)
+    expect(@transport.subscribe("foo", "bar", nil, {}, &callback)).to eq(true)
+    expect(@transport.unsubscribe).to eq(nil)
+    expect(@transport.unsubscribe(&callback)).to eq(true)
+    expect(@transport.acknowledge({})).to eq(nil)
+    expect(@transport.ack({})).to eq(nil)
+    expect(@transport.acknowledge({}, &callback)).to eq(true)
+    expect(@transport.ack({}, &callback)).to eq(true)
+    expect(@transport.stats("foo", &callback)).to eq(true)
   end
 end

data/spec/rabbitmq_spec.rb

@@ -12,17 +12,17 @@ describe "Sensu::Transport::RabbitMQ" do
   end
 
   it "provides a transport API" do
-    @transport.should respond_to(:on_error, :before_reconnect, :after_reconnect,
-                                 :connect, :reconnect, :connected?, :close,
-                                 :publish, :subscribe, :unsubscribe,
-                                 :acknowledge, :ack, :stats)
+    expect(@transport).to respond_to(:on_error, :before_reconnect, :after_reconnect,
+                                     :connect, :reconnect, :connected?, :close,
+                                     :publish, :subscribe, :unsubscribe,
+                                     :acknowledge, :ack, :stats)
   end
 
   it "can publish and subscribe" do
     async_wrapper do
       @transport.connect
       callback = Proc.new do |message|
-        message.should eq("msg")
+        expect(message).to eq("msg")
         timer(0.5) do
           async_done
         end
@@ -31,8 +31,8 @@ describe "Sensu::Transport::RabbitMQ" do
       @transport.subscribe("direct", "bar", "baz", {}, &callback)
       timer(1) do
         @transport.publish("direct", "foo", "msg") do |info|
-          info.should be_kind_of(Hash)
-          info.should be_empty
+          expect(info).to be_kind_of(Hash)
+          expect(info).to be_empty
         end
       end
     end
@@ -47,7 +47,22 @@ describe "Sensu::Transport::RabbitMQ" do
       timer(1) do
         @transport.unsubscribe do
           @transport.close
-          @transport.connected?.should be_false
+          expect(@transport.connected?).to be(false)
+          async_done
+        end
+      end
+    end
+  end
+
+  it "can open and close the connection immediately" do
+    async_wrapper do
+      @transport.connect
+      @transport.close
+      expect(@transport.connected?).to be(false)
+      EM.next_tick do
+        expect(@transport.connected?).to be(false)
+        timer(1) do
+          expect(@transport.connected?).to be(false)
           async_done
         end
       end
@@ -66,8 +81,8 @@ describe "Sensu::Transport::RabbitMQ" do
       end
       timer(1) do
         @transport.publish("direct", "foo", "msg") do |info|
-          info.should be_kind_of(Hash)
-          info.should be_empty
+          expect(info).to be_kind_of(Hash)
+          expect(info).to be_empty
         end
       end
     end
@@ -77,9 +92,9 @@ describe "Sensu::Transport::RabbitMQ" do
     async_wrapper do
       @transport.connect
       @transport.stats("bar") do |info|
-        info.should be_kind_of(Hash)
-        info[:messages].should eq(0)
-        info[:consumers].should eq(0)
+        expect(info).to be_kind_of(Hash)
+        expect(info[:messages]).to eq(0)
+        expect(info[:consumers]).to eq(0)
         async_done
       end
     end
@@ -88,7 +103,7 @@ describe "Sensu::Transport::RabbitMQ" do
   it "can fail to connect" do
     async_wrapper do
       @transport.connect(:port => 5555)
-      @transport.connected?.should be_false
+      expect(@transport.connected?).to be(false)
       async_done
     end
   end
@@ -97,14 +112,14 @@ describe "Sensu::Transport::RabbitMQ" do
     ssl_dir = File.join(File.dirname(__FILE__), "assets", "ssl", "client")
     async_wrapper do
       @transport.connect(
-        :port => 5671,
-        :ssl => {
-          :cert_chain_file => File.join(ssl_dir, "cert.pem"),
-          :private_key_file => File.join(ssl_dir, "key.pem")
-        }
-      )
+                         :port => 5671,
+                         :ssl => {
+                           :cert_chain_file => File.join(ssl_dir, "cert.pem"),
+                           :private_key_file => File.join(ssl_dir, "key.pem")
+                         }
+                         )
       timer(2) do
-        @transport.connected?.should be_true
+        expect(@transport.connected?).to be(true)
         async_done
       end
     end

data/spec/transport_spec.rb

@@ -10,7 +10,7 @@ describe "Sensu::Transport" do
       options = {}
       transport = Sensu::Transport.connect("rabbitmq", options)
       timer(1) do
-        transport.connected?.should be_true
+        expect(transport.connected?).to be(true)
         async_done
       end
     end
@@ -21,8 +21,8 @@ describe "Sensu::Transport" do
       logger = Logger.new(STDOUT)
       Sensu::Transport.logger = logger
       transport = Sensu::Transport.connect("rabbitmq")
-      transport.logger.should eq(logger)
-      transport.logger.should respond_to(:error)
+      expect(transport.logger).to eq(logger)
+      expect(transport.logger).to respond_to(:error)
       async_done
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-transport
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Sean Porter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-28 00:00:00.000000000 Z
+date: 2014-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-em