arvados 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ad00e8109202664d0bd0ebfc83e1808a7a8a83756a717c73a7bf10383693b64
-  data.tar.gz: 0c7da57f535c7d23d1e30641df729f51f856b5d1f967cff7a6afe2dfe7092352
+  metadata.gz: b6126e67d588ee7eed3b467357cdd13fbace3c46740460eac7cb824ccfbf76ae
+  data.tar.gz: 5168370d9c487d572931b13f64654f88aa15c81b4d986817b6307e1baf2e0ed5
 SHA512:
-  metadata.gz: bd677b779828f640a90f5f8851e3a7cf4b5ce0f37331940b9003babeae82158f6426105b6bb5a5156792dfad20a428ef58c8e96c20214853154ffcc628721d4f
-  data.tar.gz: fa471f6145c2f564e9c8fe500efd3ba3551ac5be3f85c8f61c039373c4b0b60e7f2cbaac43c363dd670b9d7fc9ae1ec0ec96381cc81600d7887b0534e2ce7354
+  metadata.gz: 6bbe189487f2a675ba3b4d0cc80b0a90f8ed77b8404ba044b21e6540b9345c4e00bdc4f8323566b011284f61e3b8631dc394e062f74c39a17b90fdfd7f625e06
+  data.tar.gz: 13386d6c2b88e678e8bf21a30b88ebe8abd7b6e08803698d3ee65baa4626b8df8fcc93ec44c9105692611ab116e545370e65c4a90b7ed41f2da4efbe05ae63d6

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]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arvados
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors:
 - Arvados Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-03 00:00:00.000000000 Z
+date: 2021-02-22 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 af5e26a900bbfa779ad325491d80f43eaf75de1d
-email: gem-dev@curoverse.com
+description: Arvados client library, git commit 78096170b070a9eb17b37f913798397744fa1ff5
+email: packaging@arvados.org
 executables: []
 extensions: []
 extra_rdoc_files: []