rbbt-util 5.17.5 → 5.17.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ebbbcd7563b7c4c3bd68ac9ebef1d81318430cf4
-  data.tar.gz: f3f0e6c0b52149de5fc1d2dfda1e88afda0963e1
+  metadata.gz: a76837c4ad8ddaad67f76ad427b0228526f8ced5
+  data.tar.gz: 74defa1d2bdae0f8d3c096025d1ab2ce3796c9f0
 SHA512:
-  metadata.gz: 8756e82fa2249eae15ffe96ee0cb81b94964f4e0eb84fd1588248440ed12cb9b3030c2801741b66cb44d456fe5ac396784d48789f5b12bcab3bc02ff58d69f16
-  data.tar.gz: 72210aa14174435437a7420472f231782aa150c990036fcbadd46a44e96b136ebdd5ab6be5146700869d06e38868cbbee2a0aa00c80d24c45ef25a3ce45058be
+  metadata.gz: f0e388e93422121f8e66f3e6570761f803da4a69bcbe2192de3098f602e60edf5c6ed7c043d911d9838d2499a2a9ac0b9f108d45f60f5a5ad7d6083e9fda5fc7
+  data.tar.gz: c8acbf531e4703da11cbd7c28dcf5bfb1220536c2fef0bf411ae7d9abc73014cb1e296f9a7aa3a5ea4d1b3917dcc9d985b6b868fef5148fe6bd7a8686d555a23

data/lib/rbbt/persist.rb

@@ -27,7 +27,7 @@ module Persist
 
   def self.newer?(path, file)
     return true if not Open.exists? file
-    return true if File.mtime(path) < File.mtime(file)
+    return File.mtime(path) - File.mtime(file) if File.mtime(path) < File.mtime(file)
     return false
   end
 
@@ -38,8 +38,9 @@ module Persist
     check = persist_options[:check]
     if not check.nil?
       if Array === check
-        if check.select{|file| newer? path, file}.any?
-          Log.medium "Persistence check for #{path} failed in: #{ check.select{|file| newer? path, file} * ", "}"
+        newer = check.select{|file| newer? path, file}
+        if newer.any?
+          Log.medium "Persistence check for #{path} failed in: #{ newer * ", "}"
           return false 
         end
      else

data/lib/rbbt/util/misc/inspect.rb

@@ -144,10 +144,12 @@ module Misc
       when Symbol === v
         str << k.to_s << "=>" << v.to_s
       when (String === v and v.length > HASH2MD5_MAX_STRING_LENGTH)
+        #str << k.to_s << "=>" << v[0..HASH2MD5_MAX_STRING_LENGTH] << v[v.length-3..v.length+3] << v[-3..-1] << "; #{ v.length }"
         str << k.to_s << "=>" << v[0..HASH2MD5_MAX_STRING_LENGTH] << "; #{ v.length }"
       when String === v
         str << k.to_s << "=>" << v
       when (Array === v and v.length > HASH2MD5_MAX_ARRAY_LENGTH)
+        #str << k.to_s << "=>[" << (v[0..HASH2MD5_MAX_ARRAY_LENGTH] + v[v.length-3..v.length+3] + v[-3..-1]) * "," << "; #{ v.length }]"
         str << k.to_s << "=>[" << v[0..HASH2MD5_MAX_ARRAY_LENGTH] * "," << "; #{ v.length }]"
       when TSV::Parser === v
         str << remove_long_items(v)

data/lib/rbbt/workflow/accessor.rb

@@ -272,7 +272,7 @@ class Step
   end
 
   def streaming?
-    IO === @result or status == :streaming
+    IO === @result or @saved_stream or status == :streaming
   end
 
   def running?
@@ -430,29 +430,31 @@ module Workflow
   end
 
   def rec_dependencies(taskname)
-    if task_dependencies.include? taskname
-      deps = task_dependencies[taskname]
-      all_deps = deps.select{|dep| String === dep or Symbol === dep or Array === dep}
-      deps.each do |dep| 
-        case dep
-        when Array
-          dep.first.rec_dependencies(dep.last).each do |d|
-            if Array === d
-              all_deps << d
-            else
-              all_deps << [dep.first, d]
-            end
-          end
-        when String, Symbol
-          all_deps.concat rec_dependencies(dep.to_sym)
-        when DependencyBlock
-          all_deps << dep.dependency
-        end
-      end
-      all_deps.uniq
-    else
-      []
-    end
+    @rec_dependencies ||= begin
+                            if task_dependencies.include? taskname
+                              deps = task_dependencies[taskname]
+                              all_deps = deps.select{|dep| String === dep or Symbol === dep or Array === dep}
+                              deps.each do |dep| 
+                                case dep
+                                when Array
+                                  dep.first.rec_dependencies(dep.last).each do |d|
+                                    if Array === d
+                                      all_deps << d
+                                    else
+                                      all_deps << [dep.first, d]
+                                    end
+                                  end
+                                when String, Symbol
+                                  all_deps.concat rec_dependencies(dep.to_sym)
+                                when DependencyBlock
+                                  all_deps << dep.dependency
+                                end
+                              end
+                              all_deps.uniq
+                            else
+                              []
+                            end
+                          end
   end
 
   def task_from_dep(dep)

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

@@ -98,6 +98,10 @@ class Step
   def checks
     rec_dependencies.collect{|dependency| dependency.path }.uniq
   end
+  
+  def dirty?
+    rec_dependencies.collect{|dependency| dependency.path }.uniq.reject{|path| path.exists?}.any?
+  end
 
   def kill_children
     begin
@@ -128,30 +132,32 @@ class Step
       @seen.uniq!
     end
 
+    return if @seen.empty?
+
+    @seen.each do |dependency|
+      next if dependency == self
+      if dependency.streaming? and not dependency.running?
+        dependency.clean 
+      else
+        dependency.clean if dependency.error? or dependency.aborted? or dependency.status.nil? or 
+                            (dependency.done? and dependency.dirty?) or 
+                            not (dependency.done? or dependency.running?)
+      end
+    end
+
     @seen.each do |dependency|
       next if dependency == self
       next unless dependencies.include? dependency
       dependency.dup_inputs
     end
 
-    return if @seen.empty?
-
     log :dependencies, "#{Log.color :magenta, "Dependencies"} #{Log.color :yellow, task.name.to_s || ""}"
     @seen.each do |dependency| 
       next if dependency == self
       next unless dependencies.include? dependency
       Log.info "#{Log.color :cyan, "dependency"} #{Log.color :yellow, task.name.to_s || ""} => #{Log.color :yellow, dependency.task_name.to_s || ""} -- #{Log.color :blue, dependency.path}"
       begin
-        if dependency.streaming? 
-          next if dependency.running?
-          dependency.clean 
-        else
-          dependency.clean if (dependency.error? or dependency.aborted? or dependency.status.nil? or not (dependency.done? or dependency.running?))
-        end
-
-        unless dependency.started? 
-          dependency.run(true)
-        end
+        dependency.run(true) unless dependency.started? 
       rescue Aborted
         Log.error "Aborted dep. #{Log.color :red, dependency.task.name.to_s}"
         raise $!
@@ -439,7 +445,9 @@ class Step
 
     grace
 
-    join_stream if status.to_s == "streaming"
+    if streaming?
+      join_stream 
+    end
 
     return self if not Open.exists? info_file
 

data/share/rbbt_commands/workflow/prov

@@ -53,7 +53,11 @@ def report_msg(status, name, path)
   task = Log.color(:yellow, parts.pop)
   workflow = Log.color(:magenta, parts.pop)
 
-  status_msg(status) << " " << [workflow, task, path] * " " << "\n"
+  if $main_mtime and ($main_mtime - File.mtime(path)) < 0
+    status_msg(status) << " " << [workflow, task, path] * " " << " (#{Log.color(:red, "Mtime out of sync") })\n"
+  else
+    status_msg(status) << " " << [workflow, task, path] * " " << "\n"
+  end
 end
 
 def report(step, offset = 0)
@@ -61,6 +65,7 @@ def report(step, offset = 0)
   path  = step.path
   status = info[:status] || :missing
   name = info[:name] || File.basename(path)
+  status = :unsync if status == :done and not File.exists? path
   str = " " * offset
   str << report_msg(status, name, path)
   info[:dependencies].each do |task,name,path|
@@ -76,5 +81,6 @@ def report(step, offset = 0)
 end
 
 step = get_step file
+$main_mtime = File.exists?(step.path) ? File.mtime(step.path) : nil
 
 puts report(step).strip

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-util
 version: !ruby/object:Gem::Version
-  version: 5.17.5
+  version: 5.17.6
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-12 00:00:00.000000000 Z
+date: 2015-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake