rbbt-util 5.21.102 → 5.21.103

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 552cc55adf8fe2641d93a6c2dd9c7c8894e53a64
-  data.tar.gz: f762f96ae17cf69f718c5eb15da13683fda1f99d
+  metadata.gz: 14ea1d12f7ac8fe08dc04a5e46bcf7ab10d0a669
+  data.tar.gz: f11141d1270747aafef6293a845e8e62347ed716
 SHA512:
-  metadata.gz: 53039d9cb4b69653def0d272fe3e8a6d45b058fc7123e1f79c58279d5b217e2de454c49cacee8353b8d262a603507012b7f8b4fc75e716c805df1a14155dfdf6
-  data.tar.gz: 38473fb2bd31541c0c745886c710bc484ce9b2ccd38f92af5bb1b8a85ea78a190401e046df9bf8c7f0cd6526de06aa1683dc1d2f2e9a2e82e5de4d5bd4ca76e6
+  metadata.gz: 7ac4fc17f5c9c56e4b7150247da0ea5cc8ff72417efec635c199548e52ff6230785401f8b712717ec504585f366258e005c6507810c194aa3ced1fba7bbaee28
+  data.tar.gz: 9f7937bf5f62c23c73ede5dc1326fc1ff1a34e98dc9032ed3d600907c3f4e20064e17cef3c6c53eb39a7e0a725e18c10f2ee71836d46519c70cbb859658f1314

data/lib/rbbt/workflow/accessor.rb

@@ -808,7 +808,8 @@ module Workflow
                      _inputs = IndiferentHash.setup(_inputs.dup)
                      dep = dependency.call jobname, _inputs, real_dependencies
                      if Hash === dep
-                       inputs = assign_dep_inputs({}, dep[:inputs], real_dependencies, dep[:workflow].task_info(dep[:task]))
+                       task_info = (dep[:task] && dep[:workflow]) ? dep[:workflow].task_info(dep[:task]) : nil
+                       inputs = assign_dep_inputs({}, dep[:inputs], real_dependencies, task_info)
                        dep = dep[:workflow].job(dep[:task], dep[:jobname], inputs)
                      end
                    end

data/lib/rbbt/workflow/step.rb

@@ -283,11 +283,11 @@ class Step
 
   def clean
     status = []
-    status << "dirty" if done? and dirty?
-    status << "not running" if not done? and not running? 
+    status << "dirty" if done? && dirty?
+    status << "not running" if ! done? && ! running? 
     status.unshift " " if status.any?
     Log.medium "Cleaning step: #{path}#{status * " "}"
-    abort if not done? and running?
+    abort if ! done? && running?
     Step.clean(path)
     self
   end

data/share/Rlib/plot.R

@@ -1,4 +1,4 @@
-library(ggplot2)
+rbbt.require('ggplot2')
 
 geom_entity <- function (real.geom = NULL, mapping = NULL, data = NULL, stat = "identity",
                           position = "identity", ...) {

data/share/Rlib/util.R

@@ -615,7 +615,7 @@ rbbt.plot.matrix <- function(x, ...){
 
 # Adapted from: https://rstudio-pubs-static.s3.amazonaws.com/13301_6641d73cfac741a59c0a851feb99e98b.html
 rbbt.plot.venn <- function(data, a, ...) {
-    library(VennDiagram)
+    rbbt.require(VennDiagram)
     group.matches <- function(data, fields) {
         sub = data
         for (i in 1:length(fields)) {

data/share/rbbt_commands/workflow/example

@@ -12,7 +12,7 @@ options = SOPT.setup <<EOF
 
 Description
 
-$ rbbt workflow exmaple <workflow> [<task>] [<name>] -- [<task_options>]
+$ rbbt workflow example <workflow> [<task>] [<name>] -- [<task_options>]
 
 Run workflow examples. You can define tasks and example names. You can also override task options
 

data/share/rbbt_commands/workflow/info

@@ -113,6 +113,17 @@ if messages and messages.any?
   end 
 end
 
+if status != :done && step.file('progress').exists?
+  progress = step.file('progress').yaml
+  str = Log.color(:magenta, "Progress") << ": " 
+  if progress[:last_percent]
+    str << progress[:last_percent].to_s << "%"
+  else
+    str << progress[:ticks].to_s << " items"
+  end
+  puts str
+end
+
 if status == :error
   puts Log.color(:magenta, "Backtrace") << ": "
   puts Log.color_stack backtrace
@@ -155,4 +166,5 @@ if recursive
       end
     end
   end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-util
 version: !ruby/object:Gem::Version
-  version: 5.21.102
+  version: 5.21.103
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-30 00:00:00.000000000 Z
+date: 2017-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake