beaker_puppet_helpers 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d0550fb9dda46a2effd035d07f81640e6e4e6e622ebd0866a5fc08f301d5947
-  data.tar.gz: 859a99675ab7977f47610b4a726876eac05ba76a9985785f8a2f1c3a2d2ed244
+  metadata.gz: ecec587a641c9175b474f3f5862cce202097db3a13c6085e96e38b5795dbb42a
+  data.tar.gz: 0cda17558b4ccfd995d8747158460a7e9793739b1601bbc14a3265057445a3a5
 SHA512:
-  metadata.gz: bb98aef7ffafa80edb343acdf211a7b7006a6dff6b39677e6bc8567f2f04bc4c3dc4a3b68c02d0d4e7f0aa944790f90e73f95b9ae1699164954d0365c7c046ce
-  data.tar.gz: 9a7c6dd3be79c2b72a241dc69aba3f9a383ff17f53c758ed645f62492a0256e4a4f53842c3027cb45dada00b2799dda39150c9ea98729889caa86648cb468a1a
+  metadata.gz: 69df43481f5173128fffc205b27a9a7b91b73bc707986092b7626065e3072c1601b89addb7e8223417ecefbbc5525397a28d44dda4a60bf60c833c29a75e95cc
+  data.tar.gz: 76b71365c7c9821195f7e6c94b49924dc0a84612173fad6d2f057c86b952c1a6483e5bfe1d804aa6464408407fe47f87e7cc25041b2cdc0f88619772ba5495a6

data/CHANGELOG.md

@@ -2,6 +2,15 @@
 
 All notable changes to this project will be documented in this file.
 
+## [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.2.1'
   s.authors     = ['Vox Pupuli']
   s.email       = ['voxpupuli@groups.io']
   s.homepage    = 'https://github.com/voxpupuli/beaker_puppet_helpers'

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.2.1
 platform: ruby
 authors:
 - Vox Pupuli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-10-18 00:00:00.000000000 Z
+date: 2024-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: beaker