beetle 0.2.2 → 0.2.3

data/README.rdoc

@@ -54,12 +54,11 @@ windows and execute the following commands:
     rake redis:start1
     rake redis:start2
 
-
 == Prerequisites
 
 To set up a redundant messaging system you will need
 * at least 2 AMQP servers (we use {RabbitMQ}[http://www.rabbitmq.com/])
-* at least one Redis server (better are two in a master/slave setup)
+* at least one {Redis}[http://github.com/antirez/redis] server (better are two in a master/slave setup)
 
 == Gem Dependencies
 
@@ -67,15 +66,17 @@ At runtime, Beetle will use
 * {uuid4r}[http://github.com/skaes/uuid4r]
   (which needs ossp-uuid)
 * {bunny}[http://github.com/celldee/bunny]
-* {redis-rb}[http://github.com/ezmobius/redis-rb]
-  (which needs {redis}[http://github.com/antirez/redis])
+* {redis}[http://github.com/ezmobius/redis-rb]
 * {amqp}[http://github.com/tmm1/amqp]
   (which is based on {eventmachine}[http://github.com/eventmachine/eventmachine])
+* {daemons}[http://daemons.rubyforge.org/]
 * activesupport
 
 For development, you'll need
-* mocha
-* rcov
+* {mocha}[http://github.com/floehopper/mocha]
+* {rcov}[http://github.com/relevance/rcov]
+* {cucumber}[http://github.com/aslakhellesoy/cucumber]
+* {daemon_controller}[http://github.com/FooBarWidget/daemon_controller]
 
 == Authors
 

data/beetle.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name    = "beetle"
-  s.version = "0.2.2"
+  s.version = "0.2.3"
 
   s.required_rubygems_version = ">= 1.3.1"
   s.authors            = ["Stefan Kaes", "Pascal Friederich", "Ali Jelveh", "Sebastian Roebke"]

data/lib/beetle/commands/configuration_client.rb

@@ -46,7 +46,7 @@ module Beetle
 
         dir_mode = nil
         dir = nil
-        opts.on("--pid-dir DIR", String, "Write pid and log to DIR") do |val|
+        opts.on("--pid-dir DIR", String, "Write pid and output to DIR") do |val|
           dir_mode = :normal
           dir = val
         end

data/lib/beetle/commands/configuration_server.rb

@@ -55,7 +55,7 @@ module Beetle
 
         dir_mode = nil
         dir = nil
-        opts.on("--pid-dir DIR", String, "Write pid and log to DIR") do |val|
+        opts.on("--pid-dir DIR", String, "Write pid and output to DIR") do |val|
           dir_mode = :normal
           dir = val
         end

data/lib/beetle/configuration.rb

@@ -4,8 +4,10 @@ module Beetle
   class Configuration
     # system name (used for redis cluster partitioning) (defaults to <tt>system</tt>)
     attr_accessor :system_name
-    # default logger (defaults to <tt>Logger.new(STDOUT)</tt>)
+    # default logger (defaults to <tt>Logger.new(log_file)</tt>)
     attr_accessor :logger
+    # defaults to <tt>STDOUT</tt>
+    attr_accessor :log_file
     # number of seconds after which keys are removed form the message deduplication store (defaults to <tt>3.days</tt>)
     attr_accessor :gc_threshold
     # the redis server to use for deduplication
@@ -49,14 +51,6 @@ module Beetle
     def initialize #:nodoc:
       self.system_name = "system"
 
-      self.logger = begin
-        logger = Logger.new(STDOUT)
-        logger.formatter = Logger::Formatter.new
-        logger.level = Logger::INFO
-        logger.datetime_format = "%Y-%m-%d %H:%M:%S"
-        logger
-      end
-
       self.gc_threshold = 3.days
       self.redis_server = "localhost:6379"
       self.redis_servers = ""
@@ -72,6 +66,8 @@ module Beetle
       self.vhost = "/"
       self.user = "guest"
       self.password = "guest"
+
+      self.log_file = STDOUT
     end
 
     # setting the external config file will load it on assignment
@@ -80,6 +76,16 @@ module Beetle
       load_config
     end
 
+    def logger
+      @logger ||= begin
+        l = Logger.new(log_file)
+        l.formatter = Logger::Formatter.new
+        l.level = Logger::INFO
+        l.datetime_format = "%Y-%m-%d %H:%M:%S"
+        l
+      end
+    end
+
     private
     def load_config
       hash = YAML::load(ERB.new(IO.read(config_file)).result)

data/test/beetle/configuration_test.rb

@@ -1,5 +1,4 @@
 require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
-require 'tempfile'
 
 module Beetle
   class ConfigurationTest < Test::Unit::TestCase
@@ -13,5 +12,19 @@ module Beetle
       config.config_file = "some/path/to/a/file"
       assert_equal new_value, config.gc_threshold
     end
+    
+    test "should log to STDOUT if no log_file given" do
+      config = Configuration.new
+      Logger.expects(:new).with(STDOUT).returns(stub_everything)
+      config.logger
+    end
+
+    test "should log to file if log_file given" do
+      file = '/path/to/file'
+      config = Configuration.new
+      config.log_file = file
+      Logger.expects(:new).with(file).returns(stub_everything)
+      config.logger
+    end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: beetle
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 2
-  - 2
-  version: 0.2.2
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - Stefan Kaes
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-26 00:00:00 +02:00
+date: 2010-07-27 00:00:00 +02:00
 default_executable: beetle
 dependencies: 
 - !ruby/object:Gem::Dependency