projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 3644-arv-mount-projects
[arvados.git]
/
sdk
/
cli
/
bin
/
arv
diff --git
a/sdk/cli/bin/arv
b/sdk/cli/bin/arv
index e84150a35d9b4064264393cdbab6e2e5312bc8f7..9b486d2d798a14b14491b6ff69aba75c6aaf34c1 100755
(executable)
--- a/
sdk/cli/bin/arv
+++ b/
sdk/cli/bin/arv
@@
-2,7
+2,7
@@
# Arvados cli client
#
# Arvados cli client
#
-# Ward Vandewege <ward@c
linicalfutur
e.com>
+# Ward Vandewege <ward@c
urovers
e.com>
require 'fileutils'
require 'fileutils'
@@
-53,14
+53,16
@@
end
class Google::APIClient
def discovery_document(api, version)
api = api.to_s
class Google::APIClient
def discovery_document(api, version)
api = api.to_s
- return @discovery_documents["#{api}:#{version}"] ||=
+ discovery_uri = self.discovery_uri(api, version)
+ discovery_uri_hash = Digest::MD5.hexdigest(discovery_uri)
+ return @discovery_documents[discovery_uri_hash] ||=
begin
# fetch new API discovery doc if stale
begin
# fetch new API discovery doc if stale
- cached_doc = File.expand_path
'~/.cache/arvados/discovery_uri.json'
rescue nil
+ cached_doc = File.expand_path
"~/.cache/arvados/discovery-#{discovery_uri_hash}.json"
rescue nil
if cached_doc.nil? or not File.exist?(cached_doc) or (Time.now - File.mtime(cached_doc)) > 86400
response = self.execute!(:http_method => :get,
if cached_doc.nil? or not File.exist?(cached_doc) or (Time.now - File.mtime(cached_doc)) > 86400
response = self.execute!(:http_method => :get,
- :uri =>
self.discovery_uri(api, version)
,
+ :uri =>
discovery_uri
,
:authenticated => false)
begin
:authenticated => false)
begin
@@
-356,10
+358,6
@@
end
def help_resources(option_parser, discovery_document, resource)
option_parser.educate
def help_resources(option_parser, discovery_document, resource)
option_parser.educate
-
- if not resource.nil? and resource != '--help' then
- Trollop::die "Unknown resource type #{resource.inspect}"
- end
exit 255
end
exit 255
end