rbbt-util 5.26.67 → 5.26.68
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/rest/client/get.rb +19 -3
- data/lib/rbbt/rest/client/run.rb +16 -1
- data/lib/rbbt/util/cmd.rb +7 -3
- data/lib/rbbt/workflow/provenance.rb +1 -1
- 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: 8b8ed0fc568f3cb1688d21b40a222d37b6e301c56c1eb18d6fb46838f880f4b5
|
4
|
+
data.tar.gz: dc964179d48405b167b03490cf1fa57d44e94c2811921473475ec51d762cd901
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 61db65a33fe163ea64638de873211e5ebb63c56e0aa502e9e50cbe2ebdba8aba691b624802cc1b2abe22bafeaae2b50942f392a0e352c2d6eda854d478d6989e
|
7
|
+
data.tar.gz: 83bb4b7b4a7f19f3a815da2d57035a4cd25ec6a2998eccc9a8ce0b9f59bb47baecee28d30b7266178b1842cad3dd86b135ca1e5359e0ad3724f9208e210a55e0
|
data/lib/rbbt/rest/client/get.rb
CHANGED
@@ -34,15 +34,31 @@ class WorkflowRESTClient
|
|
34
34
|
fixed
|
35
35
|
end
|
36
36
|
|
37
|
+
def self.parse_exception(text)
|
38
|
+
klass, message = text.split " => "
|
39
|
+
begin
|
40
|
+
klass = Kernel.const_get klass
|
41
|
+
return klass.new message
|
42
|
+
rescue
|
43
|
+
message
|
44
|
+
end
|
45
|
+
end
|
46
|
+
|
37
47
|
def self.capture_exception
|
38
48
|
begin
|
39
49
|
yield
|
40
50
|
rescue Exception => e
|
41
51
|
raise e unless e.respond_to? :response
|
42
52
|
begin
|
43
|
-
|
44
|
-
|
45
|
-
|
53
|
+
ne = parse_exception e.response.to_s
|
54
|
+
case ne
|
55
|
+
when String
|
56
|
+
raise e.class, ne
|
57
|
+
when Exception
|
58
|
+
raise ne
|
59
|
+
else
|
60
|
+
raise
|
61
|
+
end
|
46
62
|
rescue
|
47
63
|
raise e
|
48
64
|
end
|
data/lib/rbbt/rest/client/run.rb
CHANGED
@@ -58,7 +58,22 @@ class WorkflowRESTClient::RemoteStep
|
|
58
58
|
end
|
59
59
|
sin.close
|
60
60
|
else
|
61
|
-
|
61
|
+
err = StringIO.new
|
62
|
+
rok.read_body do |c,_a, _b|
|
63
|
+
err.write c
|
64
|
+
end
|
65
|
+
err.rewind
|
66
|
+
reader = Zlib::GzipReader.new(err)
|
67
|
+
text = reader.read
|
68
|
+
ne = WorkflowRESTClient.parse_exception text
|
69
|
+
case ne
|
70
|
+
when String
|
71
|
+
parent.raise e.class, ne
|
72
|
+
when Exception
|
73
|
+
parent.raise ne
|
74
|
+
else
|
75
|
+
parent.raise "Error in RestClient: " << rok.message
|
76
|
+
end
|
62
77
|
end
|
63
78
|
end
|
64
79
|
|
data/lib/rbbt/util/cmd.rb
CHANGED
@@ -144,6 +144,10 @@ module CMD
|
|
144
144
|
all_args = *args
|
145
145
|
|
146
146
|
all_args << {} unless Hash === all_args.last
|
147
|
+
|
148
|
+
level = all_args.last[:log] || 0
|
149
|
+
level = level.to_i
|
150
|
+
|
147
151
|
all_args.last[:log] = true
|
148
152
|
all_args.last[:pipe] = true
|
149
153
|
|
@@ -151,12 +155,12 @@ module CMD
|
|
151
155
|
pid = io.pids.first
|
152
156
|
|
153
157
|
while c = io.getc
|
154
|
-
STDERR << c if Log.severity
|
158
|
+
STDERR << c if Log.severity <= level
|
155
159
|
if c == "\n"
|
156
160
|
if pid
|
157
|
-
Log.logn "STDOUT [#{pid}]: ",
|
161
|
+
Log.logn "STDOUT [#{pid}]: ", level
|
158
162
|
else
|
159
|
-
Log.logn "STDOUT: ",
|
163
|
+
Log.logn "STDOUT: ", level
|
160
164
|
end
|
161
165
|
end
|
162
166
|
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.68
|
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-09-
|
11
|
+
date: 2019-09-05 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rake
|