Merge pull request #198 from voxpupuli/modulesync

modulesync 7.2.0

.github/CONTRIBUTING.md

@@ -232,18 +232,21 @@ simple tests against it after applying the module. You can run this
 with:
 
 ```sh
-BEAKER_setfile=debian11-64 bundle exec rake beaker
+BEAKER_PUPPET_COLLECTION=puppet7 BEAKER_setfile=debian11-64 bundle exec rake beaker
 ```
 
-You can replace the string `debian10` with any common operating system.
+You can replace the string `debian11` with any common operating system.
 The following strings are known to work:
 
-* ubuntu1804
 * ubuntu2004
-* debian10
+* ubuntu2204
 * debian11
 * centos7
 * centos8
+* centos9
+* almalinux8
+* almalinux9
+* fedora36
 
 For more information and tips & tricks, see [voxpupuli-acceptance's documentation](https://github.com/voxpupuli/voxpupuli-acceptance#running-tests).
 

.github/workflows/ci.yml

@@ -13,6 +13,6 @@ concurrency:
 jobs:
   puppet:
     name: Puppet
-    uses: voxpupuli/gha-puppet/.github/workflows/beaker.yml@v1
+    uses: voxpupuli/gha-puppet/.github/workflows/beaker.yml@v2
     with:
       pidfile_workaround: 'false'

.github/workflows/release.yml

@@ -12,7 +12,7 @@ on:
 jobs:
   release:
     name: Release
-    uses: voxpupuli/gha-puppet/.github/workflows/release.yml@v1
+    uses: voxpupuli/gha-puppet/.github/workflows/release.yml@v2
     with:
       allowed_owner: 'voxpupuli'
     secrets:

.msync.yml

@@ -2,4 +2,4 @@
 # Managed by modulesync - DO NOT EDIT
 # https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
 
-modulesync_config_version: '5.5.0'
+modulesync_config_version: '7.2.0'

.pmtignore

@@ -35,3 +35,4 @@
 /.yardoc/
 /.yardopts
 /Dockerfile
+/HISTORY.md

.rubocop.yml

@@ -2,5 +2,6 @@
 # Managed by modulesync - DO NOT EDIT
 # https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
 
+inherit_from: .rubocop_todo.yml
 inherit_gem:
   voxpupuli-test: rubocop.yml

.rubocop_todo.yml

@@ -0,0 +1,23 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2024-01-08 18:55:36 UTC using RuboCop version 1.50.2.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 12
+# Configuration parameters: Max.
+RSpec/IndexedLet:
+  Exclude:
+    - 'spec/acceptance/rvm_system_spec.rb'
+
+# Offense count: 5
+# This cop supports unsafe autocorrection (--autocorrect-all).
+Style/EnvHome:
+  Exclude:
+    - 'lib/puppet/provider/rvm_alias/alias.rb'
+    - 'lib/puppet/provider/rvm_gem/gem.rb'
+    - 'lib/puppet/provider/rvm_gemset/gemset.rb'
+    - 'lib/puppet/provider/rvm_system_ruby/rvm_system_ruby.rb'
+    - 'lib/puppet/provider/rvm_wrapper/wrapper.rb'

Gemfile

@@ -4,10 +4,10 @@
 source ENV['GEM_SOURCE'] || 'https://rubygems.org'
 
 group :test do
-  gem 'voxpupuli-test', '~> 5.4',   :require => false
+  gem 'voxpupuli-test', '~> 7.0',   :require => false
   gem 'coveralls',                  :require => false
   gem 'simplecov-console',          :require => false
-  gem 'puppet_metadata', '~> 2.0',  :require => false
+  gem 'puppet_metadata', '~> 3.5',  :require => false
 end
 
 group :development do
@@ -16,18 +16,17 @@ group :development do
 end
 
 group :system_tests do
-  gem 'voxpupuli-acceptance', '~> 1.0',  :require => false
+  gem 'voxpupuli-acceptance', '~> 3.0',  :require => false
 end
 
 group :release do
-  gem 'github_changelog_generator', '>= 1.16.1',  :require => false if RUBY_VERSION >= '2.5'
-  gem 'voxpupuli-release', '~> 2.0',              :require => false
+  gem 'voxpupuli-release', '~> 3.0',  :require => false
 end
 
 gem 'rake', :require => false
 gem 'facter', ENV['FACTER_GEM_VERSION'], :require => false, :groups => [:test]
 
-puppetversion = ENV['PUPPET_GEM_VERSION'] || '>= 6.0'
+puppetversion = ENV['PUPPET_GEM_VERSION'] || '~> 7.24'
 gem 'puppet', puppetversion, :require => false, :groups => [:test]
 
 # vim: syntax=ruby

lib/puppet/provider/rvm_alias/alias.rb

@@ -5,7 +5,7 @@
   desc 'RVM alias support.'
 
   has_command(:rvmcmd, '/usr/local/rvm/bin/rvm') do
-    environment HOME: ENV['HOME']
+    environment HOME: ENV.fetch('HOME', nil)
   end
 
   def target_ruby

lib/puppet/provider/rvm_gem/gem.rb

@@ -9,7 +9,7 @@
 
   has_feature :versionable
   has_command(:rvmcmd, '/usr/local/rvm/bin/rvm') do
-    environment HOME: ENV['HOME']
+    environment HOME: ENV.fetch('HOME', nil)
   end
 
   def ruby_version

lib/puppet/provider/rvm_gemset/gemset.rb

@@ -5,7 +5,7 @@
   desc 'RVM gemset support.'
 
   has_command(:rvmcmd, '/usr/local/rvm/bin/rvm') do
-    environment HOME: ENV['HOME']
+    environment HOME: ENV.fetch('HOME', nil)
   end
 
   def ruby_version

lib/puppet/provider/rvm_system_ruby/rvm_system_ruby.rb

@@ -4,7 +4,7 @@
   desc 'Ruby RVM support.'
 
   has_command(:rvmcmd, '/usr/local/rvm/bin/rvm') do
-    environment HOME: ENV['HOME']
+    environment HOME: ENV.fetch('HOME', nil)
   end
 
   def create

lib/puppet/provider/rvm_wrapper/wrapper.rb

@@ -5,7 +5,7 @@
   desc 'RVM wrapper support.'
 
   has_command(:rvmcmd, '/usr/local/rvm/bin/rvm') do
-    environment HOME: ENV['HOME']
+    environment HOME: ENV.fetch('HOME', nil)
   end
 
   def target_ruby

metadata.json

@@ -33,13 +33,6 @@
         "8"
       ]
     },
-    {
-      "operatingsystem": "OracleLinux",
-      "operatingsystemrelease": [
-        "7",
-        "8"
-      ]
-    },
     {
       "operatingsystem": "Scientific",
       "operatingsystemrelease": [

spec/spec_helper.rb

@@ -19,3 +19,4 @@
 end
 
 require 'spec_helper_methods'
+Dir['./spec/support/spec/**/*.rb'].sort.each { |f| require f }

spec/spec_helper_acceptance.rb

@@ -3,7 +3,7 @@
 require 'voxpupuli/acceptance/spec_helper_acceptance'
 
 configure_beaker do |host|
-  install_module_from_forge('puppet-epel', '>= 3.0.1 < 4.0.0') if fact_on(host, 'os.name') == 'CentOS'
-  install_module_from_forge('puppetlabs-apache', '>= 5.7.0 < 7.0.0')
-  install_module_from_forge('puppetlabs-java', '>= 6.3.0 < 8.0.0')
+  install_puppet_module_via_pmt_on(host, 'puppet-epel', '>= 3.0.1 < 4.0.0') if fact_on(host, 'os.family') == 'RedHat'
+  install_puppet_module_via_pmt_on(host, 'puppetlabs-apache', '>= 5.7.0 < 7.0.0')
+  install_puppet_module_via_pmt_on(host, 'puppetlabs-java', '>= 6.3.0 < 8.0.0')
 end