rbbt-util 5.11.6 → 5.11.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2230976fc29ab61ab320c1c007521196acaa9b5f
-  data.tar.gz: 60ea71f47e8afa071cdc84f7de115487ec0b1ac5
+  metadata.gz: a0b0c06dd413bbda58854a7049a059bf5063fbfc
+  data.tar.gz: ecd6b277d6914343a6a3ad9c6cf60aa2ccb7f9ff
 SHA512:
-  metadata.gz: 8f7bbea5678b31d6f49ce13f94dd0b7d3271ae6e187ea837265e202ee90e95c3cb8af27ae5ba8c05b3dd8fa5d0d6eca14ae7870685990ae391fdfb1273ddbac8
-  data.tar.gz: d4746fa8d4393a9f7c399ae766b1881bc41568793ed50722a4b4f101a54962146fead34931b393c8ca44b3ea17057f59b21f505d7336939b777ede2983f9ddc9
+  metadata.gz: 7c54603a690dd9aed68719cf07641252a80e2705b523601856202afaff71a7aaea4b5af91da396795a9f0a80b7f7edbfa2d638f1d8464396b37c5e82e83128e0
+  data.tar.gz: 6286a580ecef53c0c2509c52a2b4a322e71399812d1de75b3d800d5f1175c0a0c4bccbe1ec9ff35ad8e431a11a41a362d3882f0ad8c816b9b2c12b25c269c42a

data/lib/rbbt/workflow/step.rb

@@ -3,7 +3,6 @@ require 'rbbt/persist/tsv'
 require 'rbbt/util/log'
 require 'rbbt/util/semaphore'
 require 'rbbt/workflow/accessor'
-require 'rbbt/workflow/step/run'
 
 class Step
   attr_accessor :path, :task, :inputs, :dependencies, :bindings
@@ -180,3 +179,5 @@ class Step
     end.first
   end
 end
+
+require 'rbbt/workflow/step/run'

data/lib/rbbt/workflow/step/run.rb

@@ -19,7 +19,7 @@ class Step
 
   def exec(no_load=false)
     dependencies.each{|dependency| dependency.exec(no_load) }
-    @result = _exec
+    @result = self._exec
     @result = @result.stream if TSV::Dumper === @result
     no_load ? @result : prepare_result(@result, @task.result_description)
   end
@@ -188,7 +188,7 @@ class Step
   end
 
   def fork(semaphore = nil)
-    raise "Can not fork: Step is waiting for proces #{@pid} to finish" if not @pid.nil? and not Process.pid == @pid
+    raise "Can not fork: Step is waiting for proces #{@pid} to finish" if not @pid.nil? and not Process.pid == @pid and Misc.pid_exists?(@pid) and not done? and info[:forked]
     @pid = Process.fork do
       begin
         RbbtSemaphore.wait_semaphore(semaphore) if semaphore
@@ -300,23 +300,23 @@ class Step
     join_stream
 
     return if not Open.exists? info_file
-    @pid ||= info[:pid]
+    pid = @pid 
 
     Misc.insist [0.1, 0.2, 0.5, 1] do
-      @pid ||= info[:pid]
+      pid ||= info[:pid]
     end
 
-    if @pid.nil?
+    if pid.nil?
       dependencies.each{|dep| dep.join }
       self
     else
       begin
-        Log.debug{"Waiting for pid: #{@pid}"}
-        Process.waitpid @pid 
+        Log.debug{"Waiting for pid: #{pid}"}
+        Process.waitpid pid 
       rescue Errno::ECHILD
-        Log.debug{"Process #{ @pid } already finished: #{ path }"}
-      end if Misc.pid_exists? @pid
-      @pid = nil
+        Log.debug{"Process #{ pid } already finished: #{ path }"}
+      end if Misc.pid_exists? pid
+      pid = nil
       dependencies.each{|dep| dep.join }
       self
     end

data/test/rbbt/test_workflow.rb

@@ -121,7 +121,8 @@ class TestWorkflow < Test::Unit::TestCase
       "bar"
     end
     
-    assert_equal 'bar', a.job(:foo).exec
+    job = a.job(:foo)
+    assert_equal 'bar', job.exec
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-util
 version: !ruby/object:Gem::Version
-  version: 5.11.6
+  version: 5.11.7
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-11 00:00:00.000000000 Z
+date: 2014-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake