Merge pull request #262 from puppetlabs/inifile

(PA-7091) Vendor inifile in beaker-puppet

.github/workflows/test.yml

@@ -33,6 +33,8 @@ jobs:
           - ruby: "3.0"
             coverage: "yes"
           - ruby: "3.1"
+          - ruby: "3.2"
+          - ruby: "3.3"
 
     env:
       COVERAGE: ${{ matrix.coverage }}

beaker-puppet.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.description = 'For use for the Beaker acceptance testing tool'
   s.license     = 'Apache-2.0'
 
-  s.required_ruby_version = '>= 2.7', '< 3.2'
+  s.required_ruby_version = '>= 2.7', '< 3.4'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

lib/beaker-puppet.rb

@@ -3,6 +3,7 @@
 require 'in_parallel'
 require 'beaker-puppet/version'
 require 'beaker-puppet/wrappers'
+require 'beaker-puppet/inifile'
 
 require 'beaker-puppet/helpers/rake_helpers'
 

lib/beaker-puppet/helpers/puppet_helpers.rb

@@ -1,5 +1,4 @@
 require 'timeout'
-require 'inifile'
 require 'resolv'
 
 module Beaker
@@ -293,7 +292,7 @@ def lay_down_new_puppet_conf(host, configuration_options, testdir)
         # @!visibility private
         def puppet_conf_for(host, conf_opts)
           puppetconf = host.exec(Command.new("cat #{puppet_config(host, 'config', section: 'master')}")).stdout
-          IniFile.new(default: 'main', content: puppetconf).merge(conf_opts)
+          BeakerPuppet::IniFile.new(default: 'main', content: puppetconf).merge(conf_opts)
         end
 
         # Restarts the named puppet service

lib/beaker-puppet/helpers/tk_helpers.rb

@@ -1,6 +1,5 @@
 require 'hocon'
 require 'hocon/config_error'
-require 'inifile'
 
 module Beaker
   module DSL
@@ -70,7 +69,7 @@ def read_tk_config_string(string)
           end
 
           begin
-            return IniFile.new(content: string)
+            return BeakerPuppet::IniFile.new(content: string)
           rescue IniFile::Error
             nil
           end