sensu-redis 0.1.13 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 42a4cb01825d97e36febefee1e7a1d200bc5aec5
-  data.tar.gz: 78addc7a9d53422e76a68ea0dd03d2df183c3859
+  metadata.gz: c22a06a2ec430bbba10f536339e6e8bdb9e50dfc
+  data.tar.gz: 29dfd7de2495c052fa353e01b90e36e7c9ea2ae7
 SHA512:
-  metadata.gz: 5f30c9aed44dd9f6c26603250c2c4e5ce5a1f613ebabb685bbdcbc75b0a655ac9e51170d4cf692d1b18b6ebda342d156e20ff3422734b692e6d92710f1402cfc
-  data.tar.gz: 5842c20f550a2530789328e89f24f7ce6f51edd4eb1ba9f96f71c24344ce34548c9fa1de197dcdfa080862a497c002127901fc2586932f5f2b002bcb1cc9fb79
+  metadata.gz: 244a5a233101f19a973df8153bfeca2c470012b200aacb6a4790e19c3b73c7d11bd29804b29e92a2e1d7d03e7c61bd63c4926e7dda1a2d1e1ab705b66a3cd6ba
+  data.tar.gz: e4764f5827e5ab8440b259132bf5cd8e75f8ce9fc5038cbdca0e4c0adc1ba4c218c8269570450a3e812d731ecec7e06cfc6190167e4109f9e3f81181fb800538

data/Rakefile

@@ -1 +1,6 @@
 require "bundler/gem_tasks"
+require "rspec/core/rake_task"
+
+RSpec::Core::RakeTask.new(:spec)
+
+task :default => :spec

data/lib/sensu/redis.rb

@@ -32,12 +32,10 @@ module Sensu
       # @yield callback to be called with the redis connection object.
       def connect_via_sentinel(options, &block)
         sentinel = Sentinel.new(options)
-        sentinel.callback do
-          sentinel.resolve do |host, port|
-            redis = EM.connect(host, port, Client, options)
-            redis.sentinel = sentinel
-            block.call(redis)
-          end
+        sentinel.resolve do |host, port|
+          redis = EM.connect(host, port, Client, options)
+          redis.sentinel = sentinel
+          block.call(redis)
         end
       end
 
@@ -63,7 +61,7 @@ module Sensu
         end
         options[:host] ||= "127.0.0.1"
         options[:port] ||= 6379
-        if options[:sentinels].is_a?(Array)
+        if options[:sentinels].is_a?(Array) && options[:sentinels].size > 0
           connect_via_sentinel(options, &block)
         else
           connect_direct(options, &block)

data/lib/sensu/redis/sentinel.rb

@@ -4,8 +4,6 @@ require "eventmachine"
 module Sensu
   module Redis
     class Sentinel
-      include EM::Deferrable
-
       # Initialize the Sentinel connections. The default Redis master
       # name is "mymaster", which is the same name that the Sensu HA
       # Redis documentation uses. The master name must be set
@@ -18,20 +16,14 @@ module Sensu
         @sentinels = connect_to_sentinels(options[:sentinels])
       end
 
-      # Connect to a Sentinel instance. A successful connection will
-      # set the deferrable status to `:successful`, triggering any
-      # queued Sentinel callback calls (e.g. `resolve()`).
+      # Connect to a Sentinel instance.
       #
       # @param options [Hash] containing the host and port.
       # @return [Object] Sentinel connection.
       def connect_to_sentinel(options={})
         options[:host] ||= "127.0.0.1"
         options[:port] ||= 26379
-        connection = EM.connect(options[:host], options[:port], Client, options)
-        connection.callback do
-          succeed
-        end
-        connection
+        EM.connect(options[:host], options[:port], Client, options)
       end
 
       # Connect to all Sentinel instances. This method defaults the
@@ -85,7 +77,7 @@ module Sensu
           sentinel.errback do
             retry_resolve(&block)
           end
-          sentinel.timeout(10)
+          sentinel.timeout(60)
         end
       end
     end

data/sensu-redis.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "sensu-redis"
-  spec.version       = "0.1.13"
+  spec.version       = "0.1.14"
   spec.authors       = ["Sean Porter"]
   spec.email         = ["portertech@gmail.com"]
   spec.summary       = "The Sensu Redis client library"

data/spec/helpers.rb

@@ -0,0 +1,29 @@
+require "rspec"
+require "eventmachine"
+
+unless RUBY_VERSION < "1.9" || RUBY_PLATFORM =~ /java/
+  require "codeclimate-test-reporter"
+  CodeClimate::TestReporter.start
+end
+
+module Helpers
+  def timer(delay, &callback)
+    periodic_timer = EM::PeriodicTimer.new(delay) do
+      callback.call
+      periodic_timer.cancel
+    end
+  end
+
+  def async_wrapper(&callback)
+    EM.run do
+      timer(10) do
+        raise "test timed out"
+      end
+      callback.call
+    end
+  end
+
+  def async_done
+    EM.stop_event_loop
+  end
+end

data/spec/redis_spec.rb

@@ -0,0 +1,28 @@
+require File.join(File.dirname(__FILE__), "helpers")
+require "sensu/redis"
+
+describe "Sensu::Redis" do
+  include Helpers
+
+  it "can connect to a redis instance" do
+    async_wrapper do
+      Sensu::Redis.connect do |redis|
+        redis.callback do
+          expect(redis.connected?).to eq(true)
+          async_done
+        end
+      end
+    end
+  end
+
+  it "can connect to a redis master via sentinel", :sentinel => true do
+    async_wrapper do
+      Sensu::Redis.connect(:sentinels => [{:port => 26379}]) do |redis|
+        redis.callback do
+          expect(redis.connected?).to eq(true)
+          async_done
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-redis
 version: !ruby/object:Gem::Version
-  version: 0.1.13
+  version: 0.1.14
 platform: ruby
 authors:
 - Sean Porter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-12 00:00:00.000000000 Z
+date: 2016-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -102,6 +102,8 @@ files:
 - lib/sensu/redis/client/errors.rb
 - lib/sensu/redis/sentinel.rb
 - sensu-redis.gemspec
+- spec/helpers.rb
+- spec/redis_spec.rb
 homepage: https://github.com/sensu/sensu-redis
 licenses:
 - MIT
@@ -126,4 +128,6 @@ rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: The Sensu Redis client library
-test_files: []
+test_files:
+- spec/helpers.rb
+- spec/redis_spec.rb