rubocop-changes 0.3.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69887f58dce906adc8e7acef28816ec73fdf2900d361439662fb37c1fb78452e
-  data.tar.gz: 9706e4fb62633c8a0d5926d343e6e803a3033e47d8b818774d67bbe32dd08ff0
+  metadata.gz: ee87c885eb2498625bb6f9fc0a59719cbd1c59d71419fd32e1fc3128aa201ce0
+  data.tar.gz: 947199d33a4427840836b901f780661b98f32428ac6aaaae8012c5cf449e4a48
 SHA512:
-  metadata.gz: 0dd7213e9f9ed0569573bac73c022db2245b05de28af0468a5d523824ef45f7de45e7890d0c1c67262fdc40be712bfd7f7bec4b0d605e4600a49a26b121308ea
-  data.tar.gz: 2bc7e555c03dbf7125c60d8418a95584ec561f0d1aa178c1ff188d3edbb331a82031779e1804cbca4c7f4ab2ae5062ab953a7fd25819769aefd156e110b993a1
+  metadata.gz: 6eb29fc5b10fcdcbbb9966d5d287459def271a9ac1d593e81d227c7c1e78fb15e1a74018e93c6fd6251d24d4037da6df7b6a5c1b7e862fabaf56a7cfd70368e6
+  data.tar.gz: e43732b83c2f830f69fa795ac96d6c80bce7c1f48e0e54c9a4e076fc1614056b264268241dd9deee99a1520b99f97219c005cb6a60ec90c09bbb8be1b4423d01

data/.github/workflows/ci.yml

@@ -0,0 +1,23 @@
+name: CI
+
+on: [push, pull_request]
+
+jobs:
+  test:
+
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: ["2.5", "2.6", "2.7", "3.0", "3.1", ruby-head]
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        bundler-cache: true # 'bundle install' and cache gems
+        ruby-version: ${{ matrix.ruby }}
+    - name: Run tests
+      run: bundle exec rake

data/.gitignore

@@ -10,3 +10,6 @@
 # rspec failure tracking
 .rspec_status
 .byebug_history
+
+*.gem
+.idea

data/.rubocop.yml

@@ -1,3 +1,7 @@
+AllCops:
+  TargetRubyVersion: 2.5
+  NewCops: disable
+
 Lint/RaiseException:
   Enabled: false
 
@@ -16,5 +20,8 @@ Style/HashTransformValues:
 Style/Documentation:
   Enabled: false
 
+Style/FrozenStringLiteralComment:
+  Enabled: false
+
 Layout/LineLength:
   Max: 120

data/Gemfile

@@ -1,4 +1,4 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
 # Specify your gem's dependencies in rubocop-changes.gemspec
 gemspec

data/Gemfile.lock

@@ -1,24 +1,24 @@
 PATH
   remote: .
   specs:
-    rubocop-changes (0.3.0)
+    rubocop-changes (0.5.0)
       git_diff_parser (~> 3.2)
-      rubocop (~> 0.80)
+      rubocop (~> 1.25)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    ast (2.4.0)
+    ast (2.4.2)
     byebug (10.0.2)
     diff-lcs (1.3)
     git_diff_parser (3.2.0)
-    jaro_winkler (1.5.4)
-    parallel (1.19.1)
-    parser (2.7.1.0)
-      ast (~> 2.4.0)
-    rainbow (3.0.0)
-    rake (10.5.0)
-    rexml (3.2.4)
+    parallel (1.21.0)
+    parser (3.1.0.0)
+      ast (~> 2.4.1)
+    rainbow (3.1.1)
+    rake (13.0.3)
+    regexp_parser (2.2.0)
+    rexml (3.2.5)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
@@ -32,16 +32,19 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-support (3.9.0)
-    rubocop (0.81.0)
-      jaro_winkler (~> 1.5.1)
+    rubocop (1.25.0)
       parallel (~> 1.10)
-      parser (>= 2.7.0.1)
+      parser (>= 3.1.0.0)
       rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
       rexml
+      rubocop-ast (>= 1.15.1, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 2.0)
-    ruby-progressbar (1.10.1)
-    unicode-display_width (1.7.0)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.15.1)
+      parser (>= 3.0.1.1)
+    ruby-progressbar (1.11.0)
+    unicode-display_width (2.1.0)
 
 PLATFORMS
   ruby
@@ -49,9 +52,9 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 2.0)
   byebug (~> 10.0)
-  rake (~> 10.0)
+  rake (~> 13.0)
   rspec (~> 3.0)
   rubocop-changes!
 
 BUNDLED WITH
-   2.0.2
+   2.1.4

data/README.md

@@ -1,7 +1,7 @@
 # Rubocop::Changes
 
 [![Gem Version](https://img.shields.io/gem/v/rubocop-changes)](https://rubygems.org/gems/rubocop-changes)
-[![Build Status](https://img.shields.io/travis/com/fcsonline/rubocop-changes/master)](https://travis-ci.com/fcsonline/rubocop-changes)
+[![Build Status](https://github.com/fcsonline/rubocop-changes/actions/workflows/ci.yml/badge.svg)](https://github.com/fcsonline/rubocop-changes/actions/workflows/ci.yml)
 
 `rubocop-changes` runs rubocop and shows only the offenses you introduced since
 the fork point of your git branch. Will not complain about existing offenses in

data/Rakefile

@@ -1,6 +1,6 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task default: :spec

data/bin/console

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
-require "bundler/setup"
-require "rubocop/changes"
+require 'bundler/setup'
+require 'rubocop/changes'
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
@@ -10,5 +10,5 @@ require "rubocop/changes"
 # require "pry"
 # Pry.start
 
-require "irb"
+require 'irb'
 IRB.start(__FILE__)

data/exe/rubocop-changes

@@ -11,7 +11,9 @@ args = Rubocop::Changes::Options.new.parse!
 offenses = Rubocop::Changes::Checker.new(
   format: args.format,
   quiet: args.quiet,
-  commit: args.commit
+  commit: args.commit,
+  auto_correct: args.auto_correct,
+  base_branch: args.base_branch
 ).run
 
 exit offenses.count.positive? ? 1 : 0

data/lib/rubocop/changes/checker.rb

@@ -13,10 +13,12 @@ module Rubocop
     class UnknownForkPointError < StandardError; end
 
     class Checker
-      def initialize(format:, quiet:, commit:)
+      def initialize(format:, quiet:, commit:, auto_correct:, base_branch:)
         @format = format
         @quiet = quiet
         @commit = commit
+        @auto_correct = auto_correct
+        @base_branch = base_branch
       end
 
       def run
@@ -30,14 +32,14 @@ module Rubocop
 
       private
 
-      attr_reader :format, :quiet, :commit
+      attr_reader :format, :quiet, :commit, :auto_correct
 
       def fork_point
         @fork_point ||= Shell.run(command)
       end
 
       def command
-        return 'git merge-base HEAD origin/master' unless commit
+        return "git merge-base HEAD origin/#{@base_branch}" unless commit
 
         "git log -n 1 --pretty=format:\"%h\" #{commit}"
       end
@@ -59,7 +61,26 @@ module Rubocop
       end
 
       def rubocop
-        Shell.run("rubocop --force-exclusion -f j #{ruby_changed_files.join(' ')}")
+        shell_command = [
+          'rubocop',
+          exclussion_modifier,
+          formatter_modifier,
+          auto_correct_modifier
+        ].compact.join(' ')
+
+        Shell.run(shell_command)
+      end
+
+      def exclussion_modifier
+        '--force-exclusion'
+      end
+
+      def formatter_modifier
+        "-f j #{ruby_changed_files.join(' ')}"
+      end
+
+      def auto_correct_modifier
+        '-a' if @auto_correct
       end
 
       def rubocop_json

data/lib/rubocop/changes/options.rb

@@ -5,10 +5,10 @@ require 'optparse'
 module Rubocop
   module Changes
     class Options
-      Options = Struct.new(:format, :quiet, :commit)
+      Options = Struct.new(:format, :quiet, :commit, :auto_correct, :base_branch)
 
       def initialize
-        @args = Options.new(:simple, false, nil) # Defaults
+        @args = Options.new(:simple, false, nil, false, 'main') # Defaults
       end
 
       def parse!
@@ -18,8 +18,10 @@ module Rubocop
           parse_formatter!(opts)
           parse_commit!(opts)
           parse_quiet!(opts)
+          parse_auto_correct!(opts)
           parse_help!(opts)
           parse_version!(opts)
+          parse_base_branch!(opts)
         end.parse!
 
         args
@@ -64,6 +66,18 @@ module Rubocop
         end
       end
 
+      def parse_auto_correct!(opts)
+        opts.on('-a', '--auto-correct', 'Auto correct errors') do |v|
+          args.auto_correct = v
+        end
+      end
+
+      def parse_base_branch!(opts)
+        opts.on('-b', '--base_branch [BRANCH]', 'Base branch to compare') do |v|
+          args.base_branch = v
+        end
+      end
+
       def parse_help!(opts)
         opts.on('-h', '--help', 'Prints this help') do
           puts opts

data/lib/rubocop/changes/version.rb

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

data/rubocop-changes.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |spec|
   spec.name          = 'rubocop-changes'
   spec.version       = Rubocop::Changes::VERSION
   spec.platform      = Gem::Platform::RUBY
-  spec.required_ruby_version = '>= 2.3.0'
+  spec.required_ruby_version = '>= 2.5.0'
   spec.authors       = ['Ferran Basora']
   spec.email         = ['fcsonline@gmail.com']
 
@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added
   # into git.
-  spec.files = Dir.chdir(File.expand_path('..', __FILE__)) do
+  spec.files = Dir.chdir(File.expand_path(__dir__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
   spec.bindir        = 'exe'
@@ -37,10 +37,10 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_runtime_dependency 'git_diff_parser', '~> 3.2'
-  spec.add_runtime_dependency 'rubocop', '~> 0.80'
+  spec.add_runtime_dependency 'rubocop', '~> 1.25'
 
   spec.add_development_dependency 'bundler', '~> 2.0'
   spec.add_development_dependency 'byebug', '~> 10.0'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-changes
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Ferran Basora
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-14 00:00:00.000000000 Z
+date: 2022-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git_diff_parser
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.80'
+        version: '1.25'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.80'
+        version: '1.25'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -107,10 +107,10 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.md
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
-- ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - Gemfile.lock
@@ -141,14 +141,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Rubocop on changed lines from git fork point

data/.travis.yml

@@ -1,10 +0,0 @@
-language: ruby
-sudo: false
-rvm:
-  - 2.3.3
-  - 2.4.0
-before_install:
-  - gem update bundler
-notifications:
-  email:
-    - fcsonline@gmail.com