pigeon 0.7.0 → 0.7.1

data/VERSION

@@ -1 +1 @@
-0.7.0
+0.7.1

data/lib/pigeon/engine.rb

@@ -235,7 +235,7 @@ class Pigeon::Engine
   # Schedules a block for execution on the main EventMachine thread. This is
   # a wrapper around the EventMachine.schedule method.
   def self.execute_in_main_thread(&block)
-    EventMachine.schedule(&block)
+    EventMachine.next_tick(&block)
   end
 
   # == Instance Methods =====================================================
@@ -356,7 +356,7 @@ class Pigeon::Engine
 
       target_queue.perform(&block)
     else
-      EventMachine.schedule(&block)
+      EventMachine.next_tick(&block)
     end
   end
   

data/lib/pigeon/processor.rb

@@ -19,7 +19,6 @@ class Pigeon::Processor
   # can be given to filter the tasks contained in the associated queue.
   def initialize(queue = nil, context = nil, &filter)
     @id = Pigeon::Support.unique_id
-    @lock = Mutex.new
     @filter = filter
     @context = context
     
@@ -39,18 +38,14 @@ class Pigeon::Processor
     
     if (@queue = queue)
       @claim = lambda do |task|
-        if (@lock.try_lock)
-          if (!@task and (!@filter or @filter.call(task)))
-            @task = queue.claim(task)
+        if (!@task and (!@filter or @filter.call(task)))
+          @task = queue.claim(task)
 
-            before_task(@task)
-      
-            @task.run!(self) do
-              switch_to_next_task!
-            end
+          before_task(@task)
+    
+          @task.run!(self) do
+            switch_to_next_task!
           end
-          
-          @lock.unlock
         end
       end
 
@@ -87,21 +82,20 @@ protected
   # Used to reliably switch to the next task and coordinates the required
   # hand-off from one to the next.
   def switch_to_next_task!
-    @lock.synchronize do
-      if (@task)
-        after_task(@task)
-        @task.processor = nil
-      end
-      
+    if (@task)
+      after_task(@task)
+
+      @task.processor = nil
+
       @task = nil
-      
-      if (@queue)
-        if (@task = @queue.pop(&@filter))
-          before_task(@task)
-          
-          @task.run!(self) do
-            switch_to_next_task!
-          end
+    end
+  
+    if (@queue)
+      if (@task = @queue.pop(&@filter))
+        before_task(@task)
+        
+        @task.run!(self) do
+          switch_to_next_task!
         end
       end
     end

data/pigeon.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{pigeon}
-  s.version = "0.7.0"
+  s.name = "pigeon"
+  s.version = "0.7.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = [%q{tadman}]
-  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.authors = ["tadman"]
+  s.date = "2011-10-12"
+  s.description = "Pigeon is a simple way to get started building an EventMachine engine that's intended to run as a background job."
+  s.email = "github@tadman.ca"
   s.extra_rdoc_files = [
     "LICENSE",
     "README.rdoc"
@@ -50,24 +50,10 @@ Gem::Specification.new do |s|
     "test/unit/pigeon_task_test.rb",
     "test/unit/pigeon_test.rb"
   ]
-  s.homepage = %q{http://github.com/twg/pigeon}
-  s.require_paths = [%q{lib}]
-  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",
-    "test/unit/pigeon_backlog_test.rb",
-    "test/unit/pigeon_dispatcher_test.rb",
-    "test/unit/pigeon_engine_test.rb",
-    "test/unit/pigeon_launcher_test.rb",
-    "test/unit/pigeon_option_accessor_test.rb",
-    "test/unit/pigeon_processor_test.rb",
-    "test/unit/pigeon_queue_test.rb",
-    "test/unit/pigeon_scheduler_test.rb",
-    "test/unit/pigeon_sorted_array_test.rb",
-    "test/unit/pigeon_task_test.rb",
-    "test/unit/pigeon_test.rb"
-  ]
+  s.homepage = "http://github.com/twg/pigeon"
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.10"
+  s.summary = "Simple daemonized EventMachine engine framework with plug-in support"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

metadata

@@ -1,38 +1,36 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: pigeon
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.7.1
   prerelease: 
-  version: 0.7.0
 platform: ruby
-authors: 
+authors:
 - tadman
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-21 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-10-12 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: eventmachine
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2154594780 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-description: Pigeon is a simple way to get started building an EventMachine engine that's intended to run as a background job.
+  prerelease: false
+  version_requirements: *2154594780
+description: Pigeon is a simple way to get started building an EventMachine engine
+  that's intended to run as a background job.
 email: github@tadman.ca
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.rdoc
-files: 
+files:
 - .document
 - LICENSE
 - README.rdoc
@@ -67,41 +65,26 @@ files:
 - test/unit/pigeon_test.rb
 homepage: http://github.com/twg/pigeon
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.5
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Simple daemonized EventMachine engine framework with plug-in support
-test_files: 
-- test/helper.rb
-- test/unit/pigeon_backlog_test.rb
-- test/unit/pigeon_dispatcher_test.rb
-- test/unit/pigeon_engine_test.rb
-- test/unit/pigeon_launcher_test.rb
-- test/unit/pigeon_option_accessor_test.rb
-- test/unit/pigeon_processor_test.rb
-- test/unit/pigeon_queue_test.rb
-- test/unit/pigeon_scheduler_test.rb
-- test/unit/pigeon_sorted_array_test.rb
-- test/unit/pigeon_task_test.rb
-- test/unit/pigeon_test.rb
+test_files: []