Skip to content

Update dependency rubocop to '~> 1.80.0' #58

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.

Sign up for GitHub

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

Merged
silug merged 5 commits into from
Sep 17, 2025
Merged

Update dependency rubocop to '~> 1.80.0' #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3bc7f31
Update dependency rubocop to '~> 1.80.0'
renovate[bot] Aug 22, 2025
d9341c1
Update dependency rubocop-performance to v1.26.0
renovate[bot] Sep 6, 2025
673d46b
Update dependency rubocop-rspec to v2.31.0
renovate[bot] Aug 10, 2025
1d458db
Gem updates + rubocop fixes
silug Sep 17, 2025
c86ce09
Drop Puppet 7 and use OpenVox in tests
silug Sep 17, 2025
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
28 changes: 11 additions & 17 deletions .github/workflows/pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
Expand All @@ -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
Expand Down
42 changes: 3 additions & 39 deletions site/profile/.rubocop.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
---
require:
plugins:
- rubocop-performance
- rubocop-rspec
AllCops:
NewCops: enable
DisplayCopNames: true
TargetRubyVersion: '2.6'
TargetRubyVersion: '2.7'
Include:
- "**/*.rb"
Exclude:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -294,7 +290,7 @@ Performance/UriDefaultParser:
Enabled: false
RSpec/Be:
Enabled: false
RSpec/Capybara/FeatureMethods:
RSpec/Dialect:
Enabled: false
RSpec/ContainExactly:
Enabled: false
Expand All @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
27 changes: 13 additions & 14 deletions site/profile/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.50.0', require: false
gem "rubocop-performance", '= 1.16.0', require: false
gem "rubocop-rspec", '= 2.19.0', require: false
gem "rubocop", '~> 1.80.0', require: false
gem "rubocop-performance", '= 1.26.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|
Expand Down
42 changes: 3 additions & 39 deletions site/role/.rubocop.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
---
require:
plugins:
- rubocop-performance
- rubocop-rspec
AllCops:
NewCops: enable
DisplayCopNames: true
TargetRubyVersion: '2.6'
TargetRubyVersion: '2.7'
Include:
- "**/*.rb"
Exclude:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -294,7 +290,7 @@ Performance/UriDefaultParser:
Enabled: false
RSpec/Be:
Enabled: false
RSpec/Capybara/FeatureMethods:
RSpec/Dialect:
Enabled: false
RSpec/ContainExactly:
Enabled: false
Expand All @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
27 changes: 13 additions & 14 deletions site/role/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.50.0', require: false
gem "rubocop-performance", '= 1.16.0', require: false
gem "rubocop-rspec", '= 2.19.0', require: false
gem "rubocop", '~> 1.80.0', require: false
gem "rubocop-performance", '= 1.26.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|
Expand Down