rbbt-util 5.17.17 → 5.17.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93a138cf7e724b74445c53a3afb9e728df0ea293
-  data.tar.gz: ea7ad0564a6777c5eb64c57e42d8c8aded6c735e
+  metadata.gz: df2f1977b609e8ee620bf7f2a5318664c7ed7cbf
+  data.tar.gz: f8107c1ea077494713357cfe4b37289fcb1103ba
 SHA512:
-  metadata.gz: 9e5684971fae54cb83485755097b298c56b74dd2d6244b73e6f1212276fdb9060cd3512e09038053adcd7f08707092c4441c78298aa2d48c249cf06d745805fb
-  data.tar.gz: 6a7bffb98760080be7550e299c209bbad81b6ea43007400b097141e2b12f428336fbb5f703dc4de345f615584171ccfdb9a82ce4c6a9cf0cf80f76573c9442ff
+  metadata.gz: 5dfbc75b5b4cb08522333f438d0a40a240c29a17d3ebd37139a67d4dc7a5b236d6424b09eeb7a533d9e6f1fda1e133cca9db102de06d56ed9d9667a1c5be3855
+  data.tar.gz: 98a1e891119afbf2a454efd0e5ebc690be36f6deadb474c8ed9b3294f866522f3c568fe1571624015ca6653e29dffb229fef6d4074dc7d5a7ab702f06fadd1c5

data/bin/rbbt

@@ -36,6 +36,7 @@ $ rbbt <command> <subcommand> ... -a --arg1 --arg2='value' --arg3 'another-value
 
 
 --log*                  #{Log.color :yellow, "Log level from 0 (debug) 6 (errors)"}
+--log_file*             #{Log.color :yellow, "Divert all Rbbt logs from STDERR to the file"}
 --dev*                  #{Log.color :yellow, "Find development libraries in the directory specified"}
 -cd--command_dir*       #{Log.color :yellow, "Directory from where to load command scripts"}
 --profile               #{Log.color :yellow, "Profile execution"}
@@ -50,6 +51,9 @@ EOF
 
 locate = options.delete :locate_file
 
+if options[:log_file]
+  Log.logfile(options[:log_file])
+end
 if options[:log]
   Log.severity = options[:log].to_i
 else

data/lib/rbbt/tsv/parallel/traverse.rb

@@ -512,7 +512,8 @@ module TSV
       obj_options = obj.respond_to?(:options) ? obj.options : {}
       dumper = TSV::Dumper.new obj_options.merge(options)
       dumper.init
-      traverse(obj, obj_options.merge(:into => dumper), &block)                                                                                                                                  
+      _options = options.merge(obj_options).merge(:into => dumper)
+      traverse(obj, _options, &block)                                                                                                                                  
       return dumper
     end
 

data/lib/rbbt/util/log.rb

@@ -88,8 +88,19 @@ module Log
     end
   end
 
-  def self.logfile
-    @logfile = nil
+  def self.logfile(file=nil)
+    if file.nil?
+      @logfile
+    else
+      case file
+      when String
+        @logfile = File.open(file, :mode => 'a')
+      when IO, File
+        @logfile = file
+      else
+        raise "Unkown logfile format: #{file.inspect}"
+      end
+    end
   end
 
   WHITE, DARK, GREEN, YELLOW, RED = Color::SOLARIZED.values_at :base0, :base00, :green, :yellow, :magenta

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

@@ -124,36 +124,33 @@ class Step
 
   def run_dependencies
     @seen ||= []
+    seen_paths ||= Set.new
+    
     dependencies.uniq.each do |dependency| 
-      next if seen.collect{|d| d.path}.include?(dependency.path)
-      dependency.seen = seen
-      @seen.concat dependency.rec_dependencies.collect{|d| d } 
+      dependency_path = dependency.path
+      next if seen_paths.include? dependency_path
+      @seen.concat dependency.rec_dependencies
+      seen_paths.union(dependency.rec_dependencies.collect{|d| d.path})
       @seen << dependency
-      @seen.uniq!
+      seen_paths << dependency_path
     end
 
+    @seen.uniq!
+    @seen.delete self
+
     return if @seen.empty?
 
+    log :dependencies, "#{Log.color :magenta, "Dependencies"} #{Log.color :yellow, task.name.to_s || ""}"
+    dupping = []
     @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
+      next if (dependency.done? and not dependency.dirty?) or (dependency.streaming? and dependency.running?)
+      dependency.clean
+      dupping << dependency unless dependencies.include? dependency
     end
 
-    @seen.each do |dependency|
-      next if dependency == self
-      next unless dependencies.include? dependency
-      dependency.dup_inputs
-    end
+    dupping.each{|dep| dep.dup_inputs}
 
-    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

data/lib/rbbt/workflow/step.rb

@@ -66,8 +66,11 @@ class Step
   end
 
   def path
-    @path = Misc.sanitize_filename(Path.setup(@path.call)) if Proc === @path
-    @path
+    if Proc === @path
+      @path = Path.setup(Misc.sanitize_filename(@path.call))
+    else
+      @path
+    end
   end
 
   class << self
@@ -182,6 +185,27 @@ class Step
     self
   end
 
+  #def rec_dependencies
+
+  #  # A step result with no info_file means that it was manually
+  #  # placed. In that case, do not consider its dependencies
+  #  return [] if Open.exists?(self.path.to_s) and not Open.exists? self.info_file
+
+  #  return [] if dependencies.nil? or dependencies.empty?
+
+  #  new_dependencies = []
+  #  dependencies.each{|step| 
+  #    new_dependencies.concat step.rec_dependencies
+  #    new_dependencies << step
+  #  }
+  #  new_dependencies.uniq!
+
+  #  dependencies = self.dependencies ? self.dependencies + new_dependencies : new_dependencies
+  #  dependencies.flatten!
+  #  dependencies.uniq!
+  #  dependencies
+  #end
+
   def rec_dependencies
 
     # A step result with no info_file means that it was manually
@@ -189,14 +213,13 @@ class Step
     return [] if Open.exists?(self.path.to_s) and not Open.exists? self.info_file
 
     return [] if dependencies.nil? or dependencies.empty?
-    new_dependencies = dependencies.collect{|step| 
-      step.rec_dependencies 
-    }.flatten.uniq.compact
-
-    dependencies = self.dependencies ? self.dependencies + new_dependencies : new_dependencies
-    dependencies.flatten!
-    dependencies.uniq!
-    dependencies
+
+    new_dependencies = []
+    dependencies.each{|step| 
+      new_dependencies.concat step.rec_dependencies
+      new_dependencies << step
+    }
+    new_dependencies.uniq
   end
 
   def recursive_clean

metadata

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