beetle 3.5.3 → 3.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bce54bf1dc2290bb4c1598f6210b1c292d09691e91df2f67e913747535c90f2d
-  data.tar.gz: e6f510fb5b78a7ed0483f713920222ff1959e7a3e3073aac61abed25af56b0bd
+  metadata.gz: 38849c0467ba80b057fa8bc659ad98b025dd1c6d9ce416a4f2c48dff91f50fac
+  data.tar.gz: 791b45e82bcddf8bca2923db816475aa16bb81efa96d7c38381de12ea18fe65b
 SHA512:
-  metadata.gz: 8682a1720108f7e95ad9802bcfe5b30283c735cfaa67323e5aca6bca1e1c06d0b6bb58d8fd2b8f4fc1fb7032579832667b78bab0c0f7013a937556650ad14ad7
-  data.tar.gz: 255b3fd3827a1f33c1c244967649ab8eaa1adc8f6daa3a111b21e299f1bcc0341f324a1bee3f2c578f5c93b39eeb913caf2c3a6d8ea88d1e89c028c48576e1b0
+  metadata.gz: cbd464c6759316b86ab5732029fefa39518360dc40f055e729d585b9304ad84c9597c7e37908826bfc0347c109c89e7729db8096b2bf51ec64c536c272c9b6b3
+  data.tar.gz: c7ef92729c7d9cf38c7ec5e0a90fff5147fb4350d568c82c93e58c76b5c358d74929517b888bb8f96386230f0b2f50272488981668d183294fbda5ac86893ade

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

data/beetle.gemspec

@@ -24,20 +24,20 @@ Gem::Specification.new do |s|
 
   s.specification_version = 3
   s.add_runtime_dependency "bunny",                   "~> 0.7.12"
-  s.add_runtime_dependency "redis",                   ">= 4.2.1"
+  s.add_runtime_dependency "redis",                   [">= 4.2.1", "< 5.0"]
   s.add_runtime_dependency "hiredis",                 ">= 0.4.5"
   s.add_runtime_dependency "amq-protocol",            "= 2.3.2"
   s.add_runtime_dependency "amqp",                    "= 1.8.0"
   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 "mocha",               "~> 1.14"
+  s.add_development_dependency "mysql2",              "~> 0.5"
   s.add_development_dependency "rake",                "~> 13.0"
   s.add_development_dependency "simplecov",           "~> 0.15"
   s.add_development_dependency "webmock",             "~> 3.0"
@@ -45,4 +45,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'yard'
   s.add_development_dependency 'redcarpet'
   s.add_development_dependency 'github-markup'
+  s.add_development_dependency 'byebug'
 end

data/features/step_definitions/redis_auto_failover_steps.rb

@@ -186,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
 
@@ -199,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/lib/beetle/version.rb

@@ -1,3 +1,3 @@
 module Beetle
-  VERSION = "3.5.3"
+  VERSION = "3.5.4"
 end

data/lib/beetle.rb

@@ -39,12 +39,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/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

@@ -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/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!)

data/test/test_helper.rb

@@ -8,7 +8,7 @@ end
 require 'minitest/autorun'
 require 'minitest/unit'
 require 'minitest/pride' if ENV['RAINBOW_COLORED_TESTS'] == "1" && $stdout.tty?
-require 'mocha/setup'
+require 'mocha/minitest'
 
 require File.expand_path(File.dirname(__FILE__) + '/../lib/beetle')
 require 'eventmachine'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beetle
 version: !ruby/object:Gem::Version
-  version: 3.5.3
+  version: 3.5.4
 platform: ruby
 authors:
 - Stefan Kaes
@@ -12,7 +12,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-09 00:00:00.000000000 Z
+date: 2022-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny
@@ -35,6 +35,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,6 +45,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: hiredis
   requirement: !ruby/object:Gem::Requirement
@@ -118,14 +124,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 8.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 8.0.0
 - !ruby/object:Gem::Dependency
   name: daemon_controller
   requirement: !ruby/object:Gem::Requirement
@@ -188,28 +194,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '1.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '1.14'
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.4
+        version: '0.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.4
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -308,6 +314,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A highly available, reliable messaging infrastructure
 email: opensource@xing.com
 executables: []
@@ -398,7 +418,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.7
 requirements: []
-rubygems_version: 3.3.4
+rubygems_version: 3.3.19
 signing_key:
 specification_version: 3
 summary: High Availability AMQP Messaging with Redundant Queues