beaker_puppet_helpers 2.0.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d218d5ad4ee763da0b629fbadedb93ca724a100c73ee6439d5421bbc1f94eadb
-  data.tar.gz: 1339a28edb3a3208823b1eef7b4e347c027fcc5a8343219db2144a9bac643036
+  metadata.gz: 96b07dc57cf6ef1d1321846d99f810b208ec187cae8fcbb9f9671a7cb00684d5
+  data.tar.gz: 71d45ebf93c52dd19cf097d828487148190ffe249a52ba44fdf0b369642d9347
 SHA512:
-  metadata.gz: f8176a75aa669f7cd620c16c7f350b8483fb601307a431edd9806fe16668254fa3eda110038c56922f1e84d30c83df2c7238fd285cc565eece7bda6ee8ac2d7d
-  data.tar.gz: 468e019343afc503d231d5cbce64786d4b94568547b8b73a2373e42a4d6a88f4e478a9f3637b4c5638ce0a742721fd648ab408485a19619e5d58657cd0b1c84b
+  metadata.gz: d2a513bb98b4908fa0563adc2afd8d1e187db0f3ae79de0871a62a5d4db13c35fe5ee8c792a5f8f14c3c3eb6104c4ed6c47e175b8318097359dfbc2293ebeb8c
+  data.tar.gz: cb55fb6ce9dc07741e88b30ea2e3497a24ecc1c5f34c31850609923b505f0d70c1cac195716489154ffbc6b5584f4fb949d4fa0a1e53f4f317f2c48b28108bf1

data/CHANGELOG.md

@@ -2,6 +2,22 @@
 
 All notable changes to this project will be documented in this file.
 
+## [2.2.0](https://github.com/voxpupuli/beaker_puppet_helpers/tree/2.2.0) (2025-03-19)
+
+[Full Changelog](https://github.com/voxpupuli/beaker_puppet_helpers/compare/2.1.0...2.2.0)
+
+**Implemented enhancements:**
+
+- Support the none collection in implementation helpers [\#62](https://github.com/voxpupuli/beaker_puppet_helpers/pull/62) ([ekohl](https://github.com/ekohl))
+
+## [2.1.0](https://github.com/voxpupuli/beaker_puppet_helpers/tree/2.1.0) (2025-03-19)
+
+[Full Changelog](https://github.com/voxpupuli/beaker_puppet_helpers/compare/2.0.0...2.1.0)
+
+**Implemented enhancements:**
+
+- Add helper to get agent package name based on collection [\#60](https://github.com/voxpupuli/beaker_puppet_helpers/pull/60) ([bastelfreak](https://github.com/bastelfreak))
+
 ## [2.0.0](https://github.com/voxpupuli/beaker_puppet_helpers/tree/2.0.0) (2025-03-18)
 
 [Full Changelog](https://github.com/voxpupuli/beaker_puppet_helpers/compare/1.6.0...2.0.0)
@@ -12,8 +28,8 @@ All notable changes to this project will be documented in this file.
 
 **Implemented enhancements:**
 
-- Implement OpenVox support [\#56](https://github.com/voxpupuli/beaker_puppet_helpers/pull/56) ([bastelfreak](https://github.com/bastelfreak))
 - CI: Use voxpupuli/ruby-version@v1 / Add Ruby 3.4 support [\#58](https://github.com/voxpupuli/beaker_puppet_helpers/pull/58) ([bastelfreak](https://github.com/bastelfreak))
+- Implement OpenVox support [\#56](https://github.com/voxpupuli/beaker_puppet_helpers/pull/56) ([bastelfreak](https://github.com/bastelfreak))
 
 ## [1.6.0](https://github.com/voxpupuli/beaker_puppet_helpers/tree/1.6.0) (2024-12-11)
 

data/beaker_puppet_helpers.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'beaker_puppet_helpers'
-  s.version     = '2.0.0'
+  s.version     = '2.2.0'
   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

@@ -21,6 +21,19 @@ module BeakerPuppetHelpers
       },
     }.freeze
 
+    # returns the used implementation (puppet or openvox)
+    #
+    # @param [String] collection
+    #   The used collection (puppet7, openvox8...)
+    # @return [String] the implementation
+    def self.implementation_from_collection(collection)
+      if collection == 'none'
+        'puppet'
+      else
+        collection.gsub(/\d+/, '')
+      end
+    end
+
     # Install official Puppet release repository configuration on host(s).
     #
     # @example Install Puppet 7
@@ -38,8 +51,8 @@ module BeakerPuppetHelpers
     #   are no official Puppet releases for other platforms.
     #
     def self.install_puppet_release_repo_on(host, collection = 'puppet')
-      requirement_name = collection.gsub(/\d+/, '')
-      repos = REPOS[requirement_name.to_sym][:release]
+      implementation = implementation_from_collection(collection)
+      repos = REPOS[implementation.to_sym][:release]
 
       variant, version, _arch = host['packaging_platform'].split('-', 3)
 
@@ -61,7 +74,7 @@ module BeakerPuppetHelpers
         url = "#{repos[:yum]}/#{collection}-release-#{variant}-#{version}.noarch.rpm"
         host.install_package(url)
       when 'debian', 'ubuntu'
-        relname = (requirement_name == 'openvox') ? "#{variant}#{version}" : host['platform'].codename
+        relname = (implementation == 'openvox') ? "#{variant}#{version}" : host['platform'].codename
         url = "#{repos[:apt]}/#{collection}-release-#{relname}.deb"
         wget_on(host, url) do |filename|
           host.install_package(filename)
@@ -75,13 +88,13 @@ module BeakerPuppetHelpers
       end
     end
 
-    # Determine if we need the Perforce or OpenVox Package name
+    # Determine the correct package name, based on implementation, AIO and OS
     #
     # @param [Beaker::Host] host
     #   The host to act on
     # @param [Boolean] prefer_aio
     #   Whether to prefer AIO packages or OS packages
-    # @param implementation
+    # @param [String] implementation
     #   If we are on OpenVox or Perforce
     # @return [String] the package name
     def self.package_name(host, prefer_aio: true, implementation: 'openvox')
@@ -97,6 +110,23 @@ module BeakerPuppetHelpers
       end
     end
 
+    # Determine if we need the Perforce or OpenVox Package, based on the collection
+    #
+    # @param [Beaker::Host] host
+    #   The host to act on
+    # @param collection
+    #   The used collection (none, puppet7, openvox8, ...)
+    # @param [Optional[Boolean]] prefer_aio
+    #   Whether to prefer AIO packages or OS packages. If not specified, it's
+    #   derived from the collection
+    # @return [String] the package name
+    def self.collection2packagename(host, collection, prefer_aio: nil)
+      prefer_aio = collection != 'none' if prefer_aio.nil?
+
+      implementation = implementation_from_collection(collection)
+      package_name(host, prefer_aio: prefer_aio, implementation: implementation)
+    end
+
     # Determine the Puppet package name
     #
     # @param [Beaker::Host] host

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: beaker_puppet_helpers
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Vox Pupuli
 bindir: bin
 cert_chain: []
-date: 2025-03-18 00:00:00.000000000 Z
+date: 2025-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: beaker