rbbt-util 5.24.2 → 5.24.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4785253a5733137474410b83536a9a079b1fda64
-  data.tar.gz: 44f40786114ad60851366238366bbb5ef09bd577
+  metadata.gz: dc724315cf570c49c12aed817fc7996bb01c2c14
+  data.tar.gz: 9ed853ef0afa511e95ccf195e3b4407274fda1cd
 SHA512:
-  metadata.gz: 6cfd642943afb2e512cdf69c2cd02d4ea91180152e0a09134e0312de688e055d7a90138219b97475836855cf97e311516cf8c6a648f381422253d2559bee4ff6
-  data.tar.gz: 38e50f7448597c9d309918aa81aba0fc05bbb6a1489c3087177bd6bff4b7988ab11bc0e5e6cd4f2cc36079c882dcdf071988e0f0165b96d4080a8a8b4d9a57a3
+  metadata.gz: 36ac51895692f1d69f5d402e6bef9ff57e52118793f9f3b43115c58a28755d073a4f84b0910600b59504acdce29becc6fbccfbed8f19dfabaf4e6f04da44f102
+  data.tar.gz: daa26aa5e764a10dc3a6b770e7f9d61143173fbf4c65d946dc129a3e040d1b038a8e555902edd61560b6b0bee2a5544a141fbb5c3a80e47b7a0ecd91ab44d94e

data/lib/rbbt/util/config.rb

@@ -104,10 +104,9 @@ module Rbbt::Config
       end
     end
 
-    return nil if priorities.empty?
-
-    value = priorities.sort_by{|p,v| p}.first.last.first
-    Log.debug "Value '#{value}' for config key '#{ key }': #{tokens * ", "}"
+    value = priorities.empty? ? nil : priorities.sort_by{|p,v| p}.first.last.first
+    value = false if value == 'false'
+    Log.debug "Value #{value.inspect} for config key '#{ key }': #{tokens * ", "}"
     value
   end
 

data/lib/rbbt/util/open.rb

@@ -353,12 +353,8 @@ module Open
     begin
       CMD.cmd("ln -L '#{ source }' '#{ target }'")
     rescue ProcessFailed
-      if $!.message.include? "Invalid cross-device link"
-        Log.debug "Could not hard link #{source} and #{target}: cross-device link"
-        CMD.cmd("cp -L '#{ source }' '#{ target }'")
-      else
-        raise $!
-      end
+      Log.debug "Could not hard link #{source} and #{target}: #{$!.message.gsub("\n", '. ')}"
+      CMD.cmd("cp -L '#{ source }' '#{ target }'")
     end
   end
 
@@ -752,7 +748,13 @@ module Open
     else
       file = file.find if Path === file
       begin
-        file = Pathname.new(file).realpath.to_s if File.symlink?(file)
+        if File.symlink?(file) || File.stat(file).nlink > 1
+          if File.exists?(file + '.info')
+            file = file + '.info'
+          else
+            file = Pathname.new(file).realpath.to_s 
+          end
+        end
         File.mtime(file)
       rescue
         nil

data/lib/rbbt/workflow/accessor.rb

@@ -81,7 +81,7 @@ class Step
   end
 
   def name
-    path.sub(/.*\/#{Regexp.quote task_name.to_s}\/(.*)/, '\1')
+    @name ||= path.sub(/.*\/#{Regexp.quote task_name.to_s}\/(.*)/, '\1')
   end
 
   def short_path
@@ -943,6 +943,7 @@ module Workflow
 
                    if override_dependencies[workflow.to_s] && value = override_dependencies[workflow.to_s][dep_task]
                      d_ = Step === value ? value : Workflow.load_step(value)
+                     d_.info[:name] = d_.name
                      d_.task_name = dep_task
                      d_.overriden = true
                      d_
@@ -964,6 +965,7 @@ module Workflow
                  when Symbol
                    if override_dependencies[self.to_s] && value = override_dependencies[self.to_s][dependency]
                      d_ = Step === value ? value : Workflow.load_step(value)
+                     d_.info[:name] = d_.name
                      d_.task_name = dependency
                      d_.overriden = true
                      d_
@@ -991,6 +993,7 @@ module Workflow
                          d[:task] ||= task_name
                          if override_dependencies[d[:workflow].to_s] && value = override_dependencies[d[:workflow].to_s][d[:task]]
                            d = (Step === value ? value : Workflow.load_step(value))
+                           d.info[:name] = d.name
                            d.task_name = d[:task]
                            d.overriden = true
                            d
@@ -1012,6 +1015,7 @@ module Workflow
                        dep[:workflow] ||= wf  || self
                        if override_dependencies[dep[:workflow].to_s] && value = override_dependencies[dep[:workflow].to_s][dep[:task]]
                          dep = (Step === value ? value : Workflow.load_step(value))
+                         dep.info[:name] = dep.name
                          dep.task_name = d[:task]
                          dep.overriden = true
                          dep

data/lib/rbbt/workflow/definition.rb

@@ -63,12 +63,20 @@ module Workflow
     end
   end
 
+  FORGET_DEP_TASKS = ENV["RBBT_FORGET_DEP_TASKS"] == "true"
   def dep_task(name, *dependency, &block)
     dep(*dependency, &block)
     task name do
       dep = dependencies.last.join
       set_info :result_type, dep.info[:result_type]
-      Open.link dep.path, self.path
+      forget = config :forget_dep_tasks, :forget_dep_tasks, :default => FORGET_DEP_TASKS
+      if forget
+        Open.ln_h dep.path, self.path
+        self.dependencies = self.dependencies - [dep]
+        self.set_info :dependency, dependencies.collect{|dep| [dep.task_name, dep.name, dep.path]}
+      else
+        Open.link dep.path, self.path
+      end
       nil
     end
   end
@@ -86,7 +94,7 @@ module Workflow
     block = self.method(name) unless block_given?
 
     task_info = {
-      :name => name,
+      :name               => name,
       :inputs             => consume_inputs,
       :description        => consume_description,
       :input_types        => consume_input_types,

metadata

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