rubocop-changes 0.6.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee87c885eb2498625bb6f9fc0a59719cbd1c59d71419fd32e1fc3128aa201ce0
-  data.tar.gz: 947199d33a4427840836b901f780661b98f32428ac6aaaae8012c5cf449e4a48
+  metadata.gz: '09daace2e31cf1451cba68fe23ac1c6ab439f281b23d1634c004fe316b67cd8e'
+  data.tar.gz: dc982a2074301f56ad4658c97cd09b9e2f657498476d52c60d2bea242f60b32e
 SHA512:
-  metadata.gz: 6eb29fc5b10fcdcbbb9966d5d287459def271a9ac1d593e81d227c7c1e78fb15e1a74018e93c6fd6251d24d4037da6df7b6a5c1b7e862fabaf56a7cfd70368e6
-  data.tar.gz: e43732b83c2f830f69fa795ac96d6c80bce7c1f48e0e54c9a4e076fc1614056b264268241dd9deee99a1520b99f97219c005cb6a60ec90c09bbb8be1b4423d01
+  metadata.gz: cc9ccaf62d221526a6405f8e57a8b4c7b5ede8963a43b5793ab4013914da4eca6535f4c00c55d32038dddde15e7966f5e7c280615ab8900f57fdfb308db19f2c
+  data.tar.gz: a1d648e0776098ceb27e23d0f3efb6742d7b71fef4cfb28e628e8e0f9f4cd5d64daf829a8782196306519322cba50afa6c2c2585c896612595674b2f85e6565a

data/.github/workflows/ci.yml

@@ -10,7 +10,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: ["2.5", "2.6", "2.7", "3.0", "3.1", ruby-head]
+        ruby: ["2.6", "2.7", "3.0", "3.1", ruby-head]
 
     steps:
     - uses: actions/checkout@v2

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    rubocop-changes (0.5.0)
+    rubocop-changes (0.8.0)
       git_diff_parser (~> 3.2)
-      rubocop (~> 1.25)
+      rubocop (>= 1.0)
 
 GEM
   remote: https://rubygems.org/
@@ -12,12 +12,13 @@ GEM
     byebug (10.0.2)
     diff-lcs (1.3)
     git_diff_parser (3.2.0)
-    parallel (1.21.0)
-    parser (3.1.0.0)
+    json (2.6.3)
+    parallel (1.22.1)
+    parser (3.2.0.0)
       ast (~> 2.4.1)
     rainbow (3.1.1)
     rake (13.0.3)
-    regexp_parser (2.2.0)
+    regexp_parser (2.6.2)
     rexml (3.2.5)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
@@ -32,19 +33,20 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-support (3.9.0)
-    rubocop (1.25.0)
+    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
-      rubocop-ast (>= 1.15.1, < 2.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.24.1, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.15.1)
-      parser (>= 3.0.1.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.1.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

@@ -10,6 +10,7 @@ require 'rubocop/changes/shell'
 module Rubocop
   module Changes
     class UnknownFormat < StandardError; end
+    class UnknownBaseBranchError < StandardError; end
     class UnknownForkPointError < StandardError; end
 
     class Checker
@@ -22,6 +23,7 @@ module Rubocop
       end
 
       def run
+        raise UnknownBaseBranchError if base_branch.empty?
         raise UnknownForkPointError if fork_point.empty?
         raise UnknownFormat if formatter_klass.nil?
 
@@ -32,14 +34,23 @@ module Rubocop
 
       private
 
-      attr_reader :format, :quiet, :commit, :auto_correct
+      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
 
       def command
-        return "git merge-base HEAD origin/#{@base_branch}" unless commit
+        return "git merge-base HEAD origin/#{base_branch}" unless commit
 
         "git log -n 1 --pretty=format:\"%h\" #{commit}"
       end
@@ -57,7 +68,17 @@ 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|
+          if path_prefix
+            path.gsub(/^#{path_prefix}\//, '')
+          else
+            path
+          end
+        end
       end
 
       def rubocop
@@ -76,11 +97,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
@@ -121,7 +142,9 @@ module Rubocop
       end
 
       def formatter_klass
-        @formatter_klass ||= formatters[format]
+        return formatters[format] unless formatters[format].is_a? String
+
+        Kernel.const_get("RuboCop::Formatter::#{formatters[format]}")
       end
 
       def formatters

data/lib/rubocop/changes/options.rb

@@ -8,7 +8,13 @@ module Rubocop
       Options = Struct.new(:format, :quiet, :commit, :auto_correct, :base_branch)
 
       def initialize
-        @args = Options.new(:simple, false, nil, false, 'main') # Defaults
+        @args = Options.new(
+          :simple,
+          false,
+          nil,
+          false,
+          ENV.fetch('RUBOCOP_CHANGES_BASE_BRANCH', 'main')
+        ) # Defaults
       end
 
       def parse!
@@ -73,7 +79,8 @@ module Rubocop
       end
 
       def parse_base_branch!(opts)
-        opts.on('-b', '--base_branch [BRANCH]', 'Base branch to compare') do |v|
+        env_message = 'Also, you can set RUBOCOP_CHANGES_BASE_BRANCH environment variable'
+        opts.on('-b', '--base-branch [BRANCH]', "Base branch to compare. #{env_message}") do |v|
           args.base_branch = v
         end
       end

data/lib/rubocop/changes/version.rb

@@ -2,6 +2,6 @@
 
 module Rubocop
   module Changes
-    VERSION = '0.6.0'
+    VERSION = '0.8.0'
   end
 end

data/rubocop-changes.gemspec

@@ -37,7 +37,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_runtime_dependency 'git_diff_parser', '~> 3.2'
-  spec.add_runtime_dependency 'rubocop', '~> 1.25'
+  spec.add_runtime_dependency 'rubocop', '>= 1.0'
 
   spec.add_development_dependency 'bundler', '~> 2.0'
   spec.add_development_dependency 'byebug', '~> 10.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-changes
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Ferran Basora
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-04-01 00:00:00.000000000 Z
+date: 2023-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git_diff_parser
@@ -28,16 +28,16 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.25'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.25'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -148,7 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.3.5
 signing_key: 
 specification_version: 4
 summary: Rubocop on changed lines from git fork point