beetle 0.3.0.rc.13 → 0.3.0.rc.14

data/README.rdoc

@@ -85,7 +85,7 @@ For development, you'll need
 {Ali Jelveh}[http://github.com/dudemeister] and
 {Sebastian Roebke}[http://github.com/boosty].
 
-You cand find out more about our work on our {dev blog}[http://devblog.xing.com].
+You can find out more about our work on our {dev blog}[http://devblog.xing.com].
 
 Copyright (c) 2010 {XING AG}[http://www.xing.com/]
 

data/Rakefile

@@ -1,6 +1,5 @@
 require 'rake'
 require 'rake/testtask'
-require 'rcov/rcovtask'
 require 'bundler/gem_tasks'
 
 # rake 0.9.2 hack to supress deprecation warnings caused by cucumber
@@ -11,25 +10,35 @@ require 'cucumber/rake/task'
 $:.unshift 'lib'
 require 'beetle'
 
-namespace :test do
-  namespace :coverage do
-    desc "Delete aggregate coverage data."
-    task(:clean) { rm_f "coverage.data" }
-  end
+if RUBY_VERSION < "1.9"
+  require 'rcov/rcovtask'
+
+  namespace :test do
+    namespace :coverage do
+      desc "Delete aggregate coverage data."
+      task(:clean) { rm_f "coverage.data" }
+    end
 
-  desc 'Aggregate code coverage'
-  task :coverage => "test:coverage:clean"
+    desc 'Aggregate code coverage'
+    task :coverage => "test:coverage:clean"
 
-  Rcov::RcovTask.new(:coverage) do |t|
-    t.libs << "test"
-    t.test_files = FileList["test/**/*_test.rb"]
-    t.output_dir = "test/coverage"
-    t.verbose = true
-    t.rcov_opts << "--exclude '.*' --include-file 'lib/beetle/'"
+    Rcov::RcovTask.new(:coverage) do |t|
+      t.libs << "test"
+      t.test_files = FileList["test/**/*_test.rb"]
+      t.output_dir = "test/coverage"
+      t.verbose = true
+      t.rcov_opts << "--exclude '.*' --include-file 'lib/beetle/'"
+    end
+    task :coverage do
+      system 'open test/coverage/index.html'
+    end if RUBY_PLATFORM =~ /darwin/
+  end
+else
+  namespace :test do
+    task :coverage => :test do
+      system 'open coverage/index.html'
+    end
   end
-  task :coverage do
-    system 'open test/coverage/index.html'
-  end if RUBY_PLATFORM =~ /darwin/
 end
 
 namespace :beetle do
@@ -98,7 +107,7 @@ Rake::TestTask.new do |t|
   t.verbose = true
 end
 
-require 'rake/rdoctask'
+require 'rdoc/task'
 
 Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_dir = 'site/rdoc'

data/beetle.gemspec

@@ -33,19 +33,14 @@ 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.2"])
-  s.add_runtime_dependency("hiredis",                 ["= 0.4.4"])
-  s.add_runtime_dependency("amq-client",              ["= 0.9.1"])
-  s.add_runtime_dependency("amq-protocol",            ["= 0.9.0"])
-  s.add_runtime_dependency("amqp",                    ["= 0.9.2"])
+  s.add_runtime_dependency("bunny",                   ["= 0.7.9"])
+  s.add_runtime_dependency("redis",                   ["= 3.0.1"])
+  s.add_runtime_dependency("hiredis",                 ["= 0.4.5"])
+  s.add_runtime_dependency("amq-client",              ["= 0.9.3"])
+  s.add_runtime_dependency("amq-protocol",            ["= 0.9.3"])
+  s.add_runtime_dependency("amqp",                    ["= 0.9.6"])
   s.add_runtime_dependency("activesupport",           [">= 2.3.4"])
   s.add_runtime_dependency("eventmachine_httpserver", [">= 0.2.1"])
   s.add_runtime_dependency("daemons",                 [">= 1.0.10"])
-  s.add_development_dependency("rake",                [">= 0.8.7"])
-  s.add_development_dependency("mocha",               [">= 0"])
-  s.add_development_dependency("rcov",                ["~> 0.9.10"])
-  s.add_development_dependency("cucumber",            [">= 0.7.2"])
-  s.add_development_dependency("daemon_controller",   [">= 0"])
 end
 

data/examples/simple.rb

@@ -1,8 +1,6 @@
 # simple.rb
 # this example shows you a very basic message/handler setup
 #
-#
-#
 # ! check the examples/README.rdoc for information on starting your redis/rabbit !
 #
 # start it with ruby simple.rb
@@ -15,7 +13,7 @@ Beetle.config.logger.level = Logger::INFO
 
 # setup client
 client = Beetle::Client.new
-client.register_queue(:test, :arguments => {"x-message-ttl" => 60 * 1000})
+client.register_queue(:test)
 client.register_message(:test)
 
 # purge the test queue

data/lib/beetle/message.rb

@@ -199,7 +199,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 = 0 == @store.msetnx(msg_id, :status =>"incomplete", :expires => @expires_at, :timeout => now + timeout)
+      old_message = !@store.msetnx(msg_id, :status =>"incomplete", :expires => @expires_at, :timeout => now + timeout)
       if old_message
         logger.debug "Beetle: received duplicate message: #{msg_id} on queue: #{@queue}"
       end

data/lib/beetle/redis_ext.rb

@@ -19,11 +19,6 @@ class Redis #:nodoc:
     slaveof(host, port)
   end
 
-  # Redis 2 tries to establish a connection on inspect. this is evil!
-  def inspect
-    super
-  end
-
   def info_with_rescue
     info
   rescue Exception
@@ -51,23 +46,4 @@ class Redis #:nodoc:
     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 [:shutdown]
-      rescue Errno::ECONNREFUSED
-      ensure
-        @client.disconnect
-      end
-    end
-  end
-
 end

data/lib/beetle/version.rb

@@ -1,3 +1,3 @@
 module Beetle
-  VERSION = "0.3.0.rc.13"
+  VERSION = "0.3.0.rc.14"
 end

data/lib/beetle.rb

@@ -10,6 +10,7 @@ require 'socket'
 require 'beetle/version'
 
 module Beetle
+  #:nocov:
   Timer = if RUBY_VERSION < "1.9"
             begin
               require 'system_timer'
@@ -23,6 +24,7 @@ module Beetle
             require 'timeout'
             Timeout
           end
+  #:nocov:
 
   # abstract superclass for Beetle specific exceptions
   class Error < StandardError; end
@@ -52,7 +54,11 @@ module Beetle
   def self.hostname
     name = Socket.gethostname
     parts = name.split('.')
-    parts.size > 1 ? name : Socket.gethostbyname(parts.first).first
+    if parts.size > 1
+      name
+    else
+      Socket.gethostbyname(parts.first).first rescue name
+    end
   end
 
   # use ruby's autoload mechanism for loading beetle classes
@@ -76,7 +82,9 @@ module Beetle
       raise if $!.is_a?(Mocha::ExpectationError)
     end
   else
+    #:nocov:
     def self.reraise_expectation_errors! #:nodoc:
     end
+    #:nocov:
   end
 end

data/test/beetle/beetle_test.rb

@@ -0,0 +1,16 @@
+require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
+
+module Beetle
+  class HostnameTest < Test::Unit::TestCase
+    test "should use Socket.gethostname if returned name name is fully qualified" do
+      Socket.expects(:gethostname).returns("a.b.com")
+      assert_equal "a.b.com", Beetle.hostname
+    end
+
+    test "should use Socket.gethosbyname if returned name name is not fully qualified" do
+      Socket.expects(:gethostname).returns("a")
+      Socket.expects(:gethostbyname).with("a").returns(["a.b.com"])
+      assert_equal "a.b.com", Beetle.hostname
+    end
+  end
+end

data/test/beetle/configuration_test.rb

@@ -13,6 +13,12 @@ module Beetle
       assert_equal new_value, config.gc_threshold
     end
 
+    test "should log an error if the specified file does not exist" do
+      config    = Configuration.new
+      config.logger.expects(:error)
+      assert_raises(Errno::ENOENT){ config.config_file = "some/path/to/a/file" }
+    end
+
     test "should log to STDOUT if no log_file given" do
       config = Configuration.new
       Logger.expects(:new).with(STDOUT).returns(stub_everything)

data/test/beetle/deduplication_store_test.rb

@@ -13,11 +13,11 @@ module Beetle
       assert_equal 0, @r.del("hahahaha")
     end
 
-    test "msetnx returns 0 or 1" do
-      assert_equal 1, @r.msetnx("a", 1, "b", 2)
+    test "msetnx returns a boolean" do
+      assert_equal true, @r.msetnx("a", 1, "b", 2)
       assert_equal "1", @r.get("a")
       assert_equal "2", @r.get("b")
-      assert_equal 0, @r.msetnx("a", 3, "b", 4)
+      assert_equal false, @r.msetnx("a", 3, "b", 4)
       assert_equal "1", @r.get("a")
       assert_equal "2", @r.get("b")
     end

data/test/beetle/redis_ext_test.rb

@@ -61,23 +61,14 @@ module Beetle
     end
   end
 
-  class BrokenRedisShutdownTest < Test::Unit::TestCase
+  class RedisShutdownTest < 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 "orginal redis shutdown implementation is broken" do
-      @r.client.expects(:call_without_reply).with([:shutdown]).once
-      @r.client.expects(:disconnect).never
-      @r.broken_shutdown
-    end
-
-    test "patched redis shutdown implementation should call :shutdown and rescue Errno::ECONNREFUSED" do
-      @r.client.expects(:call).with([:shutdown]).once.raises(Errno::ECONNREFUSED)
-      @r.client.expects(:disconnect).once
-      @r.shutdown
+    test "redis shutdown implementation should call :shutdown and return nil" do
+      @r.client.expects(:call).with([:shutdown]).once.raises(Redis::ConnectionError)
+      assert_nil @r.shutdown
     end
   end
 

data/test/test_helper.rb

@@ -1,4 +1,10 @@
 require 'rubygems'
+if RUBY_VERSION >= "1.9"
+  require 'simplecov'
+  SimpleCov.start do
+    add_filter "/test/"
+  end
+end
 require 'test/unit'
 require 'mocha'
 require 'active_support/testing/declarative'
@@ -7,14 +13,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../lib/beetle')
 require File.expand_path(File.dirname(__FILE__) + '/colorized_test_output')
 
 # we can remove this hack which is needed only for testing
-begin
-  require 'qrack/errors'
-rescue LoadError
-  module Qrack
-    class BufferOverflowError < StandardError; end
-    class InvalidTypeError < StandardError; end
-  end
-end
+require 'qrack/errors'
 
 
 class Test::Unit::TestCase

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: beetle
 version: !ruby/object:Gem::Version 
-  hash: 3659109081
-  prerelease: true
+  hash: -3659944352
+  prerelease: 6
   segments: 
   - 0
   - 3
   - 0
   - rc
-  - 13
-  version: 0.3.0.rc.13
+  - 14
+  version: 0.3.0.rc.14
 platform: ruby
 authors: 
 - Stefan Kaes
@@ -21,8 +21,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-06 00:00:00 +01:00
-default_executable: beetle
+date: 2012-07-01 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: uuid4r
@@ -48,12 +47,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 17
         segments: 
         - 0
         - 7
-        - 8
-        version: 0.7.8
+        - 9
+        version: 0.7.9
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -64,12 +63,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 5
         segments: 
-        - 2
-        - 2
-        - 2
-        version: 2.2.2
+        - 3
+        - 0
+        - 1
+        version: 3.0.1
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -80,12 +79,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 5
         segments: 
         - 0
         - 4
-        - 4
-        version: 0.4.4
+        - 5
+        version: 0.4.5
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -96,12 +95,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 57
+        hash: 61
         segments: 
         - 0
         - 9
-        - 1
-        version: 0.9.1
+        - 3
+        version: 0.9.3
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
@@ -112,12 +111,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 59
+        hash: 61
         segments: 
         - 0
         - 9
-        - 0
-        version: 0.9.0
+        - 3
+        version: 0.9.3
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
@@ -128,12 +127,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 63
+        hash: 55
         segments: 
         - 0
         - 9
-        - 2
-        version: 0.9.2
+        - 6
+        version: 0.9.6
   type: :runtime
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
@@ -184,82 +183,6 @@ dependencies:
         version: 1.0.10
   type: :runtime
   version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  name: rake
-  prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 49
-        segments: 
-        - 0
-        - 8
-        - 7
-        version: 0.8.7
-  type: :development
-  version_requirements: *id011
-- !ruby/object:Gem::Dependency 
-  name: mocha
-  prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id012
-- !ruby/object:Gem::Dependency 
-  name: rcov
-  prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 47
-        segments: 
-        - 0
-        - 9
-        - 10
-        version: 0.9.10
-  type: :development
-  version_requirements: *id013
-- !ruby/object:Gem::Dependency 
-  name: cucumber
-  prerelease: false
-  requirement: &id014 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 0
-        - 7
-        - 2
-        version: 0.7.2
-  type: :development
-  version_requirements: *id014
-- !ruby/object:Gem::Dependency 
-  name: daemon_controller
-  prerelease: false
-  requirement: &id015 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id015
 description: A highly available, reliable messaging infrastructure
 email: opensource@xing.com
 executables: 
@@ -327,6 +250,7 @@ files:
 - MIT-LICENSE
 - test/beetle/amqp_gem_behavior_test.rb
 - test/beetle/base_test.rb
+- test/beetle/beetle_test.rb
 - test/beetle/client_test.rb
 - test/beetle/configuration_test.rb
 - test/beetle/deduplication_store_test.rb
@@ -343,7 +267,6 @@ files:
 - test/colorized_test_output.rb
 - test/test_helper.rb
 - bin/beetle
-has_rdoc: true
 homepage: http://xing.github.com/beetle/
 licenses: []
 
@@ -375,13 +298,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: High Availability AMQP Messaging with Redundant Queues
 test_files: 
 - test/beetle/amqp_gem_behavior_test.rb
 - test/beetle/base_test.rb
+- test/beetle/beetle_test.rb
 - test/beetle/client_test.rb
 - test/beetle/configuration_test.rb
 - test/beetle/deduplication_store_test.rb