projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
12876: Merge branch 'master' into 12876-arvados-client
[arvados.git]
/
sdk
/
ruby
/
lib
/
arvados.rb
diff --git
a/sdk/ruby/lib/arvados.rb
b/sdk/ruby/lib/arvados.rb
index 753c518b3191ebbfefbd4407ca67c2f9b83daa45..a89c21b017ddfc1943ae8c403ef8d9f871f34388 100644
(file)
--- a/
sdk/ruby/lib/arvados.rb
+++ b/
sdk/ruby/lib/arvados.rb
@@
-1,3
+1,7
@@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+
require 'rubygems'
require 'active_support/inflector'
require 'json'
require 'rubygems'
require 'active_support/inflector'
require 'json'
@@
-11,18
+15,7
@@
ActiveSupport::Inflector.inflections do |inflect|
inflect.irregular 'human', 'humans'
end
inflect.irregular 'human', 'humans'
end
-module Kernel
- def suppress_warnings
- original_verbosity = $VERBOSE
- $VERBOSE = nil
- result = yield
- $VERBOSE = original_verbosity
- return result
- end
-end
-
class Arvados
class Arvados
-
class TransactionFailedError < StandardError
end
class TransactionFailedError < StandardError
end
@@
-209,7
+202,7
@@
class Arvados
:parameters => parameters,
:body_object => body,
:headers => {
:parameters => parameters,
:body_object => body,
:headers => {
-
authorization:
'OAuth2 '+arvados.config['ARVADOS_API_TOKEN']
+
:authorization =>
'OAuth2 '+arvados.config['ARVADOS_API_TOKEN']
})
resp = JSON.parse result.body, :symbolize_names => true
if resp[:errors]
})
resp = JSON.parse result.body, :symbolize_names => true
if resp[:errors]
@@
-217,7
+210,7
@@
class Arvados
elsif resp[:uuid] and resp[:etag]
self.new(resp)
elsif resp[:items].is_a? Array
elsif resp[:uuid] and resp[:etag]
self.new(resp)
elsif resp[:items].is_a? Array
- resp.merge(
items:
resp[:items].collect do |i|
+ resp.merge(
:items =>
resp[:items].collect do |i|
self.new(i)
end)
else
self.new(i)
end)
else
@@
-262,4
+255,16
@@
class Arvados
@attributes = j
end
end
@attributes = j
end
end
+
+ protected
+
+ def suppress_warnings
+ original_verbosity = $VERBOSE
+ begin
+ $VERBOSE = nil
+ yield
+ ensure
+ $VERBOSE = original_verbosity
+ end
+ end
end
end