beaker 7.8.2 → 7.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 81a5056bbf75fb1a2d0203ea5885a278d12300fc339415e5afeeb46ebef8d785
-  data.tar.gz: e5a03effce21a9d74058016da1dcdf3421c9f9ccb2ea9717b295c8b5f99a16b1
+  metadata.gz: bc70d9b91085103e8380ab0e1a5dbbbbba99cd091d6b214462f95ce4f4735bd5
+  data.tar.gz: e4a7714defa006440a6b39c017f42ecd8c6ef1bc97c2793c86b1386c9737ff5d
 SHA512:
-  metadata.gz: 4c7ce30592e319300a0dfe9d864c4194ba1ea6eaf86febb0b0c1b8122ae9f6ec7ab4a7e718a7b0e43a48c64746f9226d4cad83688d6f71871ab9e57282e25d7e
-  data.tar.gz: 0cb47533c54b7ef3497652a1b4396ea90c53f5cf2ef7e6c9a3a964826b1cf782e75f46cd371ce38de33ae7a7249f9f6f3631d2818014c9acec11aae40dd7d7da
+  metadata.gz: b3d88078d0717e7768c614884f1e9fa430cd5cb55465d8bc570ab5f154353897ae525b24a8a54b0b0b896f5a3ce1f4572a5af2c84f15b10ca0f564ec6c0f8d58
+  data.tar.gz: 279efae545117ac3c344ccad94d1830fba5793c2235c6fa9ceeddc6b3859b5fed6b20a4bfeb9e4975f27fa68acd78c5f88bbf5cd67b7882a2c83277aec721cee

data/.github/workflows/release.yml

@@ -17,14 +17,14 @@ jobs:
     steps:
       - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
       - name: Install Ruby
-        uses: ruby/setup-ruby@95ef2b042f9d7a56d8268cba8559e2842e2ad01b # v1.321.0
+        uses: ruby/setup-ruby@b3aaceaef7e0ee231b499e7b5f49c03fc1d32199 # v1.338.0
         with:
           ruby-version: 'ruby'
       - name: Build gem
         shell: bash
         run: gem build --verbose *.gemspec
       - name: Upload gem to GitHub cache
-        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+        uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
         with:
           name: gem-artifact
           path: '*.gem'
@@ -39,7 +39,7 @@ jobs:
       contents: write # clone repo and create release
     steps:
       - name: Download gem from GitHub cache
-        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+        uses: actions/download-artifact@9000827ccba6bdab643e8b6fd33ac0654aef8333 # v8.0.2
         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@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+        uses: actions/download-artifact@9000827ccba6bdab643e8b6fd33ac0654aef8333 # v8.0.2
         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@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+        uses: actions/download-artifact@9000827ccba6bdab643e8b6fd33ac0654aef8333 # v8.0.2
         with:
           name: gem-artifact
       - uses: rubygems/configure-rubygems-credentials@dc5a8d8553e6ee01fc26761a49e99e733d17954a # v2.1.0
@@ -92,11 +92,11 @@ jobs:
       - release-to-rubygems
     steps:
       - name: Download gem from GitHub cache
-        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+        uses: actions/download-artifact@9000827ccba6bdab643e8b6fd33ac0654aef8333 # v8.0.2
         with:
           name: gem-artifact
       - name: Install Ruby
-        uses: ruby/setup-ruby@95ef2b042f9d7a56d8268cba8559e2842e2ad01b # v1.321.0
+        uses: ruby/setup-ruby@b3aaceaef7e0ee231b499e7b5f49c03fc1d32199 # v1.338.0
         with:
           ruby-version: 'ruby'
       - name: Wait for release to propagate

data/.github/workflows/test.yml

@@ -18,7 +18,7 @@ jobs:
     steps:
       - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
       - name: Install Ruby ${{ matrix.ruby }}
-        uses: ruby/setup-ruby@95ef2b042f9d7a56d8268cba8559e2842e2ad01b # v1.321.0
+        uses: ruby/setup-ruby@b3aaceaef7e0ee231b499e7b5f49c03fc1d32199 # v1.338.0
         with:
           ruby-version: '4.0'
           bundler-cache: true
@@ -40,7 +40,7 @@ jobs:
     steps:
       - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
       - name: Install Ruby ${{ matrix.ruby }}
-        uses: ruby/setup-ruby@95ef2b042f9d7a56d8268cba8559e2842e2ad01b # v1.321.0
+        uses: ruby/setup-ruby@b3aaceaef7e0ee231b499e7b5f49c03fc1d32199 # v1.338.0
         with:
           ruby-version: ${{ matrix.ruby }}
           bundler-cache: true

data/CHANGELOG.md

@@ -2,9 +2,25 @@
 
 All notable changes to this project will be documented in this file.
 
-## [7.8.2](https://github.com/voxpupuli/beaker/tree/7.8.2) (2026-09-09)
+## [7.8.4](https://github.com/voxpupuli/beaker/tree/7.8.4) (2026-11-11)
 
-[Full Changelog](https://github.com/voxpupuli/beaker/compare/v7.8.1...7.8.2)
+[Full Changelog](https://github.com/voxpupuli/beaker/compare/v7.8.3...7.8.4)
+
+**Fixed bugs:**
+
+- Restart Cygwin's sshd under its current service name [\#2059](https://github.com/voxpupuli/beaker/pull/2059) ([nmburgan](https://github.com/nmburgan))
+
+## [v7.8.3](https://github.com/voxpupuli/beaker/tree/v7.8.3) (2026-09-17)
+
+[Full Changelog](https://github.com/voxpupuli/beaker/compare/v7.8.2...v7.8.3)
+
+**Fixed bugs:**
+
+- Fix Solaris sshd\_config editing in ssh\_permit\_user\_environment [\#2029](https://github.com/voxpupuli/beaker/pull/2029) ([shubhamshinde360](https://github.com/shubhamshinde360))
+
+## [v7.8.2](https://github.com/voxpupuli/beaker/tree/v7.8.2) (2026-09-09)
+
+[Full Changelog](https://github.com/voxpupuli/beaker/compare/v7.8.1...v7.8.2)
 
 **Fixed bugs:**
 

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

@@ -300,11 +300,13 @@ module Unix::Exec
   #   (from {#ssh_service_restart}).
   def ssh_permit_user_environment
     case self['platform']
-    when /amazon|debian|ubuntu|archlinux|el-|centos|fedora|redhat|oracle|scientific|opensuse|sles|solaris/
+    when /amazon|debian|ubuntu|archlinux|el-|centos|fedora|redhat|oracle|scientific|opensuse|sles/
       directory = tmpdir
       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 /solaris/
+      exec(Beaker::Command.new("perl -i -0777 -pe 's/^#?PermitUserEnvironment\\b[^\\n]*/PermitUserEnvironment yes/m or s/\\z/PermitUserEnvironment yes\\n/' /etc/ssh/sshd_config"))
     when /(free|open)bsd/
       exec(Beaker::Command.new("sudo perl -pi -e 's/^#?PermitUserEnvironment no/PermitUserEnvironment yes/' /etc/ssh/sshd_config"), { :pty => true })
     else

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

@@ -65,13 +65,16 @@ module Windows::Exec
   #
   # @return [Result] result of starting SSH service
   def ssh_service_restart
+    # Cygwin's ssh-host-config names the service cygsshd. Older versions named it sshd.
+    cygsshd = exec(Beaker::Command.new('cygrunsrv -Q cygsshd'), :accept_all_exit_codes => true).exit_code == 0
+    service_name = cygsshd ? 'cygsshd' : 'sshd'
     command_result = nil
     # we get periodic failures to restart the service, so looping these with re-attempts
     repeat_fibonacci_style_for(5) do
-      0 == exec(Beaker::Command.new("cygrunsrv -E sshd"), :acceptable_exit_codes => [0, 1]).exit_code
+      0 == exec(Beaker::Command.new("cygrunsrv -E #{service_name}"), :acceptable_exit_codes => [0, 1]).exit_code
     end
     repeat_fibonacci_style_for(5) do
-      command_result = exec(Beaker::Command.new("cygrunsrv -S sshd"), :acceptable_exit_codes => [0, 1])
+      command_result = exec(Beaker::Command.new("cygrunsrv -S #{service_name}"), :acceptable_exit_codes => [0, 1])
       0 == command_result.exit_code
     end
     command_result

data/lib/beaker/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '7.8.2'
+    STRING = '7.8.4'
   end
 end

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

@@ -95,6 +95,18 @@ module Beaker
             expect { instance.ssh_permit_user_environment }.not_to raise_error
           end
         end
+
+        context 'on Solaris' do
+          PlatformHelpers::SOLARISPLATFORMS.each do |platform|
+            it "calls the correct commands for #{platform}" do
+              opts['platform'] = platform
+              expect(instance).to receive(:exec).once
+              expect(Beaker::Command).to receive(:new).with("perl -i -0777 -pe 's/^#?PermitUserEnvironment\\b[^\\n]*/PermitUserEnvironment yes/m or s/\\z/PermitUserEnvironment yes\\n/' /etc/ssh/sshd_config")
+              expect(instance).to receive(:ssh_service_restart)
+              expect { instance.ssh_permit_user_environment }.not_to raise_error
+            end
+          end
+        end
       end
 
       it 'raises an error on unsupported platforms' do

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

@@ -78,6 +78,25 @@ module Beaker
       end
     end
 
+    describe '#ssh_service_restart' do
+      let(:success) { double('success', :exit_code => 0) }
+      let(:failure) { double('failure', :exit_code => 1) }
+
+      it 'restarts the cygsshd service when it exists' do
+        allow(instance).to receive(:exec).with(having_attributes(command: 'cygrunsrv -Q cygsshd'), anything).and_return(success)
+        expect(instance).to receive(:exec).with(having_attributes(command: 'cygrunsrv -E cygsshd'), anything).and_return(success)
+        expect(instance).to receive(:exec).with(having_attributes(command: 'cygrunsrv -S cygsshd'), anything).and_return(success)
+        expect(instance.ssh_service_restart).to eq(success)
+      end
+
+      it 'restarts the sshd service when there is no cygsshd service' do
+        allow(instance).to receive(:exec).with(having_attributes(command: 'cygrunsrv -Q cygsshd'), anything).and_return(failure)
+        expect(instance).to receive(:exec).with(having_attributes(command: 'cygrunsrv -E sshd'), anything).and_return(success)
+        expect(instance).to receive(:exec).with(having_attributes(command: 'cygrunsrv -S sshd'), anything).and_return(success)
+        expect(instance.ssh_service_restart).to eq(success)
+      end
+    end
+
     context 'mv' do
       let(:origin)      { '/origin/path/of/content' }
       let(:destination) { '/destination/path/of/content' }

data/spec/helpers.rb

@@ -136,4 +136,6 @@ module PlatformHelpers
     scientific
     archlinux
   ]
+
+  SOLARISPLATFORMS = %w[solaris10-SPARC solaris11-SPARC]
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 7.8.2
+  version: 7.8.4
 platform: ruby
 authors:
 - Puppet
@@ -755,7 +755,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.16
+rubygems_version: 4.0.20
 specification_version: 4
 summary: Let's test Puppet!
 test_files: []