Merge pull request #195 from DannyBen/add/ruby-3.1-support

Ruby 3.1 adjustments

Author: DannyBen

.github/workflows/test.yml

@@ -13,7 +13,7 @@ jobs:
       LC_ALL: en_US.UTF-8 # consistent sort order
 
     strategy:
-      matrix: { ruby: ['2.7', '3.0'] }
+      matrix: { ruby: ['2.7', '3.0', '3.1'] }
 
     steps:
     - name: Checkout code

helpers/example.rb

@@ -21,7 +21,7 @@ def initialize(dir)
   end
 
   def config
-    @config ||= YAML.load_file(yaml_path)
+    @config ||= YAML.properly_load_file(yaml_path)
   end
 
   def yaml

lib/bashly.rb

@@ -7,6 +7,7 @@
 
 requires 'bashly/concerns'
 
+requires 'bashly/extensions'
 requires 'bashly/settings'
 requires 'bashly/exceptions'
 requires 'bashly/refinements'

lib/bashly/config.rb

@@ -10,7 +10,7 @@ class Config
 
     def self.new(config)
       if config.is_a? String
-        YAML.load_file(config).compose
+        YAML.properly_load_file(config).compose
       else
         config
       end

lib/bashly/extensions/yaml.rb

@@ -0,0 +1,8 @@
+module YAML
+  # This awkward patch is due to https://bugs.ruby-lang.org/issues/17866
+  def self.properly_load_file(path)
+    YAML.load_file path, aliases: true
+  rescue ArgumentError
+    YAML.load_file path
+  end
+end

lib/bashly/library.rb

@@ -6,7 +6,7 @@ def exist?(name)
       end
 
       def config
-        @config ||= YAML.load_file(config_path)
+        @config ||= YAML.properly_load_file(config_path)
       end
 
       def config_path

lib/bashly/message_strings.rb

@@ -13,7 +13,7 @@ def values
   private
 
     def values!
-      defaults = YAML.load_file asset("templates/strings.yml")
+      defaults = YAML.properly_load_file asset("templates/strings.yml")
       defaults.merge project_strings
     end
 
@@ -23,7 +23,7 @@ def project_strings
 
     def project_strings!
       if File.exist? project_strings_path
-        YAML.load_file project_strings_path
+        YAML.properly_load_file project_strings_path
       else
         {}
       end

lib/bashly/refinements/compose_refinements.rb

@@ -22,7 +22,7 @@ def compose(keyword = 'import')
     end
 
     def safe_load_yaml(path)
-      loaded = YAML.load_file path
+      loaded = YAML.properly_load_file path
       return loaded if loaded.is_a? Array or loaded.is_a? Hash
       raise Bashly::ConfigurationError, "Cannot find a valid YAML in !txtgrn!#{path}"
 

spec/spec_mixin.rb

@@ -8,6 +8,6 @@ def reset_tmp_dir(create_src: false, copy_from: nil)
 
   def load_fixture(filename)
     @loaded_fixtures ||= {}
-    @loaded_fixtures[filename] ||= YAML.load_file("spec/fixtures/#{filename}.yml")
+    @loaded_fixtures[filename] ||= YAML.properly_load_file("spec/fixtures/#{filename}.yml")
   end
 end