arvados 2.0.4 → 2.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ec1b09ea886e3e78ddc8b4a35f7e63fb8037c29d5432fd6cf10631d4082dcac
-  data.tar.gz: 932eef1e18cc75db99012dc971d466d2c355d297a439e785c550f4b5a41e2b3f
+  metadata.gz: f5ed67ab0c426f6f3a103bfdf385c3d4801fe4c28490d338fabc69bbd32aad5a
+  data.tar.gz: d4d523832e0f2243c4cb216948a798ca4de4cd24b159bef9086bb79999602062
 SHA512:
-  metadata.gz: 3e93c139b5a38f6c6a378efbc5256ae077d8aa5bd5f3bf4c4d5d4fab69c08d25aa9a4284c373b6383a42c80139a9865dccf0f536a9c9bde3b3d45f9c09ba5413
-  data.tar.gz: d29e86406a09db6aae06c045968836da57213bed4adce5feb4e4e4866d718ea5626f890766b29d0923f503daa1a8451b7abae03dfe02e6f927961f0ca7cc8591
+  metadata.gz: 525b03385c87eb90c4b7c3fd29973eef4e01c7bd2f2dc39e0b04c76c60297c6d2bce559e80df1663ca75aa7b996360117036c6f9b4c72d4a534dfefcb319177c
+  data.tar.gz: 2dbf9b25485fba3f92c49c31eecf8aaa916d3267e3f6fd9742a2487204e9b56ec545c8290ea050bdaa00fd72cba5eb4b1aed4e3c30bc7c2e039c2e25e68869a4

data/lib/arvados.rb

@@ -19,7 +19,6 @@ class Arvados
   class TransactionFailedError < StandardError
   end
 
-  @@config = nil
   @@debuglevel = 0
   class << self
     attr_accessor :debuglevel
@@ -31,12 +30,16 @@ class Arvados
 
     @arvados_api_version = opts[:api_version] || 'v1'
 
-    @arvados_api_host = opts[:api_host] ||
-      config['ARVADOS_API_HOST'] or
-      raise "#{$0}: no :api_host or ENV[ARVADOS_API_HOST] provided."
-    @arvados_api_token = opts[:api_token] ||
-      config['ARVADOS_API_TOKEN'] or
-      raise "#{$0}: no :api_token or ENV[ARVADOS_API_TOKEN] provided."
+    @config = nil
+    [[:api_host, 'ARVADOS_API_HOST'],
+     [:api_token, 'ARVADOS_API_TOKEN']].each do |op, en|
+      if opts[op]
+        config[en] = opts[op]
+      end
+      if !config[en]
+        raise "#{$0}: no :#{op} or ENV[#{en}] provided."
+      end
+    end
 
     if (opts[:suppress_ssl_warnings] or
         %w(1 true yes).index(config['ARVADOS_API_HOST_INSECURE'].
@@ -91,17 +94,15 @@ class Arvados
       # result looks like Arvados::A26949680::Job.
       namespace_class.const_set classname, klass
 
-      self.class.class_eval do
-        define_method classname.underscore do
-          klass
-        end
+      self.define_singleton_method classname.underscore do
+        klass
       end
     end
   end
 
   def client
     @client ||= Google::APIClient.
-      new(:host => @arvados_api_host,
+      new(:host => config["ARVADOS_API_HOST"],
           :application_name => @application_name,
           :application_version => @application_version.to_s)
   end
@@ -119,7 +120,7 @@ class Arvados
   end
 
   def config(config_file_path="~/.config/arvados/settings.conf")
-    return @@config if @@config
+    return @config if @config
 
     # Initialize config settings with environment variables.
     config = {}
@@ -137,7 +138,7 @@ class Arvados
       # Note: If we start using additional configuration settings from
       # this file in the future, we might have to read the file anyway
       # instead of returning here.
-      return (@@config = config)
+      return (@config = config)
     end
 
     begin
@@ -164,7 +165,7 @@ class Arvados
       debuglog "Ignoring error reading #{config_file_path}: #{e}", 0
     end
 
-    @@config = config
+    @config = config
   end
 
   class Model
@@ -202,7 +203,7 @@ class Arvados
                 :parameters => parameters,
                 :body_object => body,
                 :headers => {
-                  :authorization => 'OAuth2 '+arvados.config['ARVADOS_API_TOKEN']
+                  :authorization => 'Bearer '+arvados.config['ARVADOS_API_TOKEN']
                 })
       resp = JSON.parse result.body, :symbolize_names => true
       if resp[:errors]

data/lib/arvados/google_api_client.rb

@@ -6,7 +6,8 @@ require 'google/api_client'
 # Monkeypatch google-api-client gem to avoid sending newline characters
 # on headers to make ruby-2.3.7+ happy.
 # See: https://dev.arvados.org/issues/13920
-Google::APIClient::ENV::OS_VERSION.strip!
+# Addendum: OS_VERSION sometimes is not mutable, that's why we duplicate it (See: #17738)
+Google::APIClient::ENV::OS_VERSION = +Google::APIClient::ENV::OS_VERSION.strip!
 
 require 'json'
 require 'tempfile'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arvados
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.1.4
 platform: ruby
 authors:
 - Arvados Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-03 00:00:00.000000000 Z
+date: 2021-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -132,8 +132,8 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '2'
-description: Arvados client library, git commit 8014ce0457ef848bba8ce18ad5980b9883105cc9
-email: gem-dev@curoverse.com
+description: Arvados client library, git commit bfcade85c7aa6f88d25a002c271b3120d68f1120
+email: packaging@arvados.org
 executables: []
 extensions: []
 extra_rdoc_files: []