rbbt-util 5.23.4 → 5.23.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ad99d5ceecb80bf0d0280c62353eea5d2ab6b17
-  data.tar.gz: e54fdc997aae385c142661ac32c18338f49dcc67
+  metadata.gz: 8fb980bbf88e61f1087f0fd28c27cb3057bd891c
+  data.tar.gz: ac0c6c3e802ebdf902301b8289b866252eaa1f35
 SHA512:
-  metadata.gz: 9b6d2a578955ef4afde442ef337ae11638ddb17d42057e994dce571ad30da776dc4027a0f2976dac4abe7e61ff6c8ffb12fb3c2994932f4446e32e3dac9028c1
-  data.tar.gz: c01cb24b5437c370ded0438723ee3a0d5a2c72777aa6b974355670f26e1688119da3fd54627353603841747bb61e5ba08a8384bbcf24cd5d245bbbac4d53c045
+  metadata.gz: 6742777bd0aefb41ede80c70d76b1dab223fb443e12a7e492e99a02472e8dcafd9e37c012bda15c260ccd77b6b7c19990b28d2afd9edb4acf23d68bcf9b9197c
+  data.tar.gz: 7463782b74d10ec37222a8f9771a8cdf8a094987c96b803a8e8e122365da7bcd17f5cd3d0cca5bccc545b448eb83fa234f4172a5bf3e6fe63d560ec11bdfc0be

data/lib/rbbt/workflow.rb

@@ -423,11 +423,31 @@ module Workflow
     end
   end
 
+  def self.relocate(listed, real, other)
+    sl = listed.split("/", -1)
+    so = other.split("/", -1)
+    sr = real.split("/", -1)
+    prefix = [] 
+    while true
+      break if sl[0] != so[0]
+      cl = sl.shift
+      co = so.shift
+      prefix << cl
+    end
+    File.join(sr - sl + so)
+  end
+
   def self.load_step(path)
     step = Step.new path
     step.dependencies = (step.info[:dependencies] || []).collect do |task,name,dep_path|
-      Workflow.load_step dep_path
+      if File.exists?(dep_path)
+        Workflow.load_step dep_path
+      else
+        new_path = relocate(step.info[:path], path, dep_path)
+        Workflow.load_step new_path
+      end
     end
+
     step
   end
 

data/lib/rbbt/workflow/accessor.rb

@@ -153,7 +153,7 @@ class Step
   def init_info
     return nil if @exec or info_file.nil? or Open.exists?(info_file)
     Open.lock(info_file, :lock => info_lock) do
-      i = {:status => :waiting, :pid => Process.pid}
+      i = {:status => :waiting, :pid => Process.pid, :path => path}
       i[:dependencies] = dependencies.collect{|dep| [dep.task_name, dep.name, dep.path]} if dependencies
       @info_cache = i
       Misc.sensiblewrite(info_file, INFO_SERIALIAZER.dump(i), :force => true, :lock => false)
@@ -169,7 +169,6 @@ class Step
       i[key] = value 
       @info_cache = i
       Misc.sensiblewrite(info_file, INFO_SERIALIAZER.dump(i), :force => true, :lock => false)
-      #Misc.insist(([0.01,0.1,1] * 3).sort) do
       Misc.insist do
         Open.open(info_file) do |file|
           INFO_SERIALIAZER.load(file) 

data/share/rbbt_commands/workflow/prov

@@ -111,15 +111,15 @@ def report(step, offset = 0, task = nil)
   status = :unsync if status == :done and not File.exist? path
   str = " " * offset
   str << report_msg(status, name, path, info)
-  info[:dependencies].each do |task,name,path|
+  step.dependencies.each do |dep|
+    path = dep.path
     new = ! $seen.include?(path)
-    dep = get_step path
     if new
       str << report(dep, offset + 1, task)
     else
       str << Log.color(:blue, Log.uncolor(report(dep, offset+1, task)))
     end
-  end if info[:dependencies]
+  end if step.dependencies
   str
 end
 

data/test/rbbt/test_workflow.rb

@@ -271,4 +271,13 @@ class TestWorkflow < Test::Unit::TestCase
     assert_equal "CB", TestWF.job(:t3).run
   end
 
+  def test_relocate
+    listed = '/home/user/.rbbt/var/jobs/TestWF/task1/Default'
+    real = '/usr/local/var/rbbt/jobs/TestWF/task1/Default'
+    other = '/home/user/.rbbt/var/jobs/TestWF/task2/Default'
+    real_other = '/usr/local/var/rbbt/jobs/TestWF/task2/Default'
+
+    assert_equal real_other, Workflow.relocate(listed, real, other)
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-util
 version: !ruby/object:Gem::Version
-  version: 5.23.4
+  version: 5.23.5
 platform: ruby
 authors:
 - Miguel Vazquez