procrastinate 0.5.0 → 0.6.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: d211f3ecc75813707fd6acdb559783e5b1aa7124
+  data.tar.gz: 863ff06f3edb224c5edca1f38d88455a7c1c844f
+SHA512:
+  metadata.gz: 7adc67259467bdfc350ea453de21574447deabff894ad65d80586b096a6306390be1729a06e5bdd00c61423ebd6bcb31835ef2efcdb1515b7057fd32acdac8a4
+  data.tar.gz: 62e94303c101c092b49efdb3f759169075f03e2972a3ec3ffe4d9c77d2973e0b12fe1137dc5cf98fc19a3ff9f2c0927bf03cc916aeb8cdebedc34fa855b517e7

data/HISTORY.txt

@@ -1,3 +1,9 @@
+= 0.6 / 20Nov2013
+
+  - Removes the cod gem and replaces it with a correct parent child
+    communication.
+  - Makes sure this works with Ruby 2.0
+
 = 0.5 / last minor release: 18Dez2012
 
   + Replaces the custom IPC implementation with the cod gem.

data/README

@@ -55,7 +55,7 @@ The above example will output something like
 
 COMPATIBILITY
 
-This library runs with at least Ruby 1.8.7 and Ruby 1.9. 
+This library runs with MRI Ruby >= 1.9. 
 
 Ruby 1.9-p136 users must use this patch: 
 https://gist.github.com/762807

data/lib/procrastinate/process_manager.rb

@@ -1,6 +1,5 @@
 
 require 'state_machine'
-require 'cod'
 
 # Dispatches and handles tasks and task completion. Only low level unixy
 # manipulation here, no strategy. The only methods you should call from the
@@ -23,9 +22,6 @@ class Procrastinate::ProcessManager
     
     # All presently running children
     @children = {}
-
-    # Master should read from @master, Children write to @child
-    @master, @child = Cod.pipe.split
   end
   
   # Sets up resource usage for dispatcher. You must call this before dispatcher
@@ -95,21 +91,31 @@ class Procrastinate::ProcessManager
     cp_read_end = control_pipe.first
     
     loop do # until we have input in the cp_read_end (control_pipe)
-      # TODO Why does procrastinate (cod) hang sometimes when there is no
-      # timeout here? What messages are we missing?
-      ready = Cod.select(1, 
-        :child_msgs => @master, :control_pipe => cp_read_end)
-      
-      read_child_messages if ready.has_key?(:child_msgs)
+      io_map = children.inject({}) { |map, (_, child)|
+        map[child.master_pipe] = child; map }
+
+      ready, _, _ = IO.select(io_map.keys + [cp_read_end], [], [], 0.1)
+      next unless ready
+
+      # Process all messages that were sent from our childs to us. 
+      ready.each { |io| 
+        next if io == cp_read_end
 
+        child = io_map[io]
+
+        fail "Assert: All IOs correspond to a child" unless child
+        child.read_message 
+      }
+           
       # Send the tracking code for the child processes the final notifications
       # and remove them from the children hash. At this point we know that
       # no messages are waiting in the child queue.
       finalize_children
       
-      if ready.has_key?(:control_pipe)
+      if ready.include?(cp_read_end)
         # Consume the data (not important)
         cp_read_end.read_nonblock(1024)
+        # And return to our caller. This is the event we've been waiting for. 
         return
       end
     end
@@ -124,28 +130,6 @@ class Procrastinate::ProcessManager
       child.removable? }
   end
 
-  def read_child_messages
-    loop do
-      ready = Cod.select(0.1, @master)
-      break unless ready
-      
-      handle_message @master.get
-    end
-  end
-  
-  # Called for every message sent from a child. The +msg+ param here is a string
-  # that still needs decoding. 
-  #
-  def handle_message(msg)
-    pid, obj = msg
-    
-    if child=children[pid]
-      child.incoming_message(obj)
-    else
-      warn "Communication from child #{pid} received, but child is gone."
-    end
-  end
-      
   # Calls completion handlers for all the childs that have now exited.
   #     
   def reap_childs
@@ -183,12 +167,13 @@ class Procrastinate::ProcessManager
     # Tasks that are interested in getting messages from their childs must 
     # provide a result object that handles incoming 'result' messages.
     result = task.result
+    child_process = ChildProcess.new(completion_handler, result)
     
     pid = fork do
       cleanup
             
       if result
-        endpoint = lambda { |obj| @child.put [Process.pid, obj] }
+        endpoint = lambda { |obj| child_process.send_message(obj) }
         task.run(endpoint)
       else
         task.run(nil)
@@ -204,8 +189,7 @@ class Procrastinate::ProcessManager
     # The spawning is done in the same thread as the reaping is done. This is 
     # why no race condition to the following line exists. (or in other code, 
     # for that matter.)
-    children[pid] = ChildProcess.new(completion_handler, result).
-      tap { |s| s.start }
+    children[pid] = child_process.tap { |s| s.start }
   end
   
   # Gets executed in child process to clean up file handles and pipes that the

data/lib/procrastinate/process_manager/child_process.rb

@@ -4,9 +4,13 @@
 #
 Procrastinate::ProcessManager::ChildProcess = 
   Struct.new(:handler, :result, :state) do
+
+  attr_reader :master_pipe, :child_pipe
   
   def initialize(handler, result)
     super(handler, result, "new")
+
+    @master_pipe, @child_pipe = IO.pipe
   end
   
   state_machine :state, :initial => :new do
@@ -33,6 +37,10 @@ Procrastinate::ProcessManager::ChildProcess =
   #
   def notify_result
     result.process_died if result
+
+    # The child is now officially dead, so we don't need these anymore: 
+    @master_pipe.close
+    @child_pipe.close
   end
       
   # Handles incoming messages from the tasks process.
@@ -40,4 +48,17 @@ Procrastinate::ProcessManager::ChildProcess =
   def incoming_message(obj)
     result.incoming_message(obj) if result
   end
+
+  # Read and process a message from the process that is connected to this 
+  # object. Normally, we would make sure that such a message is indeed waiting
+  # on the master_pipe by means of an IO select. 
+  #
+  def read_message
+    msg = Marshal.load(master_pipe)
+    incoming_message(msg)
+  end
+
+  def send_message obj
+    Marshal.dump(obj, child_pipe)
+  end
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: procrastinate
 version: !ruby/object:Gem::Version
-  version: 0.5.0
-  prerelease: 
+  version: 0.6.0
 platform: ruby
 authors:
 - Kaspar Schiess
@@ -10,136 +9,106 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-18 00:00:00.000000000 Z
+date: 2013-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: state_machine
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
-    none: false
   type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.1'
-    none: false
-- !ruby/object:Gem::Dependency
-  name: cod
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.5'
-    none: false
-  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.5'
-    none: false
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rake
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
 - !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
 - !ruby/object:Gem::Dependency
   name: flexmock
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
 - !ruby/object:Gem::Dependency
   name: guard
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
 - !ruby/object:Gem::Dependency
   name: growl
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
 - !ruby/object:Gem::Dependency
   name: yard
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
 description: 
 email:
 - kaspar.schiess@absurd.li
@@ -151,7 +120,6 @@ extra_rdoc_files:
 files:
 - HISTORY.txt
 - LICENSE
-- Rakefile
 - README
 - lib/procrastinate/implicit.rb
 - lib/procrastinate/lock.rb
@@ -178,7 +146,9 @@ files:
 - examples/simple.rb
 - examples/throttled.rb
 homepage: http://github.com/kschiess/procrastinate
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --main
@@ -187,21 +157,19 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.6
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Framework to run tasks in separate processes.
 test_files: []
 has_rdoc: 

data/Rakefile

@@ -1,36 +0,0 @@
-require "rubygems"
-require 'rspec/core/rake_task'
-require 'rubygems/package_task'
-require 'rake/clean'
-
-desc "Run all tests: Exhaustive."
-RSpec::Core::RakeTask.new
-
-task :default => :spec
-
-task :stats do
-  %w(lib spec).each do |path|
-    printf "%10s:", path
-    system %Q(find #{path} -name "*.rb" | xargs wc -l | grep total)
-  end
-end
-
-require 'yard'
-YARD::Rake::YardocTask.new do |t|
-  # t.files   = ['lib/**/*.rb']
-  # t.options = ['--any', '--extra', '--opts'] # optional
-end
-
-desc 'Clear out RDoc'
-task :clean => [:clobber_package]
-
-# This task actually builds the gem. 
-task :gem => :spec
-spec = eval(File.read('procrastinate.gemspec'))
-
-desc "Generate the gem package."
-Gem::PackageTask.new(spec) do |pkg|
-  # pkg.need_tar = true
-end
-
-CLEAN << 'doc'