X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/19ae770973482257117fe8ded5619c3018c4b60f..8f8a0ac695f4440412de0245fc748c2792cb1496:/sdk/ruby/lib/arvados.rb diff --git a/sdk/ruby/lib/arvados.rb b/sdk/ruby/lib/arvados.rb index 753c518b31..a89c21b017 100644 --- 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' @@ -11,18 +15,7 @@ ActiveSupport::Inflector.inflections do |inflect| 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 TransactionFailedError < StandardError end @@ -209,7 +202,7 @@ class Arvados :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] @@ -217,7 +210,7 @@ class Arvados 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 @@ -262,4 +255,16 @@ class Arvados @attributes = j end end + + protected + + def suppress_warnings + original_verbosity = $VERBOSE + begin + $VERBOSE = nil + yield + ensure + $VERBOSE = original_verbosity + end + end end