simp-beaker-helpers 1.35.1 → 1.36.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc89ddced8b2e1cf2dcdb609922c36b06b67d014a3765dc1f3bdad9e18dceb33
-  data.tar.gz: 9acdbde4f540f4b9d767b5bc13cc459ec3012a4d54f69a1c0896e7d6a81dd742
+  metadata.gz: d1a600b8c573c9fb56e57bf0b7f9293ca97a04c3c9db4c81326c180e146c2512
+  data.tar.gz: 036714fc1cb88bd3bb5b6fa07b37fcecd8c8ffaab47f6b7d748c22bc287b2867
 SHA512:
-  metadata.gz: 5d4c5e7286766da95a75f33231c0141ce21581d2181890bd2288dc1fab6795c0cb7e46362b343aff9ec2246607f6de60611eb46be78be3aac357b084520b7f2e
-  data.tar.gz: 80a8695496193c5863481bed3973c0a0e9e6b12a439f3b9e17acfd44aabeb0acc8d4d51a2815fb2ec2d75a3c05a219dcf49702d909d67ef835aa618d29d0524b
+  metadata.gz: 42e4a7823d3b312d549751b6497d8938a018b9c089c15b8bf3ef12d24217e71158b8d2c3accbd815d8f44ca04af5457f71b23324bfeece60400dea94b8614c79
+  data.tar.gz: 6c87c3f220ca11b10015da816c1a39ecd3e5fc5d5b738e886b436e88cd90b00831db42a5ac67e878fd46b47d237e364d0f0c58f3437a0dd71a15bcf94e0b9a6e

data/.gitignore

@@ -22,3 +22,4 @@ dist
 /junit
 /log
 /doc
+/Gemfile.lock

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+### 1.36.0 / 2025-06-23
+* Added
+  * Openvox support
+
 ### 1.35.1 / 2025-06-11
 * Fixed:
   * `TypeError: Rake is not a class` error (#231)

data/Gemfile

@@ -37,6 +37,7 @@ group :system_tests do
 
   gem 'bcrypt_pbkdf'
   gem 'beaker-rspec'
+  gem 'beaker_puppet_helpers'
   gem 'beaker-windows'
   gem 'ed25519'
   gem 'net-ssh'

data/lib/simp/beaker_helpers/version.rb

@@ -4,5 +4,5 @@
 module Simp; end
 
 module Simp::BeakerHelpers
-  VERSION = '1.35.1'
+  VERSION = '1.36.0'
 end

data/lib/simp/beaker_helpers.rb

@@ -764,7 +764,7 @@ module Simp::BeakerHelpers
             u.strip!
             u = u.split(':')
             %r{^(/|/dev/.*|/s?bin/?.*|/proc/?.*)$}.match?(u[5]) ? [nil] : [u[0], u[5]]
-          end
+          end,
         ]
 
         user_info.each_key do |user|
@@ -1393,7 +1393,7 @@ module Simp::BeakerHelpers
   #
   # @return [String,Nil] the `puppet-agent` version or nil
   #
-  def latest_puppet_agent_version_for(puppet_version)
+  def latest_puppet_agent_version_for(puppet_version, puppet_collection_name = 'puppet')
     return nil if puppet_version.nil?
 
     require 'rubygems/requirement'
@@ -1418,7 +1418,7 @@ module Simp::BeakerHelpers
       puppet_gems = nil
 
       Bundler.with_unbundled_env do
-        puppet_gems = `gem search -ra -e puppet`.match(%r{\((.+)\)})
+        puppet_gems = `gem search -ra -e #{puppet_collection_name}`.match(%r{\((.+)\)})
       end
 
       if puppet_gems
@@ -1467,10 +1467,10 @@ module Simp::BeakerHelpers
 
     if puppet_agent_version.nil?
       if (puppet_collection = ENV['BEAKER_PUPPET_COLLECTION'] || host.options['puppet_collection'])
-        raise("Error: Puppet Collection '#{puppet_collection}' must match /puppet(\\d+)/") unless puppet_collection =~ %r{puppet(\d+)}
-        puppet_install_version = "~> #{::Regexp.last_match(1)}"
-        puppet_agent_version = latest_puppet_agent_version_for(puppet_install_version)
-
+        raise("Error: Puppet Collection '#{puppet_collection}' must match /(puppet|openvox)(\\d+)/") unless puppet_collection =~ %r{(puppet|openvox)(\d+)}
+        puppet_collection_name = ::Regexp.last_match(1)
+        puppet_install_version = "~> #{::Regexp.last_match(2)}"
+        puppet_agent_version = latest_puppet_agent_version_for(puppet_install_version, puppet_collection_name)
       else
         puppet_agent_version = latest_puppet_agent_version_for(DEFAULT_PUPPET_AGENT_VERSION)
       end
@@ -1488,19 +1488,27 @@ module Simp::BeakerHelpers
     }
   end
 
+  def run_puppet_install_helper_on(hosts)
+    block_on hosts, run_in_parallel: true do |host|
+      BeakerPuppetHelpers::InstallUtils.install_puppet_release_repo_on(host, ENV['BEAKER_PUPPET_COLLECTION'])
+      package_name = ENV.fetch('BEAKER_PUPPET_PACKAGE_NAME', BeakerPuppetHelpers::InstallUtils.collection2packagename(host, ENV['BEAKER_PUPPET_COLLECTION']))
+      host.install_package(package_name)
+    end
+  end
+
   # Replacement for `install_puppet` in spec_helper_acceptance.rb
   def install_puppet
     install_info = get_puppet_install_info
 
     # In case  Beaker needs this info internally
-    ENV['PUPPET_INSTALL_VERSION'] = install_info[:puppet_install_version]
     if install_info[:puppet_collection]
       ENV['BEAKER_PUPPET_COLLECTION'] = install_info[:puppet_collection]
     end
 
-    require 'beaker-puppet'
-    install_puppet_on(hosts, version: install_info[:puppet_install_version])
+    require 'beaker_puppet_helpers'
+    run_puppet_install_helper_on(hosts)
   end
+  alias install_openvox install_puppet
 
   # Configure all SIMP repos on a host and disable all repos in the disable Array
   #

data/spec/acceptance/suites/default/fixture_modules_spec.rb

@@ -8,7 +8,8 @@ context 'after copy_fixture_modules_to( hosts )' do
 
   describe "fact_on(default,'root_home')" do
     it 'does not return value of `root_home`' do
-      expect(fact_on(default, 'root_home').to_s).to eq ''
+      pending 'Conflicts with beaker_puppet_helpers' unless Gem::Version.new(pfact_on(default, 'puppetversion').to_s) < Gem::Version.new('8')
+      expect(Beaker::DSL::Helpers::FacterHelpers.fact_on(default, 'root_home').to_s).to eq ''
     end
   end
 

data/spec/lib/simp/beaker_helpers_spec.rb

@@ -64,6 +64,11 @@ describe 'Simp::BeakerHelpers' do
     ].join(', ')})\n"
   end
 
+  let(:openvox_gem_search_results) do
+    # subset of results, but still exercises code
+    "openvox (8.19.2, 8.19.1, 8.19.0, 7.37.2, 7.37.1)\n"
+  end
+
   context '#latest_puppet_agent_version_for' do
     context 'using table' do
       it 'maps exact Puppet version' do
@@ -206,6 +211,17 @@ describe 'Simp::BeakerHelpers' do
       expect(helper.get_puppet_install_info).to eq expected
     end
 
+    it 'extracts openvox info from BEAKER_PUPPET_COLLECTION' do
+      allow(helper).to receive(:`).with('gem search -ra -e openvox').and_return(openvox_gem_search_results)
+      helper.host.options = { 'puppet_collection' => 'openvox8' }
+      expected = {
+        puppet_install_version: '8.19.2',
+        puppet_collection: 'openvox8',
+        puppet_install_type: 'agent'
+      }
+      expect(helper.get_puppet_install_info).to eq expected
+    end
+
     it 'extracts info from PUPPET_INSTALL_TYPE' do
       ENV['PUPPET_INSTALL_TYPE'] = 'pe'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simp-beaker-helpers
 version: !ruby/object:Gem::Version
-  version: 1.35.1
+  version: 1.36.0
 platform: ruby
 authors:
 - Chris Tessmer
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-06-12 00:00:00.000000000 Z
+date: 2025-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: beaker