Update RuboCop

.github/workflows/main.yml

@@ -59,6 +59,10 @@ jobs:
  ruby-version: ${{ matrix.ruby }}
  bundler-cache: true
  working-directory: vagrant
+ - name: Run Rubocop
+ run: bundle exec rubocop --format github
+ if: matrix.ruby == '3.1'
+ working-directory: vagrant
  - name: Run tests
- run: bundle exec rake
+ run: bundle exec rake test
  working-directory: vagrant

vagrant/.rubocop.yml

@@ -1,15 +1,18 @@
+require:
+ - rubocop-minitest
+ - rubocop-rake
+
 AllCops:
  Include:
  - '**/Rakefile'
  - 'lib/**/*.rb'
  - 'test/**/*.rb'
  Exclude:
- - !ruby/regexp /katello-installer/
- - !ruby/regexp /.spec/
  - 'vendor/**/*'
- TargetRubyVersion: 2.0
+ TargetRubyVersion: '2.7'
+ NewCops: enable
 
-Metrics/LineLength:
+Layout/LineLength:
  Max: 120
 
 Metrics/ClassLength:
@@ -18,14 +21,14 @@ Metrics/ClassLength:
 Metrics/BlockLength:
  Max: 50
 
-Documentation:
+Style/Documentation:
  Enabled: false # don't require documentation
 
-MethodLength:
+Metrics/MethodLength:
  Description: 'Avoid methods longer than 30 lines of code.'
  Max: 30
 
-HashSyntax:
+Style/HashSyntax:
  Enabled: false # don't force 1.9 hash syntax
 
 Layout/EmptyLinesAroundClassBody:

vagrant/Gemfile

@@ -1,21 +1,16 @@
-# rubocop:disable Naming/FileName
 source 'https://rubygems.org'
 
-if RUBY_VERSION < '2.1'
- gem 'psych', '~> 2.0'
-end
-
 group :test do
  gem 'deep_merge'
  gem 'json'
  gem 'minitest'
  gem 'mocha'
  gem 'rake'
- if RUBY_VERSION < '3.1'
- # we need a rubocop that still can manage Ruby 2.0 code
- # but 0.49.x is not compatible with Ruby 3.1
- gem 'rubocop', '<0.50'
- end
-end
 
-# rubocop:enable Naming/FileName
+ # Make sure the Ruby version is supported
+ # https://docs.rubocop.org/rubocop/compatibility.html#support-matrix
+ gem 'rubocop', '~> 1.56.0'
+ gem 'rubocop-minitest'
+ gem 'rubocop-performance'
+ gem 'rubocop-rake'
+end

vagrant/Rakefile

@@ -13,8 +13,7 @@ default_tasks = %i[test]
 begin
  require 'rubocop/rake_task'
  RuboCop::RakeTask.new
- # insert 0, because Ruby 2.0 doesn't know Array.prepend
- default_tasks.insert(0, 'rubocop')
+ default_tasks.prepend('rubocop')
 rescue LoadError
  puts 'Rubocop not loaded'
 end

vagrant/lib/forklift.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-$LOAD_PATH.unshift File.dirname(__FILE__)
+$LOAD_PATH.unshift __dir__
 
-files = Dir[File.dirname(__FILE__) + '/forklift/**/*.rb']
+files = Dir["#{__dir__}/forklift/**/*.rb"]
 files.uniq.each { |f| require f }
 
 module Forklift

vagrant/lib/forklift/box_distributor.rb

@@ -5,7 +5,7 @@
 module Forklift
  class BoxDistributor
 
- VAGRANTFILE_API_VERSION = '2'.freeze
+ VAGRANTFILE_API_VERSION = '2'
 
  def initialize(boxes)
  @ansible_groups = {}
@@ -177,12 +177,12 @@ def configure_networks(networks)
  def configure_ansible(machine, ansible, box_name)
  return unless ansible
 
- if ansible.key?('group') && !ansible['group'].nil?
+ unless ansible['group'].nil?
  @ansible_groups[ansible['group'].to_s] ||= []
  @ansible_groups[ansible['group'].to_s] << box_name
  end
 
- if ansible.key?('server') && !ansible['server'].nil?
+ unless ansible['server'].nil?
  @ansible_groups["server-#{box_name}"] = ansible['server']
  end
 

vagrant/lib/forklift/box_factory.rb

@@ -31,7 +31,7 @@ def add_boxes!(box_file)
 
  def filter_boxes!
  box_config = Settings.new.settings['boxes']
- return unless box_config && box_config.key?('exclude')
+ return unless box_config&.key?('exclude')
 
  @boxes.reject! do |name, _box|
  box_config['exclude'].any? { |exclude| name.match(/#{exclude}/) }