pigeon 0.6.5 → 0.7.0

data/VERSION

@@ -1 +1 @@
-0.6.5
+0.7.0

data/lib/pigeon/engine.rb

@@ -39,6 +39,9 @@ class Pigeon::Engine
       /var/log
       /tmp
     ].freeze
+  option_accessor :threaded,
+    :boolean => true,
+    :default => false
     
   attr_reader :id
 
@@ -348,9 +351,13 @@ class Pigeon::Engine
   # queue has a large number of threads, while the named queues default
   # to only one so they can be processed sequentially.
   def dispatch(name = :default, &block)
-    target_queue = @dispatcher[name] ||= Pigeon::Dispatcher.new(name == :default ? nil : 1)
-    
-    target_queue.perform(&block)
+    if (self.threaded?)
+      target_queue = @dispatcher[name] ||= Pigeon::Dispatcher.new(name == :default ? nil : 1)
+
+      target_queue.perform(&block)
+    else
+      EventMachine.schedule(&block)
+    end
   end
   
   class << self

data/lib/pigeon/processor.rb

@@ -39,7 +39,7 @@ class Pigeon::Processor
     
     if (@queue = queue)
       @claim = lambda do |task|
-        @lock.synchronize do
+        if (@lock.try_lock)
           if (!@task and (!@filter or @filter.call(task)))
             @task = queue.claim(task)
 
@@ -49,6 +49,8 @@ class Pigeon::Processor
               switch_to_next_task!
             end
           end
+          
+          @lock.unlock
         end
       end
 

data/lib/pigeon/support.rb

@@ -37,10 +37,6 @@ module Pigeon::Support
               exit(-1)
             end
           end
-          
-          wfd.puts(daemon_pid)
-          wfd.flush
-          wfd.close
 
           begin
             Process.wait(daemon_pid)
@@ -50,6 +46,8 @@ module Pigeon::Support
             relaunch = ($? != 0)
 
           rescue Interrupt
+            Process.kill('INT', daemon_pid)
+
             relaunch = false
           end
           
@@ -62,6 +60,10 @@ module Pigeon::Support
           end
         end
       end
+
+      wfd.puts(supervisor_pid)
+      wfd.flush
+      wfd.close
     end
 
     Process.wait(forked_pid)

data/pigeon.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{pigeon}
-  s.version = "0.6.5"
+  s.version = "0.7.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{tadman}]
-  s.date = %q{2011-05-15}
+  s.date = %q{2011-06-21}
   s.description = %q{Pigeon is a simple way to get started building an EventMachine engine that's intended to run as a background job.}
   s.email = %q{github@tadman.ca}
   s.extra_rdoc_files = [
@@ -52,7 +52,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = %q{http://github.com/twg/pigeon}
   s.require_paths = [%q{lib}]
-  s.rubygems_version = %q{1.8.2}
+  s.rubygems_version = %q{1.8.5}
   s.summary = %q{Simple daemonized EventMachine engine framework with plug-in support}
   s.test_files = [
     "test/helper.rb",

metadata

@@ -2,7 +2,7 @@
 name: pigeon
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.6.5
+  version: 0.7.0
 platform: ruby
 authors: 
 - tadman
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-15 00:00:00 Z
+date: 2011-06-21 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: eventmachine
@@ -88,7 +88,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.2
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: Simple daemonized EventMachine engine framework with plug-in support