beetle 0.2.9.1 → 0.2.9.2

data/beetle.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name    = "beetle"
-  s.version = "0.2.9.1"
+  s.version = "0.2.9.2"
 
   s.required_rubygems_version = ">= 1.3.1"
   s.authors            = ["Stefan Kaes", "Pascal Friederich", "Ali Jelveh", "Sebastian Roebke"]
@@ -30,7 +30,8 @@ Gem::Specification.new do |s|
 
   s.specification_version = 3
   s.add_runtime_dependency("uuid4r",                [">= 0.1.1"])
-  s.add_runtime_dependency("bunny",                 [">= 0.6.0"])
+  s.add_runtime_dependency("bunny",                 ["= 0.6.0"])
+  s.add_runtime_dependency("bunny-ext",             ["= 0.6.1"])
   s.add_runtime_dependency("redis",                 ["= 2.0.4"])
   s.add_runtime_dependency("amqp",                  [">= 0.6.7"])
   s.add_runtime_dependency("activesupport",         ["~> 2.3.4"])

data/lib/beetle.rb

@@ -1,7 +1,7 @@
 $:.unshift(File.expand_path('..', __FILE__))
 require 'amqp'
 require 'mq'
-require 'bunny'
+require 'bunny-ext'
 require 'uuid4r'
 require 'active_support'
 require 'redis'
@@ -59,5 +59,3 @@ module Beetle
 
   Timer = RUBY_VERSION < "1.9" ? SystemTimer : Timeout
 end
-
-require 'ext/qrack/client'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: beetle
 version: !ruby/object:Gem::Version 
-  hash: 121
+  hash: 127
   prerelease: false
   segments: 
   - 0
   - 2
   - 9
-  - 1
-  version: 0.2.9.1
+  - 2
+  version: 0.2.9.2
 platform: ruby
 authors: 
 - Stefan Kaes
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-15 00:00:00 +01:00
+date: 2010-11-19 00:00:00 +01:00
 default_executable: beetle
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -44,7 +44,7 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
         hash: 7
         segments: 
@@ -55,9 +55,25 @@ dependencies:
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: redis
+  name: bunny-ext
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 0
+        - 6
+        - 1
+        version: 0.6.1
+  type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: redis
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -69,11 +85,11 @@ dependencies:
         - 4
         version: 2.0.4
   type: :runtime
-  version_requirements: *id003
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: amqp
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -85,11 +101,11 @@ dependencies:
         - 7
         version: 0.6.7
   type: :runtime
-  version_requirements: *id004
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: activesupport
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -101,11 +117,11 @@ dependencies:
         - 4
         version: 2.3.4
   type: :runtime
-  version_requirements: *id005
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: daemons
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -117,11 +133,11 @@ dependencies:
         - 10
         version: 1.0.10
   type: :runtime
-  version_requirements: *id006
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: mocha
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -131,11 +147,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id007
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: rcov
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -145,11 +161,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id008
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: cucumber
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -161,11 +177,11 @@ dependencies:
         - 2
         version: 0.7.2
   type: :development
-  version_requirements: *id009
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: daemon_controller
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -175,7 +191,7 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id010
+  version_requirements: *id011
 description: A highly available, reliable messaging infrastructure
 email: developers@xing.com
 executables: 
@@ -218,7 +234,6 @@ files:
 - lib/beetle/redis_server_info.rb
 - lib/beetle/subscriber.rb
 - lib/beetle.rb
-- lib/ext/qrack/client.rb
 - features/README.rdoc
 - features/redis_auto_failover.feature
 - features/step_definitions/redis_auto_failover_steps.rb
@@ -242,7 +257,6 @@ files:
 - test/beetle/client_test.rb
 - test/beetle/configuration_test.rb
 - test/beetle/deduplication_store_test.rb
-- test/beetle/ext_test.rb
 - test/beetle/handler_test.rb
 - test/beetle/message_test.rb
 - test/beetle/publisher_test.rb
@@ -296,7 +310,6 @@ test_files:
 - test/beetle/client_test.rb
 - test/beetle/configuration_test.rb
 - test/beetle/deduplication_store_test.rb
-- test/beetle/ext_test.rb
 - test/beetle/handler_test.rb
 - test/beetle/message_test.rb
 - test/beetle/publisher_test.rb

data/lib/ext/qrack/client.rb

@@ -1,28 +0,0 @@
-require 'qrack/client'
-
-unless Qrack::Client.instance_methods.include?("socket_with_reliable_timeout")
-  module Qrack
-    class Client
-      # overwrite the timeout method so that SystemTimer is used
-      # instead the standard timeout.rb: http://ph7spot.com/musings/system-timer
-      delegate :timeout, :to => Beetle::Timer
-
-      def socket_with_reliable_timeout
-        socket_without_reliable_timeout
-
-        secs   = Integer(CONNECT_TIMEOUT)
-        usecs  = Integer((CONNECT_TIMEOUT - secs) * 1_000_000)
-        optval = [secs, usecs].pack("l_2")
-      
-        begin
-          @socket.setsockopt Socket::SOL_SOCKET, Socket::SO_RCVTIMEO, optval
-          @socket.setsockopt Socket::SOL_SOCKET, Socket::SO_SNDTIMEO, optval
-        rescue Errno::ENOPROTOOPT
-        end
-        @socket
-      end
-      alias_method_chain :socket, :reliable_timeout
-
-    end
-  end
-end

data/test/beetle/ext_test.rb

@@ -1,26 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
-
-
-class QrackClientExtTest < Test::Unit::TestCase
-  def setup
-    Qrack::Client.any_instance.stubs(:create_channel).returns(nil)
-    @client = Qrack::Client.new
-  end
-
-
-  test "should use system-timer for reliable timeouts" do
-    Beetle::Timer.expects(:timeout)
-    @client.send :timeout, 1, 1 do
-    end
-  end
-
-  test "should set send/receive timeouts on the socket" do
-    socket_mock = mock("socket")
-    @client.instance_variable_set(:@socket, socket_mock)
-    @client.stubs(:socket_without_reliable_timeout)
-
-    socket_mock.expects(:setsockopt).with(Socket::SOL_SOCKET, Socket::SO_RCVTIMEO, anything)
-    socket_mock.expects(:setsockopt).with(Socket::SOL_SOCKET, Socket::SO_SNDTIMEO, anything)
-    @client.send(:socket)
-  end
-end