rbbt-util 5.26.131 → 5.26.132

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 13467fdef9b1dc72001f8373f88b4996364878049869f3f4e73661d5e2709194
4
- data.tar.gz: df31108776baec2b1633899fa72bc31fa646eccbd36ba0d4ee5bab05190aea1d
3
+ metadata.gz: 004ef399bbaea720212ff572b75ad76590b6a937a40ddb3412f036445f6aa4db
4
+ data.tar.gz: 8d1aa9f12402e41e6783c17cf8b78e9386cc76a01cf65ea9a39efb16330b250c
5
5
  SHA512:
6
- metadata.gz: 06ee4e1a38408e11312db1bbf3995e43041270002c1d2dde278a3d8fd75f9da08f5a8b3e66026a7d7b2f7b07f0684188696f2159c8f18d26d2aa0d2629c4b60c
7
- data.tar.gz: 041b9f61405a84cf5845aaec01350fcd4bca79200b373051254ce8c7d488df91a1e9f747cee15d15401660b4a1aa3e7acc5849f22af10a11c22664987c97c144
6
+ metadata.gz: bfd45ce5a2fb29aa0c7fa0103a5c51eb8b4cb19f8c75c402af16511a9228ee53561a410042fa6d52cf7f823cb7e2c3462eb9982cce5dbef291c552e54b1176d9
7
+ data.tar.gz: 79d474d7dd445d53033c61556780ff08cd8609aef2da4de7f7f77bd3b29da9a98122241d173d02a85cf07eb9576783a551ac5b8b463dd75c10bc759d25034450
@@ -66,7 +66,6 @@ class Step
66
66
  job_files << step.path
67
67
  job_files << step.info_file if File.exists?(step.info_file)
68
68
  job_file_dir_content = Dir.glob(step.files_dir + '/**/*')
69
- iii job_file_dir_content
70
69
  job_files += job_file_dir_content
71
70
  rec_dependencies = Set.new
72
71
 
@@ -157,12 +156,11 @@ puts files * "\n"
157
156
  path = Path.setup(path)
158
157
  end
159
158
  files = path.glob_all
160
- if options[:recursive]
161
- files = Step.job_files_for_archive(files)
162
- end
159
+ files = Step.job_files_for_archive(files, recursive)
163
160
  files
164
161
  end
165
162
 
163
+
166
164
  target = if options[:target]
167
165
  target = SSHDriver.run(options[:target], <<-EOF).split("\n").first
168
166
  require 'rbbt-util'
@@ -176,10 +174,16 @@ puts resource[path].find(search_path)
176
174
  end
177
175
 
178
176
  subpath_files = {}
179
- paths.each do |source|
180
- parts = source.split("/")
177
+ paths.sort.each do |path|
178
+ parts = path.split("/")
181
179
  subpath = parts[0..-4] * "/"
182
- source = parts[-3..-1] * "/"
180
+
181
+ if subpath_files.keys.any? && subpath.start_with?(subpath_files.keys.last)
182
+ subpath = subpath_files.keys.last
183
+ end
184
+
185
+ source = path[subpath.length..-1]
186
+
183
187
  subpath_files[subpath] ||= []
184
188
  subpath_files[subpath] << source
185
189
  end
@@ -198,7 +202,7 @@ puts resource[path].find(search_path)
198
202
  end
199
203
  target = [options[:target], target] * ":" if options[:target]
200
204
 
201
- files_and_dirs = Set.new(files )
205
+ files_and_dirs = Set.new( files )
202
206
  files.each do |file|
203
207
  parts = file.split("/")[0..-2]
204
208
  while parts.any?
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: rbbt-util
3
3
  version: !ruby/object:Gem::Version
4
- version: 5.26.131
4
+ version: 5.26.132
5
5
  platform: ruby
6
6
  authors:
7
7
  - Miguel Vazquez
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2020-01-31 00:00:00.000000000 Z
11
+ date: 2020-02-05 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rake