fix: YAML::safe_load deprecated arguments use

rock-core · Jul 4, 2024 · 7eb4527 · 7eb4527
1 parent c11aeb9
commit 7eb4527
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 5 deletions.
diff --git a/bin/autoproj_bootstrap b/bin/autoproj_bootstrap
@@ -264,14 +264,22 @@ module Autoproj
             # @param [String] autoproj_version a constraint on the autoproj version
             #   that should be used
             # @return [String]
-            def default_gemfile_contents(autoproj_version = ">= 2.16.0")
+            def default_gemfile_contents(autoproj_version = ">= 2.17.0")
                 ["source \"#{gem_source}\"",
                  "ruby \"#{RUBY_VERSION}\" if respond_to?(:ruby)",
                  "gem \"autoproj\", \"#{autoproj_version}\""].join("\n")
             end
 
+            def load_yaml(contents)
+                if Gem::Version.new(Psych::VERSION) >= Gem::Version.new("3.1.0")
+                    YAML.safe_load(contents, permitted_classes: [Symbol])
+                else
+                    YAML.safe_load(contents, [Symbol])
+                end
+            end
+
             def add_seed_config(path)
-                @config.merge!(YAML.safe_load(File.read(path), [Symbol]))
+                @config.merge!(load_yaml(File.read(path)))
             end
 
             # Parse the provided command line options and returns the non-options

diff --git a/bin/autoproj_install b/bin/autoproj_install
@@ -264,14 +264,22 @@ module Autoproj
             # @param [String] autoproj_version a constraint on the autoproj version
             #   that should be used
             # @return [String]
-            def default_gemfile_contents(autoproj_version = ">= 2.16.0")
+            def default_gemfile_contents(autoproj_version = ">= 2.17.0")
                 ["source \"#{gem_source}\"",
                  "ruby \"#{RUBY_VERSION}\" if respond_to?(:ruby)",
                  "gem \"autoproj\", \"#{autoproj_version}\""].join("\n")
             end
 
+            def load_yaml(contents)
+                if Gem::Version.new(Psych::VERSION) >= Gem::Version.new("3.1.0")
+                    YAML.safe_load(contents, permitted_classes: [Symbol])
+                else
+                    YAML.safe_load(contents, [Symbol])
+                end
+            end
+
             def add_seed_config(path)
-                @config.merge!(YAML.safe_load(File.read(path), [Symbol]))
+                @config.merge!(load_yaml(File.read(path)))
             end
 
             # Parse the provided command line options and returns the non-options

diff --git a/lib/autoproj/ops/install.rb b/lib/autoproj/ops/install.rb
@@ -260,8 +260,16 @@ def default_gemfile_contents(autoproj_version = ">= #{Autoproj::VERSION}")
                  "gem \"autoproj\", \"#{autoproj_version}\""].join("\n")
             end
 
+            def load_yaml(contents)
+                if Gem::Version.new(Psych::VERSION) >= Gem::Version.new("3.1.0")
+                    YAML.safe_load(contents, permitted_classes: [Symbol])
+                else
+                    YAML.safe_load(contents, [Symbol])
+                end
+            end
+
             def add_seed_config(path)
-                @config.merge!(YAML.safe_load(File.read(path), [Symbol]))
+                @config.merge!(load_yaml(File.read(path)))
             end
 
             # Parse the provided command line options and returns the non-options