Merge pull request #45 from bastelfreak/vpr

voxpupuli-rubocop: Require 2.7.0
voxpupuli · May 28, 2024 · 96aa0be · 96aa0be
2 parents 2f186cf + 7e74665
commit 96aa0be
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
@@ -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
@@ -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'
diff --git a/Gemfile b/Gemfile
@@ -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

diff --git a/lib/beaker_puppet_helpers/install_utils.rb b/lib/beaker_puppet_helpers/install_utils.rb
@@ -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'
       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