Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

modulesync 7.2.0 #198

Merged
merged 4 commits into from
Jan 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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).

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .msync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
1 change: 1 addition & 0 deletions .pmtignore
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,4 @@
/.yardoc/
/.yardopts
/Dockerfile
/HISTORY.md
1 change: 1 addition & 0 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
23 changes: 23 additions & 0 deletions .rubocop_todo.yml
Original file line number Diff line number Diff line change
@@ -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'
11 changes: 5 additions & 6 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
2 changes: 1 addition & 1 deletion lib/puppet/provider/rvm_alias/alias.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion lib/puppet/provider/rvm_gem/gem.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion lib/puppet/provider/rvm_gemset/gemset.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion lib/puppet/provider/rvm_system_ruby/rvm_system_ruby.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion lib/puppet/provider/rvm_wrapper/wrapper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 0 additions & 7 deletions metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,6 @@
"8"
]
},
{
"operatingsystem": "OracleLinux",
"operatingsystemrelease": [
"7",
"8"
]
},
{
"operatingsystem": "Scientific",
"operatingsystemrelease": [
Expand Down
1 change: 1 addition & 0 deletions spec/spec_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,4 @@
end

require 'spec_helper_methods'
Dir['./spec/support/spec/**/*.rb'].sort.each { |f| require f }
6 changes: 3 additions & 3 deletions spec/spec_helper_acceptance.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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