beaker 6.9.0 → 7.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f34a28e10b3448ee6294cdfd53903ec145d6c81d28b95dc7370a30936922e80c
-  data.tar.gz: 7e7ba934516ed374c96c97357047d56693dddbd23a45be3a6b088b5dcdbae52a
+  metadata.gz: a52a04e5317c78954859cef26c1988cf66a832ad0f62de9d78c69ffbe23c108c
+  data.tar.gz: 4de10d9e282aaa62986410393d440278c5821d042505436131ba5d6ac92a2fdd
 SHA512:
-  metadata.gz: b7a2345337cec50941ba9aa8c20a8f4cfab3bd0c84e1bb74f0e8c506ff29f894568562c423aa815fcaaf16b423dbde3150117a579c3463481802b91d3bb159eb
-  data.tar.gz: ba81525b5f025ad793d7175b694a2a95702af799282ddcec8f060e3c4e0badd5ded71a905b2239c7230d4161056c0a9a69511fd7e318eb675605bcfde0aa3aa5
+  metadata.gz: 155935fc22c9dd129c5c54c6179709b330048f85f6048aa4f67430b61402bbdc1934856138f23e159aaa40c306024208b7ad18ca9d9628df9c17326b20725e31
+  data.tar.gz: 92508f324729fde5238743beabd46b89c98921d5bd28321240ae73aebb06690cceae28db7a403ed4f385812353f650e01a82d6a67d35592d82673f6b6d7322bc

data/.github/workflows/release.yml

@@ -39,7 +39,7 @@ jobs:
       contents: write # clone repo and create release
     steps:
       - name: Download gem from GitHub cache
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v5
         with:
           name: gem-artifact
       - name: Create Release
@@ -56,7 +56,7 @@ jobs:
       packages: write # publish to rubygems.pkg.github.com
     steps:
       - name: Download gem from GitHub cache
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v5
         with:
           name: gem-artifact
       - name: Publish gem to GitHub packages
@@ -73,7 +73,7 @@ jobs:
       id-token: write # rubygems.org authentication
     steps:
       - name: Download gem from GitHub cache
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v5
         with:
           name: gem-artifact
       - uses: rubygems/configure-rubygems-credentials@v1.0.0
@@ -92,7 +92,7 @@ jobs:
       - release-to-rubygems
     steps:
       - name: Download gem from GitHub cache
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v5
         with:
           name: gem-artifact
       - name: Install Ruby

data/.rubocop.yml

@@ -4,6 +4,9 @@ inherit_from: .rubocop_todo.yml
 inherit_gem:
   voxpupuli-rubocop: rubocop.yml
 
+AllCops:
+  TargetRubyVersion: 3.2
+
 Layout/LineLength:
   Exclude:
     - acceptance/**/*.rb

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config --no-auto-gen-timestamp`
-# using RuboCop version 1.75.7.
+# using RuboCop version 1.75.8.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -294,12 +294,6 @@ RSpec/UnspecifiedException:
 RSpec/VerifiedDoubles:
   Enabled: false
 
-# Offense count: 2
-# This cop supports safe autocorrection (--autocorrect).
-Rake/Desc:
-  Exclude:
-    - 'Rakefile'
-
 # Offense count: 7
 Security/Eval:
   Exclude:
@@ -316,7 +310,7 @@ Security/Open:
   Exclude:
     - 'lib/beaker/dsl/helpers/web_helpers.rb'
 
-# Offense count: 104
+# Offense count: 105
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns, SplitStrings.
 # URISchemes: http, https

data/CHANGELOG.md

@@ -1,22 +1,16 @@
 # Changelog
 
-## [6.9.0](https://github.com/voxpupuli/beaker/tree/6.9.0) (2026-08-14)
+## [7.0.0](https://github.com/voxpupuli/beaker/tree/7.0.0) (2025-08-07)
 
-[Full Changelog](https://github.com/voxpupuli/beaker/compare/6.8.1...6.9.0)
+[Full Changelog](https://github.com/voxpupuli/beaker/compare/6.8.1...7.0.0)
 
-**Implemented enhancements:**
-
-- \(maint\) Add Ubuntu 26.04 \(resolute\) codename mapping [\#2024](https://github.com/voxpupuli/beaker/pull/2024) ([bastelfreak](https://github.com/bastelfreak))
-
-**Fixed bugs:**
+**Breaking changes:**
 
-- Ensure correct encoding for logging and fix performance bugs [\#2027](https://github.com/voxpupuli/beaker/pull/2027) ([bastelfreak](https://github.com/bastelfreak))
-- Don't lose a whole junit report to one bad byte [\#2026](https://github.com/voxpupuli/beaker/pull/2026) ([bastelfreak](https://github.com/bastelfreak))
-- Stop escape\_invalid\_xml\_chars allocating per character [\#2025](https://github.com/voxpupuli/beaker/pull/2025) ([bastelfreak](https://github.com/bastelfreak))
+- Require Ruby 3.2 [\#1906](https://github.com/voxpupuli/beaker/pull/1906) ([bastelfreak](https://github.com/bastelfreak))
 
-**Closed issues:**
+**Implemented enhancements:**
 
-- The tmpfile method in pswindows needs to implement the use of the extension parameter [\#1955](https://github.com/voxpupuli/beaker/issues/1955)
+- beaker-hostgenerator: Switch to 3.x [\#1937](https://github.com/voxpupuli/beaker/pull/1937) ([bastelfreak](https://github.com/bastelfreak))
 
 ## [6.8.1](https://github.com/voxpupuli/beaker/tree/6.8.1) (2025-06-16)
 

data/Rakefile

@@ -6,10 +6,12 @@ HOSTS_PRESERVED  = 'log/latest/hosts_preserved.yml'
 
 task :default => ['test:spec']
 
+desc 'Run unit tests'
 task :test do
   Rake::Task['test:spec'].invoke
 end
 
+desc 'run unit tests'
 task :spec do
   Rake::Task['test:spec'].invoke
 end
@@ -186,13 +188,13 @@ begin
   require 'github_changelog_generator/task'
 
   GitHubChangelogGenerator::RakeTask.new :changelog do |config|
-    config.exclude_labels = %w{duplicate question invalid wontfix wont-fix skip-changelog}
+    config.exclude_labels = %w{duplicate question invalid wontfix wont-fix skip-changelog github_actions}
     config.user = 'voxpupuli'
     config.project = 'beaker'
     gem_version = Gem::Specification.load("#{config.project}.gemspec").version
     config.future_release = gem_version
-    config.release_branch = '6.x'
-    config.exclude_tags_regex = /^v?[4,7]\./
+    config.release_branch = 'master'
+    config.exclude_tags_regex = /\A4\./
     config.since_tag = '5.7.0'
   end
 rescue LoadError

data/beaker.gemspec

@@ -16,13 +16,13 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.required_ruby_version = Gem::Requirement.new('>= 2.7')
+  s.required_ruby_version = Gem::Requirement.new('>= 3.2')
 
   # Testing dependencies
   s.add_development_dependency 'fakefs', '>= 2.4', '< 4'
   s.add_development_dependency 'rake', '~> 13.0'
   s.add_development_dependency 'rspec', '~> 3.0'
-  s.add_development_dependency 'voxpupuli-rubocop', '~> 3.1.0'
+  s.add_development_dependency 'voxpupuli-rubocop', '~> 4.1.0'
 
   # Run time dependencies
   # Required for Ruby 3.3+ support
@@ -47,6 +47,6 @@ Gem::Specification.new do |s|
   s.add_dependency 'thor', ['>= 1.0.1', '< 2.0']
 
   # Run time dependencies that are Beaker libraries
-  s.add_dependency 'beaker-hostgenerator', '~> 2.0'
+  s.add_dependency 'beaker-hostgenerator', '~> 3.0'
   s.add_dependency 'stringify-hash', '~> 0.0'
 end

data/lib/beaker/dsl/helpers/host_helpers.rb

@@ -118,8 +118,8 @@ module Beaker
         #
         # @return [Result]   An object representing the outcome of *command*.
         # @raise  [FailTest] Raises an exception if *command* obviously fails.
-        def shell(command, opts = {}, &block)
-          on(default, command, opts, &block)
+        def shell(command, opts = {}, &)
+          on(default, command, opts, &)
         end
 
         # Move a file from a remote to a local path
@@ -307,7 +307,7 @@ module Beaker
         # @param [Proc] block Additional tests to run after script has executed
         #
         # @return [Result] Returns the result of the underlying SCP operation.
-        def run_script_on(host, script, opts = {}, &block)
+        def run_script_on(host, script, opts = {}, &)
           # this is unsafe as it uses the File::SEPARATOR will be set to that
           # of the coordinator node.  This works for us because we use cygwin
           # which will properly convert the paths.  Otherwise this would not
@@ -317,13 +317,13 @@ module Beaker
           remote_path = File.join("", "tmp", File.basename(script))
 
           scp_to host, script, remote_path
-          on host, remote_path, opts, &block
+          on(host, remote_path, opts, &)
         end
 
         # Move a local script to default host and execute it
         # @see #run_script_on
-        def run_script(script, opts = {}, &block)
-          run_script_on(default, script, opts, &block)
+        def run_script(script, opts = {}, &)
+          run_script_on(default, script, opts, &)
         end
 
         # Install a package on a host
@@ -515,8 +515,8 @@ module Beaker
         # @param [Proc]              block   Additional actions or assertions.
         # @!macro common_opts
         #
-        def curl_on(host, cmd, opts = {}, &block)
-          on host, "curl --tlsv1 %s" % cmd, opts, &block
+        def curl_on(host, cmd, opts = {}, &)
+          on(host, "curl --tlsv1 %s" % cmd, opts, &)
         end
 
         def curl_with_retries(_desc, host, url, desired_exit_codes, max_retries = 60, retry_interval = 1)
@@ -547,7 +547,7 @@ module Beaker
         # @option opts [Boolean] :verbose (false)
         #
         # @return [Result] Result object of the last command execution
-        def retry_on(host, command, opts = {}, &block)
+        def retry_on(host, command, opts = {}, &)
           option_exit_codes     = opts[:desired_exit_codes]
           option_max_retries    = opts[:max_retries].to_i
           option_retry_interval = opts[:retry_interval].to_f
@@ -562,11 +562,11 @@ module Beaker
           logger.debug "  Trying command #{max_retries} times."
           logger.debug ".", add_newline: false
 
-          result = on host, command, { :accept_all_exit_codes => true, :silent => !verbose }, &block
+          result = on(host, command, { :accept_all_exit_codes => true, :silent => !verbose }, &)
           num_retries = 0
           until desired_exit_codes.include?(result.exit_code)
             sleep retry_interval
-            result = on host, command, { :accept_all_exit_codes => true, :silent => !verbose }, &block
+            result = on(host, command, { :accept_all_exit_codes => true, :silent => !verbose }, &)
             num_retries += 1
             logger.debug ".", add_newline: false
             if (num_retries > max_retries)

data/lib/beaker/dsl/patterns.rb

@@ -22,7 +22,7 @@ module Beaker
       #
       # @return [Array<Result>, Result, nil] An array of results, a result object, or nil.
       #   Check {Beaker::Shared::HostManager#run_block_on} for more details on this.
-      def block_on hosts_or_filter, opts = {}, &block
+      def block_on(hosts_or_filter, opts = {}, &)
         block_hosts = nil
         if defined? hosts
           block_hosts = hosts
@@ -33,7 +33,7 @@ module Beaker
         else
           block_hosts = hosts_or_filter
         end
-        run_block_on block_hosts, filter, opts, &block
+        run_block_on(block_hosts, filter, opts, &)
       end
     end
   end

data/lib/beaker/dsl/structure.rb

@@ -107,10 +107,10 @@ module Beaker
       # @param [String] manual_test_name The name of the test to be logged.
       # @param [Proc] block The actions to be performed during this test.
       #
-      def manual_test manual_test_name, &block
+      def manual_test(manual_test_name, &)
         if @options.has_key?(:exec_manual_tests) && @options[:exec_manual_tests] == true
           # here the option is set so we run the test as normal
-          test_name manual_test_name, &block
+          test_name(manual_test_name, &)
         else
           # here no option was set so we log the test name and skip it
           test_name manual_test_name
@@ -261,13 +261,13 @@ module Beaker
       #   targets for this tests case.
       # @raise [SkipTest] Raises skip test if there are no valid hosts for
       #   this test case after confinement.
-      def confine(type, criteria, host_array = nil, &block)
+      def confine(type, criteria, host_array = nil, &)
         hosts_to_modify = Array(host_array || hosts)
         hosts_not_modified = hosts - hosts_to_modify # we aren't examining these hosts
         case type
         when :except
           hosts_to_modify = if criteria and (not criteria.empty?)
-                              hosts_to_modify - select_hosts(criteria, hosts_to_modify, &block) + hosts_not_modified
+                              hosts_to_modify - select_hosts(criteria, hosts_to_modify, &) + hosts_not_modified
                             else
                               # confining to all hosts *except* provided array of hosts
                               hosts_not_modified
@@ -278,7 +278,7 @@ module Beaker
           end
         when :to
           if criteria and (not criteria.empty?)
-            hosts_to_modify = select_hosts(criteria, hosts_to_modify, &block) + hosts_not_modified
+            hosts_to_modify = select_hosts(criteria, hosts_to_modify, &) + hosts_not_modified
           else
             # confining to only hosts in provided array of hosts
           end

data/lib/beaker/host/aix/group.rb

@@ -26,11 +26,11 @@ module Aix::Group
     end
   end
 
-  def group_present(name, &block)
-    execute("if ! lsgroup #{name}; then mkgroup #{name}; fi", {}, &block)
+  def group_present(name, &)
+    execute("if ! lsgroup #{name}; then mkgroup #{name}; fi", {}, &)
   end
 
-  def group_absent(name, &block)
-    execute("if lsgroup #{name}; then rmgroup #{name}; fi", {}, &block)
+  def group_absent(name, &)
+    execute("if lsgroup #{name}; then rmgroup #{name}; fi", {}, &)
   end
 end

data/lib/beaker/host/aix/user.rb

@@ -23,11 +23,11 @@ module Aix::User
     end
   end
 
-  def user_present(name, &block)
-    execute("if ! lsuser #{name}; then mkuser #{name}; fi", {}, &block)
+  def user_present(name, &)
+    execute("if ! lsuser #{name}; then mkuser #{name}; fi", {}, &)
   end
 
-  def user_absent(name, &block)
-    execute("if lsuser #{name}; then rmuser #{name}; fi", {}, &block)
+  def user_absent(name, &)
+    execute("if lsuser #{name}; then rmuser #{name}; fi", {}, &)
   end
 end

data/lib/beaker/host/mac/group.rb

@@ -83,8 +83,8 @@ module Mac::Group
   #
   # @param [String] name Name of the group
   # @param [Proc] block Additional actions or insertions
-  def group_absent(name, &block)
-    execute("if dscl . -list /Groups/#{name}; then dscl . -delete /Groups/#{name}; fi", {}, &block)
+  def group_absent(name, &)
+    execute("if dscl . -list /Groups/#{name}; then dscl . -delete /Groups/#{name}; fi", {}, &)
   end
 
   # Gives the next gid not used on the system

data/lib/beaker/host/mac/user.rb

@@ -66,8 +66,8 @@ module Mac::User
   #
   # @param [String] name Name of the user
   # @param [Proc] block Additional actions or insertions
-  def user_absent(name, &block)
-    execute("if dscl . -list /Users/#{name}; then dscl . -delete /Users/#{name}; fi", {}, &block)
+  def user_absent(name, &)
+    execute("if dscl . -list /Users/#{name}; then dscl . -delete /Users/#{name}; fi", {}, &)
   end
 
   # Gives the next uid not used on the system

data/lib/beaker/host/pswindows/group.rb

@@ -27,11 +27,11 @@ module PSWindows::Group
     raise NotImplementedError, "Can't retrieve group gid on a Windows host"
   end
 
-  def group_present(name, &block)
-    execute("net localgroup /add \"#{name}\"", { :acceptable_exit_codes => [0, 2] }, &block)
+  def group_present(name, &)
+    execute("net localgroup /add \"#{name}\"", { :acceptable_exit_codes => [0, 2] }, &)
   end
 
-  def group_absent(name, &block)
-    execute("net localgroup /delete \"#{name}\"", { :acceptable_exit_codes => [0, 2] }, &block)
+  def group_absent(name, &)
+    execute("net localgroup /delete \"#{name}\"", { :acceptable_exit_codes => [0, 2] }, &)
   end
 end

data/lib/beaker/host/pswindows/user.rb

@@ -23,11 +23,11 @@ module PSWindows::User
     end
   end
 
-  def user_present(name, &block)
-    execute("net user /add \"#{name}\"", { :acceptable_exit_codes => [0, 2] }, &block)
+  def user_present(name, &)
+    execute("net user /add \"#{name}\"", { :acceptable_exit_codes => [0, 2] }, &)
   end
 
-  def user_absent(name, &block)
-    execute("net user /delete \"#{name}\"", { :acceptable_exit_codes => [0, 2] }, &block)
+  def user_absent(name, &)
+    execute("net user /delete \"#{name}\"", { :acceptable_exit_codes => [0, 2] }, &)
   end
 end

data/lib/beaker/host/unix/group.rb

@@ -31,11 +31,11 @@ module Unix::Group
     end
   end
 
-  def group_present(name, &block)
-    execute("if ! getent group #{name}; then groupadd #{name}; fi", {}, &block)
+  def group_present(name, &)
+    execute("if ! getent group #{name}; then groupadd #{name}; fi", {}, &)
   end
 
-  def group_absent(name, &block)
-    execute("if getent group #{name}; then groupdel #{name}; fi", {}, &block)
+  def group_absent(name, &)
+    execute("if getent group #{name}; then groupdel #{name}; fi", {}, &)
   end
 end

data/lib/beaker/host/unix/user.rb

@@ -23,11 +23,11 @@ module Unix::User
     end
   end
 
-  def user_present(name, &block)
-    execute("if ! getent passwd #{name}; then useradd #{name}; fi", {}, &block)
+  def user_present(name, &)
+    execute("if ! getent passwd #{name}; then useradd #{name}; fi", {}, &)
   end
 
-  def user_absent(name, &block)
-    execute("if getent passwd #{name}; then userdel #{name}; fi", {}, &block)
+  def user_absent(name, &)
+    execute("if getent passwd #{name}; then userdel #{name}; fi", {}, &)
   end
 end

data/lib/beaker/host/windows/group.rb

@@ -41,11 +41,11 @@ module Windows::Group
     raise NotImplementedError, "Can't retrieve group gid on a Windows host"
   end
 
-  def group_present(name, &block)
-    execute("net localgroup /add \"#{name}\"", { :acceptable_exit_codes => [0, 2] }, &block)
+  def group_present(name, &)
+    execute("net localgroup /add \"#{name}\"", { :acceptable_exit_codes => [0, 2] }, &)
   end
 
-  def group_absent(name, &block)
-    execute("net localgroup /delete \"#{name}\"", { :acceptable_exit_codes => [0, 2] }, &block)
+  def group_absent(name, &)
+    execute("net localgroup /delete \"#{name}\"", { :acceptable_exit_codes => [0, 2] }, &)
   end
 end

data/lib/beaker/host/windows/user.rb

@@ -37,11 +37,11 @@ module Windows::User
     end
   end
 
-  def user_present(name, &block)
-    execute("net user /add \"#{name}\"", { :acceptable_exit_codes => [0, 2] }, &block)
+  def user_present(name, &)
+    execute("net user /add \"#{name}\"", { :acceptable_exit_codes => [0, 2] }, &)
   end
 
-  def user_absent(name, &block)
-    execute("net user /delete \"#{name}\"", { :acceptable_exit_codes => [0, 2] }, &block)
+  def user_absent(name, &)
+    execute("net user /delete \"#{name}\"", { :acceptable_exit_codes => [0, 2] }, &)
   end
 end

data/lib/beaker/logger.rb

@@ -197,7 +197,7 @@ module Beaker
       else
         # Remove invalid and undefined UTF-8 character encodings
         string = string.to_s.dup.force_encoding('UTF-8')
-        string.scrub('')
+        return string.to_s.chars.select { |i| i.valid_encoding? }.join
       end
     end
 

data/lib/beaker/logger_junit.rb

@@ -120,34 +120,21 @@ module Beaker
       self.escape_invalid_xml_chars(Logger.strip_color_codes(string))
     end
 
-    # Every character {is_valid_xml} rejects, as one pattern. Note that this
-    # tracks that method rather than the specification it cites: #xD is absent
-    # from both, and both take the last range as 0x100000 rather than the
-    # 0x10000 the specification gives. Changing either would change the
-    # contents of every junit report, so they are left alone here and the specs
-    # walk the whole range to keep the two in step.
-    INVALID_XML_CHARS = /[^\u{9}\u{A}\u{20}-\u{D7FF}\u{E000}-\u{FFFD}\u{100000}-\u{10FFFF}]/
-
     # Escape invalid XML UTF-8 codes from provided string, see http://www.w3.org/TR/xml/#charsets for valid
     # character specification
     # @param [String] string The string to remove invalid codes from
     # @return [String] Properly escaped string
     def self.escape_invalid_xml_chars string
-      # Bytes that are not valid in their own encoding cannot be represented in
-      # xml at all, and would make the gsub below raise. Drop them, the same
-      # way Logger#convert does further upstream. Raising matters more here
-      # than it might look: TestSuiteResult calls #format_cdata from inside a
-      # blanket rescue that abandons the whole junit document, so one stray
-      # byte in one sublog loses every test result for the run.
-      string = string.dup.force_encoding(Encoding::UTF_8) unless string.encoding == Encoding::UTF_8
-      string = string.scrub('') unless string.valid_encoding?
-
-      # This walked the string a character at a time, unpacking each one into
-      # an array and joining it back into a string just to read its codepoint.
-      # That is around four objects per character, and it runs over the whole
-      # sublog of every test case at the end of a run: 28 million objects, and
-      # 98MB of permanently grown ruby heap, for a 6MB suite.
-      string.gsub(INVALID_XML_CHARS) { |char| "\\#{char.ord}" }
+      escaped_string = ""
+      string.chars.each do |i|
+        char_as_codestring = i.unpack("U*").join
+        escaped_string << if self.is_valid_xml(char_as_codestring.to_i)
+                            i
+                          else
+                            "\\#{char_as_codestring}"
+                          end
+      end
+      escaped_string
     end
 
     # Determine if the provided number falls in the range of accepted xml unicode values

data/lib/beaker/platform.rb

@@ -11,8 +11,7 @@ module Beaker
                      "bookworm" => "12",
                      "bullseye" => "11",
                      "buster" => "10", },
-        :ubuntu => { "resolute" => "2604",
-                     "noble" => "2404",
+        :ubuntu => { "noble" => "2404",
                      "jammy" => "2204",
                      "focal" => "2004",
                      "bionic" => "1804", },

data/lib/beaker/result.rb

@@ -31,24 +31,10 @@ module Beaker
       return string.gsub(/\r\n?/, "\n")
     end
 
-    # This method behaves differently when given a string instance, subclass
-    # or something else. The latter two cases should be deprecated.
-    def convert(string)
-      # guard against nil, which never worked on accident
-      raise TypeError, "Beaker::Result#convert cannot convert nil to a String" if string.nil?
-
-      unless string.instance_of?(String)
-        # For a string subclass, `string.to_s` returns a copy, so calling
-        # `force_encoding` on it was meaningless.
-        return string.to_s.scrub('')
-      end
-
-      # Data collected from the connection is binary (ASCII-8BIT). In that
-      # encoding, every byte is a valid character, so we tag the string as UTF-8
-      string.force_encoding('UTF-8')
-
-      # And remove invalid and undefined UTF-8 character encodings.
-      string.scrub('')
+    def convert string
+      # Remove invalid and undefined UTF-8 character encodings
+      string.to_s.force_encoding('UTF-8')
+      string.to_s.chars.select { |i| i.valid_encoding? }.join
     end
 
     def log(logger)

data/lib/beaker/shared/repetition.rb

@@ -1,9 +1,9 @@
 module Beaker
   module Shared
     module Repetition
-      def repeat_for seconds, &block
+      def repeat_for(seconds, &)
         # do not peg CPU if &block takes less than 1 second
-        repeat_for_and_wait seconds, 1, &block
+        repeat_for_and_wait(seconds, 1, &)
       end
 
       def repeat_for_and_wait seconds, wait

data/lib/beaker/tasks/rake_task.rb

@@ -29,14 +29,14 @@ module Beaker
       # Sets up the predefine task checking
       # @param args [Array] First argument is always the name of the task
       # if no additonal arguments are defined such as parameters it will default to [:hosts,:type]
-      def initialize(*args, &task_block)
+      def initialize(*args, &)
         super
 
         @name = args.shift || 'beaker:test'
         args = %i[hosts type] if args.empty?
         @acceptance_root = DEFAULT_ACCEPTANCE_ROOT
         @options_file = nil
-        define(args, &task_block)
+        define(args, &)
       end
 
       private

data/lib/beaker/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '6.9.0'
+    STRING = '7.0.0'
   end
 end

data/spec/beaker/host_prebuilt_steps_spec.rb

@@ -380,14 +380,14 @@ describe Beaker do
         let(:cygwin) { true }
         let(:cat) { "cat /cygdrive/c/Windows/System32/drivers/etc/hosts" }
 
-        include_examples 'find domain name'
+        it_behaves_like 'find domain name'
       end
 
       context "without cygwin" do
         let(:cygwin) { false }
         let(:cat) { 'type C:\Windows\System32\drivers\etc\hosts' }
 
-        include_examples 'find domain name'
+        it_behaves_like 'find domain name'
       end
     end
 
@@ -399,25 +399,25 @@ describe Beaker do
         context "with a domain entry" do
           let(:stdout) { "domain labs.lan d.labs.net dc1.labs.net labs.com\nnameserver 10.16.22.10\nnameserver 10.16.22.11" }
 
-          include_examples 'find domain name'
+          it_behaves_like 'find domain name'
         end
 
         context "with a search entry" do
           let(:stdout) { "search labs.lan d.labs.net dc1.labs.net labs.com\nnameserver 10.16.22.10\nnameserver 10.16.22.11" }
 
-          include_examples 'find domain name'
+          it_behaves_like 'find domain name'
         end
 
         context "with a both a domain and a search entry" do
           let(:stdout) { "domain labs.lan\nsearch d.labs.net dc1.labs.net labs.com\nnameserver 10.16.22.10\nnameserver 10.16.22.11" }
 
-          include_examples 'find domain name'
+          it_behaves_like 'find domain name'
         end
 
         context "with a both a domain and a search entry, the search entry first" do
           let(:stdout) { "search foo.example.net\ndomain labs.lan d.labs.net dc1.labs.net labs.com\nnameserver 10.16.22.10\nnameserver 10.16.22.11" }
 
-          include_examples 'find domain name'
+          it_behaves_like 'find domain name'
         end
       end
     end

data/spec/beaker/logger_junit_spec.rb

@@ -32,42 +32,6 @@ module Beaker
         testing_string = 'pants man, pants!'
         expect(described_class.escape_invalid_xml_chars(testing_string)).to be === testing_string
       end
-
-      it 'escapes carriage returns, which is_valid_xml does not accept' do
-        expect(described_class.escape_invalid_xml_chars("a\rb")).to be === 'a\13b'
-      end
-
-      it 'agrees with is_valid_xml on every codepoint' do
-        # INVALID_XML_CHARS has to track is_valid_xml rather than the spec that
-        # method cites, so walk the whole range instead of trusting either.
-        codepoints = (0..0xD7FF).to_a + (0xE000..0x10FFFF).to_a # surrogates cannot be in a String
-        codepoints.each_slice(50_000) do |slice|
-          string = slice.map { |c| c.chr(Encoding::UTF_8) }.join
-          expected = slice.map { |c| described_class.is_valid_xml(c) ? c.chr(Encoding::UTF_8) : "\\#{c}" }.join
-          expect(described_class.escape_invalid_xml_chars(string)).to eq(expected)
-        end
-      end
-
-      it 'drops invalid encodings rather than raising' do
-        # TestSuiteResult calls format_cdata from inside a blanket rescue that
-        # abandons the whole junit document, so an exception raised here would
-        # cost the run its entire test report.
-        expect(described_class.escape_invalid_xml_chars("ok\xFFbad".b)).to eq('okbad')
-      end
-
-      it 'accepts a frozen string' do
-        expect(described_class.escape_invalid_xml_chars('pants'.freeze)).to eq('pants')
-      end
-    end
-
-    describe '#format_cdata' do
-      it 'strips colour codes and escapes what is left' do
-        expect(described_class.format_cdata("\e[00;33mpants\e[00;00m")).to eq('pants')
-      end
-
-      it 'survives invalid encodings' do
-        expect(described_class.format_cdata("\e[00;33mok\xFFbad".b)).to eq('okbad')
-      end
     end
 
     describe '#copy_stylesheet_into_xml_dir' do

data/spec/beaker/logger_spec.rb

@@ -24,24 +24,6 @@ module Beaker
         valid_utf8.freeze
         expect(logger.convert(valid_utf8)).to be === valid_utf8
       end
-
-      it 'leaves the string it was given alone' do
-        expect(logger.convert(invalid_utf8)).not_to equal(invalid_utf8)
-        expect(invalid_utf8.bytes).to include(0xAD)
-      end
-
-      it 'converts each item of an array' do
-        expect(logger.convert([valid_utf8, invalid_utf8])).to eq([valid_utf8, valid_utf8])
-      end
-
-      it 'converts arrays of arrays' do
-        expect(logger.convert([[invalid_utf8], valid_utf8])).to eq([[valid_utf8], valid_utf8])
-      end
-
-      it 'converts anything that can describe itself' do
-        expect(logger.convert(42)).to eq('42')
-        expect(logger.convert(nil)).to eq('')
-      end
     end
 
     describe '#generate_dated_log_folder' do

data/spec/beaker/platform_spec.rb

@@ -78,11 +78,6 @@ module Beaker
         expect(platform.with_version_codename).to be === 'debian-bullseye-xxx'
       end
 
-      it "can convert ubuntu-2604-xxx to ubuntu-resolute-xxx" do
-        @name = 'ubuntu-2604-xxx'
-        expect(platform.with_version_codename).to be === 'ubuntu-resolute-xxx'
-      end
-
       it "can convert ubuntu-2404-xxx to ubuntu-noble-xxx" do
         @name = 'ubuntu-2404-xxx'
         expect(platform.with_version_codename).to be === 'ubuntu-noble-xxx'
@@ -127,11 +122,6 @@ module Beaker
         expect(platform.with_version_number).to be === 'ubuntu-2204-xxx'
       end
 
-      it "can convert ubuntu-resolute-xxx to ubuntu-2604-xxx" do
-        @name = 'ubuntu-resolute-xxx'
-        expect(platform.with_version_number).to be === 'ubuntu-2604-xxx'
-      end
-
       %w[centos redhat].each do |p|
         it "leaves #{p}-7-xxx alone" do
           @name = "#{p}-7-xxx"
@@ -150,7 +140,7 @@ module Beaker
         if YAML.respond_to?(:unsafe_load)
           YAML.unsafe_load(YAML.dump(platform))
         else
-          YAML.load(YAML.dump(platform)) # rubocop:disable Security/YAMLLoad
+          YAML.load(YAML.dump(platform))
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 6.9.0
+  version: 7.0.0
 platform: ruby
 authors:
 - Puppet
@@ -63,14 +63,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 4.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 4.1.0
 - !ruby/object:Gem::Dependency
   name: base64
   requirement: !ruby/object:Gem::Requirement
@@ -327,14 +327,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: stringify-hash
   requirement: !ruby/object:Gem::Requirement
@@ -659,7 +659,6 @@ files:
 - spec/beaker/options/validator_spec.rb
 - spec/beaker/perf_spec.rb
 - spec/beaker/platform_spec.rb
-- spec/beaker/result_spec.rb
 - spec/beaker/shared/error_handler_spec.rb
 - spec/beaker/shared/fog_credentials_spec.rb
 - spec/beaker/shared/host_manager_spec.rb
@@ -686,14 +685,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.16
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Let's test Puppet!
 test_files: []

data/spec/beaker/result_spec.rb

@@ -1,189 +0,0 @@
-require 'spec_helper'
-
-module Beaker
-  describe Result do
-    subject(:result) { described_class.new(host, cmd) }
-
-    let(:host) { 'my_host' }
-    let(:cmd)  { 'ls -la' }
-
-    # Command output reaches a Result the way net-ssh hands it over: as chunks
-    # of binary data, appended as they arrive.
-    def binary(string)
-      string.dup.force_encoding('ASCII-8BIT')
-    end
-
-    describe '#initialize' do
-      it 'starts with empty streams and no exit code' do
-        expect(result.stdout).to eq('')
-        expect(result.stderr).to eq('')
-        expect(result.output).to eq('')
-        expect(result.exit_code).to be_nil
-      end
-    end
-
-    describe '#convert' do
-      let(:valid_utf8) { "modules\n├── jimmy-appleseed (v1.1.0)\n└── jimmy-crakorn (v0.4.0)\n" }
-
-      it 'preserves valid utf-8' do
-        expect(result.convert(valid_utf8.dup)).to eq(valid_utf8)
-      end
-
-      it 'strips invalid utf-8 byte sequences' do
-        expect(result.convert(binary("ok\xFFbad"))).to eq('okbad')
-      end
-
-      it 'strips a truncated multi-byte sequence' do
-        expect(result.convert(binary("ok\xE3\x81"))).to eq('ok')
-      end
-
-      it 'returns utf-8 whatever encoding it was handed' do
-        expect(result.convert(binary('plain')).encoding).to eq(Encoding::UTF_8)
-      end
-
-      it 'modifies the argument encoding in place' do
-        string = binary('plain')
-        result.convert(string)
-        expect(string.encoding).to eq(Encoding::UTF_8)
-      end
-
-      it 'returns a new string rather than scrubbing the one it was given' do
-        string = binary("ok\xFFbad")
-        expect(result.convert(string)).not_to equal(string)
-        expect(string.bytes).to include(0xFF)
-      end
-
-      context 'when handed String subclass' do
-        let(:string_subclass) { Class.new(String) }
-
-        it 'accepts String subclass' do
-          expect(result.convert(string_subclass.new('plain'))).to eq('plain')
-        end
-
-        it 'leaves invalid encodings in place, as it always has' do
-          subclass = string_subclass.new(binary("ok\xFFbad"))
-          expect(result.convert(subclass).bytes).to include(0xFF)
-        end
-
-        it 'converts anything else that can describe itself' do
-          expect(result.convert(5)).to eq('5')
-        end
-
-        it 'raises TypeError on nil' do
-          expect { result.convert(nil) }.to raise_error(TypeError, /cannot convert nil to a String/)
-        end
-      end
-    end
-
-    describe '#normalize_line_endings' do
-      it 'converts crlf to lf' do
-        expect(result.normalize_line_endings("a\r\nb")).to eq("a\nb")
-      end
-
-      it 'converts a lone cr to lf' do
-        expect(result.normalize_line_endings("a\rb")).to eq("a\nb")
-      end
-
-      it 'leaves lf alone' do
-        expect(result.normalize_line_endings("a\nb")).to eq("a\nb")
-      end
-    end
-
-    describe '#finalize!' do
-      before do
-        result.stdout << binary("out\xFF\r\n")
-        result.stderr << binary("err\xFF\r\n")
-        result.output << binary("out\xFF\r\nerr\xFF\r\n")
-        result.finalize!
-      end
-
-      it 'scrubs and normalizes every stream' do
-        expect(result.stdout).to eq("out\n")
-        expect(result.stderr).to eq("err\n")
-        expect(result.output).to eq("out\nerr\n")
-      end
-
-      it 'keeps the unscrubbed bytes in the raw_ attributes' do
-        expect(result.raw_stdout.bytes).to include(0xFF)
-        expect(result.raw_stderr.bytes).to include(0xFF)
-        expect(result.raw_output.bytes).to include(0xFF)
-      end
-
-      it 'leaves the raw_ line endings alone' do
-        expect(result.raw_stdout).to include("\r\n")
-      end
-    end
-
-    describe '#formatted_output' do
-      before do
-        result.output << (1..15).map { |i| "line #{i}" }.join("\n")
-      end
-
-      it 'returns the last ten lines by default, tab indented' do
-        expect(result.formatted_output).to eq((6..15).map { |i| "\tline #{i}" }.join("\n"))
-      end
-
-      it 'honours a limit' do
-        expect(result.formatted_output(2)).to eq("\tline 14\n\tline 15")
-      end
-    end
-
-    describe '#exit_code_in?' do
-      it 'is true when the exit code is in the range' do
-        result.exit_code = 2
-        expect(result.exit_code_in?([0, 2])).to be true
-      end
-
-      it 'is false when it is not' do
-        result.exit_code = 1
-        expect(result.exit_code_in?([0, 2])).to be false
-      end
-    end
-
-    describe '#success?' do
-      it 'is true only for an exit code of zero' do
-        result.exit_code = 0
-        expect(result).to be_success
-      end
-
-      it 'is false for a non-zero exit code' do
-        result.exit_code = 1
-        expect(result).not_to be_success
-      end
-
-      it 'is false when no exit code was collected' do
-        expect(result).not_to be_success
-      end
-    end
-
-    describe '#log' do
-      let(:logger) { instance_double(Beaker::Logger) }
-
-      it 'reports a non-zero exit code' do
-        result.exit_code = 1
-        expect(logger).to receive(:debug).with('Exited: 1')
-        result.log(logger)
-      end
-
-      it 'says nothing for a successful command' do
-        result.exit_code = 0
-        expect(logger).not_to receive(:debug)
-        result.log(logger)
-      end
-
-      it 'says nothing when no exit code was collected' do
-        expect(logger).not_to receive(:debug)
-        result.log(logger)
-      end
-    end
-  end
-
-  describe NullResult do
-    subject(:result) { described_class.new('my_host', 'ls -la') }
-
-    it 'succeeds without having run anything' do
-      expect(result.exit_code).to eq(0)
-      expect(result).to be_success
-    end
-  end
-end