rbbt-util 5.23.17 → 5.23.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b741d19f2b817da6421a86a354264aabedae4397
-  data.tar.gz: 5003c159ae149e9a1660acfa939080c3895b08d7
+  metadata.gz: 39526da82633a38054bbce4d640d5006f0e2f3d2
+  data.tar.gz: 2bb4766c1d2aea82fa9cdbccfa4ebc8f6ef49deb
 SHA512:
-  metadata.gz: 7f14b692b30f79dfd99d859c66d2a51313d83f3f1e704bb08a7a89baa0c69aacdadaf331a998c48958f066c73f8eecc050216c23de774c23461070ca3d3c5e9a
-  data.tar.gz: 6755c1770e04c17b779f63d22649230018d0480fad203fe56033a295d75f0989d63c97fffeee0a1c70b031ce27186d5cbaa05c22be1eeff42500cab170813e0c
+  metadata.gz: bc8a05f50a9615be78b3cf65cac028208e02d8a00b0fdca73ddd389258e1e836cc573d25dcf90fb45805a322a204794f137ebb58f270f351c8646c6e2ec014f7
+  data.tar.gz: 1a9a0b9baf29b552cf4d19f0343d1154dccc87ecbe522226f49c6090b6c631ae1680505eedaa483aa117020583562679c3211c5ad5c4b0376ed559e187e5cb03

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

@@ -99,11 +99,11 @@ module Log
       if @history.length > 3
 
         sticks, stime = @history.first
-        ssticks, sstime = @history[3]
+        ssticks, sstime = @history[-3]
         lticks, ltime = @history.last
 
         mean = @mean = (lticks - sticks).to_f / (ltime - stime)
-        short_mean = (ssticks - sticks).to_f / (sstime - stime)
+        short_mean = (lticks - ssticks).to_f / (ltime - sstime)
 
         @mean_max = mean if mean > @mean_max
       end

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

@@ -74,12 +74,16 @@ module Log
     def self.with_bar(max, options = {})
       bar = new_bar(max, options)
       begin
+        error = false
         yield bar
         keep = false
       rescue KeepBar
         keep = true
+      rescue
+        error = true
+        raise $!
       ensure
-        remove_bar(bar) if bar
+        remove_bar(bar, error) if bar
       end
     end
   end

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

@@ -16,6 +16,7 @@ class Aborted < StandardError; end
 
 class TryAgain < StandardError; end
 class SemaphoreInterrupted < TryAgain; end
+class LockInterrupted < TryAgain; end
 
 class RemoteServerError < RbbtException; end
 

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

@@ -26,21 +26,25 @@ module Misc
     FileUtils.mkdir_p File.dirname(File.expand_path(file)) unless File.exist? File.dirname(File.expand_path(file))
 
 
-    case options[:lock]
-    when Lockfile
-      lockfile = options[:lock]
-      lockfile.lock unless lockfile.locked?
-    when FalseClass
-      lockfile = nil
-      unlock = false
-    when Path, String
-      lock_path = options[:lock].find
-      lockfile = Lockfile.new(lock_path, options)
-      lockfile.lock 
-    else
-      lock_path = File.expand_path(file + '.lock')
-      lockfile = Lockfile.new(lock_path, options)
-      lockfile.lock 
+    begin
+      case options[:lock]
+      when Lockfile
+        lockfile = options[:lock]
+        lockfile.lock unless lockfile.locked?
+      when FalseClass
+        lockfile = nil
+        unlock = false
+      when Path, String
+        lock_path = options[:lock].find
+        lockfile = Lockfile.new(lock_path, options)
+        lockfile.lock
+      else
+        lock_path = File.expand_path(file + '.lock')
+        lockfile = Lockfile.new(lock_path, options)
+        lockfile.lock
+      end
+    rescue Aborted, Interrupt
+      raise LockInterrupted
     end
 
     res = nil

data/lib/rbbt/workflow.rb

@@ -308,7 +308,7 @@ module Workflow
     Workflow.resolve_locals(inputs)
 
     task_info = task_info(taskname)
-    task_inputs = task_info[:inputs]
+    task_inputs = task.inputs
     #defaults = IndiferentHash.setup(task_info[:input_defaults]).merge(task.input_defaults)
     defaults = IndiferentHash.setup(task.input_defaults)
 
@@ -338,8 +338,8 @@ module Workflow
     real_inputs = {}
 
     inputs.each do |k,v|
-      default = defaults[k]
       next unless (task_inputs.include?(k.to_sym) or task_inputs.include?(k.to_s))
+      default = defaults[k]
       next if default == v 
       next if (String === default and Symbol === v and v.to_s == default)
       next if (Symbol === default and String === v and v == default.to_s)
@@ -405,7 +405,11 @@ module Workflow
   end
 
   def load_id(id)
-    path = File.join(workdir, id)
+    path = if Path === workdir
+             workdir[id].find
+           else
+             File.join(workdir, id)
+           end
     task = task_for path
     return remote_tasks[task].load_id(id) if remote_tasks and remote_tasks.include? task
     step = Step.new path, tasks[task.to_sym]

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

@@ -391,6 +391,8 @@ class Step
       res
     rescue DependencyError
       exception $!
+    rescue LockInterrupted
+      raise $!
     rescue Aborted, Interrupt
       abort
       stop_dependencies

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-util
 version: !ruby/object:Gem::Version
-  version: 5.23.17
+  version: 5.23.18
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-15 00:00:00.000000000 Z
+date: 2018-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake