rbbt-util 5.26.132 → 5.26.133

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 004ef399bbaea720212ff572b75ad76590b6a937a40ddb3412f036445f6aa4db
-  data.tar.gz: 8d1aa9f12402e41e6783c17cf8b78e9386cc76a01cf65ea9a39efb16330b250c
+  metadata.gz: 305b2b990497eb41e92a4abc1aa9beabd40d36c2a048b60a8d41123416e3c80b
+  data.tar.gz: 1d1a4d961e7490060a71511b3f118c19c4bfe8b3148ee9138115c88f7df40e57
 SHA512:
-  metadata.gz: bfd45ce5a2fb29aa0c7fa0103a5c51eb8b4cb19f8c75c402af16511a9228ee53561a410042fa6d52cf7f823cb7e2c3462eb9982cce5dbef291c552e54b1176d9
-  data.tar.gz: 79d474d7dd445d53033c61556780ff08cd8609aef2da4de7f7f77bd3b29da9a98122241d173d02a85cf07eb9576783a551ac5b8b463dd75c10bc759d25034450
+  metadata.gz: f31ec3f71b32e894e4a2755011184fa2a036b3dff1720725f6848b5e90cd62434ae4df4a617bc9ca95cbf56799564a6ca6bacc78923ac6e84185b853569fc89c
+  data.tar.gz: 7fd22893c76e6f75e0903e8122b1e3462d534d61ddeb2a4352e7887febc55f6769116b0428349568e033e7c91f738ed4ac434555a2926074f086c5b46de79b78

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

@@ -112,17 +112,19 @@ class Step
   end
 
   def updatable?
-    (ENV["RBBT_UPDATE_ALL_JOBS"] == 'true' || Open.exists?(info_file)) && ! (relocated? && done?)
+    (ENV["RBBT_UPDATE_ALL_JOBS"] == 'true' || ( ENV["RBBT_UPDATE"] == "true" && Open.exists?(info_file)) && status != :noinfo && ! (relocated? && done?))
   end
 
   def dependency_checks
+    return [] if ENV["RBBT_UPDATE"] != "true"
+
     rec_dependencies.
-      select{|dependency| ! (defined? WorkflowRemoteClient and WorkflowRemoteClient::RemoteStep === dependency) }.
-      collect{|dependency| Workflow.relocate_dependency self, dependency}.
-      select{|dependency| Open.exists?(dependency.path) || ((Open.exists?(dependency.info_file) && (dependency.status == :cleaned) || dependency.status == :waiting)) }.
-      select{|dependency| ! Open.remote?(dependency.path) }.
+      reject{|dependency| (defined?(WorkflowRemoteClient) && WorkflowRemoteClient::RemoteStep === dependency) || Open.remote?(dependency.path) }.
+      reject{|dependency| dependency.error? }.
+      #select{|dependency| Open.exists?(dependency.path) || ((Open.exists?(dependency.info_file) && (dependency.status == :cleaned) || dependency.status == :waiting)) }.
+      #select{|dependency| Open.exists?(dependency.path) || ((Open.exists?(dependency.info_file) && (dependency.status == :cleaned) || dependency.status == :waiting)) }.
       select{|dependency| dependency.updatable? }.
-      select{|dependency| ! dependency.error? }
+      collect{|dependency| Workflow.relocate_dependency(self, dependency)}
   end
 
   def input_checks

data/lib/rbbt/workflow/util/archive.rb

@@ -204,18 +204,17 @@ puts resource[path].find(search_path)
 
       files_and_dirs = Set.new( files )
       files.each do |file|
-        parts = file.split("/")[0..-2]
+        parts = file.split("/")[0..-2].reject{|p| p.empty?}
         while parts.any?
           files_and_dirs << parts * "/"
           parts.pop
         end
       end
 
-      TmpFile.with_file(files_and_dirs.to_a * "\n") do |tmp_include_file|
+      TmpFile.with_file(files_and_dirs.sort_by{|l| l.length}.to_a * "\n", false) do |tmp_include_file|
         test_str = options[:test] ? '-nv' : ''
 
-        includes_str = "--include-from='#{tmp_include_file}'"
-        cmd = "rsync -avztAXHP --progress #{test_str} --include-from='#{tmp_include_file}' --exclude='*' #{source}/ #{target}/ #{other_rsync_args}"
+        cmd = "rsync -avztAXHP --progress #{test_str} --files-from='#{tmp_include_file}' #{source}/ #{target}/ #{other_rsync_args}"
 
         cmd << " && rm -Rf #{source}" if options[:delete]
 

data/share/rbbt_commands/workflow/task

@@ -236,6 +236,7 @@ end
 
 if options[:update_all_jobs]
   ENV["RBBT_UPDATE_ALL_JOBS"] = 'true'
+  ENV["RBBT_UPDATE"] = 'true'
 end
 
 if options[:workflows]

metadata

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