beetle 0.3.0.rc.12 → 0.3.0.rc.15

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

data/features/step_definitions/redis_auto_failover_steps.rb

@@ -5,7 +5,7 @@ end
 
 Given /^a redis server "([^\"]*)" exists as slave of "([^\"]*)"$/ do |redis_name, redis_master_name|
   TestDaemons::Redis[redis_name].start
-  Given "redis server \"#{redis_name}\" is slave of \"#{redis_master_name}\""
+  step "redis server \"#{redis_name}\" is slave of \"#{redis_master_name}\""
 end
 
 Given /^redis server "([^\"]*)" is master$/ do |redis_name|

data/lib/beetle/client.rb

@@ -149,9 +149,10 @@ module Beetle
 
     # this is a convenience method to configure exchanges, queues, messages and handlers
     # with a common set of options. allows one to call all register methods without the
-    # register_ prefix. returns self.
+    # register_ prefix. returns self. if the passed in block has no parameters, the block
+    # will be evaluated in the context of the client configurator.
     #
-    # Example:
+    # Example: (block with config argument)
     #  client = Beetle.client.new.configure :exchange => :foobar do |config|
     #    config.queue :q1, :key => "foo"
     #    config.queue :q2, :key => "bar"
@@ -160,8 +161,24 @@ module Beetle
     #    config.handler :q1 { puts "got foo"}
     #    config.handler :q2 { puts "got bar"}
     #  end
-    def configure(options={}) #:yields: config
-      yield Configurator.new(self, options)
+    #
+    # Example: (block without config argument)
+    #  client = Beetle.client.new.configure :exchange => :foobar do
+    #    queue :q1, :key => "foo"
+    #    queue :q2, :key => "bar"
+    #    message :foo
+    #    message :bar
+    #    handler :q1 { puts "got foo"}
+    #    handler :q2 { puts "got bar"}
+    #  end
+    #
+    def configure(options={}, &block)
+      configurator = Configurator.new(self, options)
+      if block.arity == 1
+        yield configurator
+      else
+        configurator.instance_eval &block
+      end
       self
     end
 
@@ -223,18 +240,22 @@ module Beetle
     end
 
     # traces queues without consuming them. useful for debugging message flow.
-    def trace(queue_names=self.queues.keys, &block)
+    def trace(queue_names=self.queues.keys, tracer=nil, &block)
       queues_to_trace = self.queues.slice(*queue_names)
       queues_to_trace.each do |name, opts|
         opts.merge! :durable => false, :auto_delete => true, :amqp_name => queue_name_for_tracing(opts[:amqp_name])
       end
-      register_handler(queue_names) do |msg|
-        puts "-----===== new message =====-----"
-        puts "SERVER: #{msg.server}"
-        puts "HEADER: #{msg.header.inspect}"
-        puts "MSGID: #{msg.msg_id}"
-        puts "DATA: #{msg.data}"
-      end
+      tracer ||=
+        lambda do |msg|
+          puts "-----===== new message =====-----"
+          puts "SERVER: #{msg.server}"
+          puts "HEADER: #{msg.header.attributes[:headers].inspect}"
+          puts "EXCHANGE: #{msg.header.method.exchange}"
+          puts "KEY: #{msg.header.method.routing_key}"
+          puts "MSGID: #{msg.msg_id}"
+          puts "DATA: #{msg.data}"
+        end
+      register_handler(queue_names){|msg| tracer.call msg }
       listen_queues(queue_names, &block)
     end
 

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_configuration_client.rb

@@ -117,16 +117,19 @@ module Beetle
     end
 
     def pong!
+      logger.info "Sending pong message with id '#{id}' and token '#{@current_token}'"
       beetle.publish(:pong, {"id" => id, "token" => @current_token}.to_json)
     end
 
     def client_started!
+      logger.info "Sending client_started message with id '#{id}'"
       beetle.publish(:client_started, {"id" => id}.to_json)
     end
 
     def invalidate!
       @current_master = nil
       clear_redis_master_file
+      logger.info "Sending client_invalidated message with id '#{id}' and token '#{@current_token}'"
       beetle.publish(:client_invalidated, {"id" => id, "token" => @current_token}.to_json)
     end
 

data/lib/beetle/redis_configuration_server.rb

@@ -86,7 +86,7 @@ module Beetle
       return unless redeem_token(token)
       @client_pong_ids_received << id
       if all_client_pong_ids_received?
-        logger.debug "All client pong messages received"
+        logger.info "All client pong messages received"
         @available_timer.cancel if @available_timer
         invalidate_current_master
       end
@@ -96,10 +96,10 @@ module Beetle
     def client_started(payload)
       id = payload["id"]
       if client_id_valid?(id)
-        logger.info("Received client_started message from id '#{id}'")
+        logger.info "Received client_started message from id '#{id}'"
       else
         msg = "Received client_started message from unknown id '#{id}'"
-        logger.error(msg)
+        logger.error msg
         beetle.publish(:system_notification, {"message" => msg}.to_json)
       end
     end
@@ -152,7 +152,7 @@ module Beetle
     def initiate_master_switch
       redis.refresh
       available, switch_in_progress = master_available?, paused?
-      logger.debug "initiating master switch: already in progress = #{switch_in_progress}"
+      logger.debug "Initiating master switch: already in progress = #{switch_in_progress}"
       unless available || switch_in_progress
         master_unavailable!
       end
@@ -205,7 +205,7 @@ module Beetle
       else
         write_redis_master_file(current_master.server) if @current_master = redis.auto_detect_master
       end
-      current_master or raise NoRedisMaster.new("failed to determine initial redis master")
+      current_master or raise NoRedisMaster.new("Failed to determine initial redis master")
     end
 
     def determine_new_master
@@ -215,7 +215,8 @@ module Beetle
     def validate_pong_client_id(client_id)
       unless known_client = client_id_valid?(client_id)
         msg = "Received pong message from unknown id '#{client_id}'"
-        logger.error(msg)
+        logger.error msg
+        logger.info "Sending system_notification message with text: #{msg}"
         beetle.publish(:system_notification, {"message" => msg}.to_json)
       end
       known_client
@@ -239,12 +240,14 @@ module Beetle
 
     def check_all_clients_available
       generate_new_token
+      logger.info "Sending ping message with token '#{@current_token}'"
       beetle.publish(:ping, payload_with_current_token)
       @available_timer = EM::Timer.new(config.redis_configuration_client_timeout) { cancel_invalidation }
     end
 
     def invalidate_current_master
       generate_new_token
+      logger.info "Sending invalidate message with token '#{@current_token}'"
       beetle.publish(:invalidate, payload_with_current_token)
       @invalidate_timer = EM::Timer.new(config.redis_configuration_client_timeout) { cancel_invalidation }
     end
@@ -275,7 +278,8 @@ module Beetle
     def switch_master
       if new_master = determine_new_master
         msg = "Setting redis master to '#{new_master.server}' (was '#{current_master.server}')"
-        logger.warn(msg)
+        logger.warn msg
+        logger.info "Sending system_notification message with text: #{msg}"
         beetle.publish(:system_notification, {"message" => msg}.to_json)
 
         new_master.master!
@@ -283,7 +287,8 @@ module Beetle
         @current_master = new_master
       else
         msg = "Redis master could not be switched, no slave available to become new master, promoting old master"
-        logger.error(msg)
+        logger.error msg
+        logger.info "Sending system_notification message with text: #{msg}"
         beetle.publish(:system_notification, {"message" => msg}.to_json)
       end
 
@@ -292,7 +297,7 @@ module Beetle
     end
 
     def publish_master(master)
-      logger.info "Publishing reconfigure message with server '#{master.server}'"
+      logger.info "Sending reconfigure message with server '#{master.server}'"
       beetle.publish(:reconfigure, payload_with_current_token({"server" => master.server}))
     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.12"
+  VERSION = "0.3.0.rc.15"
 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
@@ -40,7 +42,7 @@ module Beetle
   # AMQP options for exchange creation
   EXCHANGE_CREATION_KEYS  = [:auto_delete, :durable, :internal, :nowait, :passive]
   # AMQP options for queue creation
-  QUEUE_CREATION_KEYS     = [:passive, :durable, :exclusive, :auto_delete, :no_wait]
+  QUEUE_CREATION_KEYS     = [:passive, :durable, :exclusive, :auto_delete, :no_wait, :arguments]
   # AMQP options for queue bindings
   QUEUE_BINDING_KEYS      = [:key, :no_wait]
   # AMQP options for message publishing
@@ -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/client_test.rb

@@ -151,6 +151,16 @@ module Beetle
       @client.configure(options) {|config| assert_equal 42, config}
     end
 
+    test "configure should eval a passed block without arguments in the context of the configurator" do
+      options = {:exchange => :foobar}
+      m = "mock"
+      m.expects(:foo).returns(42)
+      Client::Configurator.expects(:new).with(@client, options).returns(m)
+      value = nil
+      @client.configure(options) { value = foo }
+      assert_equal 42, value
+    end
+
     test "a configurator should forward all known registration methods to the client" do
       options = {:foo => :bar}
       config = Client::Configurator.new(@client, options)
@@ -353,7 +363,7 @@ module Beetle
       client = Client.new
       client.register_queue("test")
       sub = client.send(:subscriber)
-      sub.expects(:register_handler).with(client.queues.keys, {}, nil).yields(stub_everything("message"))
+      sub.expects(:register_handler).with(client.queues.keys, {}, nil).yields(message_stub_for_tracing)
       sub.expects(:listen_queues)
       client.stubs(:puts)
       client.trace
@@ -369,11 +379,19 @@ module Beetle
       client.register_queue("test")
       client.register_queue("irrelevant")
       sub = client.send(:subscriber)
-      sub.expects(:register_handler).with(["test"], {}, nil).yields(stub_everything("message"))
+      sub.expects(:register_handler).with(["test"], {}, nil).yields(message_stub_for_tracing)
       sub.expects(:listen_queues).with(["test"])
       client.stubs(:puts)
       client.trace(["test"])
     end
 
+    def message_stub_for_tracing
+      header_stub = stub_everything("header")
+      header_stub.stubs(:method).returns(stub_everything("method"))
+      header_stub.stubs(:attributes).returns(stub_everything("attributes"))
+      msg_stub = stub_everything("message")
+      msg_stub.stubs(:header).returns(header_stub)
+      msg_stub
+    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/publisher_test.rb

@@ -224,12 +224,12 @@ module Beetle
     end
 
     test "binding a queue should create it using the config and bind it to the exchange with the name specified" do
-      @client.register_queue("some_queue", :exchange => "some_exchange", :key => "haha.#")
+      @client.register_queue("some_queue", :exchange => "some_exchange", :key => "haha.#", :arguments => {"foo" => "fighter"})
       @pub.expects(:exchange).with("some_exchange").returns(:the_exchange)
       q = mock("queue")
       q.expects(:bind).with(:the_exchange, {:key => "haha.#"})
       m = mock("Bunny")
-      m.expects(:queue).with("some_queue", :durable => true, :passive => false, :auto_delete => false, :exclusive => false).returns(q)
+      m.expects(:queue).with("some_queue", :durable => true, :passive => false, :auto_delete => false, :exclusive => false, :arguments => {"foo" => "fighter"}).returns(q)
       @pub.expects(:bunny).returns(m)
 
       @pub.send(:queue, "some_queue")

data/test/beetle/redis_configuration_server_test.rb

@@ -303,38 +303,26 @@ module Beetle
     end
   end
 
-  class RedisConfigurationServerSystemNotificationAndLoggingTest < Test::Unit::TestCase
+  class RedisConfigurationServerSystemNotificationTest < Test::Unit::TestCase
     def setup
       Beetle.config.redis_configuration_client_ids = "rc-client-1,rc-client-2"
       @server = RedisConfigurationServer.new
       @server.stubs(:beetle).returns(stub(:publish))
-      @server.stubs(:logger).returns(stub)
       EventMachine.stubs(:add_timer).yields
     end
 
-    test "should log and send a system notification when pong message from unknown client received" do
+    test "should send a system notification when receiving pong message from unknown client" do
       payload = {"id" => "unknown-client", "token" => @server.current_token}
       msg = "Received pong message from unknown id 'unknown-client'"
       @server.beetle.expects(:publish).with(:system_notification, ({:message => msg}).to_json)
-      @server.logger.expects(:error).with(msg)
       @server.pong(payload)
     end
 
-    test "should warn about unknown clients when receiving client_started messages" do
+    test "should send a system notification when receiving client_started message from unknown client" do
       payload = {"id" => "unknown-client"}
       msg = "Received client_started message from unknown id 'unknown-client'"
       @server.beetle.expects(:publish).with(:system_notification, ({:message => msg}).to_json)
-      @server.logger.expects(:error).with(msg)
       @server.client_started(payload)
     end
-
-    test "should log an info about received client_started client_started messages" do
-      payload = {"id" => "known-client"}
-      msg = "Received client_started message from id 'known-client'"
-      @server.logger.expects(:info).with(msg)
-      @server.expects(:client_id_valid?).with('known-client').returns(true)
-      @server.client_started(payload)
-    end
-
   end
 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/beetle/subscriber_test.rb

@@ -128,12 +128,12 @@ module Beetle
     end
 
     test "binding a queue should create it using the config and bind it to the exchange with the name specified" do
-      @client.register_queue("some_queue", "durable" => true, "exchange" => "some_exchange", "key" => "haha.#")
+      @client.register_queue("some_queue", "durable" => true, "exchange" => "some_exchange", "key" => "haha.#", "arguments" => {"schmu" => 5})
       @sub.expects(:exchange).with("some_exchange").returns(:the_exchange)
       q = mock("queue")
       q.expects(:bind).with(:the_exchange, {:key => "haha.#"})
       m = mock("MQ")
-      m.expects(:queue).with("some_queue", :durable => true, :passive => false, :auto_delete => false, :exclusive => false).returns(q)
+      m.expects(:queue).with("some_queue", :durable => true, :passive => false, :auto_delete => false, :exclusive => false, :arguments => {"schmu" => 5}).returns(q)
       @sub.expects(:channel).returns(m)
 
       @sub.send(:queue, "some_queue")

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: 534360161
-  prerelease: true
+  hash: -946228374
+  prerelease: 6
   segments: 
   - 0
   - 3
   - 0
   - rc
-  - 12
-  version: 0.3.0.rc.12
+  - 15
+  version: 0.3.0.rc.15
 platform: ruby
 authors: 
 - Stefan Kaes
@@ -21,12 +21,9 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-25 00:00:00 +01:00
-default_executable: beetle
+date: 2012-07-23 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: uuid4r
-  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -38,107 +35,107 @@ dependencies:
         - 1
         - 2
         version: 0.1.2
-  type: :runtime
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: bunny
   prerelease: false
+  type: :runtime
+  name: uuid4r
+- !ruby/object:Gem::Dependency 
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 17
         segments: 
         - 0
         - 7
-        - 8
-        version: 0.7.8
-  type: :runtime
+        - 9
+        version: 0.7.9
   version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: redis
   prerelease: false
+  type: :runtime
+  name: bunny
+- !ruby/object:Gem::Dependency 
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 5
         segments: 
-        - 2
-        - 2
-        - 2
-        version: 2.2.2
-  type: :runtime
+        - 3
+        - 0
+        - 1
+        version: 3.0.1
   version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: hiredis
   prerelease: false
+  type: :runtime
+  name: redis
+- !ruby/object:Gem::Dependency 
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 5
         segments: 
         - 0
         - 4
-        - 4
-        version: 0.4.4
-  type: :runtime
+        - 5
+        version: 0.4.5
   version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: amq-client
   prerelease: false
+  type: :runtime
+  name: hiredis
+- !ruby/object:Gem::Dependency 
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 57
+        hash: 61
         segments: 
         - 0
         - 9
-        - 1
-        version: 0.9.1
-  type: :runtime
+        - 3
+        version: 0.9.3
   version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: amq-protocol
   prerelease: false
+  type: :runtime
+  name: amq-client
+- !ruby/object:Gem::Dependency 
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 59
+        hash: 61
         segments: 
         - 0
         - 9
-        - 0
-        version: 0.9.0
-  type: :runtime
+        - 3
+        version: 0.9.3
   version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: amqp
   prerelease: false
+  type: :runtime
+  name: amq-protocol
+- !ruby/object:Gem::Dependency 
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 63
+        hash: 55
         segments: 
         - 0
         - 9
-        - 2
-        version: 0.9.2
-  type: :runtime
+        - 6
+        version: 0.9.6
   version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: activesupport
   prerelease: false
+  type: :runtime
+  name: amqp
+- !ruby/object:Gem::Dependency 
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -150,11 +147,11 @@ dependencies:
         - 3
         - 4
         version: 2.3.4
-  type: :runtime
   version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: eventmachine_httpserver
   prerelease: false
+  type: :runtime
+  name: activesupport
+- !ruby/object:Gem::Dependency 
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -166,11 +163,11 @@ dependencies:
         - 2
         - 1
         version: 0.2.1
-  type: :runtime
   version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: daemons
   prerelease: false
+  type: :runtime
+  name: eventmachine_httpserver
+- !ruby/object:Gem::Dependency 
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -182,84 +179,10 @@ dependencies:
         - 0
         - 10
         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
+  type: :runtime
+  name: daemons
 description: A highly available, reliable messaging infrastructure
 email: opensource@xing.com
 executables: 
@@ -326,6 +249,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
@@ -342,7 +266,6 @@ files:
 - test/colorized_test_output.rb
 - test/test_helper.rb
 - bin/beetle
-has_rdoc: true
 homepage: http://xing.github.com/beetle/
 licenses: []
 
@@ -374,13 +297,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