daemonizer 0.1.0 → 0.1.1

data/README.md

@@ -84,8 +84,17 @@ Usage
       log_file "log/daemonizer.log" #relative to Demfile
 
       handler ::MyBackgroundSolution::DaemonizerHandler
-  
-      set_option :queue, lambda { |worker_id, worker_count| "queue_#{worker_id}"}
+
+      #automatically-parsed option by daemonizer
+      set_option :queue do |worker_id, worker_count|  
+        "queue_#{worker_id}"
+      end
+      
+      #simple string option
+      set_option :author, "Gleb Pomykalov"
+      
+      #lambda-option (transparent for daemonizer, fully processed by handler)
+      set_option :on_error, lambda { |object| object.logger.fatal "epic fail"}
     end
 
 

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/daemonizer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{daemonizer}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Gleb Pomykalov"]
-  s.date = %q{2010-07-08}
+  s.date = %q{2010-07-12}
   s.default_executable = %q{daemonizer}
   s.description = %q{Inspired by bundler and rack. Mostly built on top of Alexey Kovyrin's loops code. http://github.com/kovyrin/loops}
   s.email = %q{glebpom@gmail.com}
@@ -35,6 +35,7 @@ Gem::Specification.new do |s|
      "lib/daemonizer/engine.rb",
      "lib/daemonizer/errors.rb",
      "lib/daemonizer/handler.rb",
+     "lib/daemonizer/option.rb",
      "lib/daemonizer/process_manager.rb",
      "lib/daemonizer/worker.rb",
      "lib/daemonizer/worker_pool.rb"

data/lib/daemonizer/autoload.rb

@@ -13,6 +13,7 @@ module Daemonizer
   autoload :ProcessManager, __p('process_manager')
   autoload :Handler,        __p('handler')
   autoload :FakeHandler,    __p('handler')
+  autoload :Option,         __p('option')
 
   include Errors
 end

data/lib/daemonizer/config.rb

@@ -12,7 +12,7 @@ module Daemonizer
       validate
       initialize_handler
     end
-    
+
     def initialize_handler
       if @options[:after_init]
         @handler = FakeHandler.new(@options[:before_init], @options[:after_init], @options)
@@ -22,7 +22,7 @@ module Daemonizer
       end
       @handler.logger = @logger
     end
-    
+
     def init_logger
       @logger = Logger.new @pool.to_s
       outputter = FileOutputter.new('log', :filename => self.log_file)
@@ -31,7 +31,7 @@ module Daemonizer
       @logger.level = INFO
       GDC.set "#{Process.pid}/monitor"
     end
-    
+
     def init_defaults
       @options[:before_init] ||= nil
       @options[:after_init] ||= nil
@@ -43,7 +43,7 @@ module Daemonizer
       @options[:handler] ||= nil
       @options[:handler_options] ||= {}
     end
-    
+
     def validate
       raise ConfigError, "Workers count should be more then zero" if @options[:workers] < 1
       raise ConfigError, "Engine #{@options[:engine]} is not known" unless [:fork, :thread].include?(@options[:engine])
@@ -61,13 +61,13 @@ module Daemonizer
         raise ConfigError, "after_init should have block" unless @options[:after_init].is_a?(Proc)
       end
     end
-    
+
     [:engine, :workers, :poll_period, :root].each do |method|
       define_method method do
         @options[method.to_sym]
       end
     end
-        
+
     [:log_file, :pid_file].each do |method|
       define_method method do
         File.join(Daemonizer.root, @options[method.to_sym])

data/lib/daemonizer/dsl.rb

@@ -15,9 +15,15 @@ module Daemonizer
       @configs  = {}
     end
     
-    def set_option(option, value)
+    def set_option(option, value = nil, &block)
       @options[:handler_options] ||= {}
-      @options[:handler_options][option.to_sym] = value
+      if value
+        @options[:handler_options][option.to_sym] = Option.new(option, value)
+      elsif block_given?
+        @options[:handler_options][option.to_sym] = Option.new(option, block, true)
+      else
+        raise DslError, "you should supply block or value to :set_option"
+      end
     end
     
     def handler(handler)

data/lib/daemonizer/handler.rb

@@ -13,10 +13,10 @@ module Daemonizer
     end
     
     def option(key)
-      if option = @options[key.to_sym] and option.is_a?(Proc)
-        option.call(@worker_id, @workers_count)
+      if option = @options[key.to_sym]
+        option.value(self)
       else
-        option
+        nil
       end
     end
   end

data/lib/daemonizer/option.rb

@@ -0,0 +1,27 @@
+module Daemonizer
+  class Option
+    class OptionError < StandardError; end
+         
+    def initialize(option, value, auto_eval = false)
+      @option = option
+      @value = value
+      @auto_eval = auto_eval
+      if @auto_eval && !@value.is_a?(Proc)
+        raise OptionError, "auto_apply can be used only with callable option"
+      end
+    end
+    
+    def value(handler = nil)
+      if @auto_eval && @value.is_a?(Proc) 
+        if handler && handler.worker_id && handler.workers_count
+          return @value.call(handler.worker_id, handler.workers_count)
+        else
+          raise OptionError, "value called before handler initialized"
+        end
+      else
+        @value
+      end
+    end
+    
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: daemonizer
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Gleb Pomykalov
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-08 00:00:00 +04:00
+date: 2010-07-12 00:00:00 +04:00
 default_executable: daemonizer
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -76,6 +76,7 @@ files:
 - lib/daemonizer/engine.rb
 - lib/daemonizer/errors.rb
 - lib/daemonizer/handler.rb
+- lib/daemonizer/option.rb
 - lib/daemonizer/process_manager.rb
 - lib/daemonizer/worker.rb
 - lib/daemonizer/worker_pool.rb