rbbt-util 5.26.131 → 5.26.132

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 13467fdef9b1dc72001f8373f88b4996364878049869f3f4e73661d5e2709194
-  data.tar.gz: df31108776baec2b1633899fa72bc31fa646eccbd36ba0d4ee5bab05190aea1d
+  metadata.gz: 004ef399bbaea720212ff572b75ad76590b6a937a40ddb3412f036445f6aa4db
+  data.tar.gz: 8d1aa9f12402e41e6783c17cf8b78e9386cc76a01cf65ea9a39efb16330b250c
 SHA512:
-  metadata.gz: 06ee4e1a38408e11312db1bbf3995e43041270002c1d2dde278a3d8fd75f9da08f5a8b3e66026a7d7b2f7b07f0684188696f2159c8f18d26d2aa0d2629c4b60c
-  data.tar.gz: 041b9f61405a84cf5845aaec01350fcd4bca79200b373051254ce8c7d488df91a1e9f747cee15d15401660b4a1aa3e7acc5849f22af10a11c22664987c97c144
+  metadata.gz: bfd45ce5a2fb29aa0c7fa0103a5c51eb8b4cb19f8c75c402af16511a9228ee53561a410042fa6d52cf7f823cb7e2c3462eb9982cce5dbef291c552e54b1176d9
+  data.tar.gz: 79d474d7dd445d53033c61556780ff08cd8609aef2da4de7f7f77bd3b29da9a98122241d173d02a85cf07eb9576783a551ac5b8b463dd75c10bc759d25034450

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

@@ -66,7 +66,6 @@ class Step
       job_files << step.path
       job_files << step.info_file if File.exists?(step.info_file)
       job_file_dir_content = Dir.glob(step.files_dir + '/**/*')
-      iii job_file_dir_content
       job_files += job_file_dir_content
       rec_dependencies = Set.new
 
@@ -157,12 +156,11 @@ puts files * "\n"
                 path = Path.setup(path)
               end
               files = path.glob_all
-              if options[:recursive]
-                files = Step.job_files_for_archive(files)
-              end
+              files = Step.job_files_for_archive(files, recursive)
               files
             end
 
+
     target = if options[:target] 
                target = SSHDriver.run(options[:target], <<-EOF).split("\n").first
 require 'rbbt-util'
@@ -176,10 +174,16 @@ puts resource[path].find(search_path)
              end
 
     subpath_files = {}
-    paths.each do |source|
-      parts = source.split("/")
+    paths.sort.each do |path|
+      parts = path.split("/")
       subpath = parts[0..-4] * "/"
-      source = parts[-3..-1] * "/"
+
+      if subpath_files.keys.any? && subpath.start_with?(subpath_files.keys.last)
+        subpath = subpath_files.keys.last
+      end
+
+      source = path[subpath.length..-1]
+
       subpath_files[subpath] ||= []
       subpath_files[subpath] << source
     end
@@ -198,7 +202,7 @@ puts resource[path].find(search_path)
       end
       target = [options[:target], target] * ":" if options[:target]
 
-      files_and_dirs = Set.new(files )
+      files_and_dirs = Set.new( files )
       files.each do |file|
         parts = file.split("/")[0..-2]
         while parts.any?

metadata

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