Change kwarg names of Psych in Ruby 2.6

Some kwarg names of `Psych.safe_load` method has been changed by the following links. - ruby/psych#378 - ruby/ruby@6268098
koic · Nov 13, 2018 · 2d07ed3 · 2d07ed3
1 parent 1e21c30
commit 2d07ed3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/bin/ridgepole b/bin/ridgepole
@@ -256,8 +256,8 @@ begin
       elsif Gem::Version.new(Psych::VERSION) >= Gem::Version.new('3.1.0.pre1') # Ruby 2.6
         YAML.safe_load(
           diff_file,
-          whitelist_classes: [],
-          whitelist_symbols: [],
+          permitted_classes: [],
+          permitted_symbols: [],
           aliases: true
         )
       else

diff --git a/lib/ridgepole/cli/config.rb b/lib/ridgepole/cli/config.rb
@@ -14,8 +14,8 @@ def load(config, env = 'development')
                         elsif Gem::Version.new(Psych::VERSION) >= Gem::Version.new('3.1.0.pre1') # Ruby 2.6
                           YAML.safe_load(
                             ERB.new(config).result,
-                            whitelist_classes: [],
-                            whitelist_symbols: [],
+                            permitted_classes: [],
+                            permitted_symbols: [],
                             aliases: true
                           )
                         else
@@ -41,8 +41,8 @@ def parse_config_file(path)
         if Gem::Version.new(Psych::VERSION) >= Gem::Version.new('3.1.0.pre1') # Ruby 2.6
           YAML.safe_load(
             yaml,
-            whitelist_classes: [],
-            whitelist_symbols: [],
+            permitted_classes: [],
+            permitted_symbols: [],
             aliases: true
           )
         else