rubocop-changes 0.7.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d17f6a268625b8b30740a9e1409576f00374bf777632a3c1e6b068678a70d9c
-  data.tar.gz: 16eaed76c02755b4a0239c52f36ad8c2ab7369098abd2cdf77fc7bfa8f8d13e6
+  metadata.gz: 50ba12f7f5d19c871a2d3ea88b3e04f08dc568e3c662d6250c32e4a524d5bf9f
+  data.tar.gz: c1b438aeea0f9796093617663b00c737a6bc1325fe4e0593125318de005f0422
 SHA512:
-  metadata.gz: 7e611a8344770358d7690dc7cf58d0421b06853e696d03e0bc99ae42d6c9e3b5e24f2de7c0fef195f6fd54c14d64527cc0ba2a3190187645f713c4a6e8ef6c17
-  data.tar.gz: 4c7b4eb56b4eaa7f7a59c5016b9e26f5d3b4d60246804a67481c94e35cdd0334f1799fc88b2cb34189a0ec8bf57a51a72940d5ca114bab95b32be33c5ade3842
+  metadata.gz: 598a1939a20f292b1ece470057e7ba633ce5721a3c0950efa45aef16e138fe0f89e4d4c910d46052ba51da5d13af8d64e26820a72bab55c466e491796dfc1127
+  data.tar.gz: 56193641cd04df8b28c120ed3bf638da9dddcaae43b8a86f3e9621d3672c4454b38307a1ffec3d9335e6baaa30b8a57c5c2ca374f339419ceb8e4ed32ce00c47

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rubocop-changes (0.7.0)
+    rubocop-changes (0.8.0)
       git_diff_parser (~> 3.2)
       rubocop (>= 1.0)
 
@@ -12,13 +12,13 @@ GEM
     byebug (10.0.2)
     diff-lcs (1.3)
     git_diff_parser (3.2.0)
-    json (2.6.2)
+    json (2.6.3)
     parallel (1.22.1)
-    parser (3.1.2.0)
+    parser (3.2.0.0)
       ast (~> 2.4.1)
     rainbow (3.1.1)
     rake (13.0.3)
-    regexp_parser (2.5.0)
+    regexp_parser (2.6.2)
     rexml (3.2.5)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
@@ -33,20 +33,20 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-support (3.9.0)
-    rubocop (1.31.2)
+    rubocop (1.44.0)
       json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 3.1.0.0)
+      parser (>= 3.2.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.18.0, < 2.0)
+      rubocop-ast (>= 1.24.1, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.19.1)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.24.1)
       parser (>= 3.1.1.0)
     ruby-progressbar (1.11.0)
-    unicode-display_width (2.2.0)
+    unicode-display_width (2.4.2)
 
 PLATFORMS
   ruby

data/README.md

@@ -32,7 +32,9 @@ Or install it yourself as:
 
 ## Usage
 
-    $ bundle exec rubocop-changes
+    $ bundle exec rubocop-changes -b master
+    
+When you run `rubocop-changes`, you have to specify which is your base branch with `-b` argument. By default is `main`. If you want to avoid to pass this argument everytime you execute this command, you can also set the `RUBOCOP_CHANGES_BASE_BRANCH` environment variable.
 
 ## Other gems
 

data/lib/rubocop/changes/checker.rb

@@ -36,6 +36,15 @@ module Rubocop
 
       attr_reader :format, :quiet, :commit, :auto_correct, :base_branch
 
+      def path_prefix
+        return @path_prefix if defined?(@path_prefix)
+        @path_prefix = local_git_root_path && Dir.pwd.gsub(local_git_root_path, '')[1..-1]
+      end
+
+      def local_git_root_path
+        @local_git_root_path ||= Shell.run("git rev-parse --show-toplevel")
+      end
+
       def fork_point
         @fork_point ||= Shell.run(command)
       end
@@ -59,7 +68,13 @@ module Rubocop
       end
 
       def ruby_changed_files
-        changed_files.select { |changed_file| changed_file =~ /.rb$/ }
+        changed_files.select { |changed_file| changed_file =~ /\.rb$/ }
+      end
+
+      def ruby_changed_files_from_pwd
+        ruby_changed_files.map do |path|
+          from_pwd_path(path)
+        end
       end
 
       def rubocop
@@ -78,11 +93,11 @@ module Rubocop
       end
 
       def formatter_modifier
-        "-f j #{ruby_changed_files.join(' ')}"
+        "-f j #{ruby_changed_files_from_pwd.join(' ')}"
       end
 
       def auto_correct_modifier
-        '-a' if @auto_correct
+        '-A' if @auto_correct
       end
 
       def rubocop_json
@@ -91,7 +106,7 @@ module Rubocop
 
       def checks
         @checks ||= ruby_changed_files.map do |file|
-          analysis = rubocop_json.files.find { |item| item.path == file }
+          analysis = rubocop_json.files.find { |item| item.path == from_pwd_path(file) }
           patch = patches.find { |item| item.file == file }
 
           next unless analysis
@@ -150,6 +165,14 @@ module Rubocop
 
         formatter.file_finished(check.path, offenses)
       end
+
+      def from_pwd_path(path)
+        if path_prefix
+          path.gsub(/^#{path_prefix}\//, '')
+        else
+          path
+        end
+      end
     end
   end
 end

data/lib/rubocop/changes/version.rb

@@ -2,6 +2,6 @@
 
 module Rubocop
   module Changes
-    VERSION = '0.7.0'
+    VERSION = '0.8.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-changes
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Ferran Basora
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-07-20 00:00:00.000000000 Z
+date: 2023-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git_diff_parser