rbbt-util 5.26.16 → 5.26.17
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/rbbt/resource/path.rb +2 -2
- data/lib/rbbt/util/docker.rb +14 -14
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 7cd4fb8b55aecafae6989ecaf79447dadbf5266f6adff7a7aac180f60486c12f
|
4
|
+
data.tar.gz: 74c2f293e4b913c78df2a7497bb7e99b750964a0c065b0f72cead6b544e5be99
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 03dde3dd4ed5c7bf62d505e789928f6e259cbe1027ae3c3755d35626ff0d999b0a604599bcf2b0889622e608aec2bbe45f8bf2164a9aaf97924dd95da01a839c
|
7
|
+
data.tar.gz: f5ca51a17ab7f29f8f77e8de3a7b365199e07550b6408ca76949ccfc27b93a0a6618b8f5c24fdcbea7f1b4bb4a5ec587e9d686801fdafa534b1d065ba8b89263
|
data/lib/rbbt/resource/path.rb
CHANGED
@@ -378,9 +378,9 @@ module Path
|
|
378
378
|
|
379
379
|
def replace_extension(new_extension = nil, multiple = false)
|
380
380
|
if multiple
|
381
|
-
new_path = self.sub(/(\.[^\.\/]{2,
|
381
|
+
new_path = self.sub(/(\.[^\.\/]{2,5})+$/,'')
|
382
382
|
else
|
383
|
-
new_path = self.sub(/\.[^\.\/]{2,
|
383
|
+
new_path = self.sub(/\.[^\.\/]{2,5}$/,'')
|
384
384
|
end
|
385
385
|
new_path = new_path + "." + new_extension.to_s
|
386
386
|
self.annotate(new_path)
|
data/lib/rbbt/util/docker.rb
CHANGED
@@ -1,5 +1,5 @@
|
|
1
1
|
module Docker
|
2
|
-
def self.run(image, cmd, options)
|
2
|
+
def self.run(image, cmd, options = {})
|
3
3
|
mounts, job_inputs, directory, pipe = Misc.process_options options, :mounts, :job_inputs, :directory, :pipe
|
4
4
|
|
5
5
|
if mounts
|
@@ -18,7 +18,7 @@ module Docker
|
|
18
18
|
job_inputs.each do |name,obj|
|
19
19
|
case obj
|
20
20
|
when File
|
21
|
-
|
21
|
+
Open.ln_h Open.realpath(obj.filename), directory[name]
|
22
22
|
when IO
|
23
23
|
begin
|
24
24
|
Open.write(directory[name], obj)
|
@@ -27,21 +27,27 @@ module Docker
|
|
27
27
|
end
|
28
28
|
when String
|
29
29
|
if obj.length < 256 and File.exist?(obj)
|
30
|
-
|
30
|
+
Open.ln_h Open.realpath(obj), directory[name]
|
31
31
|
else
|
32
32
|
Open.write(directory[name], obj)
|
33
33
|
end
|
34
34
|
end
|
35
35
|
end if job_inputs
|
36
|
+
cmd = "docker run #{mount_cmd} #{image_cmd} #{cmd}"
|
37
|
+
if pipe
|
38
|
+
CMD.cmd(cmd, :log => true, :pipe => true)
|
39
|
+
else
|
40
|
+
CMD.cmd_log(cmd, :log => true)
|
41
|
+
end
|
36
42
|
else
|
37
43
|
TmpFile.with_file do |tmpfile|
|
38
44
|
Path.setup(tmpfile)
|
39
|
-
|
45
|
+
Open.mkdir tmpfile
|
40
46
|
mount_cmd += " -v '#{tmpfile}':/job"
|
41
47
|
job_inputs.each do |name,obj|
|
42
48
|
case obj
|
43
49
|
when File
|
44
|
-
|
50
|
+
Open.ln_h Open.realpath(obj.filename), tmpfile[name]
|
45
51
|
when IO
|
46
52
|
begin
|
47
53
|
Open.write(tmpfile[name], obj)
|
@@ -50,21 +56,15 @@ module Docker
|
|
50
56
|
end
|
51
57
|
when String
|
52
58
|
if obj.length < 256 and File.exist?(obj)
|
53
|
-
|
59
|
+
Open.ln_h Open.realpath(obj), tmpfile[name]
|
54
60
|
else
|
55
61
|
Open.write(tmpfile[name], obj)
|
56
62
|
end
|
57
63
|
end
|
58
64
|
end if job_inputs
|
59
|
-
|
65
|
+
cmd = "docker run #{mount_cmd} #{image_cmd} #{cmd}"
|
66
|
+
CMD.cmd_log(cmd, :log => true)
|
60
67
|
end
|
61
|
-
|
62
|
-
end
|
63
|
-
cmd = "docker run #{mount_cmd} #{image_cmd} #{cmd}"
|
64
|
-
if pipe
|
65
|
-
CMD.cmd(cmd, :log => true, :pipe => true)
|
66
|
-
else
|
67
|
-
CMD.cmd_log(cmd, :log => true)
|
68
68
|
end
|
69
69
|
end
|
70
70
|
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.17
|
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-06-
|
11
|
+
date: 2019-06-06 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rake
|