rubocop-gradual 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 03f450cd4cc7123b6c7bf7b393cab547f36ea8c38bff64ff5468a8d50e7590c8
-  data.tar.gz: 4abbd0ba12b43d4db80203315bbfc4d2cd9fc120e30d0659a32bcd62278b1087
+  metadata.gz: 750548fbcac00bd48721d0c3f1b0b7a43b5cf77aaafe7a81d6f58bfbe6edc2e6
+  data.tar.gz: dfba66113c744a92a51b6c72e6bec157c12dd721cee9d8a1d033a0845b4bf0ab
 SHA512:
-  metadata.gz: a4a1ebecba028f66d5b646bfe36c62e01ac5d45e9a31ffab5cb01b12ff90023333dbcd61c58dc427090e6f095e9ee658284c8bab714cacbcf0c52eabad8b9f75
-  data.tar.gz: 2a04f09d401e024597bc255cb9897f1b76fe62ac0b2395a665951b49f019e531273335564e8481791b480597278370924de474eca0a45dacf708a71fac8674da
+  metadata.gz: d713758f60a7b2ee780aeafda2fb01c6eb2f68f5a97aa521da5b1ef57a5a33bf3d3fa05b9dfb0f9d231ac3f0d107b72b7af1260eb9e76f6ae259bc3a619d1190
+  data.tar.gz: 1e4286b97788902cfc101698cb31ae756a70c2419d824ae3b547db1eb060a2cc36e6fc6eb334007658ef3c0ffec8ba484b257770d0e025768c1bf70aef58e419

data/CHANGELOG.md

@@ -7,6 +7,18 @@ and this project adheres to [Semantic Versioning].
 
 ## [Unreleased]
 
+## [0.3.5] - 2024-06-24
+
+### Added
+
+- Add support for the RuboCop `--list` option. ([@skryukov])
+
+### Fixed
+
+- Respect files passed to RuboCop in required mode. ([@skryukov])
+- Exclude deleted files when running `--staged`. ([@dmorgan-fa])
+- Don't show "EVEN BETTER" instruction when all issues are fixed. ([@skryukov])
+
 ## [0.3.4] - 2023-10-26
 
 ### Fixed
@@ -103,9 +115,11 @@ RuboCop::Gradual::RakeTask.new
 
 - Initial implementation. ([@skryukov])
 
+[@dmorgan-fa]: https://github.com/dmorgan-fa
 [@skryukov]: https://github.com/skryukov
 
-[Unreleased]: https://github.com/skryukov/rubocop-gradual/compare/v0.3.4...HEAD
+[Unreleased]: https://github.com/skryukov/rubocop-gradual/compare/v0.3.5...HEAD
+[0.3.5]: https://github.com/skryukov/rubocop-gradual/compare/v0.3.4...v0.3.5
 [0.3.4]: https://github.com/skryukov/rubocop-gradual/compare/v0.3.3...v0.3.4
 [0.3.3]: https://github.com/skryukov/rubocop-gradual/compare/v0.3.2...v0.3.3
 [0.3.2]: https://github.com/skryukov/rubocop-gradual/compare/v0.3.1...v0.3.2

data/lib/rubocop/gradual/cli.rb

@@ -10,11 +10,19 @@ module RuboCop
       def run(argv = ARGV)
         Configuration.apply(*Options.new.parse(argv))
         puts "Gradual mode: #{Configuration.mode}" if Configuration.debug?
-        load_command(Configuration.command).call.to_i
+        cmd = load_command(Configuration.command)
+        return list_target_files(cmd) if Configuration.rubocop_options[:list_target_files]
+
+        cmd.call.to_i
       end
 
       private
 
+      def list_target_files(cmd)
+        cmd.lint_paths.each { |path| puts PathUtil.relative_path(path) }
+        1
+      end
+
       def load_command(command)
         require_relative "commands/#{command}"
         ::RuboCop::Gradual::Commands.const_get(command.to_s.capitalize).new

data/lib/rubocop/gradual/commands/autocorrect.rb

@@ -20,14 +20,14 @@ module RuboCop
           Base.new.call
         end
 
-        private
-
         def lint_paths
           return Configuration.target_file_paths if Configuration.lint_paths.any?
 
           changed_or_untracked_files.map(&:path)
         end
 
+        private
+
         def changed_or_untracked_files
           tracked_files = LockFile.new(Configuration.path).read_results&.files || []
 

data/lib/rubocop/gradual/commands/base.rb

@@ -23,6 +23,10 @@ module RuboCop
           1
         end
 
+        def lint_paths
+          Configuration.target_file_paths
+        end
+
         private
 
         def run_rubocop
@@ -36,12 +40,6 @@ module RuboCop
           rubocop_runner.run
         end
 
-        def lint_paths
-          return [] if Configuration.lint_paths.empty?
-
-          Configuration.target_file_paths
-        end
-
         def rubocop_options
           Configuration.rubocop_options
                        .slice(:config, :debug, :display_time)

data/lib/rubocop/gradual/git.rb

@@ -14,7 +14,7 @@ module RuboCop
           when :unstaged
             `git ls-files --others --exclude-standard -m`.split("\n")
           when :staged
-            `git diff --cached --name-only`.split("\n")
+            `git diff --cached --name-only --diff-filter=d`.split("\n") # excludes deleted files
           else
             `git diff --name-only #{commit}`.split("\n")
           end

data/lib/rubocop/gradual/patch.rb

@@ -9,23 +9,22 @@ module RuboCop
       def run_command(name)
         return super if name != :execute_runner || (ARGV & %w[--stdin -s]).any?
 
-        Configuration.apply(*parse_options)
-        puts "Gradual mode: #{Configuration.mode}" if Configuration.debug?
-        load_command(Configuration.command).call.to_i
+        RuboCop::Gradual::CLI.new.run(patched_argv)
       end
 
       private
 
-      def load_command(command)
-        require_relative "commands/#{command}"
-        ::RuboCop::Gradual::Commands.const_get(command.to_s.capitalize).new
-      end
+      def patched_argv
+        return ARGV if ARGV[0] != "gradual"
 
-      def parse_options
-        options, rubocop_options = Options.new.parse(ARGV)
-        options[:mode] = :force_update if @env.paths[0..1] == %w[gradual force_update]
-        options[:mode] = :check if @env.paths[0..1] == %w[gradual check]
-        [options, rubocop_options]
+        case ARGV[1]
+        when "force_update"
+          ARGV[2..] + ["--force-update"]
+        when "check"
+          ARGV[2..] + ["--check"]
+        else
+          raise ArgumentError, "Unknown gradual command #{ARGV[1]}"
+        end
       end
     end
   end

data/lib/rubocop/gradual/process/printer.rb

@@ -12,16 +12,19 @@ module RuboCop
         def print_results
           puts diff.statistics if Configuration.debug?
 
-          send "print_#{diff.state}"
+          send :"print_#{diff.state}"
         end
 
-        def print_ci_warning(diff)
+        def print_ci_warning(diff, statistics:)
           puts <<~MSG
             \n#{bold("Unexpected Changes!")}
 
             RuboCop Gradual lock file is outdated, to fix this message:
-            - Run `rubocop-gradual` locally and commit the results, or
-            - EVEN BETTER: before doing the above, try to fix the remaining issues in those files!
+            - Run `rubocop-gradual` locally and commit the results#{
+              if statistics[:unchanged] != statistics[:left]
+                ", or\n- EVEN BETTER: before doing the above, try to fix the remaining issues in those files!"
+              end
+            }
 
             #{bold("`#{Configuration.path}` diff:")}
 

data/lib/rubocop/gradual/process.rb

@@ -23,7 +23,9 @@ module RuboCop
         printer = Printer.new(diff)
 
         printer.print_results
-        printer.print_ci_warning(lock_file.diff(new_results)) if fail_with_outdated_lock?(diff)
+        if fail_with_outdated_lock?(diff)
+          printer.print_ci_warning(lock_file.diff(new_results), statistics: diff.statistics)
+        end
 
         exit_code = error_code(diff)
         sync_lock_file(diff) if exit_code.zero?

data/lib/rubocop/gradual/version.rb

@@ -2,6 +2,6 @@
 
 module RuboCop
   module Gradual
-    VERSION = "0.3.4"
+    VERSION = "0.3.5"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-gradual
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Svyatoslav Kryukov
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-10-26 00:00:00.000000000 Z
+date: 2024-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diff-lcs
@@ -152,7 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.5.7
 signing_key:
 specification_version: 4
 summary: Gradual RuboCop plugin