rbbt-util 5.26.3 → 5.26.4
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 +4 -4
- data/lib/rbbt/resource.rb +3 -1
- data/lib/rbbt/tsv/stream.rb +2 -2
- data/lib/rbbt/util/log.rb +9 -9
- data/lib/rbbt/workflow/prepare.rb +3 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 9e4dda2ba8718e44af7064ac562b5535cb4271bf
|
4
|
+
data.tar.gz: 87e7d84660913247bae2b99da8728c9b22edba12
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: e7439eb5f1aab09428f79bca41ce43545e18c52ff5361ef43d35ae3394d6cc4655d3761dc6223c4e03617236927f2588a8e5e02d661a30959cbdc6e8fb88027f
|
7
|
+
data.tar.gz: 31c6f48ab66ac09fd20c6ba164623f2a33cab3ee7a0b968ec3fc26f9349706bbbd3824945b8021eebd4a60d02d216b6a3c8d11e8f9c450e9b8f56d0a49c3b347
|
data/lib/rbbt/resource.rb
CHANGED
@@ -64,9 +64,11 @@ module Resource
|
|
64
64
|
|
65
65
|
if type == :install
|
66
66
|
Log.debug "Preparing software: #{path}"
|
67
|
+
$set_software_env = false unless path.exists?
|
67
68
|
path.produce
|
68
69
|
software_dir = path.resource.root.software
|
69
|
-
set_software_env(software_dir)
|
70
|
+
set_software_env(software_dir) unless $set_software_env
|
71
|
+
$set_software_env = true
|
70
72
|
end
|
71
73
|
end
|
72
74
|
end
|
data/lib/rbbt/tsv/stream.rb
CHANGED
@@ -56,7 +56,7 @@ module TSV
|
|
56
56
|
preambles = []
|
57
57
|
|
58
58
|
streams = streams.collect do |stream|
|
59
|
-
parser = TSV::Parser.new stream, options
|
59
|
+
parser = TSV::Parser.new stream, options.dup
|
60
60
|
|
61
61
|
lines << parser.first_line
|
62
62
|
empty << stream if parser.first_line.nil?
|
@@ -178,7 +178,7 @@ module TSV
|
|
178
178
|
if values.nil?
|
179
179
|
values = _p.collect{|v| [v]}
|
180
180
|
else
|
181
|
-
_p.each_with_index{|v,i| values[i] << v}
|
181
|
+
_p.each_with_index{|v,i| values[i] ||= []; values[i] << v}
|
182
182
|
end
|
183
183
|
end
|
184
184
|
|
data/lib/rbbt/util/log.rb
CHANGED
@@ -353,39 +353,39 @@ def mmm(obj, file = $stdout)
|
|
353
353
|
Log.log_obj_inspect(obj, :medium, file)
|
354
354
|
end
|
355
355
|
|
356
|
-
def iii(obj, file = $stdout)
|
356
|
+
def iii(obj=nil, file = $stdout)
|
357
357
|
Log.log_obj_inspect(obj, :info, file)
|
358
358
|
end
|
359
359
|
|
360
|
-
def wwww(obj, file = $stdout)
|
360
|
+
def wwww(obj=nil, file = $stdout)
|
361
361
|
Log.log_obj_inspect(obj, :warn, file)
|
362
362
|
end
|
363
363
|
|
364
|
-
def eee(obj, file = $stdout)
|
364
|
+
def eee(obj=nil, file = $stdout)
|
365
365
|
Log.log_obj_inspect(obj, :error, file)
|
366
366
|
end
|
367
367
|
|
368
|
-
def ddf(obj, file = $stdout)
|
368
|
+
def ddf(obj=nil, file = $stdout)
|
369
369
|
Log.log_obj_fingerprint(obj, :debug, file)
|
370
370
|
end
|
371
371
|
|
372
|
-
def llf(obj, file = $stdout)
|
372
|
+
def llf(obj=nil, file = $stdout)
|
373
373
|
Log.log_obj_fingerprint(obj, :low, file)
|
374
374
|
end
|
375
375
|
|
376
|
-
def mmf(obj, file = $stdout)
|
376
|
+
def mmf(obj=nil, file = $stdout)
|
377
377
|
Log.log_obj_fingerprint(obj, :medium, file)
|
378
378
|
end
|
379
379
|
|
380
|
-
def iif(obj, file = $stdout)
|
380
|
+
def iif(obj=nil, file = $stdout)
|
381
381
|
Log.log_obj_fingerprint(obj, :info, file)
|
382
382
|
end
|
383
383
|
|
384
|
-
def wwwf(obj, file = $stdout)
|
384
|
+
def wwwf(obj=nil, file = $stdout)
|
385
385
|
Log.log_obj_fingerprint(obj, :warn, file)
|
386
386
|
end
|
387
387
|
|
388
|
-
def eef(obj, file = $stdout)
|
388
|
+
def eef(obj=nil, file = $stdout)
|
389
389
|
Log.log_obj_fingerprint(obj, :error, file)
|
390
390
|
end
|
391
391
|
|
@@ -9,15 +9,17 @@ class Step
|
|
9
9
|
jobs.each do |job|
|
10
10
|
job.rec_dependencies.each do |dep|
|
11
11
|
next if dep.done?
|
12
|
+
dep.clean if dep.error? && dep.recoverable_error?
|
12
13
|
deps << dep if tasks.include?(dep.task_name.to_s) or tasks.include?([dep.workflow.to_s, dep.task_name] * "#")
|
13
14
|
end
|
14
15
|
end
|
15
16
|
|
16
17
|
cpus = jobs.length if cpus.to_s == "max"
|
17
18
|
cpus = cpus.to_i if String === cpus
|
18
|
-
TSV.traverse deps.collect{|dep| dep.path}, :type => :array, :cpus => cpus, :bar => "Prepare dependencies #{Misc.fingerprint tasks} for #{Misc.fingerprint
|
19
|
+
TSV.traverse deps.collect{|dep| dep.path}, :type => :array, :cpus => cpus, :bar => "Prepare dependencies #{Misc.fingerprint tasks} for #{Misc.fingerprint jobs}" do |path|
|
19
20
|
dep = deps.select{|dep| dep.path == path}.first
|
20
21
|
dep.produce
|
22
|
+
nil
|
21
23
|
end
|
22
24
|
end
|
23
25
|
end
|
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.
|
4
|
+
version: 5.26.4
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Miguel Vazquez
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2019-04-
|
11
|
+
date: 2019-04-26 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rake
|