rbbt-util 5.21.92 → 5.21.93

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '085baf05c5686c39e301773dce420dd46947b483'
-  data.tar.gz: 1e45580741e0644488f7c891f1d737d8ff421668
+  metadata.gz: 77e44fdba77ff951630a24ae328a7b917e79738f
+  data.tar.gz: bb3a6043e270884608148d6597761ccc9dce3710
 SHA512:
-  metadata.gz: b07ae9833c2832a79511ca6539d7de339e8008d83bc1d7056bb0d679355fce723b5233598c2ca372d0d55e99e7f0352c1c3f489f9c42dce0dc58ba89c3b99998
-  data.tar.gz: c41b15827ed605424506a7bf44ceebd27ad0c95012cc449cebb04d9e2660af6c96a6b9897f0ff8c9ccf91564bd196b4a5c0f66f43784dba12c1ae15e86d017eb
+  metadata.gz: ea343a35ca0a4349d408acc1d060312a35b9266635c4c02292115e77b3485b7ca841d78319f4daab106bfb1ec1c97764c2c28d2a132abe60da7529ecb4e455b7
+  data.tar.gz: 39989917783f2268f88df2130afdd02cda7e0a7acfd21d9e814ad2383e079bbc7e13495aa644d9c93d8b7c72408292add1f744ba2db49b830ea9d270d1fac6de

data/lib/rbbt/util/log.rb

@@ -163,7 +163,7 @@ module Log
 
     prefix = time << color(severity) << "["  << sev_str << "]" << color(0)
     message = "" << highlight << message << color(0) if severity >= INFO
-    str = prefix << " " << message
+    str = prefix << " " << message.to_s
 
     LOG_MUTEX.synchronize do
       STDERR.puts str

data/lib/rbbt/workflow/accessor.rb

@@ -139,9 +139,10 @@ class Step
   end
 
   def init_info
-    return nil if @exec or info_file.nil?
+    return nil if @exec or info_file.nil? or Open.exists?(info_file)
     Open.lock(info_file, :lock => info_lock) do
-      i = {:status => :init, :pid => Process.pid}
+      i = {:status => :waiting, :pid => Process.pid}
+      i[:dependencies] = dependencies.collect{|dep| [dep.task_name, dep.name, dep.path]}
       @info_cache = i
       Misc.sensiblewrite(info_file, INFO_SERIALIAZER.dump(i), :force => true, :lock => false)
       @info_cache_time = Time.now
@@ -347,7 +348,7 @@ class Step
   end
 
   def started?
-    Open.exists?(path) or Open.exists?(pid_file) or Open.exists?(info_file)
+    Open.exists?(path) or Open.exists?(pid_file) #or Open.exists?(info_file)
   end
 
   def dirty?

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

@@ -87,7 +87,7 @@ class Step
       job.clean 
     end
 
-    job.dup_inputs unless status == 'done' or job.started?
+    (job.init_info and job.dup_inputs) unless status == 'done' or job.started?
 
     raise DependencyError, job if job.error?
   end
@@ -251,13 +251,6 @@ class Step
 
     all_deps = rec_dependencies + [self]
 
-    dependencies.each do |dep|
-      next unless ComputeDependency === dep
-      if dep.compute == :produce
-        dep.produce 
-      end
-    end
-
     compute_deps = rec_dependencies.collect do |dep|
       next unless ComputeDependency === dep
       dep.rec_dependencies
@@ -275,6 +268,13 @@ class Step
         dep_step[step_dep.path] << step_dep
       end
     end
+
+    dependencies.each do |dep|
+      next unless ComputeDependency === dep
+      if dep.compute == :produce
+        dep.produce 
+      end
+    end
     
     self.dup_inputs
 

metadata

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