(CONT-738) - Address rubocop errors

Author: jordanbreen28

.github/workflows/ci.yml

@@ -31,7 +31,7 @@ jobs:
       matrix:
         os:
           - "ubuntu-latest"
-          - "windows-2019"
+          - "windows-latest"
         ruby_version:
           - "2.5"
           - "2.7"
@@ -43,7 +43,6 @@ jobs:
     secrets: "inherit"
     with:
       ruby_version: ${{ matrix.ruby_version }}
-      rake_task: 'acceptance:local_parallel'
+      rake_task: 'acceptance'
       puppet_version: ${{ matrix.puppet_gem_version }}
       runs_on: ${{ matrix.os }}
-

.github/workflows/nightly.yml

@@ -30,7 +30,7 @@ jobs:
       matrix:
         os:
           - "ubuntu-latest"
-          - "windows-2019"
+          - "windows-latest"
         ruby_version:
           - "2.5"
           - "2.7"
@@ -42,7 +42,6 @@ jobs:
     secrets: "inherit"
     with:
       ruby_version: ${{ matrix.ruby_version }}
-      rake_task: 'acceptance:local_parallel'
+      rake_task: 'acceptance'
       puppet_version: ${{ matrix.puppet_gem_version }}
       runs_on: ${{ matrix.os }}
-

.rubocop.yml

@@ -1,7 +1,7 @@
 require: rubocop-rspec
 
 AllCops:
-  TargetRubyVersion: 2.3
+  TargetRubyVersion: 2.5
   Exclude:
     # binstubs, and other utilities
     - bin/**/*
@@ -178,3 +178,6 @@ Lint/RaiseException:
 
 Lint/StructNewOverride:
   Enabled: true
+
+RSpec/MultipleMemoizedHelpers:
+  Max: 14

Gemfile

@@ -11,8 +11,9 @@ group :development do
   gem 'rake', '~> 12.0'
   gem 'rspec', '~> 3.0'
 
-  gem 'rubocop', ['~> 0.68', '< 0.82.0']
-  gem 'rubocop-rspec', '~> 1.38'
+  gem 'rubocop', '= 1.6.1',                            require: false
+  gem 'rubocop-performance', '= 1.9.1',                require: false
+  gem 'rubocop-rspec', '= 2.0.1',                      require: false
 
   gem 'codecov', '~> 0.1'
   gem 'github_changelog_generator', '~> 1.15', require: false

lib/puppet/modulebuilder/builder.rb

@@ -16,9 +16,7 @@ class Builder
       '/vendor/',
     ].freeze
 
-    attr_reader :destination
-
-    attr_reader :logger
+    attr_reader :destination, :logger
 
     def initialize(source, destination = nil, logger = nil)
       raise ArgumentError, 'logger is expected to be nil or a Logger. Got %{klass}' % { klass: logger.class } unless logger.nil? || logger.is_a?(Logger)
@@ -143,7 +141,7 @@ def copy_mtime(path)
     #
     # @return [Boolean] true if the path matches and should be ignored.
     def ignored_path?(path)
-      path = path.to_s + '/' if File.directory?(path)
+      path = "#{path}/" if File.directory?(path)
 
       ignored_files.match_path(path, source)
     end

puppet-modulebuilder.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.email                 = ['[email protected]', 'https://puppetlabs.github.io/iac/']
   spec.summary               = 'A gem to set up puppet-modulebuilder'
   spec.homepage              = 'https://github.com/puppetlabs/puppet-modulebuilder'
-  spec.required_ruby_version = Gem::Requirement.new('>= 2.1.0')
+  spec.required_ruby_version = Gem::Requirement.new('>= 2.5.0')
   spec.license               = 'Apache-2.0'
 
   spec.metadata['homepage_uri'] = spec.homepage