beetle 0.1 → 0.2.1

data/test/test_helper.rb

@@ -2,7 +2,10 @@ require 'rubygems'
 require 'active_support'
 require 'active_support/testing/declarative'
 require 'test/unit'
-require 'redgreen' unless ENV['TM_FILENAME'] rescue nil
+begin
+  require 'redgreen' unless ENV['TM_FILENAME'] 
+rescue MissingSourceFile
+end
 require 'mocha'
 require File.expand_path(File.dirname(__FILE__) + '/../lib/beetle')
 
@@ -10,7 +13,9 @@ class Test::Unit::TestCase
   extend ActiveSupport::Testing::Declarative
 end
 
+
 Beetle.config.logger = Logger.new(File.dirname(__FILE__) + '/../test.log')
+Beetle.config.redis_server = "localhost:6379"
 
 def header_with_params(opts = {})
   beetle_headers = Beetle::Message.publishing_options(opts)
@@ -18,3 +23,10 @@ def header_with_params(opts = {})
   header.stubs(:properties).returns(beetle_headers)
   header
 end
+
+def redis_stub(name, opts = {})
+  default_port = opts['port'] || "1234"
+  default_host = opts['host'] || "foo"
+  opts = {'host' => default_host, 'port' => default_port, 'server' => "#{default_host}:#{default_port}"}.update(opts)
+  stub(name, opts)
+end

metadata

@@ -1,133 +1,221 @@
 --- !ruby/object:Gem::Specification 
 name: beetle
 version: !ruby/object:Gem::Version 
-  version: "0.1"
+  hash: 21
+  prerelease: false
+  segments: 
+  - 0
+  - 2
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Stefan Kaes
 - Pascal Friederich
 - Ali Jelveh
+- Sebastian Roebke
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-04-14 00:00:00 +02:00
-default_executable: 
+date: 2010-07-22 00:00:00 +02:00
+default_executable: beetle
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: uuid4r
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 0
+        - 1
+        - 1
         version: 0.1.1
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: bunny
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 0
+        - 6
+        - 0
         version: 0.6.0
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: redis
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.1.2
-    version: 
+        hash: 9
+        segments: 
+        - 2
+        - 0
+        - 3
+        version: 2.0.3
+  type: :runtime
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: amqp
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 0
+        - 6
+        - 7
         version: 0.6.7
-    version: 
+  type: :runtime
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: activesupport
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 2
+        - 3
+        - 4
         version: 2.3.4
-    version: 
+  type: :runtime
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: daemons
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 1
+        - 0
+        - 10
+        version: 1.0.10
+  type: :runtime
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: mocha
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: rcov
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: cucumber
+  prerelease: false
+  requirement: &id009 !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: *id009
+- !ruby/object:Gem::Dependency 
+  name: daemon_controller
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id010
 description: A highly available, reliable messaging infrastructure
 email: developers@xing.com
-executables: []
-
-extensions: []
-
+executables: 
+- beetle
+extensions: 
+- ext/mkrf_conf.rb
 extra_rdoc_files: 
 - README.rdoc
-- TODO
 files: 
-- .gitignore
-- MIT-LICENSE
-- README.rdoc
-- Rakefile
-- TODO
-- beetle.gemspec
-- doc/redundant_queues.graffle
-- etc/redis-master.conf
-- etc/redis-slave.conf
-- examples/README.rdoc
 - examples/attempts.rb
 - examples/handler_class.rb
 - examples/handling_exceptions.rb
 - examples/multiple_exchanges.rb
 - examples/multiple_queues.rb
-- examples/redis_failover.rb
 - examples/redundant.rb
 - examples/rpc.rb
 - examples/simple.rb
-- lib/beetle.rb
+- ext/mkrf_conf.rb
 - lib/beetle/base.rb
 - lib/beetle/client.rb
+- lib/beetle/commands/configuration_client.rb
+- lib/beetle/commands/configuration_server.rb
+- lib/beetle/commands.rb
 - lib/beetle/configuration.rb
 - lib/beetle/deduplication_store.rb
 - lib/beetle/handler.rb
+- lib/beetle/logging.rb
 - lib/beetle/message.rb
 - lib/beetle/publisher.rb
 - lib/beetle/r_c.rb
+- lib/beetle/redis_configuration_client.rb
+- lib/beetle/redis_configuration_server.rb
+- lib/beetle/redis_ext.rb
+- lib/beetle/redis_master_file.rb
+- lib/beetle/redis_server_info.rb
 - lib/beetle/subscriber.rb
-- script/start_rabbit
-- snafu.rb
-- test/beetle.yml
+- lib/beetle.rb
+- beetle.gemspec
+- examples/README.rdoc
+- README.rdoc
 - test/beetle/base_test.rb
-- test/beetle/bla.rb
 - test/beetle/client_test.rb
 - test/beetle/configuration_test.rb
 - test/beetle/deduplication_store_test.rb
@@ -135,42 +223,52 @@ files:
 - test/beetle/message_test.rb
 - test/beetle/publisher_test.rb
 - test/beetle/r_c_test.rb
+- test/beetle/redis_configuration_client_test.rb
+- test/beetle/redis_configuration_server_test.rb
+- test/beetle/redis_ext_test.rb
+- test/beetle/redis_master_file_test.rb
 - test/beetle/subscriber_test.rb
 - test/beetle_test.rb
 - test/test_helper.rb
-- tmp/master/.gitignore
-- tmp/slave/.gitignore
+- bin/beetle
 has_rdoc: true
 homepage: http://xing.github.com/beetle/
 licenses: []
 
-post_install_message: 
+post_install_message: "  *********************************************************************************************\n\n    If you're running a ruby version < 1.9 we silently installed the SystemTimer gem for you.\n    See: http://ph7spot.com/musings/system-timer\n\n  *********************************************************************************************\n"
 rdoc_options: 
 - --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
+      hash: 25
+      segments: 
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: High Availability AMQP Messaging with Redundant Queues
 test_files: 
 - test/beetle/base_test.rb
-- test/beetle/bla.rb
 - test/beetle/client_test.rb
 - test/beetle/configuration_test.rb
 - test/beetle/deduplication_store_test.rb
@@ -178,15 +276,10 @@ test_files:
 - test/beetle/message_test.rb
 - test/beetle/publisher_test.rb
 - test/beetle/r_c_test.rb
+- test/beetle/redis_configuration_client_test.rb
+- test/beetle/redis_configuration_server_test.rb
+- test/beetle/redis_ext_test.rb
+- test/beetle/redis_master_file_test.rb
 - test/beetle/subscriber_test.rb
 - test/beetle_test.rb
 - test/test_helper.rb
-- examples/attempts.rb
-- examples/handler_class.rb
-- examples/handling_exceptions.rb
-- examples/multiple_exchanges.rb
-- examples/multiple_queues.rb
-- examples/redis_failover.rb
-- examples/redundant.rb
-- examples/rpc.rb
-- examples/simple.rb

data/.gitignore

@@ -1,5 +0,0 @@
-*.log
-doc
-pkg
-site
-test/coverage

data/MIT-LICENSE

@@ -1,20 +0,0 @@
-Copyright (c) 2010 XING AG
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/Rakefile

@@ -1,114 +0,0 @@
-require 'rake'
-require 'rake/testtask'
-require 'lib/beetle'
-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"
-
-  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
-
-
-namespace :beetle do
-  task :test do
-    Beetle::Client.new.test
-  end
-
-  task :trace do
-    trap('INT'){ EM.stop_event_loop }
-    Beetle::Client.new.trace
-  end
-end
-
-namespace :rabbit do
-  def start(node_name, port)
-    script = File.expand_path(File.dirname(__FILE__)+"/script/start_rabbit")
-    puts "starting rabbit #{node_name} on port #{port}"
-    puts "type ^C a RETURN to abort"
-    sleep 1
-    exec "sudo #{script} #{node_name} #{port}"
-  end
-  desc "start rabbit instance 1"
-  task :start1 do
-    start "rabbit1", 5672
-  end
-  desc "start rabbit instance 2"
-  task :start2 do
-    start "rabbit2", 5673
-  end
-end
-
-namespace :redis do
-  def config_file(suffix)
-    File.expand_path(File.dirname(__FILE__)+"/etc/redis-#{suffix}.conf")
-  end
-  desc "start main redis"
-  task :start1 do
-    exec "redis-server #{config_file(:master)}"
-  end
-  desc "start slave redis"
-  task :start2 do
-    exec "redis-server #{config_file(:slave)}"
-  end
-end
-
-task :default do
-  Rake::Task[:test].invoke
-end
-
-Rake::TestTask.new do |t|
-  t.libs << "test"
-  t.test_files = FileList['test/**/*_test.rb']
-  t.verbose = true
-end
-
-require 'rake/rdoctask'
-
-Rake::RDocTask.new do |rdoc|
-  rdoc.rdoc_dir = 'site/rdoc'
-  rdoc.title    = 'Beetle'
-  rdoc.options << '--line-numbers' << '--inline-source' << '--quiet'
-  rdoc.rdoc_files.include('README.rdoc')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gemspec|
-    gemspec.name    = 'beetle'
-    gemspec.version = '0.1'
-    gemspec.summary = "High Availability AMQP Messaging with Redundant Queues"
-    gemspec.description = "A highly available, reliable messaging infrastructure"
-    gemspec.email = "developers@xing.com"
-    gemspec.homepage = "http://xing.github.com/beetle/"
-    gemspec.authors = ["Stefan Kaes", "Pascal Friederich", "Ali Jelveh"]
-    gemspec.add_dependency('uuid4r', '>=0.1.1')
-    gemspec.add_dependency('bunny', '>=0.6.0')
-    gemspec.add_dependency('redis', '>=0.1.2')
-    gemspec.add_dependency('amqp', '>=0.6.7')
-    gemspec.add_dependency('activesupport', '>=2.3.4')
-
-    gemspec.add_development_dependency('mocha')
-    gemspec.add_development_dependency('rcov')
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  # puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end
-