rbbt-util 5.17.41 → 5.17.42

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ed9dd3f321ca95c42e5a49fc9c3eeb598ad61d6
-  data.tar.gz: 08d83cb895399a8a883f0f3b1381865140e914d4
+  metadata.gz: 9f0745b484e891381f6695758305c67ca5613107
+  data.tar.gz: c423abd687f02d9bd62842e122acc2717ca54952
 SHA512:
-  metadata.gz: 9efc01d608b2fd778045967ed52877f22a766e223bc813673e52a0ed7c2774c70a564d89434482de78abd0d3a1b71acec46bac799174653d5b0dc54d644cfe1a
-  data.tar.gz: d076a19ad91b79d21b22209f3f3059041b9c06325dfbdccbb2ebcf2ec87db873d9cbc9c2d283fe25fb10439eca0b258eaa112fe6fb3493d24ee2a0581fc73606
+  metadata.gz: 14913302cb087a67d728f8bddcdcfe287795c03ff369ef0a746dab82810160fad0826c290c9ac47722027e91a3fc180ad020ae11e9cb4992ea374d780247a3eb
+  data.tar.gz: 5cb69dd9cf4401b1c87f6f18972aef61d5a287a3b1e12b3943f5024182c25e2e64ec64ce066ba7bbd3f93f73f500d56e740195d9eda74195b454e3e163155bb2

data/lib/rbbt/tsv/parser.rb

@@ -541,7 +541,7 @@ module TSV
           desc = monitor[:desc] if monitor.include? :desc 
           step = monitor[:step] if monitor.include? :step 
         end
-        progress_monitor = Log::ProgressBar.new_bar(size, :desc => desc)
+        progress_monitor = Log::ProgressBar.new_bar(size, :desc => desc, :bytes => true)
       elsif progress_monitor 
 
         size = case
@@ -551,6 +551,7 @@ module TSV
                  stream.stat.size
                end
 
+        progress_monitor.bytes = true
         progress_monitor.max =  size unless size.to_i == 0
       end
 

data/lib/rbbt/util/log/progress.rb

@@ -4,10 +4,10 @@ require 'rbbt/util/log/progress/report'
 module Log
   class ProgressBar
 
-    attr_accessor :max, :ticks, :frequency, :depth, :desc, :file
+    attr_accessor :max, :ticks, :frequency, :depth, :desc, :file, :bytes
     def initialize(max = nil, options = {})
       options = Misc.add_defaults options, :depth => 0, :num_reports => 100, :desc => "Progress", :io => STDERR, :severity => Log.severity
-      depth, num_reports, desc, io, severity, file = Misc.process_options options, :depth, :num_reports, :desc, :io, :severity, :file
+      depth, num_reports, desc, io, severity, file, bytes = Misc.process_options options, :depth, :num_reports, :desc, :io, :severity, :file, :bytes
 
       @max = max
       @ticks = 0

data/lib/rbbt/util/log/progress/report.rb

@@ -31,7 +31,7 @@ module Log
     def thr_msg
       thr = self.thr
       if @history.nil?
-        @history ||= []
+        @history ||= [thr]
       else
         @history << thr
         @history.shift if @history.length > 20
@@ -73,7 +73,8 @@ module Log
       used = Misc.format_seconds(used) 
       eta = [eta/3600, eta/60 % 60, eta % 60].map{|t| "%02i" % t }.join(':')
 
-      indicator << " #{Log.color :yellow, used} used #{Log.color :yellow, eta} left - #{Log.color :yellow, ticks.to_s} of #{Log.color :yellow, @max.to_s}"
+      #indicator << " #{Log.color :yellow, used} used #{Log.color :yellow, eta} left - #{Log.color :yellow, ticks.to_s} of #{Log.color :yellow, @max.to_s} #{bytes ? 'bytes' : 'items'}"
+      indicator << " #{Log.color :yellow, eta} => #{Log.color :yellow, used} - #{Log.color :yellow, ticks.to_s} of #{Log.color :yellow, @max.to_s} #{bytes ? 'bytes' : 'items'}"
 
       indicator
     end
@@ -82,7 +83,7 @@ module Log
       str = Log.color :magenta, desc
       if @ticks == 0
         if @max
-          return str << " " << Log.color(:yellow, "waiting on #{@max} - #{Process.pid}") 
+          return str << " " << Log.color(:yellow, "waiting on #{@max} #{bytes ? 'bytes' : 'items'} - #{Process.pid}") 
         else
           return str << " " << Log.color(:yellow, "waiting - #{Process.pid}") 
         end
@@ -91,7 +92,7 @@ module Log
       if max
         str << Log.color(:blue, " -- ") << eta_msg
       else
-        str << Log.color(:blue, " -- ") << ticks.to_s
+        str << Log.color(:blue, " -- ") << ticks.to_s << " #{bytes ? 'bytes' : 'items'}"
       end
       str
     end
@@ -116,6 +117,7 @@ module Log
       else
         bars = BARS
       end
+
       print(io, up_lines(bars.length) << Log.color(:yellow, "...Progress\n") << down_lines(bars.length)) 
       print(io, up_lines(@depth) << report_msg << down_lines(@depth)) 
       @last_time = Time.now

data/lib/rbbt/util/log/progress/util.rb

@@ -8,7 +8,7 @@ module Log
     def self.new_bar(max, options = {})
       cleanup_bars
       BAR_MUTEX.synchronize do
-        Log::LAST.replace "new_bar" if Log::LAST == "progress"
+        #Log::LAST.replace "new_bar" if Log::LAST == "progress"
         options = Misc.add_defaults options, :depth => BARS.length
         BARS << (bar = ProgressBar.new(max, options))
         bar

data/lib/rbbt/workflow/accessor.rb

@@ -239,7 +239,7 @@ class Step
 
   def progress_bar(msg, options = {})
     max = options[:max]
-    Log::ProgressBar.new max, {:desc => msg, :file => file(:progress)}.merge(options)
+    Log::ProgressBar.new_bar(max, {:desc => msg, :file => file(:progress)}.merge(options))
   end
 
   def self.log(status, message, path, &block)

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

@@ -279,9 +279,16 @@ class Step
     end
   end
 
-  def produce
+  def produce(force=true)
     return self if done? and not dirty?
-    clean if dirty?
+    if error? or aborted?
+      if force
+        clean
+      else
+        raise "Error in job: #{status}"
+      end
+    end
+    clean if dirty? 
     run(true) unless started?
     join unless done?
     self

data/test/rbbt/util/log/test_progress.rb

@@ -53,5 +53,22 @@ class TestProgress < Test::Unit::TestCase
     t1.join
     t2.join
   end
+
+  def test_bar_nested
+    Log::ProgressBar.with_bar(20, :desc => "Bar 1") do |bar|
+      bar.init
+      20.times do
+        Log::ProgressBar.with_bar(5, :desc => "Bar 2") do |bar|
+          5.times do
+            bar.tick
+            sleep 0.2
+          end
+        end
+        bar.tick
+        sleep 0.2
+      end
+    end
+
+  end
 end
 

metadata

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