20846: Update sdk/ruby for Ruby 3.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>

diff --git a/sdk/ruby/lib/arvados.rb b/sdk/ruby/lib/arvados.rb
index 73a0d0d2f7c6c05f6674e2260fe788d33c4b2aa4..63550cd37c71840fed8bdd5a7e90734810a488b1 100644 (file)
--- a/sdk/ruby/lib/arvados.rb
+++ b/sdk/ruby/lib/arvados.rb
@@ -76,7 +76,7 @@ class Arvados
     _arvados = self
     namespace_class = Arvados.const_set "A#{self.object_id}", Class.new
     self.arvados_api.schemas.each do |classname, schema|
-      next if classname.match /List$/
+      next if classname.match(/List$/)
       klass = Class.new(Arvados::Model) do
         def self.arvados
           @arvados
@@ -137,7 +137,7 @@ class Arvados
   end
 
   def debuglog *args
-    self.class.debuglog *args
+    self.class.debuglog(*args)
   end
 
   def config(config_file_path="~/.config/arvados/settings.conf")
@@ -206,10 +206,10 @@ class Arvados
       arvados.client
     end
     def self.debuglog(*args)
-      arvados.class.debuglog *args
+      arvados.class.debuglog(*args)
     end
     def debuglog(*args)
-      self.class.arvados.class.debuglog *args
+      self.class.arvados.class.debuglog(*args)
     end
     def self.api_exec(method, parameters={})
       api_method = arvados_api.send(api_models_sym).send(method.name.to_sym)

diff --git a/sdk/ruby/test/sdk_fixtures.rb b/sdk/ruby/test/sdk_fixtures.rb
index 0f385e221877a38075571479057282f73147f51f..28f12b0b02f82d9931af280ec6784b8238b61ab3 100644 (file)
--- a/sdk/ruby/test/sdk_fixtures.rb
+++ b/sdk/ruby/test/sdk_fixtures.rb
@@ -33,7 +33,7 @@ module SDKFixtures
         file = IO.read(path)
         trim_index = file.index('# Test Helper trims the rest of the file')
         file = file[0, trim_index] if trim_index
-        YAML.load(file)
+        YAML.safe_load(file, permitted_classes: [Time])
       end
   end
 

diff --git a/sdk/ruby/test/test_keep_manifest.rb b/sdk/ruby/test/test_keep_manifest.rb
index eee8b39699078681d89ad331fe6c74cfe6f47079..ff0cab6ef922dad8cd66beec0a0fc2add067c62b 100644 (file)
--- a/sdk/ruby/test/test_keep_manifest.rb
+++ b/sdk/ruby/test/test_keep_manifest.rb
@@ -357,8 +357,6 @@ class ManifestTest < Minitest::Test
       "invalid file token \"0:0:a/./bc.txt\""],
     [false, ". d41d8cd98f00b204e9800998ecf8427e 0:0:a/../bc.txt\n",
       "invalid file token \"0:0:a/../bc.txt\""],
-    [false, "./abc/./foo d41d8cd98f00b204e9800998ecf8427e 0:0:abc.txt\n",
-      "invalid stream name \"./abc/./foo\""],
     [false, "d41d8cd98f00b204e9800998ecf8427e+0 0:0:abc.txt\n",
       "invalid stream name \"d41d8cd98f00b204e9800998ecf8427e+0\""],
     [false, ". d41d8cd98f00b204e9800998ecf8427 0:0:abc.txt\n",

diff --git a/sdk/ruby/test/test_request_id.rb b/sdk/ruby/test/test_request_id.rb
index 2e25210ba706a792817a4fe2559416d070d8aed2..641b442751797a24218e5844892f79bd1c04a8e3 100644 (file)
--- a/sdk/ruby/test/test_request_id.rb
+++ b/sdk/ruby/test/test_request_id.rb
@@ -17,6 +17,6 @@ class RequestIdTest < Minitest::Test
             arv.collection.get(uuid: "zzzzz-4zz18-zzzzzzzzzzzzzzz")
         end
         assert clnt.request_id != nil
-        assert_match /Uh-oh.*\(Request ID: req-[0-9a-zA-Z]{20}\)/, err.message
+        assert_match(/Uh-oh.*\(Request ID: req-[0-9a-zA-Z]{20}\)/, err.message)
     end
-end
\ No newline at end of file
+end