arvados-cli 2.3.3 → 2.4.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/bin/arv +13 -14
- metadata +3 -3
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 2f72ce8f492bc8b5eeea7a378ac81e432a34f43602188c26d27e5453b6124bf4
|
4
|
+
data.tar.gz: 594302474288eef3c072231eb45ef5d288785e4e921b3531e51fd18fe2f0ca87
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: f726a1faf4b392a2343cb6a4bf3bd8e989b1c0bc4c979bcc2d6bb90e657c7ddf5eec2a05c24c9ac6b9d317b9c22b00251c5974997f8d3854b8edf1e21740fa2e
|
7
|
+
data.tar.gz: a135ad867e8b3316c23bf84694d2285ca3aac9010f5b5e30d22c51a6987bd4e3608c1e33d86842e27be8590db4ae10d7b9ec84f82fbc3ac3de4acc200efae2ec
|
data/bin/arv
CHANGED
@@ -65,16 +65,6 @@ module Kernel
|
|
65
65
|
end
|
66
66
|
end
|
67
67
|
|
68
|
-
class ArvadosClient < Google::APIClient
|
69
|
-
def execute(*args)
|
70
|
-
if args.last.is_a? Hash
|
71
|
-
args.last[:headers] ||= {}
|
72
|
-
args.last[:headers]['Accept'] ||= 'application/json'
|
73
|
-
end
|
74
|
-
super(*args)
|
75
|
-
end
|
76
|
-
end
|
77
|
-
|
78
68
|
def init_config
|
79
69
|
# read authentication data from arvados configuration file if present
|
80
70
|
lineno = 0
|
@@ -182,7 +172,7 @@ def edit_and_commit_object initial_obj, tmp_stem, global_opts, &block
|
|
182
172
|
# Load the new object
|
183
173
|
newobj = case global_opts[:format]
|
184
174
|
when 'json'
|
185
|
-
Oj.
|
175
|
+
Oj.safe_load(newcontent)
|
186
176
|
when 'yaml'
|
187
177
|
YAML.load(newcontent)
|
188
178
|
else
|
@@ -605,7 +595,7 @@ if ENV['ARVADOS_API_HOST_INSECURE']
|
|
605
595
|
end
|
606
596
|
|
607
597
|
begin
|
608
|
-
client =
|
598
|
+
client = Google::APIClient.new(:host => ENV['ARVADOS_API_HOST'], :application_name => 'arvados-cli', :application_version => '1.0')
|
609
599
|
arvados = client.discovered_api('arvados', ENV['ARVADOS_API_VERSION'])
|
610
600
|
rescue Exception => e
|
611
601
|
puts "Failed to connect to Arvados API server: #{e}"
|
@@ -708,14 +698,23 @@ else
|
|
708
698
|
})
|
709
699
|
end
|
710
700
|
|
701
|
+
request_id = result.headers[:x_request_id]
|
711
702
|
begin
|
712
703
|
results = JSON.parse result.body
|
713
704
|
rescue JSON::ParserError => e
|
714
|
-
|
705
|
+
err_msg = "Failed to parse server response:\n" + e.to_s
|
706
|
+
if request_id
|
707
|
+
err_msg += "\nRequest ID: #{request_id or client.request_id}"
|
708
|
+
end
|
709
|
+
abort err_msg
|
715
710
|
end
|
716
711
|
|
717
712
|
if results["errors"] then
|
718
|
-
|
713
|
+
err_message = results["errors"][0]
|
714
|
+
if request_id and !err_message.match(/.*req-[0-9a-zA-Z]{20}.*/)
|
715
|
+
err_message += " (#{request_id})"
|
716
|
+
end
|
717
|
+
abort "Error: #{err_message}"
|
719
718
|
end
|
720
719
|
|
721
720
|
case global_opts[:format]
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: arvados-cli
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 2.
|
4
|
+
version: 2.4.2
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Arvados Authors
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date:
|
11
|
+
date: 2022-08-04 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: arvados
|
@@ -160,7 +160,7 @@ dependencies:
|
|
160
160
|
- - "<"
|
161
161
|
- !ruby/object:Gem::Version
|
162
162
|
version: '2.5'
|
163
|
-
description: Arvados command line tools, git commit
|
163
|
+
description: Arvados command line tools, git commit a58e9d7052c42510be3238dc7e1ade52c73f17cd
|
164
164
|
email: packaging@arvados.org
|
165
165
|
executables:
|
166
166
|
- arv
|