beetle 0.2.11 → 0.2.13

data/Rakefile

@@ -2,7 +2,6 @@ require 'rake'
 require 'rake/testtask'
 require 'rcov/rcovtask'
 require 'cucumber/rake/task'
-require 'active_support'
 
 # 1.8/1.9 compatible way of loading lib/beetle.rb
 $:.unshift 'lib'

data/beetle.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name    = "beetle"
-  s.version = "0.2.11"
-  s.required_rubygems_version = ">= 1.3.1"
+  s.version = "0.2.13"
+  s.required_rubygems_version = ">= 1.3.7"
   s.authors            = ["Stefan Kaes", "Pascal Friederich", "Ali Jelveh", "Sebastian Roebke"]
   s.date               = Time.now.strftime('%Y-%m-%d')
   s.default_executable = "beetle"
@@ -28,15 +28,18 @@ Gem::Specification.new do |s|
   INFO
 
   s.specification_version = 3
-  s.add_runtime_dependency("uuid4r",                [">= 0.1.1"])
+  s.add_runtime_dependency("uuid4r",                [">= 0.1.2"])
   s.add_runtime_dependency("bunny",                 ["= 0.6.0"])
   s.add_runtime_dependency("bunny-ext",             [">= 0.6.5"])
   s.add_runtime_dependency("redis",                 ["= 2.0.4"])
-  s.add_runtime_dependency("amqp",                  [">= 0.6.7"])
-  s.add_runtime_dependency("activesupport",         ["~> 2.3.4"])
+  s.add_runtime_dependency("amqp",                  ["~> 0.6.7"])
+  s.add_runtime_dependency("activesupport",         [">= 2.3.4"])
   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"])
+  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/env.rb

@@ -40,7 +40,9 @@ def first_redis_configuration_client_pid
 end
 
 def system_notification_log_path
-  tmp_path + "/system_notifications.log"
+  log_path = tmp_path + "/system_notifications.log"
+  `touch #{log_path}` unless File.exists?(log_path)
+  log_path
 end
 
 def tmp_path

data/features/support/test_daemons/redis.conf.erb

@@ -185,5 +185,5 @@ glueoutputbuf yes
 # WARNING: object sharing is experimental, don't enable this feature
 # in production before of Redis 1.0-stable. Still please try this feature in
 # your development environment so that we can test it better.
-shareobjects no
-shareobjectspoolsize 1024
+# shareobjects no
+# shareobjectspoolsize 1024

data/lib/beetle.rb

@@ -2,7 +2,9 @@ $:.unshift(File.expand_path('..', __FILE__))
 require 'bunny-ext'
 require 'uuid4r'
 require 'active_support'
+require 'active_support/core_ext'
 require 'redis'
+require 'set'
 
 module Beetle
 

data/lib/beetle/base.rb

@@ -53,7 +53,7 @@ module Beetle
       queues[name] ||=
         begin
           opts = @client.queues[name]
-          error("You are trying to bind a queue #{name} which is not configured!") unless opts
+          raise UnknownQueue.new("You are trying to bind a queue #{name} which is not configured!") unless opts
           logger.debug("Beetle: binding queue #{name} with internal name #{opts[:amqp_name]} on server #{@server}")
           queue_name = opts[:amqp_name]
           creation_options = opts.slice(*QUEUE_CREATION_KEYS)

data/lib/beetle/client.rb

@@ -189,12 +189,17 @@ module Beetle
       publisher.purge(queue_name)
     end
 
-    # start listening to a list of messages (default to all registered messages).
+    # start listening to all registered queues. Calls #listen_queues internally
     # runs the given block before entering the eventmachine loop.
-    def listen(messages=self.messages.keys, &block)
-      messages = messages.map(&:to_s)
-      messages.each{|m| raise UnknownMessage.new("unknown message #{m}") unless self.messages.include?(m)}
-      subscriber.listen(messages, &block)
+    def listen(_deprecated_messages=nil, &block)
+      raise Error.new("Beetle::Client#listen no longer works with arguments. Please use #listen_queues(['queue1', 'queue2']) instead") if _deprecated_messages
+      listen_queues(&block)
+    end
+
+    # start listening to a list of queues (default to all registered queues).
+    # runs the given block before entering the eventmachine loop.
+    def listen_queues(queues=self.queues.keys, &block)
+      subscriber.listen_queues(queues, &block)
     end
 
     # stops the eventmachine loop
@@ -207,19 +212,20 @@ module Beetle
       publisher.stop
     end
 
-    # traces messages without consuming them. useful for debugging message flow.
-    def trace(messages=self.messages.keys, &block)
-      queues.each do |name, opts|
+    # traces queues without consuming them. useful for debugging message flow.
+    def trace(queue_names=self.queues.keys, &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(queues.keys) do |msg|
+      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
-      listen(messages, &block)
+      listen_queues(queue_names, &block)
     end
 
     # evaluate the ruby files matching the given +glob+ pattern in the context of the client instance.

data/lib/beetle/subscriber.rb

@@ -14,26 +14,25 @@ module Beetle
       @mqs = {}
     end
 
-    # the client calls this method to subscribe to all queues on all servers which have
-    # handlers registered for the given list of messages. this method does the following
-    # things:
+    # the client calls this method to subscribe to a list of queues.
+    # this method does the following things:
     #
-    # * creates all exchanges which have been registered for the given messages
-    # * creates and binds queues which have been registered for the exchanges
+    # * creates all exchanges which have been registered for the given queues
+    # * creates and binds each listed queue queues
     # * subscribes the handlers for all these queues
     #
     # yields before entering the eventmachine loop (if a block was given)
-    def listen(messages) #:nodoc:
+    def listen_queues(queues) #:nodoc:
       EM.run do
-        exchanges = exchanges_for_messages(messages)
+        exchanges = exchanges_for_queues(queues)
         create_exchanges(exchanges)
-        queues = queues_for_exchanges(exchanges)
         bind_queues(queues)
         subscribe_queues(queues)
         yield if block_given?
       end
     end
 
+
     # closes all AMQP connections and stops the eventmachine loop
     def stop! #:nodoc:
       if @amqp_connections.empty?
@@ -53,6 +52,10 @@ module Beetle
 
     private
 
+    def exchanges_for_queues(queues)
+      @client.bindings.slice(*queues).map{|_, opts| opts.map{|opt| opt[:exchange]}}.flatten.uniq
+    end
+
     def exchanges_for_messages(messages)
       @client.messages.slice(*messages).map{|_, opts| opts[:exchange]}.uniq
     end

data/script/console~

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

data/test/beetle/client_test.rb

@@ -261,18 +261,26 @@ module Beetle
 
     test "should delegate listening to the subscriber instance" do
       client = Client.new
-      client.register_queue(:a)
-      client.register_message(:a)
-      client.register_queue(:b)
-      client.register_message(:b)
-      client.send(:subscriber).expects(:listen).with(["a", "b"]).yields
-      x = 0
-      client.listen([:a, "b"]) { x = 5 }
-      assert_equal 5, x
+      client.register_queue("b_queue")
+      client.register_queue("a_queue")
+      client.send(:subscriber).expects(:listen_queues).with {|value| value.include?("a_queue") && value.include?("b_queue")}.yields
+      client.listen
     end
 
-    test "trying to listen to an unknown message should raise an exception" do
-      assert_raises(UnknownMessage) { Client.new.listen([:a])}
+    test "trying to listen to a message is no longer supported and should raise an exception" do
+      assert_raises(Error) { Client.new.listen([:a])}
+    end
+
+    test "should delegate listening to queues to the subscriber instance" do
+      client = Client.new
+      client.register_queue(:test)
+      client.send(:subscriber).expects(:listen_queues).with([:test]).yields
+      client.listen_queues([:test])
+    end
+
+    test "trying to listen to an unknown queue should raise an exception" do
+      client = Client.new
+      assert_raises(UnknownQueue) { Client.new.listen_queues([:foobar])}
     end
 
     test "should delegate stop_listening to the subscriber instance" do
@@ -314,7 +322,7 @@ module Beetle
       client.register_queue("test")
       sub = client.send(:subscriber)
       sub.expects(:register_handler).with(client.queues.keys, {}, nil).yields(stub_everything("message"))
-      sub.expects(:listen)
+      sub.expects(:listen_queues)
       client.stubs(:puts)
       client.trace
       test_queue_opts = client.queues["test"]
@@ -324,5 +332,16 @@ module Beetle
       assert !test_queue_opts[:durable]
     end
 
+    test "limiting tracing to some queues" do
+      client = Client.new
+      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(:listen_queues).with(["test"])
+      client.stubs(:puts)
+      client.trace(["test"])
+    end
+
   end
 end

data/test/beetle/subscriber_test.rb

@@ -249,14 +249,16 @@ module Beetle
       assert_raises(Error){ @sub.send(:subscribe, "some_queue") }
     end
 
-    test "listening should use eventmachine. create exchanges. bind queues. install subscribers. and yield." do
-      @client.register_queue(:a)
-      @client.register_message(:a)
+    test "listeninging on queues should use eventmachine. create exchanges. bind queues. install subscribers. and yield." do
+      @client.register_exchange(:an_exchange)
+      @client.register_queue(:a_queue, :exchange => :an_exchange)
+      @client.register_message(:a_message, :key => "foo", :exchange => :an_exchange)
+
       EM.expects(:run).yields
-      @sub.expects(:create_exchanges).with(["a"])
-      @sub.expects(:bind_queues).with(["a"])
-      @sub.expects(:subscribe_queues).with(["a"])
-      @sub.listen(["a"]) {}
+      @sub.expects(:create_exchanges).with(["an_exchange"])
+      @sub.expects(:bind_queues).with(["a_queue"])
+      @sub.expects(:subscribe_queues).with(["a_queue"])
+      @sub.listen_queues(["a_queue"]) {}
     end
   end
 

data/test/test_helper.rb

@@ -1,10 +1,13 @@
 require 'rubygems'
-require 'active_support'
-require 'active_support/testing/declarative'
 require 'test/unit'
+require 'mocha'
+require 'active_support/testing/declarative'
+
+require File.expand_path(File.dirname(__FILE__) + '/../lib/beetle')
+
 begin
   require 'redgreen' unless ENV['TM_FILENAME']
-rescue MissingSourceFile
+rescue LoadError => e
 end
 
 # we can remove this hack which is needed only for testing
@@ -17,8 +20,6 @@ rescue LoadError
   end
 end
 
-require 'mocha'
-require File.expand_path(File.dirname(__FILE__) + '/../lib/beetle')
 
 class Test::Unit::TestCase
   extend ActiveSupport::Testing::Declarative

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: beetle
 version: !ruby/object:Gem::Version 
-  hash: 1
-  prerelease: false
+  hash: 13
+  prerelease: 
   segments: 
   - 0
   - 2
-  - 11
-  version: 0.2.11
+  - 13
+  version: 0.2.13
 platform: ruby
 authors: 
 - Stefan Kaes
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-15 00:00:00 +01:00
+date: 2011-05-15 00:00:00 +02:00
 default_executable: beetle
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -29,12 +29,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 25
+        hash: 31
         segments: 
         - 0
         - 1
-        - 1
-        version: 0.1.1
+        - 2
+        version: 0.1.2
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -91,7 +91,7 @@ dependencies:
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         hash: 9
         segments: 
@@ -107,7 +107,7 @@ dependencies:
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         hash: 11
         segments: 
@@ -134,21 +134,23 @@ dependencies:
   type: :runtime
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: mocha
+  name: rake
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 49
         segments: 
         - 0
-        version: "0"
+        - 8
+        - 7
+        version: 0.8.7
   type: :development
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  name: rcov
+  name: mocha
   prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
@@ -162,9 +164,51 @@ dependencies:
   type: :development
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
-  name: cucumber
+  name: rcov
   prerelease: false
   requirement: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id010
+- !ruby/object:Gem::Dependency 
+  name: redgreen
+  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: wirble
+  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: cucumber
+  prerelease: false
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -176,11 +220,11 @@ dependencies:
         - 2
         version: 0.7.2
   type: :development
-  version_requirements: *id010
+  version_requirements: *id013
 - !ruby/object:Gem::Dependency 
   name: daemon_controller
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -190,7 +234,7 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id011
+  version_requirements: *id014
 description: A highly available, reliable messaging infrastructure
 email: developers@xing.com
 executables: 
@@ -243,6 +287,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
@@ -290,16 +335,16 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 21
       segments: 
       - 1
       - 3
-      - 1
-      version: 1.3.1
+      - 7
+      version: 1.3.7
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: High Availability AMQP Messaging with Redundant Queues