beaker 7.3.0 → 7.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ddee4c17a106c817361dc58a101c0c98d6dba0a1eddab7f865856059eab87bdb
-  data.tar.gz: 4248053a457d1c41469bd825d4eef81b1ab2673ac6d30e8fd9ad292f2a4ead3d
+  metadata.gz: 8728e0534809f9264bde56aae96f4f8639596d92a17396f16636e1230493f954
+  data.tar.gz: dff353b3b984b363b15d60902a10f88a794a620c94cabfd1ef67b6054389fb11
 SHA512:
-  metadata.gz: f6471b11f4aa7b5dd6e78313d042cdb79bec4d4c15d6c18aff840bbd5e52deab4feb0c9b1a3acce934bf577a12b47688b7e8934a28d6619a7e149c4263ec8638
-  data.tar.gz: fb14fbffb4397d853e8cc048b4498af7b7cc96825d208356205caaf067f3e13a7dd9e4d27f97b43217c3948aec69f30233485b33e46ed5bca9ca0fdac600c7e8
+  metadata.gz: 859bfebb10ad3ae5d399508fcc2ee61bc01ce5aa60da9542e584ed90e5a5d3266b39d05e9a732db77063f356448dbf71307f948d46358816357a9bd0f7b5b2cf
+  data.tar.gz: 2aff57d8a71deef1c5fa275de75d4b02e9184adcf2966c14b2827842568c3f34458ce2abea65eedee5051dcd4d2044fd1764fa11cc1d930d4d5a721149661b26

data/CHANGELOG.md

@@ -2,6 +2,22 @@
 
 All notable changes to this project will be documented in this file.
 
+## [7.4.0](https://github.com/voxpupuli/beaker/tree/7.4.0) (2026-01-22)
+
+[Full Changelog](https://github.com/voxpupuli/beaker/compare/7.3.0...7.4.0)
+
+**Implemented enhancements:**
+
+- Respect no\_color [\#1980](https://github.com/voxpupuli/beaker/pull/1980) ([bwitt](https://github.com/bwitt))
+
+**Fixed bugs:**
+
+- Avoid duplicating PermitUserEnvironment [\#1954](https://github.com/voxpupuli/beaker/pull/1954) ([kajinamit](https://github.com/kajinamit))
+
+**Merged pull requests:**
+
+- Add rspec annotations to GitHub CI [\#1986](https://github.com/voxpupuli/beaker/pull/1986) ([bastelfreak](https://github.com/bastelfreak))
+
 ## [7.3.0](https://github.com/voxpupuli/beaker/tree/7.3.0) (2026-01-06)
 
 [Full Changelog](https://github.com/voxpupuli/beaker/compare/7.2.2...7.3.0)

data/beaker.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |s|
   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 'rspec-github', '~> 3.0'
   s.add_development_dependency 'voxpupuli-rubocop', '~> 5.1.0'
 
   # Run time dependencies

data/docs/concepts/beaker_vs_beaker_rspec.md

@@ -71,7 +71,7 @@ beaker is an acceptance testing framework that is written in Ruby.  beaker-rspec
 
           # Run it twice and test for idempotency
           apply_manifest(pp, :catch_failures => true)
-          expect(apply_manifest(pp, :catch_failures => true).exit_code).to be_zero
+          apply_manifest(pp, :catch_changes => true)
         end
 
         describe package(package_name) do

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

@@ -302,7 +302,7 @@ module Unix::Exec
     case self['platform']
     when /amazon|debian|ubuntu|archlinux|el-|centos|fedora|redhat|oracle|scientific|opensuse|sles|solaris/
       directory = tmpdir
-      exec(Beaker::Command.new("echo 'PermitUserEnvironment yes' | cat - /etc/ssh/sshd_config > #{directory}/sshd_config.permit"))
+      exec(Beaker::Command.new("sed -e 's/^PermitUserEnvironment .*/PermitUserEnvironment yes/' -e t -e '1s/^/PermitUserEnvironment yes\\n/' /etc/ssh/sshd_config > #{directory}/sshd_config.permit"))
       exec(Beaker::Command.new("mv #{directory}/sshd_config.permit /etc/ssh/sshd_config"))
       exec(Beaker::Command.new("echo '' >/etc/environment")) if self['platform'].include?('ubuntu-')
     when /(free|open)bsd/

data/lib/beaker/options/presets.rb

@@ -37,6 +37,7 @@ module Beaker
         :test_tag_or => ['BEAKER_TEST_TAG_OR'],
         :test_tag_exclude => %w[BEAKER_EXCLUDE_TAG BEAKER_TEST_TAG_EXCLUDE],
         :run_in_parallel => ['BEAKER_RUN_IN_PARALLEL'],
+        :color => 'BEAKER_COLOR',
       }
 
       # Select all environment variables whose name matches provided regex
@@ -85,6 +86,18 @@ module Beaker
         end
         found_env_vars[:run_in_parallel] = found_env_vars[:run_in_parallel].split(',') if found_env_vars[:run_in_parallel]
 
+        # NO_COLOR is handled manually since it has inverted logic (presence means no color)
+        no_color_val = ENV['NO_COLOR']
+        beaker_color_val = found_env_vars[:color]
+
+        if beaker_color_val && !beaker_color_val.empty?
+          found_env_vars[:color] = !/^(no|false)$/i.match?(beaker_color_val)
+        elsif no_color_val && !no_color_val.empty?
+          found_env_vars[:color] = false
+        else
+          found_env_vars.delete(:color)
+        end
+
         found_env_vars[:pe_version_file_win] = found_env_vars[:pe_version_file]
         found_env_vars
       end
@@ -98,7 +111,7 @@ module Beaker
         found = found.merge(format_found_env_vars(collect_env_vars(ENVIRONMENT_SPEC)))
         found[:answers] = select_env_by_regex('\\Aq_')
 
-        found.delete_if { |_key, value| value.nil? or value.empty? }
+        found.delete_if { |_key, value| value.nil? or (value.respond_to?(:empty?) && value.empty?) }
         found
       end
 

data/lib/beaker/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '7.3.0'
+    STRING = '7.4.0'
   end
 end

data/spec/beaker/host/unix/exec_spec.rb

@@ -79,7 +79,7 @@ module Beaker
     describe '#ssh_permit_user_environment' do
       context 'When called without error' do
         let(:directory) { '/directory' }
-        let(:ssh_command) { "echo 'PermitUserEnvironment yes' | cat - /etc/ssh/sshd_config > #{directory}/sshd_config.permit" }
+        let(:ssh_command) { "sed -e 's/^PermitUserEnvironment .*/PermitUserEnvironment yes/' -e t -e '1s/^/PermitUserEnvironment yes\\n/' /etc/ssh/sshd_config > #{directory}/sshd_config.permit" }
         let(:ssh_move) { "mv #{directory}/sshd_config.permit /etc/ssh/sshd_config" }
 
         platforms = PlatformHelpers::REDHATPLATFORMS + PlatformHelpers::DEBIANPLATFORMS

data/spec/beaker/options/presets_spec.rb

@@ -23,6 +23,56 @@ module Beaker
         expect(env[:run_in_parallel]).to eq(%w[install configure])
       end
 
+      describe "color environment variables" do
+        after do
+          ENV.delete('NO_COLOR')
+          ENV.delete('BEAKER_COLOR')
+        end
+
+        it "disables color when NO_COLOR is set to any non-empty value" do
+          ENV['NO_COLOR'] = '1'
+          env = presets.env_vars
+          expect(env[:color]).to be false
+        end
+
+        it "does not set color when NO_COLOR is set to an empty string" do
+          ENV['NO_COLOR'] = ''
+          env = presets.env_vars
+          expect(env).not_to have_key(:color)
+        end
+
+        it "disables color when BEAKER_COLOR is set to 'no'" do
+          ENV['BEAKER_COLOR'] = 'no'
+          env = presets.env_vars
+          expect(env[:color]).to be false
+        end
+
+        it "disables color when BEAKER_COLOR is set to 'false'" do
+          ENV['BEAKER_COLOR'] = 'false'
+          env = presets.env_vars
+          expect(env[:color]).to be false
+        end
+
+        it "enables color when BEAKER_COLOR is set to 'yes'" do
+          ENV['BEAKER_COLOR'] = 'yes'
+          env = presets.env_vars
+          expect(env[:color]).to be true
+        end
+
+        it "enables color when BEAKER_COLOR is set to 'true'" do
+          ENV['BEAKER_COLOR'] = 'true'
+          env = presets.env_vars
+          expect(env[:color]).to be true
+        end
+
+        it "prioritizes BEAKER_COLOR over NO_COLOR" do
+          ENV['NO_COLOR'] = '1'
+          ENV['BEAKER_COLOR'] = 'yes'
+          env = presets.env_vars
+          expect(env[:color]).to be true
+        end
+      end
+
       it "removes all empty/nil entries in env_vars" do
         expect(presets.env_vars.has_value?(nil)).to be === false
         expect(presets.env_vars.has_value?({})).to be === false

data/spec/spec_helper.rb

@@ -8,4 +8,9 @@ RSpec.configure do |config|
   config.include FakeFS::SpecHelpers
   config.include TestFileHelpers
   config.include HostHelpers
+  # Use the GitHub Annotations formatter for CI
+  if ENV['GITHUB_ACTIONS'] == 'true'
+    require 'rspec/github'
+    config.add_formatter RSpec::Github::Formatter
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 7.3.0
+  version: 7.4.0
 platform: ruby
 authors:
 - Puppet
@@ -58,6 +58,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rspec-github
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: voxpupuli-rubocop
   requirement: !ruby/object:Gem::Requirement