rbbt-util 5.21.133 → 5.21.134

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9b38322d267fc80b9c85230ca46ac6b9c241de0
-  data.tar.gz: e42a40b18fb7a7f2071bdc7421c533f4d04c6839
+  metadata.gz: 9227ad4cb1b0693292f83fa73b32a7e93e394962
+  data.tar.gz: edffcead7218ee6b035ec40cf83ec81000225eec
 SHA512:
-  metadata.gz: b0774253cc2ce55866e974c64c1be394d9490ae474a686fcebc43b1701b752a8fd34e62e066059eab71f576850924aa0509bf19825d0c8a64c288ae2c39c36b9
-  data.tar.gz: aaaf89742fa53a166d1fe25398f4112ace03d447f2e7f17e6a606dcc5d8a939d61f676593ede4ff19435ea10f3b6ae37df4502af95c0f0a6d1824fd45e8cbb70
+  metadata.gz: 71f104a48e0be07359ce59f196818d5fef1dabf9b9a8293bb75243216cd154b48ffce3912911033bfc9981583c43c391d3f22c2d115272e0bf38f1901fb7d5dd
+  data.tar.gz: 909e1acf886e349d1e37a5e3f71c370a4c79abce82d9c05601a12b99dda9d6a4611081aaf19098d3fdd0d89127149263e0454b737fb5f15c8d2ae844f9020e0d

data/lib/rbbt/workflow.rb

@@ -405,6 +405,14 @@ module Workflow
     end
   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
+    end
+    step
+  end
+
   def load_name(task, name)
     return remote_tasks[task].load_step(path) if remote_tasks and remote_tasks.include? task
     task = tasks[task.to_sym] if String === task or Symbol === task

data/lib/rbbt/workflow/accessor.rb

@@ -919,6 +919,14 @@ module Workflow
     Misc.path_relative_to workdir_find, path
   end
 
+  def self.workflow_for(path)
+    begin
+      Kernel.const_get File.dirname(File.dirname(path))
+    rescue
+      nil
+    end
+  end
+
   def task_for(path)
     if workdir.respond_to? :find
       workdir_find = workdir.find 

data/lib/rbbt/workflow/step.rb

@@ -67,6 +67,7 @@ class Step
     end
   end
 
+
   def inputs
     return @inputs if NamedArray === @inputs
 

data/share/rbbt_commands/workflow/info

@@ -27,7 +27,8 @@ recursive = options.delete :recursive
 
 def get_step(file)
   file = file.sub(/\.(info|files)/,'')
-  Step.new file
+  step = Workflow.load_step file
+  step
 end
 
 def status_msg(status)
@@ -84,7 +85,7 @@ exception = info[:exception]
 rest = info.keys - [:inputs, :dependencies, :status, :time_elapsed, :messages, :backtrace, :exception, :pid]
 
 puts Log.color(:magenta, "File") << ": " << step.path
-puts Log.color(:magenta, "Status") << ": " << status_msg(status) << ((step.aborted? || step.error?) && step.recoverable_error? ? " (recoverable)" : "" )
+puts Log.color(:magenta, "Status") << ": " << status_msg(status) << ((step.aborted? || step.error?) && step.recoverable_error? ? " (recoverable)" : "" ) << (step.dirty? ? " (dirty)" : "")
 puts Log.color(:magenta, "Pid") << ": " << pid_msg(pid, status.to_s == "done")
 puts Log.color(:magenta, "Time") << ": " << time.to_i.to_s << " sec." if time
 puts Log.color(:magenta, "Total time") << ": " << total_time.to_i.to_s << " sec." if time

data/share/rbbt_commands/workflow/prov

@@ -20,17 +20,22 @@ $ rbbt workflow prov <job-result>
 
 -h--help Help
 -p--plot* draw the dependency plot into <file.png>
+-i--inputs* List of inputs to print
+-if--info_fields* List of info fields to print
 EOF
 
 SOPT.usage if options[:help]
 
+$inputs = (options[:inputs] || "").split(",")
+$info_fields = (options[:info_fields] || "").split(",")
+
 file = ARGV.shift
 
 $seen = []
 def get_step(file)
   file = file.sub(/\.(info|files)/,'')
   $seen << file
-  Step.new file
+  Workflow.load_step file
 end
 
 def status_msg(status)
@@ -53,18 +58,42 @@ def status_msg(status)
   Log.color(color, status.to_s)
 end
 
-def report_msg(status, name, path)
+def report_msg(status, name, path, info = nil)
 
   parts = path.sub(/\{.*/,'').sub(/#{Regexp.quote(name)}$/,'').split "/"
 
   task = Log.color(:yellow, parts.pop)
   workflow = Log.color(:magenta, parts.pop)
 
-  if not Open.remote?(path) and (File.exists?(path) and $main_mtime and ($main_mtime - File.mtime(path)) < 0)
-    status_msg(status.to_s) << " " << [workflow, task, path] * " " << " (#{Log.color(:red, "Mtime out of sync") })\n"
+  str = if not Open.remote?(path) and (File.exists?(path) and $main_mtime and ($main_mtime - File.mtime(path)) < 0)
+    status_msg(status.to_s) << " " << [workflow, task, path] * " " << " (#{Log.color(:red, "Mtime out of sync") })"
   else
-    status_msg(status.to_s) << " " << [workflow, task, path] * " " << "\n"
+    status_msg(status.to_s) << " " << [workflow, task, path] * " " 
+  end
+
+  if $inputs and $inputs.any? 
+    job_inputs = info[:inputs]
+    IndiferentHash.setup(job_inputs)
+
+    $inputs.each do |input|
+      value = job_inputs[input]
+      next if  value.nil?
+      value_str = Misc.fingerprint(value)
+      str << " #{input}=#{value_str}"
+    end
   end
+
+  if $info_fields and $info_fields.any?
+    $info_fields.each do |field|
+      IndiferentHash.setup(info)
+      value = info[field]
+      next if  value.nil?
+      value_str = Misc.fingerprint(value)
+      str << " #{field}=#{value_str}"
+    end
+  end
+
+  str << "\n"
 end
 
 def report(step, offset = 0)
@@ -75,7 +104,7 @@ def report(step, offset = 0)
   name = info[:name] || File.basename(path)
   status = :unsync if status == :done and not File.exist? path
   str = " " * offset
-  str << report_msg(status, name, path)
+  str << report_msg(status, name, path, info)
   info[:dependencies].each do |task,name,path|
     new = ! $seen.include?(path)
     dep = get_step path

metadata

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