From 3bc7f312d181c31e8f411e953932ac45c69da326 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 22 Aug 2025 10:02:38 +0000 Subject: [PATCH 1/5] Update dependency rubocop to '~> 1.80.0' --- site/profile/Gemfile | 2 +- site/role/Gemfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/site/profile/Gemfile b/site/profile/Gemfile index c64c155..d50014a 100644 --- a/site/profile/Gemfile +++ b/site/profile/Gemfile @@ -26,7 +26,7 @@ group :development do gem "pry", '~> 0.10', require: false gem "simplecov-console", '~> 0.9', require: false gem "puppet-debugger", '~> 1.0', require: false - gem "rubocop", '~> 1.50.0', require: false + gem "rubocop", '~> 1.80.0', require: false gem "rubocop-performance", '= 1.16.0', require: false gem "rubocop-rspec", '= 2.19.0', require: false gem "rb-readline", '= 0.5.5', require: false, platforms: [:mswin, :mingw, :x64_mingw] diff --git a/site/role/Gemfile b/site/role/Gemfile index c64c155..d50014a 100644 --- a/site/role/Gemfile +++ b/site/role/Gemfile @@ -26,7 +26,7 @@ group :development do gem "pry", '~> 0.10', require: false gem "simplecov-console", '~> 0.9', require: false gem "puppet-debugger", '~> 1.0', require: false - gem "rubocop", '~> 1.50.0', require: false + gem "rubocop", '~> 1.80.0', require: false gem "rubocop-performance", '= 1.16.0', require: false gem "rubocop-rspec", '= 2.19.0', require: false gem "rb-readline", '= 0.5.5', require: false, platforms: [:mswin, :mingw, :x64_mingw] From d9341c191fbc550030d5154f161394985d24ab29 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 6 Sep 2025 02:08:19 +0000 Subject: [PATCH 2/5] Update dependency rubocop-performance to v1.26.0 --- site/profile/Gemfile | 2 +- site/role/Gemfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/site/profile/Gemfile b/site/profile/Gemfile index d50014a..9d96cec 100644 --- a/site/profile/Gemfile +++ b/site/profile/Gemfile @@ -27,7 +27,7 @@ group :development do gem "simplecov-console", '~> 0.9', require: false gem "puppet-debugger", '~> 1.0', require: false gem "rubocop", '~> 1.80.0', require: false - gem "rubocop-performance", '= 1.16.0', require: false + gem "rubocop-performance", '= 1.26.0', require: false gem "rubocop-rspec", '= 2.19.0', require: false gem "rb-readline", '= 0.5.5', require: false, platforms: [:mswin, :mingw, :x64_mingw] gem "rexml", '>= 3.0.0', '< 3.4.5', require: false diff --git a/site/role/Gemfile b/site/role/Gemfile index d50014a..9d96cec 100644 --- a/site/role/Gemfile +++ b/site/role/Gemfile @@ -27,7 +27,7 @@ group :development do gem "simplecov-console", '~> 0.9', require: false gem "puppet-debugger", '~> 1.0', require: false gem "rubocop", '~> 1.80.0', require: false - gem "rubocop-performance", '= 1.16.0', require: false + gem "rubocop-performance", '= 1.26.0', require: false gem "rubocop-rspec", '= 2.19.0', require: false gem "rb-readline", '= 0.5.5', require: false, platforms: [:mswin, :mingw, :x64_mingw] gem "rexml", '>= 3.0.0', '< 3.4.5', require: false From 673d46b52eb134476479967453c0d8f3bdb27c7b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 10 Aug 2025 12:52:18 +0000 Subject: [PATCH 3/5] Update dependency rubocop-rspec to v2.31.0 --- site/profile/Gemfile | 2 +- site/role/Gemfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/site/profile/Gemfile b/site/profile/Gemfile index 9d96cec..cd2b359 100644 --- a/site/profile/Gemfile +++ b/site/profile/Gemfile @@ -28,7 +28,7 @@ group :development do gem "puppet-debugger", '~> 1.0', require: false gem "rubocop", '~> 1.80.0', require: false gem "rubocop-performance", '= 1.26.0', require: false - gem "rubocop-rspec", '= 2.19.0', require: false + gem "rubocop-rspec", '= 2.31.0', require: false gem "rb-readline", '= 0.5.5', require: false, platforms: [:mswin, :mingw, :x64_mingw] gem "rexml", '>= 3.0.0', '< 3.4.5', require: false end diff --git a/site/role/Gemfile b/site/role/Gemfile index 9d96cec..cd2b359 100644 --- a/site/role/Gemfile +++ b/site/role/Gemfile @@ -28,7 +28,7 @@ group :development do gem "puppet-debugger", '~> 1.0', require: false gem "rubocop", '~> 1.80.0', require: false gem "rubocop-performance", '= 1.26.0', require: false - gem "rubocop-rspec", '= 2.19.0', require: false + gem "rubocop-rspec", '= 2.31.0', require: false gem "rb-readline", '= 0.5.5', require: false, platforms: [:mswin, :mingw, :x64_mingw] gem "rexml", '>= 3.0.0', '< 3.4.5', require: false end From 1d458db63a393cc8222479d27258fd066ddc5f10 Mon Sep 17 00:00:00 2001 From: Steven Pritchard Date: Wed, 17 Sep 2025 16:43:01 -0500 Subject: [PATCH 4/5] Gem updates + rubocop fixes --- site/profile/.rubocop.yml | 42 +++------------------------------------ site/profile/Gemfile | 23 ++++++++++----------- site/role/.rubocop.yml | 42 +++------------------------------------ site/role/Gemfile | 23 ++++++++++----------- 4 files changed, 28 insertions(+), 102 deletions(-) diff --git a/site/profile/.rubocop.yml b/site/profile/.rubocop.yml index 21b82b9..3c4fcc7 100644 --- a/site/profile/.rubocop.yml +++ b/site/profile/.rubocop.yml @@ -1,11 +1,11 @@ --- -require: +plugins: - rubocop-performance - rubocop-rspec AllCops: NewCops: enable DisplayCopNames: true - TargetRubyVersion: '2.6' + TargetRubyVersion: '2.7' Include: - "**/*.rb" Exclude: @@ -116,10 +116,6 @@ Bundler/GemFilename: Enabled: false Bundler/InsecureProtocolSource: Enabled: false -Capybara/CurrentPathExpectation: - Enabled: false -Capybara/VisibilityMatcher: - Enabled: false Gemspec/DuplicatedAssignment: Enabled: false Gemspec/OrderedDependencies: @@ -294,7 +290,7 @@ Performance/UriDefaultParser: Enabled: false RSpec/Be: Enabled: false -RSpec/Capybara/FeatureMethods: +RSpec/Dialect: Enabled: false RSpec/ContainExactly: Enabled: false @@ -320,12 +316,6 @@ RSpec/ExpectChange: Enabled: false RSpec/ExpectInHook: Enabled: false -RSpec/FactoryBot/AttributeDefinedStatically: - Enabled: false -RSpec/FactoryBot/CreateList: - Enabled: false -RSpec/FactoryBot/FactoryClassName: - Enabled: false RSpec/HooksBeforeExamples: Enabled: false RSpec/ImplicitBlockExpectation: @@ -490,16 +480,6 @@ Style/TrailingMethodEndStatement: Enabled: false Style/UnpackFirst: Enabled: false -Capybara/MatchStyle: - Enabled: false -Capybara/NegationMatcher: - Enabled: false -Capybara/SpecificActions: - Enabled: false -Capybara/SpecificFinders: - Enabled: false -Capybara/SpecificMatcher: - Enabled: false Gemspec/DeprecatedAttributeAssignment: Enabled: false Gemspec/DevelopmentDependencies: @@ -600,28 +580,12 @@ RSpec/DuplicatedMetadata: Enabled: false RSpec/ExcessiveDocstringSpacing: Enabled: false -RSpec/FactoryBot/ConsistentParenthesesStyle: - Enabled: false -RSpec/FactoryBot/FactoryNameStyle: - Enabled: false -RSpec/FactoryBot/SyntaxMethods: - Enabled: false RSpec/IdenticalEqualityAssertion: Enabled: false RSpec/NoExpectationExample: Enabled: false RSpec/PendingWithoutReason: Enabled: false -RSpec/Rails/AvoidSetupHook: - Enabled: false -RSpec/Rails/HaveHttpStatus: - Enabled: false -RSpec/Rails/InferredSpecType: - Enabled: false -RSpec/Rails/MinitestAssertions: - Enabled: false -RSpec/Rails/TravelAround: - Enabled: false RSpec/RedundantAround: Enabled: false RSpec/SkipBlockInsideExample: diff --git a/site/profile/Gemfile b/site/profile/Gemfile index cd2b359..83a8f16 100644 --- a/site/profile/Gemfile +++ b/site/profile/Gemfile @@ -18,43 +18,42 @@ group :development do gem "racc", '~> 1.8.0', require: false if Gem::Requirement.create(['>= 2.7.0', '< 3.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup)) gem "deep_merge", '~> 1.2.2', require: false gem "voxpupuli-puppet-lint-plugins", '~> 5.0', require: false - gem "facterdb", '~> 2.1', require: false - gem "metadata-json-lint", '~> 4.0', require: false - gem "rspec-puppet-facts", '~> 4.0', require: false + gem "facterdb", '~> 3.0', require: false + gem "metadata-json-lint", '~> 5.0', require: false + gem "rspec-puppet-facts", '~> 5.0', require: false gem "dependency_checker", '~> 1.0.0', require: false - gem "parallel_tests", '= 3.13.0', require: false + gem "parallel_tests", '= 5.4.0', require: false gem "pry", '~> 0.10', require: false gem "simplecov-console", '~> 0.9', require: false gem "puppet-debugger", '~> 1.0', require: false gem "rubocop", '~> 1.80.0', require: false gem "rubocop-performance", '= 1.26.0', require: false - gem "rubocop-rspec", '= 2.31.0', require: false + gem "rubocop-rspec", '= 3.7.0', require: false gem "rb-readline", '= 0.5.5', require: false, platforms: [:mswin, :mingw, :x64_mingw] gem "rexml", '>= 3.0.0', '< 3.4.5', require: false end group :development, :release_prep do - gem "puppet-strings", '~> 4.0', require: false + gem "openvox-strings", '~> 6.0', require: false gem "puppetlabs_spec_helper", '~> 8.0', require: false gem "puppet-blacksmith", '~> 8.0', require: false end group :system_tests do - gem "puppet_litmus", '~> 1.0', require: false, platforms: [:ruby, :x64_mingw] gem "CFPropertyList", '< 3.0.8', require: false, platforms: [:mswin, :mingw, :x64_mingw] gem "serverspec", '~> 2.41', require: false end -puppet_version = ENV['PUPPET_GEM_VERSION'] -facter_version = ENV['FACTER_GEM_VERSION'] +openvox_version = ENV['OPENVOX_GEM_VERSION'] +openfact_version = ENV['OPENFACT_GEM_VERSION'] hiera_version = ENV['HIERA_GEM_VERSION'] gems = {} -gems['puppet'] = location_for(puppet_version) +gems['openvox'] = location_for(openvox_version) -# If facter or hiera versions have been specified via the environment +# If openfact or hiera versions have been specified via the environment # variables -gems['facter'] = location_for(facter_version) if facter_version +gems['openfact'] = location_for(openfact_version) if openfact_version gems['hiera'] = location_for(hiera_version) if hiera_version gems.each do |gem_name, gem_params| diff --git a/site/role/.rubocop.yml b/site/role/.rubocop.yml index 21b82b9..3c4fcc7 100644 --- a/site/role/.rubocop.yml +++ b/site/role/.rubocop.yml @@ -1,11 +1,11 @@ --- -require: +plugins: - rubocop-performance - rubocop-rspec AllCops: NewCops: enable DisplayCopNames: true - TargetRubyVersion: '2.6' + TargetRubyVersion: '2.7' Include: - "**/*.rb" Exclude: @@ -116,10 +116,6 @@ Bundler/GemFilename: Enabled: false Bundler/InsecureProtocolSource: Enabled: false -Capybara/CurrentPathExpectation: - Enabled: false -Capybara/VisibilityMatcher: - Enabled: false Gemspec/DuplicatedAssignment: Enabled: false Gemspec/OrderedDependencies: @@ -294,7 +290,7 @@ Performance/UriDefaultParser: Enabled: false RSpec/Be: Enabled: false -RSpec/Capybara/FeatureMethods: +RSpec/Dialect: Enabled: false RSpec/ContainExactly: Enabled: false @@ -320,12 +316,6 @@ RSpec/ExpectChange: Enabled: false RSpec/ExpectInHook: Enabled: false -RSpec/FactoryBot/AttributeDefinedStatically: - Enabled: false -RSpec/FactoryBot/CreateList: - Enabled: false -RSpec/FactoryBot/FactoryClassName: - Enabled: false RSpec/HooksBeforeExamples: Enabled: false RSpec/ImplicitBlockExpectation: @@ -490,16 +480,6 @@ Style/TrailingMethodEndStatement: Enabled: false Style/UnpackFirst: Enabled: false -Capybara/MatchStyle: - Enabled: false -Capybara/NegationMatcher: - Enabled: false -Capybara/SpecificActions: - Enabled: false -Capybara/SpecificFinders: - Enabled: false -Capybara/SpecificMatcher: - Enabled: false Gemspec/DeprecatedAttributeAssignment: Enabled: false Gemspec/DevelopmentDependencies: @@ -600,28 +580,12 @@ RSpec/DuplicatedMetadata: Enabled: false RSpec/ExcessiveDocstringSpacing: Enabled: false -RSpec/FactoryBot/ConsistentParenthesesStyle: - Enabled: false -RSpec/FactoryBot/FactoryNameStyle: - Enabled: false -RSpec/FactoryBot/SyntaxMethods: - Enabled: false RSpec/IdenticalEqualityAssertion: Enabled: false RSpec/NoExpectationExample: Enabled: false RSpec/PendingWithoutReason: Enabled: false -RSpec/Rails/AvoidSetupHook: - Enabled: false -RSpec/Rails/HaveHttpStatus: - Enabled: false -RSpec/Rails/InferredSpecType: - Enabled: false -RSpec/Rails/MinitestAssertions: - Enabled: false -RSpec/Rails/TravelAround: - Enabled: false RSpec/RedundantAround: Enabled: false RSpec/SkipBlockInsideExample: diff --git a/site/role/Gemfile b/site/role/Gemfile index cd2b359..83a8f16 100644 --- a/site/role/Gemfile +++ b/site/role/Gemfile @@ -18,43 +18,42 @@ group :development do gem "racc", '~> 1.8.0', require: false if Gem::Requirement.create(['>= 2.7.0', '< 3.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup)) gem "deep_merge", '~> 1.2.2', require: false gem "voxpupuli-puppet-lint-plugins", '~> 5.0', require: false - gem "facterdb", '~> 2.1', require: false - gem "metadata-json-lint", '~> 4.0', require: false - gem "rspec-puppet-facts", '~> 4.0', require: false + gem "facterdb", '~> 3.0', require: false + gem "metadata-json-lint", '~> 5.0', require: false + gem "rspec-puppet-facts", '~> 5.0', require: false gem "dependency_checker", '~> 1.0.0', require: false - gem "parallel_tests", '= 3.13.0', require: false + gem "parallel_tests", '= 5.4.0', require: false gem "pry", '~> 0.10', require: false gem "simplecov-console", '~> 0.9', require: false gem "puppet-debugger", '~> 1.0', require: false gem "rubocop", '~> 1.80.0', require: false gem "rubocop-performance", '= 1.26.0', require: false - gem "rubocop-rspec", '= 2.31.0', require: false + gem "rubocop-rspec", '= 3.7.0', require: false gem "rb-readline", '= 0.5.5', require: false, platforms: [:mswin, :mingw, :x64_mingw] gem "rexml", '>= 3.0.0', '< 3.4.5', require: false end group :development, :release_prep do - gem "puppet-strings", '~> 4.0', require: false + gem "openvox-strings", '~> 6.0', require: false gem "puppetlabs_spec_helper", '~> 8.0', require: false gem "puppet-blacksmith", '~> 8.0', require: false end group :system_tests do - gem "puppet_litmus", '~> 1.0', require: false, platforms: [:ruby, :x64_mingw] gem "CFPropertyList", '< 3.0.8', require: false, platforms: [:mswin, :mingw, :x64_mingw] gem "serverspec", '~> 2.41', require: false end -puppet_version = ENV['PUPPET_GEM_VERSION'] -facter_version = ENV['FACTER_GEM_VERSION'] +openvox_version = ENV['OPENVOX_GEM_VERSION'] +openfact_version = ENV['OPENFACT_GEM_VERSION'] hiera_version = ENV['HIERA_GEM_VERSION'] gems = {} -gems['puppet'] = location_for(puppet_version) +gems['openvox'] = location_for(openvox_version) -# If facter or hiera versions have been specified via the environment +# If openfact or hiera versions have been specified via the environment # variables -gems['facter'] = location_for(facter_version) if facter_version +gems['openfact'] = location_for(openfact_version) if openfact_version gems['hiera'] = location_for(hiera_version) if hiera_version gems.each do |gem_name, gem_params| From c86ce09f9eb2b3eebb60404c4b84d2eee08303b3 Mon Sep 17 00:00:00 2001 From: Steven Pritchard Date: Wed, 17 Sep 2025 16:49:49 -0500 Subject: [PATCH 5/5] Drop Puppet 7 and use OpenVox in tests --- .github/workflows/pr.yml | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index fd309af..2e4a5db 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -11,7 +11,7 @@ jobs: - uses: actions/checkout@v4 - uses: ruby/setup-ruby@v1 with: - ruby-version: '3.3' + ruby-version: '3.4' bundler-cache: false - run: ruby -wc Vagrantfile @@ -22,20 +22,17 @@ jobs: module: - profile - role - puppet: - - label: 'Puppet 7' - puppet_version: '~> 7' - ruby_version: '2.7' - - label: 'Puppet 8' - puppet_version: '~> 8' + openvox: + - label: 'OpenVox 8' + openvox_version: '~> 8' ruby_version: '3.2' env: - PUPPET_GEM_VERSION: ${{matrix.puppet.puppet_version}} + OPENVOX_GEM_VERSION: ${{matrix.openvox.openvox_version}} steps: - uses: actions/checkout@v4 - uses: ruby/setup-ruby@v1 with: - ruby-version: ${{matrix.puppet.ruby_version}} + ruby-version: ${{matrix.openvox.ruby_version}} bundler-cache: true working-directory: site/${{matrix.module}} - run: bundle exec rake validate lint check rubocop @@ -50,20 +47,17 @@ jobs: module: - profile - role - puppet: - - label: 'Puppet 7' - puppet_version: '~> 7' - ruby_version: '2.7' - - label: 'Puppet 8' - puppet_version: '~> 8' + openvox: + - label: 'OpenVox 8' + openvox_version: '~> 8' ruby_version: '3.2' env: - PUPPET_GEM_VERSION: ${{matrix.puppet.puppet_version}} + OPENVOX_GEM_VERSION: ${{matrix.openvox.openvox_version}} steps: - uses: actions/checkout@v4 - uses: ruby/setup-ruby@v1 with: - ruby-version: ${{matrix.puppet.ruby_version}} + ruby-version: ${{matrix.openvox.ruby_version}} bundler-cache: true working-directory: site/${{matrix.module}} - run: bundle exec rake parallel_spec