beetle 0.3.0.rc.5 → 0.3.0.rc.6

data/beetle.gemspec

@@ -34,7 +34,7 @@ Gem::Specification.new do |s|
   s.specification_version = 3
   s.add_runtime_dependency("uuid4r",                [">= 0.1.2"])
   s.add_runtime_dependency("bunny",                 ["= 0.7.8"])
-  s.add_runtime_dependency("redis",                 ["= 2.2.0"])
+  s.add_runtime_dependency("redis",                 ["= 2.2.2"])
   s.add_runtime_dependency("hiredis",               ["= 0.3.2"])
   s.add_runtime_dependency("amq-client",            ["= 0.8.3"])
   s.add_runtime_dependency("amq-protocol",          ["= 0.8.1"])
@@ -44,8 +44,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency("rake",              [">= 0.8.7"])
   s.add_development_dependency("mocha",             [">= 0"])
   s.add_development_dependency("rcov",              [">= 0"])
-  s.add_development_dependency("redgreen",          [">= 0"])
-  s.add_development_dependency("wirble",            [">= 0"])
   s.add_development_dependency("cucumber",          [">= 0.7.2"])
   s.add_development_dependency("daemon_controller", [">= 0"])
 end

data/features/support/test_daemons/redis.rb

@@ -39,7 +39,7 @@ module TestDaemons
     end
 
     def restart(delay=1)
-      redis.shutdown rescue Errno::ECONNREFUSED
+      redis.shutdown
       sleep delay
       `redis-server #{config_filename}`
     end

data/lib/beetle/redis_ext.rb

@@ -50,4 +50,23 @@ class Redis #:nodoc:
     info = info_with_rescue
     info["role"] == "slave" && info["master_host"] == host && info["master_port"] == port.to_s
   end
+
+  # redis 2.2.2 shutdown implementation does not disconnect from the redis server.
+  # this leaves the connection in an inconsistent state and causes the next command to silently fail.
+  # this in turn breaks our cucumber test scenarios.
+  # fix this here, until a new version is released which fixes the problem.
+
+  alias_method :broken_shutdown, :shutdown
+
+  # Synchronously save the dataset to disk and then shut down the server.
+  def shutdown
+    synchronize do
+      begin
+        @client.call_without_reply [:shutdown]
+      ensure
+        @client.disconnect
+      end
+    end
+  end
+
 end

data/lib/beetle/version.rb

@@ -1,3 +1,3 @@
 module Beetle
-  VERSION = "0.3.0.rc.5"
+  VERSION = "0.3.0.rc.6"
 end

data/script/console~

@@ -0,0 +1,2 @@
+#!/usr/bin/env ruby
+$:.unshift(File.expand_path("../lib",__FILE__))

data/test/beetle/redis_ext_test.rb

@@ -60,4 +60,19 @@ module Beetle
       assert defined?(Hiredis)
     end
   end
+
+  class BrokenRedisShutdownTest < Test::Unit::TestCase
+    def setup
+      @r = Redis.new(:host => "localhost", :port => 6390)
+    end
+
+    # if this test fails after upgrading redis, we can probably remove
+    # our custom shutdown method from redis_ext.rb
+    test "redis shutdown implementation is broken" do
+      @r.client.expects(:call_without_reply).with([:shutdown]).once
+      @r.client.expects(:disconnect).never
+      @r.broken_shutdown
+    end
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beetle
 version: !ruby/object:Gem::Version
-  version: 0.3.0.rc.5
+  version: 0.3.0.rc.6
   prerelease: 6
 platform: ruby
 authors:
@@ -13,11 +13,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-21 00:00:00.000000000Z
+date: 2011-10-22 00:00:00.000000000 +02:00
+default_executable: beetle
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uuid4r
-  requirement: &2156300280 !ruby/object:Gem::Requirement
+  requirement: &2151634120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -25,10 +26,10 @@ dependencies:
         version: 0.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *2156300280
+  version_requirements: *2151634120
 - !ruby/object:Gem::Dependency
   name: bunny
-  requirement: &2156298900 !ruby/object:Gem::Requirement
+  requirement: &2151633580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -36,21 +37,21 @@ dependencies:
         version: 0.7.8
   type: :runtime
   prerelease: false
-  version_requirements: *2156298900
+  version_requirements: *2151633580
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &2156289280 !ruby/object:Gem::Requirement
+  requirement: &2151633100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *2156289280
+  version_requirements: *2151633100
 - !ruby/object:Gem::Dependency
   name: hiredis
-  requirement: &2156282480 !ruby/object:Gem::Requirement
+  requirement: &2151632560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -58,10 +59,10 @@ dependencies:
         version: 0.3.2
   type: :runtime
   prerelease: false
-  version_requirements: *2156282480
+  version_requirements: *2151632560
 - !ruby/object:Gem::Dependency
   name: amq-client
-  requirement: &2156280400 !ruby/object:Gem::Requirement
+  requirement: &2151632020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -69,10 +70,10 @@ dependencies:
         version: 0.8.3
   type: :runtime
   prerelease: false
-  version_requirements: *2156280400
+  version_requirements: *2151632020
 - !ruby/object:Gem::Dependency
   name: amq-protocol
-  requirement: &2156276300 !ruby/object:Gem::Requirement
+  requirement: &2151631540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -80,10 +81,10 @@ dependencies:
         version: 0.8.1
   type: :runtime
   prerelease: false
-  version_requirements: *2156276300
+  version_requirements: *2151631540
 - !ruby/object:Gem::Dependency
   name: amqp
-  requirement: &2156268980 !ruby/object:Gem::Requirement
+  requirement: &2151631000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -91,10 +92,10 @@ dependencies:
         version: 0.8.0
   type: :runtime
   prerelease: false
-  version_requirements: *2156268980
+  version_requirements: *2151631000
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2156253980 !ruby/object:Gem::Requirement
+  requirement: &2151630480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -102,10 +103,10 @@ dependencies:
         version: 2.3.4
   type: :runtime
   prerelease: false
-  version_requirements: *2156253980
+  version_requirements: *2151630480
 - !ruby/object:Gem::Dependency
   name: daemons
-  requirement: &2156249880 !ruby/object:Gem::Requirement
+  requirement: &2151629940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -113,10 +114,10 @@ dependencies:
         version: 1.0.10
   type: :runtime
   prerelease: false
-  version_requirements: *2156249880
+  version_requirements: *2151629940
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2156225200 !ruby/object:Gem::Requirement
+  requirement: &2151629420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -124,10 +125,10 @@ dependencies:
         version: 0.8.7
   type: :development
   prerelease: false
-  version_requirements: *2156225200
+  version_requirements: *2151629420
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &2156214080 !ruby/object:Gem::Requirement
+  requirement: &2151628940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -135,10 +136,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156214080
+  version_requirements: *2151628940
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2156209740 !ruby/object:Gem::Requirement
+  requirement: &2151628460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -146,32 +147,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156209740
-- !ruby/object:Gem::Dependency
-  name: redgreen
-  requirement: &2156172620 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *2156172620
-- !ruby/object:Gem::Dependency
-  name: wirble
-  requirement: &2156171940 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *2156171940
+  version_requirements: *2151628460
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &2156171120 !ruby/object:Gem::Requirement
+  requirement: &2151627860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -179,10 +158,10 @@ dependencies:
         version: 0.7.2
   type: :development
   prerelease: false
-  version_requirements: *2156171120
+  version_requirements: *2151627860
 - !ruby/object:Gem::Dependency
   name: daemon_controller
-  requirement: &2156167680 !ruby/object:Gem::Requirement
+  requirement: &2151627360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -190,7 +169,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156167680
+  version_requirements: *2151627360
 description: A highly available, reliable messaging infrastructure
 email: opensource@xing.com
 executables:
@@ -245,6 +224,7 @@ files:
 - features/support/test_daemons/redis_configuration_client.rb
 - features/support/test_daemons/redis_configuration_server.rb
 - script/console
+- script/console~
 - script/start_rabbit
 - beetle.gemspec
 - Rakefile
@@ -271,6 +251,7 @@ files:
 - test/colorized_test_output.rb
 - test/test_helper.rb
 - bin/beetle
+has_rdoc: true
 homepage: http://xing.github.com/beetle/
 licenses: []
 post_install_message: ! "  *********************************************************************************************\n\n
@@ -295,7 +276,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.7
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: High Availability AMQP Messaging with Redundant Queues