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

voxpupuli-rubocop: Require 2.7.0 #45

Merged
merged 1 commit into from
May 28, 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
12 changes: 9 additions & 3 deletions .rubocop_todo.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This configuration was generated by
# `rubocop --auto-gen-config`
# on 2023-05-05 18:42:04 UTC using RuboCop version 1.50.2.
# on 2024-05-28 10:04:32 UTC using RuboCop version 1.63.5.
# 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
Expand All @@ -11,17 +11,23 @@
RSpec/ExampleLength:
Max: 9

# Offense count: 72
# Offense count: 77
# Configuration parameters: .
# SupportedStyles: have_received, receive
RSpec/MessageSpies:
EnforcedStyle: receive

# Offense count: 24
# Offense count: 26
RSpec/MultipleExpectations:
Max: 7

# Offense count: 4
# Configuration parameters: AllowedGroups.
RSpec/NestedGroups:
Max: 4

# Offense count: 2
# This cop supports unsafe autocorrection (--autocorrect-all).
RSpec/ReceiveMessages:
Exclude:
- 'spec/beaker_puppet_helpers/dsl_spec.rb'
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ group :development do
end

group :rubocop do
gem 'voxpupuli-rubocop', '~> 1.2'
gem 'voxpupuli-rubocop', '~> 2.7.0'
end

group :test do
Expand Down
4 changes: 2 additions & 2 deletions lib/beaker_puppet_helpers/install_utils.rb
Original file line number Diff line number Diff line change
Expand Up @@ -80,14 +80,14 @@ def self.puppet_package_name(host, prefer_aio: true)
case host['packaging_platform'].split('-', 3).first
when 'debian'
# 12 started to ship puppet-agent with puppet as a legacy package
prefer_aio || host['packaging_platform'].split('-', 3)[1].to_i >= 12 ? 'puppet-agent' : 'puppet'
(prefer_aio || host['packaging_platform'].split('-', 3)[1].to_i >= 12) ? 'puppet-agent' : 'puppet'
bastelfreak marked this conversation as resolved.
Show resolved Hide resolved
when /el|fedora|sles|cisco_/
prefer_aio ? 'puppet-agent' : 'puppet'
when /freebsd/
'sysutils/puppet8'
when 'ubuntu'
# 23.04 started to ship puppet-agent with puppet as a legacy package
prefer_aio || host['packaging_platform'].split('-', 3)[1].to_i >= 2304 ? 'puppet-agent' : 'puppet'
(prefer_aio || host['packaging_platform'].split('-', 3)[1].to_i >= 2304) ? 'puppet-agent' : 'puppet'
else
'puppet'
end
Expand Down