Bump rubocop 1.79 (#135)

Merge pull request #135 from adangel:bump-rubocop-1.79

Author: adangel

History.md

@@ -26,6 +26,9 @@ projects. You might need to add `<tag>master</tag>` for some projects.
 * [#133](https://github.com/pmd/pmd-regression-tester/pull/133): \[ci] Make build a reuseable workflow
 * [#136](https://github.com/pmd/pmd-regression-tester/pull/136): Fix integration tests - missing pmd-core:jar:tests
 
+## Dependency Updates
+* [#135](https://github.com/pmd/pmd-regression-tester/pull/135): Bump rubocop 1.79
+
 ## External Contributions
 
 # 1.5.5 / 2023-11-16

Rakefile

@@ -34,7 +34,7 @@ hoe = Hoe.spec 'pmdtester' do
     ['hoe-git',       '~> 1.6'],
     ['minitest',      '~> 5.16'],
     ['mocha',         '~> 1.16'],
-    ['rubocop',       '~> 1.60'],
+    ['rubocop',       '~> 1.79'],
     ['test-unit',     '~> 3.5'],
     ['rdoc',          '~> 6.4'],
     # Pin rake to 13.1.0, which is still compatible with hoe. See https://github.com/seattlerb/hoe/pull/118

lib/pmdtester/builders/pmd_report_builder.rb

@@ -102,7 +102,7 @@ def generate_pmd_report(project)
                 "-r #{project.get_pmd_report_path(@pmd_branch_name)} " \
                 "#{fail_on_violation} -t #{@threads} " \
                 "#{auxclasspath_option}" \
-                "#{pmd7? ? ' --no-progress' : ''}"
+                "#{' --no-progress' if pmd7?}"
       start_time = Time.now
       exit_code = nil
       if File.exist?(project.get_pmd_report_path(@pmd_branch_name))
@@ -173,7 +173,7 @@ def checkout_build_branch
       # determine the version
       @pmd_version = determine_pmd_version
 
-      return unless wd_has_dirty_git_changes
+      return unless wd_has_dirty_git_changes?
 
       # working dir is dirty....
       # we don't allow this because we need the SHA to address the zip file
@@ -193,7 +193,7 @@ def saved_distro_path(build_sha)
         "-#{build_sha}"
     end
 
-    def wd_has_dirty_git_changes
+    def wd_has_dirty_git_changes?
       !Cmd.execute_successfully('git status --porcelain').empty?
     end
 
@@ -251,24 +251,24 @@ def find_pmd_dist_target
     def build_pmd_with_maven
       logger.info "#{@pmd_branch_name}: Building PMD #{@pmd_version}..."
 
-      if Semver.compare(@pmd_version, '7.14.0') >= 0
-        # build command since PMD migrated to central portal
-        package_cmd = './mvnw clean package ' \
-                      '-PfastSkip ' \
-                      '-DskipTests ' \
-                      '-T1C -B'
-      else
-        # build command for older PMD versions
-        package_cmd = './mvnw clean package ' \
-                      "-s #{ResourceLocator.resource('maven-settings.xml')} " \
-                      '-Pfor-dokka-maven-plugin ' \
-                      '-Dmaven.test.skip=true ' \
-                      '-Dmaven.javadoc.skip=true ' \
-                      '-Dmaven.source.skip=true ' \
-                      '-Dcheckstyle.skip=true ' \
-                      '-Dpmd.skip=true ' \
-                      '-T1C -B'
-      end
+      package_cmd = if Semver.compare(@pmd_version, '7.14.0') >= 0
+                      # build command since PMD migrated to central portal
+                      './mvnw clean package ' \
+                        '-PfastSkip ' \
+                        '-DskipTests ' \
+                        '-T1C -B'
+                    else
+                      # build command for older PMD versions
+                      './mvnw clean package ' \
+                        "-s #{ResourceLocator.resource('maven-settings.xml')} " \
+                        '-Pfor-dokka-maven-plugin ' \
+                        '-Dmaven.test.skip=true ' \
+                        '-Dmaven.javadoc.skip=true ' \
+                        '-Dmaven.source.skip=true ' \
+                        '-Dcheckstyle.skip=true ' \
+                        '-Dpmd.skip=true ' \
+                        '-T1C -B'
+                    end
 
       logger.debug "#{@pmd_branch_name}: maven command: #{package_cmd}"
       Cmd.execute_successfully(package_cmd)

lib/pmdtester/builders/rule_set_builder.rb

@@ -9,6 +9,7 @@ module PmdTester
   # Attention: we only consider java rulesets now.
   class RuleSetBuilder
     include PmdTester
+
     PATH_TO_DYNAMIC_CONFIG = 'target/dynamic-config.xml'
     NO_RULES_CHANGED_MESSAGE = 'No regression tested rules have been changed!'
 
@@ -126,7 +127,7 @@ def determine_categories_rules(filenames)
       categories = Set[]
       rules = Set[]
       filenames.each do |filename|
-        matched = check_single_filename(filename, categories, rules)
+        matched = check_single_filename?(filename, categories, rules)
         regression_test_required = true if matched
 
         next if matched
@@ -140,7 +141,7 @@ def determine_categories_rules(filenames)
       [regression_test_required, categories, rules]
     end
 
-    def check_single_filename(filename, categories, rules)
+    def check_single_filename?(filename, categories, rules)
       logger.debug "Checking #{filename}"
 
       # matches Java-based rule implementations

lib/pmdtester/builders/simple_progress_logger.rb

@@ -6,6 +6,7 @@ module PmdTester
   # Helper class that provides a simple progress logging
   class SimpleProgressLogger
     include PmdTester
+
     def initialize(task_name)
       @task_name = task_name
     end

lib/pmdtester/parsers/options.rb

@@ -10,6 +10,7 @@ class InvalidModeError < StandardError; end
   # command line options
   class Options
     include PmdTester
+
     ANY = 'any'
     LOCAL = 'local'
     ONLINE = 'online'

lib/pmdtester/pmd_error.rb

@@ -5,6 +5,7 @@ module PmdTester
   # and which Pmd branch the 'error' is from
   class PmdError
     include PmdTester
+
     # The pmd branch type, 'base' or 'patch'
     attr_reader :branch
 

pmdtester.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.metadata = { "bug_tracker_uri" => "https://github.com/pmd/pmd-regression-tester/issues", "homepage_uri" => "https://pmd.github.io", "source_code_uri" => "https://github.com/pmd/pmd-regression-tester" } if s.respond_to? :metadata=
   s.require_paths = ["lib".freeze]
   s.authors = ["Andreas Dangel".freeze, "Binguo Bao".freeze, "Cl\u00E9ment Fournier".freeze]
-  s.date = "2025-05-15"
+  s.date = "2025-07-24"
   s.description = "A regression testing tool ensure that new problems and unexpected behaviors will not be introduced to PMD project after fixing an issue , and new rules can work as expected.".freeze
   s.email = ["[email protected]".freeze, "[email protected]".freeze, "[email protected]".freeze]
   s.executables = ["pmdtester".freeze]
@@ -38,7 +38,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency(%q<hoe-git>.freeze, ["~> 1.6".freeze])
   s.add_development_dependency(%q<minitest>.freeze, ["~> 5.16".freeze])
   s.add_development_dependency(%q<mocha>.freeze, ["~> 1.16".freeze])
-  s.add_development_dependency(%q<rubocop>.freeze, ["~> 1.60".freeze])
+  s.add_development_dependency(%q<rubocop>.freeze, ["~> 1.79".freeze])
   s.add_development_dependency(%q<test-unit>.freeze, ["~> 3.5".freeze])
   s.add_development_dependency(%q<rdoc>.freeze, ["~> 6.4".freeze])
   s.add_development_dependency(%q<rake>.freeze, ["= 13.1.0".freeze])

test/integration_test_pmd_report_builder.rb

@@ -6,6 +6,7 @@
 # Integration test for PmdTester::PmdReportBuilder
 class IntegrationTestPmdReportBuilder < Test::Unit::TestCase
   include PmdTester
+
   def setup
     `rake clean`
   end

test/test_diff_builder.rb

@@ -6,6 +6,7 @@
 class TestDiffBuilder < Test::Unit::TestCase
   include PmdTester::PmdTesterUtils
   include ProjectHasher
+
   BASE_REPORT_INFO_PATH = 'test/resources/diff_builder/base_report_info.json'
   PATCH_REPORT_INFO_PATH = 'test/resources/diff_builder/patch_report_info.json'