beaker_puppet_helpers 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d0550fb9dda46a2effd035d07f81640e6e4e6e622ebd0866a5fc08f301d5947
-  data.tar.gz: 859a99675ab7977f47610b4a726876eac05ba76a9985785f8a2f1c3a2d2ed244
+  metadata.gz: 860333658bb4763948199ffd7f44aa8d63f91f82e1433237e173646a7f846946
+  data.tar.gz: ab16c43125a9ad5a07bd3f84e0e48897fb759b0a79c2be4af36601126dd09942
 SHA512:
-  metadata.gz: bb98aef7ffafa80edb343acdf211a7b7006a6dff6b39677e6bc8567f2f04bc4c3dc4a3b68c02d0d4e7f0aa944790f90e73f95b9ae1699164954d0365c7c046ce
-  data.tar.gz: 9a7c6dd3be79c2b72a241dc69aba3f9a383ff17f53c758ed645f62492a0256e4a4f53842c3027cb45dada00b2799dda39150c9ea98729889caa86648cb468a1a
+  metadata.gz: 3e80f94672298bb94adf4aea463aa2dcfa0271d36a6e6e9916964cac8ba0944229888b7bf5c2cc9be42829ef19df8829caf28e1b3dd8dd0060f999d12be077de
+  data.tar.gz: 0360e4c00279e81aa205ca1933fbaa00288d3dc549b0f97ef247fd2990994cb5b2b9fadb73d6b7f531becf918ded29d6641a5bc4d55aed4807c10e51cb779f05

data/.github/workflows/release.yml

@@ -11,10 +11,10 @@ jobs:
     if: github.repository_owner == 'voxpupuli'
     steps:
       - uses: actions/checkout@v4
-      - name: Install Ruby 3.0
+      - name: Install Ruby 3.3
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '3.0'
+          ruby-version: '3.3'
           bundler: 'none'
       - name: Build gem
         run: gem build --strict --verbose *.gemspec

data/.github/workflows/test.yml

@@ -19,7 +19,7 @@ jobs:
       - name: Install Ruby ${{ matrix.ruby }}
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "3.0"
+          ruby-version: "3.3"
           bundler-cache: true
       - name: Rubocop
         run: bundle exec rake rubocop
@@ -30,6 +30,7 @@ jobs:
       fail-fast: false
       matrix:
         ruby:
+          - "3.3"
           - "3.2"
           - "3.1"
           - "3.0"

data/CHANGELOG.md

@@ -2,6 +2,24 @@
 
 All notable changes to this project will be documented in this file.
 
+## [1.3.0](https://github.com/voxpupuli/beaker_puppet_helpers/tree/1.3.0) (2024-05-02)
+
+[Full Changelog](https://github.com/voxpupuli/beaker_puppet_helpers/compare/1.2.1...1.3.0)
+
+**Implemented enhancements:**
+
+- Add Ruby 3.3 to CI [\#44](https://github.com/voxpupuli/beaker_puppet_helpers/pull/44) ([traylenator](https://github.com/traylenator))
+- New beaker helper `bolt_supported?` to show bolt availability [\#42](https://github.com/voxpupuli/beaker_puppet_helpers/pull/42) ([traylenator](https://github.com/traylenator))
+
+## [1.2.1](https://github.com/voxpupuli/beaker_puppet_helpers/tree/1.2.1) (2024-01-08)
+
+[Full Changelog](https://github.com/voxpupuli/beaker_puppet_helpers/compare/1.2.0...1.2.1)
+
+**Fixed bugs:**
+
+- shell escape Puppet command options [\#40](https://github.com/voxpupuli/beaker_puppet_helpers/pull/40) ([ekohl](https://github.com/ekohl))
+- FreeBSD has the Puppet major version in the package name [\#39](https://github.com/voxpupuli/beaker_puppet_helpers/pull/39) ([evgeni](https://github.com/evgeni))
+
 ## [1.2.0](https://github.com/voxpupuli/beaker_puppet_helpers/tree/1.2.0) (2023-10-17)
 
 [Full Changelog](https://github.com/voxpupuli/beaker_puppet_helpers/compare/1.1.1...1.2.0)

data/beaker_puppet_helpers.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'beaker_puppet_helpers'
-  s.version     = '1.2.0'
+  s.version     = '1.3.0'
   s.authors     = ['Vox Pupuli']
   s.email       = ['voxpupuli@groups.io']
   s.homepage    = 'https://github.com/voxpupuli/beaker_puppet_helpers'

data/lib/beaker_puppet_helpers/dsl.rb

@@ -224,5 +224,30 @@ module BeakerPuppetHelpers
     def fact(name, opts = {})
       fact_on(default, name, opts)
     end
+
+    # Show if bolt package is available
+    #
+    # @param [Beaker::Host] host
+    # @return True if package is available.
+    #
+    def bolt_supported?(host = default)
+      #
+      # Supported platforms
+      # https://github.com/puppetlabs/bolt/blob/main/documentation/bolt_installing.md
+      # https://github.com/puppetlabs/bolt-vanagon/tree/main/configs/platforms
+
+      case host['packaging_platform'].split('-', 3)[0, 1]
+      when %w[el 7], %w[el 8], %w[el 9],
+        %w[debian 10], %w[debian 11],
+        ['ubuntu', '20.04'], ['ubuntu', '22.04'],
+        %w[osx 11], %w[osx 12],
+        %w[sles 12], %w[sles 15],
+        %w[fedora 36],
+        %w[windows 2012r2]
+        true
+      else
+        false
+      end
+    end
   end
 end

data/lib/beaker_puppet_helpers/install_utils.rb

@@ -84,7 +84,7 @@ module BeakerPuppetHelpers
       when /el|fedora|sles|cisco_/
         prefer_aio ? 'puppet-agent' : 'puppet'
       when /freebsd/
-        'sysutils/puppet'
+        'sysutils/puppet8'
       when 'ubuntu'
         # 23.04 started to ship puppet-agent with puppet as a legacy package
         prefer_aio || host['packaging_platform'].split('-', 3)[1].to_i >= 2304 ? 'puppet-agent' : 'puppet'

data/lib/beaker_puppet_helpers/module_utils.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'shellwords'
 require 'beaker/command'
 require 'puppet/modulebuilder'
 
@@ -21,8 +22,8 @@ module BeakerPuppetHelpers
       block_on hosts do |host|
         puppet_opts = {}
         puppet_opts.merge!(host[:default_module_install_opts]) if host[:default_module_install_opts]
-        puppet_opts[:version] = version if version
-        puppet_opts[:module_repository] = module_repository if module_repository
+        puppet_opts[:version] = Shellwords.escape(version) if version
+        puppet_opts[:module_repository] = Shellwords.escape(module_repository) if module_repository
 
         on host, Beaker::PuppetCommand.new('module', ['install', module_name], puppet_opts)
       end

data/spec/beaker_puppet_helpers/module_utils_spec.rb

@@ -37,6 +37,13 @@ describe BeakerPuppetHelpers::ModuleUtils do
       dsl.install_puppet_module_via_pmt_on(host, 'test', '1.2.3')
     end
 
+    it 'escapes the version parameter' do
+      expect(Beaker::PuppetCommand).to receive(:new).with('module', %w[install test], { version: '\\>\\=\\ 4.0\\ \\<\\ 6.0' }).once
+      expect(dsl).to receive(:on).with(host, anything).once
+
+      dsl.install_puppet_module_via_pmt_on(host, 'test', '>= 4.0 < 6.0')
+    end
+
     it 'accepts the module_repository parameter' do
       expect(Beaker::PuppetCommand).to receive(:new).with('module', %w[install test], { module_repository: 'http://forge.example.com' }).once
       expect(dsl).to receive(:on).with(host, anything).once

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker_puppet_helpers
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Vox Pupuli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-10-18 00:00:00.000000000 Z
+date: 2024-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: beaker
@@ -103,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.33
+rubygems_version: 3.5.9
 signing_key: 
 specification_version: 4
 summary: Beaker's Puppet DSL Extension Helpers