rbbt-util 5.23.29 → 5.23.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d79b37d85261eb8752a28f32688774224fc9d99f
-  data.tar.gz: 3d3b98478b25ef4185166e437bcf40deedffcd66
+  metadata.gz: 46009fb0f9f3cf772708eab0fa79e5c6c92e4119
+  data.tar.gz: 2317148b52eecea200d1f7579d0094dbfbd553e0
 SHA512:
-  metadata.gz: d82e5d8c6f47d92b887d757e8f6f317fb4fd5284f756027de4a70ecaf785d4577e8f13b854d549969d122069adccc7e5b7e7e497ba9af5e6adf1d51ce9903694
-  data.tar.gz: c6e7f5d41afd0fb98004bdcc01a8b1d5a4576d5f68b42e753d0be302e63b7baa97fc8cea4e252300bf6176841f2793e533130c398365b58bc637a30c60b17ca5
+  metadata.gz: 13ac3808249e0c62124bc0755afe12011a55c1b5f381b9bb6ecacf0861208a5042f8cb9364358a51804b1860cb4dfcbb43938e14231f834813eb7eab4dbc03b2
+  data.tar.gz: c99ea47d4bd81b6c52f1e18d08eccc909e05018dcaa2539362e98277960ed4cb42b7f40b63c71a3d72f096bdc0527f3cd9241af4313d13cf18a7fa026464cce5

data/lib/rbbt/monitor.rb

@@ -147,7 +147,7 @@ module Rbbt
           next if tasks and not tasks.include? task
 
           #cmd = "find -L '#{ taskdir }/'  -not \\( -path \"#{taskdir}/*.files/*\" -prune \\) -not -name '*.pid' -not -name '*.notify' -not -name '\\.*' 2>/dev/null"
-          cmd = "find -L '#{ taskdir }/' -not \\( -path \"#{taskdir}/*.files/*\" -prune \\) -not -name '*.pid' -not -name '*.notify' -not -name '\\.*' \\( -not -type d -o -name '*.files' \\)  2>/dev/null"
+          cmd = "find -L '#{ taskdir }/' -not \\( -path \"#{taskdir}/.info/*\" -prune \\) -not \\( -path \"#{taskdir}/*.files/*\" -prune \\) -not -name '*.pid' -not -name '*.notify' -not -name '\\.*' \\( -not -type d -o -name '*.files' \\)  2>/dev/null"
 
           files = CMD.cmd(cmd, :pipe => true)
           TSV.traverse files, :type => :array, :into => jobs, :_bar => "Finding jobs in #{ taskdir }" do |file|

data/lib/rbbt/resource/path.rb

@@ -129,7 +129,7 @@ module Path
     @path ||= {}
     rsearch_paths = (resource and resource.respond_to?(:search_paths)) ? resource.search_paths : nil 
     key_elems = [where, caller_lib, rsearch_paths, paths]
-    key = Misc.digest(key_elems.inspect)
+    key = Misc.obj2digest(key_elems)
     self.sub!('~/', Etc.getpwuid.dir + '/') if self.include? "~"
 
     return @path[key] if @path[key]

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

@@ -251,6 +251,8 @@ module Misc
     obj = Annotated.purge(obj) if Annotated === obj
 
     str = case obj
+          when nil
+            'nil'
           when TrueClass
             'true'
           when FalseClass

data/lib/rbbt/workflow/accessor.rb

@@ -652,43 +652,45 @@ module Workflow
     name = name.to_sym
     task = tasks[name]
     raise "No '#{name}' task in '#{self.to_s}' Workflow" if task.nil?
-    description = task.description
-    result_description = task.result_description
-    result_type = task.result_type
-    inputs = rec_inputs(name).uniq
-    input_types = rec_input_types(name)
-    input_descriptions = rec_input_descriptions(name)
-    input_use = rec_input_use(name)
-    input_defaults = rec_input_defaults(name)
-    input_options = rec_input_options(name)
-    export = case
-             when (synchronous_exports.include?(name.to_sym) or synchronous_exports.include?(name.to_s))
-               :synchronous
-             when (asynchronous_exports.include?(name.to_sym) or asynchronous_exports.include?(name.to_s))
-               :asynchronous
-             when (exec_exports.include?(name.to_sym) or exec_exports.include?(name.to_s))
-               :exec
-             when (stream_exports.include?(name.to_sym) or stream_exports.include?(name.to_s))
-               :stream
-             else
-               :none
-             end
-
-
-    dependencies = task_dependencies[name].select{|dep| String === dep or Symbol === dep}
-    { :id => File.join(self.to_s, name.to_s),
-      :description => description,
-      :export => export,
-      :inputs => inputs,
-      :input_types => input_types,
-      :input_descriptions => input_descriptions,
-      :input_defaults => input_defaults,
-      :input_options => input_options,
-      :input_use => input_use,
-      :result_type => result_type,
-      :result_description => result_description,
-      :dependencies => dependencies
-    }
+    @@task_info ||= {}
+    @@task_info[name] ||= begin description = task.description
+                           result_description = task.result_description
+                           result_type = task.result_type
+                           inputs = rec_inputs(name).uniq
+                           input_types = rec_input_types(name)
+                           input_descriptions = rec_input_descriptions(name)
+                           input_use = rec_input_use(name)
+                           input_defaults = rec_input_defaults(name)
+                           input_options = rec_input_options(name)
+                           export = case
+                                    when (synchronous_exports.include?(name.to_sym) or synchronous_exports.include?(name.to_s))
+                                      :synchronous
+                                    when (asynchronous_exports.include?(name.to_sym) or asynchronous_exports.include?(name.to_s))
+                                      :asynchronous
+                                    when (exec_exports.include?(name.to_sym) or exec_exports.include?(name.to_s))
+                                      :exec
+                                    when (stream_exports.include?(name.to_sym) or stream_exports.include?(name.to_s))
+                                      :stream
+                                    else
+                                      :none
+                                    end
+
+
+                           dependencies = task_dependencies[name].select{|dep| String === dep or Symbol === dep}
+                           { :id => File.join(self.to_s, name.to_s),
+                             :description => description,
+                             :export => export,
+                             :inputs => inputs,
+                             :input_types => input_types,
+                             :input_descriptions => input_descriptions,
+                             :input_defaults => input_defaults,
+                             :input_options => input_options,
+                             :input_use => input_use,
+                             :result_type => result_type,
+                             :result_description => result_description,
+                             :dependencies => dependencies
+                           }
+                         end
   end
 
   def rec_dependencies(taskname)

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

@@ -300,22 +300,23 @@ class Step
   end
 
   def canfail_paths
-    return Set.new if ! Open.exists?(info_file)
+    return Set.new if done? && ! Open.exists?(info_file)
 
-    if !relocated && info[:canfail_paths] 
-      Set.new(info[:canfail_paths])
+    if !relocated && info[:canfail] 
+      Set.new(info[:canfail])
     else
       canfail_paths = Set.new
       all_deps = dependencies
       all_deps.each do |dep|
         next if canfail_paths.include? dep.path
+        canfail_paths += dep.canfail_paths
         next unless ComputeDependency === dep && dep.canfail?
         canfail_paths << dep.path
         canfail_paths += dep.rec_dependencies.collect{|d| d.path }
       end
       canfail_paths
       begin
-        set_info :canfail_paths, canfail_paths.to_a
+        set_info :canfail, canfail_paths.to_a
       rescue Errno::EROFS
       end
       canfail_paths

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-util
 version: !ruby/object:Gem::Version
-  version: 5.23.29
+  version: 5.23.30
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-20 00:00:00.000000000 Z
+date: 2018-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake