beaker_puppet_helpers 1.6.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4777b9a142a72ada934c3c3b35e71eac3056bc6a5ee9d32ff38ce65a1fdcb93f
-  data.tar.gz: c3dc1c395a6c6451a8830042e6de3c38c34267fe8093e9d26f51b06c6d635d73
+  metadata.gz: d4d4e63615ac64312d0629aa6845bc1b48717317b9279918fbdb41f7f58cbb88
+  data.tar.gz: 38ccbc1d294f2d73616866d06c3d2cbf7101611998180d8ced901b61a98ce680
 SHA512:
-  metadata.gz: 2851c412f57ae3d9360da61c4bfdfae1cf07e17581816315dad43049217940043c52c6ff7b0c101cb822372d83add43353b14a49396aa95621e03c722a079da8
-  data.tar.gz: 5063b4158507a07c786a3be963cf56857972d0847f752a3df874bd8f9e60fc94a1b5cc95536c34fae95844f56de97d5863b79c71b861a0eed2b164e74022ce5b
+  metadata.gz: 94c853ad79f8c90f41aa0832db6eadaf75f92584d74412a95e326098d78e6ab4357de513c577e96c364d04138f90286bddd965712a78b9c4f2ab94118fa3b898
+  data.tar.gz: 264e3ce0e6394719acb3146248ea1868bce207499d5e45d6ae065a8134879e90b0af3839cadd57d75d62e493562cdbcc50bba87d08b473408987a7f0046b4410

data/.github/workflows/release.yml

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

data/.github/workflows/test.yml

@@ -11,30 +11,29 @@ env:
   BUNDLE_WITHOUT: release
 
 jobs:
-  rubocop:
+  rubocop_and_matrix:
     runs-on: ubuntu-latest
-    name: Rubocop
+    outputs:
+      ruby: ${{ steps.ruby.outputs.versions }}
     steps:
       - uses: actions/checkout@v4
       - name: Install Ruby ${{ matrix.ruby }}
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "3.3"
+          ruby-version: "3.4"
           bundler-cache: true
       - name: Rubocop
         run: bundle exec rake rubocop
+      - id: ruby
+        uses: voxpupuli/ruby-version@v1
 
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
+    needs: rubocop_and_matrix
     strategy:
       fail-fast: false
       matrix:
-        ruby:
-          - "3.3"
-          - "3.2"
-          - "3.1"
-          - "3.0"
-          - "2.7"
+        ruby: ${{ fromJSON(needs.rubocop_and_matrix.outputs.ruby) }}
     name: Ruby ${{ matrix.ruby }}
     steps:
       - uses: actions/checkout@v4
@@ -52,7 +51,6 @@ jobs:
 
   tests:
     needs:
-      - rubocop
       - build
     runs-on: ubuntu-latest
     name: Test suite

data/CHANGELOG.md

@@ -2,6 +2,27 @@
 
 All notable changes to this project will be documented in this file.
 
+## [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)
+
+**Breaking changes:**
+
+- Drop support for nightly repos [\#57](https://github.com/voxpupuli/beaker_puppet_helpers/pull/57) ([bastelfreak](https://github.com/bastelfreak))
+
+**Implemented enhancements:**
+
+- 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)
 
 [Full Changelog](https://github.com/voxpupuli/beaker_puppet_helpers/compare/1.5.0...1.6.0)

data/beaker_puppet_helpers.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'beaker_puppet_helpers'
-  s.version     = '1.6.0'
+  s.version     = '2.1.0'
   s.authors     = ['Vox Pupuli']
   s.email       = ['voxpupuli@groups.io']
   s.homepage    = 'https://github.com/voxpupuli/beaker_puppet_helpers'
@@ -18,4 +18,7 @@ Gem::Specification.new do |s|
   # Run time dependencies
   s.add_dependency 'beaker', '>= 5.8.1', '< 7'
   s.add_dependency 'puppet-modulebuilder', '>= 0.3', '< 3'
+  # we need to declare both dependencies explicitly on Ruby 3.4+
+  s.add_dependency 'base64', '~> 0.2.0'
+  s.add_dependency 'benchmark', '~> 0.4.0'
 end

data/lib/beaker_puppet_helpers/install_utils.rb

@@ -7,16 +7,29 @@ module BeakerPuppetHelpers
   class InstallUtils
     # @api private
     REPOS = {
-      release: {
-        apt: 'https://apt.puppet.com',
-        yum: 'https://yum.puppet.com',
+      openvox: {
+        release: {
+          apt: 'https://apt.voxpupuli.org/',
+          yum: 'https://yum.voxpupuli.org/',
+        },
       },
-      nightly: {
-        apt: 'https://nightlies.puppet.com/apt',
-        yum: 'https://nightlies.puppet.com/yum',
+      puppet: {
+        release: {
+          apt: 'https://apt.puppet.com',
+          yum: 'https://yum.puppet.com',
+        },
       },
     }.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)
+      collection.gsub(/\d+/, '')
+    end
+
     # Install official Puppet release repository configuration on host(s).
     #
     # @example Install Puppet 7
@@ -24,17 +37,18 @@ module BeakerPuppetHelpers
     #
     # @param [Beaker::Host] host
     #   A host to act upon.
+    #
     # @param [String] collection
     #   The collection to install. The default (puppet) is the latest
-    #   available version.
-    # @param [Boolean] nightly
-    #   Whether to install nightly or release packages
+    #   available version. Can also be openvox7, puppet8 and others.
+    #   Method is called from beaker_install_helpers
     #
     # @note This method only works on redhat-like and debian-like hosts. There
     #   are no official Puppet releases for other platforms.
     #
-    def self.install_puppet_release_repo_on(host, collection = 'puppet', nightly: false)
-      repos = REPOS[nightly ? :nightly : :release]
+    def self.install_puppet_release_repo_on(host, collection = 'puppet')
+      implementation = implementation_from_collection(collection)
+      repos = REPOS[implementation.to_sym][:release]
 
       variant, version, _arch = host['packaging_platform'].split('-', 3)
 
@@ -56,7 +70,8 @@ module BeakerPuppetHelpers
         url = "#{repos[:yum]}/#{collection}-release-#{variant}-#{version}.noarch.rpm"
         host.install_package(url)
       when 'debian', 'ubuntu'
-        url = "#{repos[:apt]}/#{collection}-release-#{host['platform'].codename}.deb"
+        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)
         end
@@ -69,6 +84,42 @@ module BeakerPuppetHelpers
       end
     end
 
+    # 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 [String] implementation
+    #   If we are on OpenVox or Perforce
+    # @return [String] the package name
+    def self.package_name(host, prefer_aio: true, implementation: 'openvox')
+      case implementation
+      when 'openvox'
+        openvox_package_name
+      when 'puppet'
+        puppet_package_name(host, prefer_aio: prefer_aio)
+      when 'none'
+        'puppet'
+      else
+        raise StandardError, "Unknown requirement '#{implementation}'"
+      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 (puppet7, openvox8...)
+    # @param [Boolean] prefer_aio
+    #   Whether to prefer AIO packages or OS packages
+    # @return [String] the package name
+    def self.collection2packagename(host, collection, prefer_aio: true)
+      implementation = implementation_from_collection(collection)
+      package_name(host, prefer_aio: prefer_aio, implementation: implementation)
+    end
+
     # Determine the Puppet package name
     #
     # @param [Beaker::Host] host
@@ -93,6 +144,13 @@ module BeakerPuppetHelpers
       end
     end
 
+    # Determine the openvox package name
+    #
+    # @return [String] The openvox package name
+    def self.openvox_package_name
+      'openvox-agent'
+    end
+
     # @param [Beaker::Host] host
     #   The host to act on
     # @api private

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: beaker_puppet_helpers
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Vox Pupuli
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-11 00:00:00.000000000 Z
+date: 2025-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: beaker
@@ -50,6 +49,34 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '3'
+- !ruby/object:Gem::Dependency
+  name: base64
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+- !ruby/object:Gem::Dependency
+  name: benchmark
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.4.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.4.0
 description: For use for the Beaker acceptance testing tool
 email:
 - voxpupuli@groups.io
@@ -85,7 +112,6 @@ homepage: https://github.com/voxpupuli/beaker_puppet_helpers
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -103,8 +129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Beaker's Puppet DSL Extension Helpers
 test_files: []