beetle 3.5.1 → 3.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2dcaf90eaf1b11b7f6350bb34e17d73591616790ede7b43b6e98cef363dd3770
-  data.tar.gz: 55348c9ce61cc2f43869f9c12cd26bbc5dc033b0e0a0506c0a821d6a6e24862c
+  metadata.gz: a0e823ee91e804e241eefc9057879a94c538c43c45f04af9c0e9491d6bc9e0b3
+  data.tar.gz: b211a4cfb395af0a048431fa53f865a0b9b9a61478d5f0527cf8c794a4751273
 SHA512:
-  metadata.gz: 6daabfea72ab76b0fa6944d35cee52139678f9a02a272e86a32af6045750496ee81b96ff685eee1bbe9617030b981df3718b7569efabc98df59f894127da29d1
-  data.tar.gz: 04d599595b4c39e62a78b496b284a67bed1a545e759d9a094facc757e0334ed16e4bdd7bab4f7bfabb7b6f63da0e590351e86d0da55328ab6db898e9ceaaef7f
+  metadata.gz: 244515a2a89649e6f09900b910bbe29c4d624b1750051136d26e7f49fcf825910b602f6714438e8a3a8bd9f9822af2a0955afbfe82cd46cb23acd393999346f8
+  data.tar.gz: 3735d575d65abbf415e9bad4c74c2c84720144cd3147c6687061413eeaf296ea46a739bfdb731c62c4031bf751869acf4ef8ccc269146067c36a354f69fcb08c

data/Rakefile

@@ -98,7 +98,7 @@ namespace :consul do
 end
 
 Cucumber::Rake::Task.new(:cucumber) do |t|
-  t.cucumber_opts = "features --format progress"
+  t.cucumber_opts = ["features", "--format progress"]
 end
 
 task :cucumber => :clean
@@ -115,18 +115,14 @@ Rake::TestTask.new do |t|
   t.warning = false
 end
 
-require 'rdoc/task'
-
-RDoc::Task.new do |rdoc|
-  rdoc.rdoc_dir = 'site/rdoc'
-  rdoc.title    = 'Beetle'
-  rdoc.main     = 'README.rdoc'
-  rdoc.options << '--line-numbers' << '--inline-source' << '--quiet'
-  rdoc.rdoc_files.include('**/*.rdoc')
-  rdoc.rdoc_files.include('MIT-LICENSE')
-  rdoc.rdoc_files.include('lib/**/*.rb')
+task :clean do
+  sh "rm -f tmp/*.output tmp/*.log tmp/master-dir/* tmp/slave-dir/* tmp/*lock tmp/*pid test.log" unless ENV['GITHUB_ACTIONS']
 end
 
-task :clean do
-  sh "rm -f tmp/*.output tmp/*.log tmp/master-dir/* tmp/slave-dir/* tmp/*lock tmp/*pid test.log"
+require 'yard'
+
+YARD::Rake::YardocTask.new do |t|
+  OTHER_PATHS = %w()
+  t.files = ['lib/**/*.rb'] + OTHER_PATHS
+  t.options = %w(--markup-provider=redcarpet --markup=markdown --main=README.md --output-dir=site/yard)
 end

data/beetle.gemspec

@@ -31,16 +31,21 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "activesupport",           ">= 2.3.4"
 
   s.add_development_dependency "activerecord",        "~> 5.0"
-  s.add_development_dependency "cucumber",            "~> 2.4.0"
+  s.add_development_dependency "cucumber",            "~> 8.0.0"
   s.add_development_dependency "daemon_controller",   "~> 1.2.0"
   s.add_development_dependency "daemons",             ">= 1.2.0"
   s.add_development_dependency "i18n"
   s.add_development_dependency "minitest",            "~> 5.1"
-  s.add_development_dependency "mocha",               "~> 1.3.0"
-  s.add_development_dependency "mysql2",              "~> 0.4.4"
+  s.add_development_dependency "minitest-reporters"
+  s.add_development_dependency "mocha",               "~> 1.14"
+  s.add_development_dependency "mysql2",              "~> 0.5"
   s.add_development_dependency "rake",                "~> 13.0"
-  s.add_development_dependency "rdoc",                "~> 4.0"
   s.add_development_dependency "simplecov",           "~> 0.15"
   s.add_development_dependency "webmock",             "~> 3.0"
   s.add_development_dependency "websocket-eventmachine-client"
+  s.add_development_dependency 'yard'
+  s.add_development_dependency 'redcarpet'
+  s.add_development_dependency 'github-markup'
+  s.add_development_dependency 'byebug'
+  s.add_development_dependency 'appraisal'
 end

data/examples/redundant.rb

@@ -17,7 +17,7 @@ Beetle.config.logger.level = Logger::INFO
 client = Beetle::Client.new
 
 # use two servers
-Beetle.config.servers = "localhost:5672, localhost:5673"
+Beetle.config.servers = ENV["RABBITMQ_SERVERS"] || "localhost:5672, localhost:5673"
 # instantiate a client
 client = Beetle::Client.new
 

data/examples/rpc.rb

@@ -4,7 +4,7 @@ require File.expand_path(File.dirname(__FILE__)+"/../lib/beetle")
 
 # suppress debug messages
 Beetle.config.logger.level = Logger::INFO
-Beetle.config.servers = "localhost:5672, localhost:5673"
+Beetle.config.servers = ENV["RABBITMQ_SERVERS"] || "localhost:5672, localhost:5673"
 # instantiate a client
 
 client = Beetle::Client.new

data/features/redis_auto_failover.feature

@@ -24,6 +24,26 @@ Feature: Redis auto failover
     Given a redis server "redis-1" exists as master
     Then the role of redis server "redis-1" should be "slave"
 
+  Scenario: Successful redis master switch with multiple slaves
+    And a redis server "redis-3" exists as slave of "redis-3"
+    Given a redis configuration server using redis servers "redis-1,redis-2,redis-3" with clients "rc-client-1,rc-client-2" exists
+    And a redis configuration client "rc-client-1" using redis servers "redis-1,redis-2,redis-3" exists
+    And a redis configuration client "rc-client-2" using redis servers "redis-1,redis-2,redis-3" exists
+    And a beetle handler using the redis-master file from "rc-client-1" exists
+    And redis server "redis-1" is down
+    And the retry timeout for the redis master check is reached
+    Then a system notification for "redis-1" not being available should be sent
+    And the role of redis server "redis-2" should be "master"
+    And the redis master file of the redis configuration server should contain "redis-2"
+    And the redis master of "rc-client-1" should be "redis-2"
+    And the redis master of "rc-client-2" should be "redis-2"
+    And the redis master of the beetle handler should be "redis-2"
+    And a system notification for switching from "redis-1" to "redis-2" should be sent
+    Given a redis server "redis-1" exists as master
+    Then the role of redis server "redis-1" should be "slave"
+    And the redis server "redis-1" is a slave of "redis-2"
+    And the redis server "redis-3" is a slave of "redis-2"
+
   Scenario: Successful single redis master switch with multiple failover sets
     Given a redis server "redis-3" exists as master
     And a redis server "redis-4" exists as slave of "redis-3"

data/features/step_definitions/redis_auto_failover_steps.rb

@@ -1,8 +1,9 @@
 Given /^consul state has been cleared$/ do
+  consul_host = ENV["CONSUL_HOST"] || "localhost:8500"
   system "killall beetle beetle_handler >/dev/null 2>/dev/null"
-  system "curl --silent --request PUT http://localhost:8500/v1/kv/apps/beetle/config/ >/dev/null"
-  system "curl --silent --request PUT http://localhost:8500/v1/kv/shared/config/ >/dev/null"
-  system "curl --silent --request DELETE http://localhost:8500/v1/kv/apps/beetle/state/redis_master_file_content >/dev/null"
+  system "curl --silent --request PUT http://#{consul_host}/v1/kv/apps/beetle/config/ >/dev/null"
+  system "curl --silent --request PUT http://#{consul_host}/v1/kv/shared/config/ >/dev/null"
+  system "curl --silent --request DELETE http://#{consul_host}/v1/kv/apps/beetle/state/redis_master_file_content >/dev/null"
 end
 
 Given /^a redis server "([^\"]*)" exists as master$/ do |redis_name|
@@ -93,7 +94,6 @@ Given /^an old redis master file for "([^\"]*)" with master "([^\"]*)" exists$/
   end
 end
 
-
 Then /^the role of redis server "([^\"]*)" should be "(master|slave)"$/ do |redis_name, role|
   expected_role = false
   10.times do
@@ -103,6 +103,16 @@ Then /^the role of redis server "([^\"]*)" should be "(master|slave)"$/ do |redi
   assert expected_role, "#{redis_name} is not a #{role}"
 end
 
+Then /^the redis server "([^\"]*)" is a slave of "([^\"]*)"$/ do |redis_name, redis_master_name|
+  master = TestDaemons::Redis[redis_master_name].redis
+  slave = TestDaemons::Redis[redis_name].redis
+  3.times do
+    sleep 1
+    break if slave.slave_of?(master.host, master.port)
+  end
+  assert slave.slave_of?(master.host, master.port)
+end
+
 Then /^the redis master of "([^\"]*)" (?:in system "([^"]*)" )?should be "([^\"]*)"$/ do |redis_configuration_client_name, system_name, redis_name|
   system_name ||= "system"
   master_file = redis_master_file(redis_configuration_client_name)
@@ -143,11 +153,21 @@ end
 Then /^the redis master of the beetle handler should be "([^\"]*)"$/ do |redis_name|
   Beetle.config.servers = "127.0.0.1:5672" # rabbitmq
   Beetle.config.logger.level = Logger::INFO
-  client = Beetle::Client.new.configure :auto_delete => true do |config|
-    config.queue(:echo, :lazy => true, :dead_lettering => true)
-    config.message(:echo)
+  redis_master = TestDaemons::Redis[redis_name].ip_with_port
+  response = nil
+  expected_response = ['OK', redis_master]
+  3.times do |i|
+    client = Beetle::Client.new.configure :auto_delete => true do |config|
+      config.queue(:echo, :lazy => true, :dead_lettering => true)
+      config.message(:echo)
+    end
+    t1 = Time.now
+    response = client.rpc(:echo, 'echo')
+    t2 = Time.now
+    # puts "OK,#{redis_master} =?= #{response.join(',')} after #{t2-t1}, attempt #{i+1}"
+    break if expected_response == response
   end
-  assert_match /#{TestDaemons::Redis[redis_name].ip_with_port}/, client.rpc(:echo, 'nil').second
+  assert_equal expected_response, response
 end
 
 Then /^a system notification for "([^\"]*)" not being available should be sent$/ do |redis_name|
@@ -166,8 +186,12 @@ end
 
 Then /^a system notification for no slave available to become new master should be sent$/ do
   text = "Redis master could not be switched, no slave available to become new master"
-  lines = File.readlines(system_notification_log_path)
-  tail = (["","",""]+lines)[-3..-1].join("\n")
+  tail = ""
+  3.times do
+    lines = File.readlines(system_notification_log_path)
+    tail = (["","",""]+lines)[-3..-1].join("\n")
+    sleep 0.1 unless tail =~ /#{text}/
+  end
   assert_match /#{text}/, tail
 end
 
@@ -179,7 +203,7 @@ end
 
 Given /^an immediate master switch is initiated and responds with (\d+)$/ do |response_code|
   response = TestDaemons::RedisConfigurationServer.initiate_master_switch
-  assert_equal response_code, response.code, "unexpected response code #{response.code}, message: #{response.body}"
+  assert_equal response_code.to_s, response.code, "unexpected response code #{response.code}, message: #{response.body}"
   sleep 1
 end
 

data/features/support/test_daemons/redis_configuration_server.rb

@@ -25,9 +25,10 @@ module TestDaemons
 
     def self.daemon_controller
       clients_parameter_string = @@redis_configuration_clients.blank? ? "" : "--client-ids #{@@redis_configuration_clients}"
+      consul_host = ENV["CONSUL_HOST"] || "localhost:8500"
       DaemonController.new(
          :identifier    => "Redis configuration test server",
-         :start_command => "./beetle configuration_server -v -d --redis-master-file #{redis_master_file} --redis-servers '#{@@redis_servers}' #{clients_parameter_string} --redis-master-retry-interval 1 --pid-file #{pid_file} --log-file #{log_file} --redis-failover-confidence-level #{@@confidence_level} --consul http://localhost:8500",
+         :start_command => "./beetle configuration_server -v -d --redis-master-file #{redis_master_file} --redis-servers '#{@@redis_servers}' #{clients_parameter_string} --redis-master-retry-interval 1 --pid-file #{pid_file} --log-file #{log_file} --redis-failover-confidence-level #{@@confidence_level} --consul http://#{consul_host}",
          :ping_command  => lambda{ answers_text_requests? },
          :pid_file      => pid_file,
          :log_file      => log_file,

data/lib/beetle/configuration.rb

@@ -33,6 +33,12 @@ module Beetle
     attr_accessor :redis_servers
     # redis database number to use for the message deduplication store (defaults to <tt>4</tt>)
     attr_accessor :redis_db
+    # redis connect timeout. defaults to 5 seconds.
+    attr_accessor :redis_connect_timeout
+    # redis read timeout. defaults to 5 seconds.
+    attr_accessor :redis_read_timeout
+    # redis write timeout. defaults to 5 seconds.
+    attr_accessor :redis_write_timeout
 
     # how long we should repeatedly retry a redis operation before giving up, with a one
     # second sleep between retries (defaults to <tt>180.seconds</tt>). this value needs to be
@@ -157,6 +163,9 @@ module Beetle
       self.redis_server = "localhost:6379"
       self.redis_servers = ""
       self.redis_db = 4
+      self.redis_connect_timeout = 5.0
+      self.redis_read_timeout = 5.0
+      self.redis_write_timeout = 5.0
       self.redis_failover_timeout = 180.seconds
       self.redis_status_key_expiry_interval = 0.seconds
       self.redis_failover_client_heartbeat_interval = 10.seconds
@@ -217,6 +226,17 @@ module Beetle
         end
     end
 
+    # redis optins to be passed to Redis.new
+    def redis_options
+      {
+        db: redis_db,
+        connect_timeout: redis_connect_timeout,
+        read_timeout: redis_read_timeout,
+        write_timeout: redis_write_timeout,
+        logger: redis_logger,
+      }
+    end
+
     private
     def load_config
       raw = ERB.new(IO.read(config_file)).result

data/lib/beetle/deduplication_store.rb

@@ -62,7 +62,7 @@ module Beetle
     # store completion status for given <tt>msg_id</tt> if it doesn't exist yet. Returns whether the
     # operation was successful.
     def setnx_completed!(msg_id)
-      expiry = @config.redis_status_key_expiry_interval
+      expiry = @config.redis_status_key_expiry_interval.to_i
       return true if expiry == 0
       with_failover do
         redis.set(
@@ -109,7 +109,7 @@ module Beetle
 
     # delete all keys associated with the given <tt>msg_id</tt>.
     def del_keys(msg_id)
-      expiry = @config.redis_status_key_expiry_interval
+      expiry = @config.redis_status_key_expiry_interval.to_i
       keys = keys(msg_id)
       status_key = keys.shift if expiry > 0
       with_failover do
@@ -150,7 +150,7 @@ module Beetle
 
     # set current redis master instance (as specified in the Beetle::Configuration)
     def redis_master_from_server_string
-      @current_master ||= Redis.from_server_string(@config.redis_server, :db => @config.redis_db, :logger => @config.redis_logger)
+      @current_master ||= Redis.from_server_string(@config.redis_server, @config.redis_options)
     end
 
     # set current redis master from master file
@@ -168,7 +168,7 @@ module Beetle
     def set_current_redis_master_from_master_file
       @last_time_master_file_changed = File.mtime(@config.redis_server)
       server_string = extract_redis_master(read_master_file)
-      @current_master = !server_string.blank? ? Redis.from_server_string(server_string, :db => @config.redis_db, :logger => @config.redis_logger) : nil
+      @current_master = !server_string.blank? ? Redis.from_server_string(server_string, @config.redis_options ) : nil
     end
 
     # extract redis master from file content and return the server for our system

data/lib/beetle/message.rb

@@ -72,15 +72,15 @@ module Beetle
 
     def setup(opts) #:nodoc:
       @server           = opts[:server]
-      @timeout          = opts[:timeout]    || DEFAULT_HANDLER_TIMEOUT
-      @delay            = opts[:delay]      || DEFAULT_HANDLER_EXECUTION_ATTEMPTS_DELAY
+      @timeout          = opts[:timeout]    || DEFAULT_HANDLER_TIMEOUT.to_i
+      @delay            = (opts[:delay]     || DEFAULT_HANDLER_EXECUTION_ATTEMPTS_DELAY).ceil
       @attempts_limit   = opts[:attempts]   || DEFAULT_HANDLER_EXECUTION_ATTEMPTS
       @exceptions_limit = opts[:exceptions] || DEFAULT_EXCEPTION_LIMIT
       @attempts_limit   = @exceptions_limit + 1 if @attempts_limit <= @exceptions_limit
       @retry_on         = opts[:retry_on] || nil
       @store            = opts[:store]
       max_delay         = opts[:max_delay] || @delay
-      @max_delay        = max_delay if max_delay >= 2*@delay
+      @max_delay        = max_delay.ceil if max_delay >= 2*@delay
     end
 
     # extracts various values from the AMQP header properties
@@ -101,7 +101,7 @@ module Beetle
     def self.publishing_options(opts = {}) #:nodoc:
       flags = 0
       flags |= FLAG_REDUNDANT if opts[:redundant]
-      expires_at = now + (opts[:ttl] || DEFAULT_TTL)
+      expires_at = now + (opts[:ttl] || DEFAULT_TTL).to_i
       opts = opts.slice(*PUBLISHING_KEYS)
       opts[:message_id] = generate_uuid.to_s
       opts[:timestamp] = now
@@ -165,7 +165,7 @@ module Beetle
 
     # store handler timeout timestamp in the deduplication store
     def set_timeout!
-      @store.set(msg_id, :timeout, now + timeout)
+      @store.set(msg_id, :timeout, (now + timeout).ceil)
     end
 
     # handler timed out?
@@ -230,7 +230,7 @@ module Beetle
     # have we already seen this message? if not, set the status to "incomplete" and store
     # the message exipration timestamp in the deduplication store.
     def key_exists?
-      old_message = !@store.msetnx(msg_id, :status =>"incomplete", :expires => @expires_at, :timeout => now + timeout)
+      old_message = !@store.msetnx(msg_id, :status =>"incomplete", :expires => @expires_at.to_i, :timeout => (now + timeout).to_i)
       if old_message
         logger.debug "Beetle: received duplicate message: #{msg_id} on queue: #{@queue}"
       end

data/lib/beetle/publisher.rb

@@ -34,7 +34,7 @@ module Beetle
         Bunny::ConnectionError, Bunny::ForcedChannelCloseError, Bunny::ForcedConnectionCloseError,
         Bunny::MessageError, Bunny::ProtocolError, Bunny::ServerDownError, Bunny::UnsubscribeError,
         Bunny::AcknowledgementError, Qrack::BufferOverflowError, Qrack::InvalidTypeError,
-        Errno::EHOSTUNREACH, Errno::ECONNRESET, Timeout::Error
+        Errno::EHOSTUNREACH, Errno::ECONNRESET, Errno::ETIMEDOUT, Timeout::Error
       ]
     end
 
@@ -66,6 +66,7 @@ module Beetle
         logger.debug "Beetle: message sent!"
         published = 1
       rescue *bunny_exceptions => e
+        logger.warn("Beetle: publishing exception #{e} #{e.backtrace[0..4].join("\n")}")
         stop!(e)
         tries -= 1
         # retry same server on receiving the first exception for it (might have been a normal restart)
@@ -98,6 +99,7 @@ module Beetle
           published << @server
           logger.debug "Beetle: message sent (#{published})!"
         rescue *bunny_exceptions => e
+          logger.warn("Beetle: publishing exception #{e} #{e.backtrace[0..4].join("\n")}")
           stop!(e)
           retry if (tries += 1) == 1
           mark_server_dead

data/lib/beetle/redis_ext.rb

@@ -3,6 +3,7 @@ class Redis #:nodoc:
   def self.from_server_string(server_string, options = {})
     host, port = server_string.split(':')
     options = {:host => host, :port => port}.update(options)
+    options.delete(:logger) if Redis::VERSION >= "5.0"
     new(options)
   end
 
@@ -79,6 +80,19 @@ class Redis #:nodoc:
       super != 0
     end
 
+  elsif Redis::VERSION >= "5.0.0"
+
+    # redis 5.0.0 has a shutdown method which raises if a connection to the redis server
+    # cannot be established.
+    module SaneShutdown
+      def shutdown
+        super
+      rescue RedisClient::CannotConnectError
+        nil
+      end
+    end
+    prepend SaneShutdown
+
   elsif Redis::VERSION >= "4.0.0"
 
     # redis 4.0.0 has a shutdown method which raises if a connection to the redis server

data/lib/beetle/version.rb

@@ -1,3 +1,3 @@
 module Beetle
-  VERSION = "3.5.1"
+  VERSION = "3.5.5"
 end

data/lib/beetle.rb

@@ -1,8 +1,13 @@
 $:.unshift(File.expand_path('..', __FILE__))
 require 'bunny'                    # which bunny picks up
 require 'qrack/errors'             # needed by the publisher
-require 'redis/connection/hiredis' # require *before* redis as specified in the redis-rb gem docs
-require 'redis'
+begin
+  require 'redis/connection/hiredis' # require *before* redis as specified in the redis-rb gem docs
+  require 'redis'
+rescue LoadError
+  require 'redis'
+  require 'hiredis-client'
+end
 require 'active_support/all'
 require 'set'
 require 'socket'
@@ -39,12 +44,8 @@ module Beetle
   # determine the fully qualified domainname of the host we're running on
   def self.hostname
     name = Socket.gethostname
-    parts = name.split('.')
-    if parts.size > 1
-      name
-    else
-      Socket.gethostbyname(parts.first).first rescue name
-    end
+    host = name.split('.').first
+    Addrinfo.getaddrinfo(host, nil, nil, :STREAM, nil, Socket::AI_CANONNAME).first.canonname rescue name
   end
 
   # use ruby's autoload mechanism for loading beetle classes

data/test/beetle/amqp_gem_behavior_test.rb

@@ -7,7 +7,7 @@ class AMQPGemBehaviorTest < Minitest::Test
     begin
       exception = nil
       EM.run do
-        AMQP.start(:logging => false) do |connection|
+        AMQP.start(logging: false, host: ENV['RABBITMQ_SERVERS'] || 'localhost') do |connection|
           EM::Timer.new(1){ connection.close { EM.stop }}
           channel = AMQP::Channel.new(connection)
           channel.on_error { puts "woot"}

data/test/beetle/base_test.rb

@@ -26,7 +26,7 @@ module Beetle
     end
 
     test "server should be initialized" do
-      assert_equal @bs.servers.first, @bs.server
+      assert @bs.server
     end
 
     test "current_host should return the hostname of the current server" do

data/test/beetle/beetle_test.rb

@@ -2,15 +2,18 @@ require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
 
 module Beetle
   class HostnameTest < Minitest::Test
-    test "should use Socket.gethostname if returned name name is fully qualified" do
+   test "should use canonical name if possible " do
+      addr = mock("addr")
+      addr.expects(:canonname).returns("a.b.com")
       Socket.expects(:gethostname).returns("a.b.com")
+      Addrinfo.expects(:getaddrinfo).with("a", nil, nil, :STREAM, nil, Socket::AI_CANONNAME).returns([addr])
       assert_equal "a.b.com", Beetle.hostname
     end
 
-    test "should use Socket.gethosbyname if returned name name is not fully qualified" do
+    test "should use Socket.gethostbyname if Addrinfo raises" do
       Socket.expects(:gethostname).returns("a")
-      Socket.expects(:gethostbyname).with("a").returns(["a.b.com"])
-      assert_equal "a.b.com", Beetle.hostname
+      Addrinfo.expects(:getaddrinfo).with("a", nil, nil, :STREAM, nil, Socket::AI_CANONNAME).raises("murks")
+      assert_equal "a", Beetle.hostname
     end
   end
 end

data/test/beetle/client_test.rb

@@ -8,7 +8,7 @@ module Beetle
     end
 
     test "should have a default server" do
-      assert_equal ["localhost:5672"], @client.servers
+      assert !@client.servers.empty?
     end
 
     test "should have no additional subscription servers" do
@@ -327,7 +327,9 @@ module Beetle
       client.register_queue("b_queue")
       client.register_queue("a_queue")
       client.send(:subscriber).expects(:listen_queues).with {|value| value.include?("a_queue") && value.include?("b_queue")}.yields
-      client.listen
+      called = false
+      client.listen { called = true }
+      assert called
     end
 
     test "trying to listen to a message is no longer supported and should raise an exception" do
@@ -338,7 +340,9 @@ module Beetle
       client = Client.new
       client.register_queue(:test)
       client.send(:subscriber).expects(:listen_queues).with(['test']).yields
-      client.listen_queues([:test])
+      called = false
+      client.listen_queues([:test]) { called = true }
+      assert called
     end
 
     test "trying to listen to an unknown queue should raise an exception" do

data/test/beetle/deduplication_store_test.rb

@@ -87,7 +87,7 @@ module Beetle
     private
     def redis_test_master_file(server_string)
       tmp_dir = File.expand_path("../../../tmp", __FILE__)
-      Dir.mkdir(tmp_dir) unless File.exists?(tmp_dir)
+      Dir.mkdir(tmp_dir) unless File.exist?(tmp_dir)
       path = tmp_dir + "/redis-master-for-unit-tests"
       File.open(path, "w"){|f| f.puts server_string}
       path

data/test/beetle/publisher_test.rb

@@ -77,7 +77,9 @@ module Beetle
 
   class PublisherPublishingTest < Minitest::Test
     def setup
-      @client = Client.new
+      @config = Configuration.new
+      @config.servers = ENV['RABBITMQ_SERVERS'].split(',').first if ENV['RABBITMQ_SERVERS']
+      @client = Client.new(@config)
       @pub = Publisher.new(@client)
       @pub.stubs(:bind_queues_for_exchange)
       @client.register_queue("mama", :exchange => "mama-exchange")
@@ -277,6 +279,7 @@ module Beetle
   class PublisherQueueManagementTest < Minitest::Test
     def setup
       @config = Configuration.new
+      @config.servers = ENV['RABBITMQ_SERVERS'] if ENV['RABBITMQ_SERVERS']
       @client = Client.new(@config)
       @pub = Publisher.new(@client)
     end
@@ -305,7 +308,9 @@ module Beetle
       @client.register_queue('test_queue_2', :exchange => 'test_exchange')
       @client.register_queue('test_queue_3', :exchange => 'test_exchange_2')
       queue = mock("queue")
-      queue.expects(:bind).times(3)
+      @pub.expects(:bind_queue!).with(queue, "test_exchange", {:key => "test_queue_1"}).once
+      @pub.expects(:bind_queue!).with(queue, "test_exchange", {:key => "test_queue_2"}).once
+      @pub.expects(:bind_queue!).with(queue, "test_exchange_2", {:key => "test_queue_3"}).once
       @pub.expects(:declare_queue!).returns(queue).times(3)
       @pub.send(:bind_queues_for_exchange, 'test_exchange')
       @pub.send(:bind_queues_for_exchange, 'test_exchange_2')
@@ -315,18 +320,21 @@ module Beetle
       @client.register_queue('test_queue_1', :exchange => 'test_exchange')
       @client.register_queue('test_queue_2', :exchange => 'test_exchange')
       queue = mock("queue")
-      queue.expects(:bind).twice
       @pub.expects(:declare_queue!).returns(queue).twice
+      @pub.expects(:bind_queue!).with(queue, "test_exchange", {:key => "test_queue_1"}).once
+      @pub.expects(:bind_queue!).with(queue, "test_exchange", {:key => "test_queue_2"}).once
       @pub.send(:bind_queues_for_exchange, 'test_exchange')
       @pub.send(:bind_queues_for_exchange, 'test_exchange')
     end
 
     test "should declare queues only once even with many bindings" do
+
       @client.register_queue('test_queue', :exchange => 'test_exchange')
       @client.register_binding('test_queue', :exchange => 'test_exchange', :key => 'sir-message-a-lot')
       queue = mock("queue")
-      queue.expects(:bind).twice
       @pub.expects(:declare_queue!).returns(queue).once
+      @pub.expects(:bind_queue!).with(queue, "test_exchange", {:key => "test_queue"}).once
+      @pub.expects(:bind_queue!).with(queue, "test_exchange", {:key => "sir-message-a-lot"}).once
       @pub.send(:bind_queues_for_exchange, 'test_exchange')
     end
 
@@ -549,10 +557,11 @@ module Beetle
     end
   end
 
-
   class RPCTest < Minitest::Test
     def setup
-      @client = Client.new
+      @config = Configuration.new
+      @config.servers = ENV['RABBITMQ_SERVERS'].split(',').first if ENV['RABBITMQ_SERVERS']
+      @client = Client.new(@config)
       @pub = Publisher.new(@client)
       @client.register_message(:test, :exchange => :some_exchange)
     end

data/test/beetle/redis_ext_test.rb

@@ -57,7 +57,11 @@ module Beetle
 
   class HiredisLoadedTest < Minitest::Test
     test "should be using hiredis instead of the redis ruby backend" do
-      assert defined?(Hiredis)
+      if Redis::VERSION < "5.0"
+        assert defined?(Hiredis)
+      else
+        assert_equal RedisClient.default_driver, RedisClient::HiredisConnection
+      end
     end
   end
 

data/test/beetle/subscriber_test.rb

@@ -41,9 +41,9 @@ module Beetle
 
     test "stop! should close all connections if the reactor is not running" do
       connection1 = mock('conection1')
-      connection1.expects(:close).yields
+      connection1.expects(:close)
       connection2 = mock('connection2')
-      connection2.expects(:close).yields
+      connection2.expects(:close)
       @sub.instance_variable_set "@connections", [["server1", connection1], ["server2", connection2]]
       EM.expects(:reactor_running?).returns(false)
       @sub.send(:stop!)
@@ -52,7 +52,9 @@ module Beetle
 
   class SubscriberPauseAndResumeTest < Minitest::Test
     def setup
-      @client = Client.new
+      @config = Configuration.new
+      @config.servers = "localhost:5672"
+      @client = Client.new(@config)
       @sub = @client.send(:subscriber)
       @sub.servers << "localhost:7777"
       @server1, @server2 = @sub.servers
@@ -342,7 +344,9 @@ module Beetle
 
   class SubscriptionTest < Minitest::Test
     def setup
-      @client = Client.new
+      @config = Configuration.new
+      @config.servers = "locahost:5672"
+      @client = Client.new(@config)
       @sub = @client.send(:subscriber)
     end