beetle 0.3.0.rc.4 → 0.3.0.rc.6

data/beetle.gemspec

@@ -1,13 +1,17 @@
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "beetle/version"
+
 Gem::Specification.new do |s|
   s.name    = "beetle"
-  s.version = "0.3.0.rc.4"
+  s.version = Beetle::VERSION
   s.required_rubygems_version = ">= 1.3.7"
-  s.authors            = ["Stefan Kaes", "Pascal Friederich", "Ali Jelveh", "Sebastian Roebke"]
+  s.authors            = ["Stefan Kaes", "Pascal Friederich", "Ali Jelveh", "Sebastian Roebke", "Larry Baltz"]
   s.date               = Time.now.strftime('%Y-%m-%d')
   s.default_executable = "beetle"
   s.description        = "A highly available, reliable messaging infrastructure"
   s.summary            = "High Availability AMQP Messaging with Redundant Queues"
-  s.email              = "developers@xing.com"
+  s.email              = "opensource@xing.com"
   s.executables        = ["beetle"]
   s.extra_rdoc_files   = Dir['**/*.rdoc'] + %w(MIT-LICENSE)
   s.files              = Dir['{examples,lib}/**/*.rb'] + Dir['{features,script}/**/*'] + %w(beetle.gemspec Rakefile)
@@ -30,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"])
@@ -40,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.rb

@@ -6,6 +6,7 @@ require 'redis'
 require 'active_support'
 require 'active_support/core_ext'
 require 'set'
+require 'socket'
 
 module Beetle
   Timer = if RUBY_VERSION < "1.9"
@@ -46,6 +47,13 @@ module Beetle
   # AMQP options for subscribing to queues
   SUBSCRIPTION_KEYS       = [:ack, :key]
 
+  # determine the fully qualified domainname of the host we're running on
+  def self.hostname
+    name = Socket.gethostname
+    parts = name.split('.')
+    parts.size > 1 ? name : Socket.gethostbyname(parts.first).first
+  end
+
   # use ruby's autoload mechanism for loading beetle classes
   lib_dir = File.expand_path(File.dirname(__FILE__) + '/beetle/')
   Dir["#{lib_dir}/*.rb"].each do |libfile|

data/lib/beetle/client.rb

@@ -289,7 +289,7 @@ module Beetle
     end
 
     def queue_name_for_tracing(queue)
-      "trace-#{queue}-#{`hostname`.chomp}-#{$$}"
+      "trace-#{queue}-#{Beetle.hostname}-#{$$}"
     end
   end
 end

data/lib/beetle/redis_configuration_client.rb

@@ -25,7 +25,7 @@ module Beetle
 
     # Unique id for this instance (defaults to the fully qualified hostname)
     def id
-      @id ||= `hostname -f`.chomp
+      @id ||= Beetle.hostname
     end
 
     def initialize #:nodoc:

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

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

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,288 +1,188 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: beetle
-version: !ruby/object:Gem::Version 
-  hash: 15424045
+version: !ruby/object:Gem::Version
+  version: 0.3.0.rc.6
   prerelease: 6
-  segments: 
-  - 0
-  - 3
-  - 0
-  - rc
-  - 4
-  version: 0.3.0.rc.4
 platform: ruby
-authors: 
+authors:
 - Stefan Kaes
 - Pascal Friederich
 - Ali Jelveh
 - Sebastian Roebke
+- Larry Baltz
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-10-11 00:00:00 +02:00
+date: 2011-10-22 00:00:00.000000000 +02:00
 default_executable: beetle
-dependencies: 
-- !ruby/object:Gem::Dependency 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: uuid4r
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2151634120 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 0
-        - 1
-        - 2
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.1.2
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: bunny
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2151634120
+- !ruby/object:Gem::Dependency
+  name: bunny
+  requirement: &2151633580 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 0
-        - 7
-        - 8
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
         version: 0.7.8
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: redis
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2151633580
+- !ruby/object:Gem::Dependency
+  name: redis
+  requirement: &2151633100 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 2
-        - 2
-        - 0
-        version: 2.2.0
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 2.2.2
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: hiredis
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *2151633100
+- !ruby/object:Gem::Dependency
+  name: hiredis
+  requirement: &2151632560 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 0
-        - 3
-        - 2
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
         version: 0.3.2
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: amq-client
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *2151632560
+- !ruby/object:Gem::Dependency
+  name: amq-client
+  requirement: &2151632020 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 57
-        segments: 
-        - 0
-        - 8
-        - 3
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
         version: 0.8.3
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: amq-protocol
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *2151632020
+- !ruby/object:Gem::Dependency
+  name: amq-protocol
+  requirement: &2151631540 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 61
-        segments: 
-        - 0
-        - 8
-        - 1
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
         version: 0.8.1
   type: :runtime
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: amqp
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *2151631540
+- !ruby/object:Gem::Dependency
+  name: amqp
+  requirement: &2151631000 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 63
-        segments: 
-        - 0
-        - 8
-        - 0
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
         version: 0.8.0
   type: :runtime
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: activesupport
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: *2151631000
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: &2151630480 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 2
-        - 3
-        - 4
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.3.4
   type: :runtime
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: daemons
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: *2151630480
+- !ruby/object:Gem::Dependency
+  name: daemons
+  requirement: &2151629940 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 1
-        - 0
-        - 10
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.10
   type: :runtime
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: *2151629940
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &2151629420 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 49
-        segments: 
-        - 0
-        - 8
-        - 7
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.8.7
   type: :development
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  name: mocha
-  prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id011
-- !ruby/object:Gem::Dependency 
-  name: rcov
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  version_requirements: *2151629420
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: &2151628940 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id012
-- !ruby/object:Gem::Dependency 
-  name: redgreen
   prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  version_requirements: *2151628940
+- !ruby/object:Gem::Dependency
+  name: rcov
+  requirement: &2151628460 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id013
-- !ruby/object:Gem::Dependency 
-  name: wirble
   prerelease: false
-  requirement: &id014 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id014
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2151628460
+- !ruby/object:Gem::Dependency
   name: cucumber
-  prerelease: false
-  requirement: &id015 !ruby/object:Gem::Requirement 
+  requirement: &2151627860 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 0
-        - 7
-        - 2
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.7.2
   type: :development
-  version_requirements: *id015
-- !ruby/object:Gem::Dependency 
-  name: daemon_controller
   prerelease: false
-  requirement: &id016 !ruby/object:Gem::Requirement 
+  version_requirements: *2151627860
+- !ruby/object:Gem::Dependency
+  name: daemon_controller
+  requirement: &2151627360 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id016
+  prerelease: false
+  version_requirements: *2151627360
 description: A highly available, reliable messaging infrastructure
-email: developers@xing.com
-executables: 
+email: opensource@xing.com
+executables:
 - beetle
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - examples/README.rdoc
 - features/README.rdoc
 - README.rdoc
 - REDIS_AUTO_FAILOVER.rdoc
 - RELEASE_NOTES.rdoc
 - MIT-LICENSE
-files: 
+files:
 - examples/attempts.rb
 - examples/handler_class.rb
 - examples/handling_exceptions.rb
@@ -311,6 +211,7 @@ files:
 - lib/beetle/redis_master_file.rb
 - lib/beetle/redis_server_info.rb
 - lib/beetle/subscriber.rb
+- lib/beetle/version.rb
 - lib/beetle.rb
 - features/README.rdoc
 - features/redis_auto_failover.feature
@@ -353,40 +254,33 @@ files:
 has_rdoc: true
 homepage: http://xing.github.com/beetle/
 licenses: []
-
-post_install_message: "  *********************************************************************************************\n\n    Please install the SystemTimer gem if you're running a ruby version < 1.9:\n    `gem install SystemTimer -v '=1.2.1'`\n    See: http://ph7spot.com/musings/system-timer\n\n  *********************************************************************************************\n"
-rdoc_options: 
+post_install_message: ! "  *********************************************************************************************\n\n
+  \   Please install the SystemTimer gem if you're running a ruby version < 1.9:\n
+  \   `gem install SystemTimer -v '=1.2.1'`\n    See: http://ph7spot.com/musings/system-timer\n\n
+  \ *********************************************************************************************\n"
+rdoc_options:
 - --charset=UTF-8
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 21
-      segments: 
-      - 1
-      - 3
-      - 7
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.7
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: High Availability AMQP Messaging with Redundant Queues
-test_files: 
+test_files:
 - test/beetle/amqp_gem_behavior_test.rb
 - test/beetle/base_test.rb
 - test/beetle/client_test.rb