rubocop-changes 0.4.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a94905b21e4303a0e32552697c0766e15aa6caedba8a96a047f5ecc5f5393fd
-  data.tar.gz: 98efe986e967c29ef194427f0cab777b9d611d230b1add48f44716e475d2164e
+  metadata.gz: 2d17f6a268625b8b30740a9e1409576f00374bf777632a3c1e6b068678a70d9c
+  data.tar.gz: 16eaed76c02755b4a0239c52f36ad8c2ab7369098abd2cdf77fc7bfa8f8d13e6
 SHA512:
-  metadata.gz: 34ae25af5ff70f8428c54dca710d8b0e423b8f599ab4b854e73d080ccc4db008dd9a85f34feeaefa98d6c2faabb4bcef0c8ab3a30bfa371b42c1592f65779972
-  data.tar.gz: 392d5448f21ebe2bdf11e8b3b09bcb6d54212906bbebca4da3850efddd78e6ec3f3653b421754c9696747c76be63aeb4b75c86aa8aa60dd3bf8375c9898e6d2e
+  metadata.gz: 7e611a8344770358d7690dc7cf58d0421b06853e696d03e0bc99ae42d6c9e3b5e24f2de7c0fef195f6fd54c14d64527cc0ba2a3190187645f713c4a6e8ef6c17
+  data.tar.gz: 4c7b4eb56b4eaa7f7a59c5016b9e26f5d3b4d60246804a67481c94e35cdd0334f1799fc88b2cb34189a0ec8bf57a51a72940d5ca114bab95b32be33c5ade3842

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.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,9 +1,9 @@
 PATH
   remote: .
   specs:
-    rubocop-changes (0.4.0)
+    rubocop-changes (0.7.0)
       git_diff_parser (~> 3.2)
-      rubocop (~> 0.80)
+      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)
-    jaro_winkler (1.5.4)
-    parallel (1.19.1)
-    parser (3.0.0.0)
+    json (2.6.2)
+    parallel (1.22.1)
+    parser (3.1.2.0)
       ast (~> 2.4.1)
-    rainbow (3.0.0)
+    rainbow (3.1.1)
     rake (13.0.3)
+    regexp_parser (2.5.0)
     rexml (3.2.5)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
@@ -32,16 +33,20 @@ 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.31.2)
+      json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 2.7.0.1)
+      parser (>= 3.1.0.0)
       rainbow (>= 2.2.2, < 4.0)
-      rexml
+      regexp_parser (>= 1.8, < 3.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.18.0, < 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.19.1)
+      parser (>= 3.1.1.0)
+    ruby-progressbar (1.11.0)
+    unicode-display_width (2.2.0)
 
 PLATFORMS
   ruby

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

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

data/lib/rubocop/changes/checker.rb

@@ -10,17 +10,20 @@ require 'rubocop/changes/shell'
 module Rubocop
   module Changes
     class UnknownFormat < StandardError; end
+    class UnknownBaseBranchError < StandardError; end
     class UnknownForkPointError < StandardError; end
 
     class Checker
-      def initialize(format:, quiet:, commit:, auto_correct:)
+      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
+        raise UnknownBaseBranchError if base_branch.empty?
         raise UnknownForkPointError if fork_point.empty?
         raise UnknownFormat if formatter_klass.nil?
 
@@ -31,14 +34,14 @@ module Rubocop
 
       private
 
-      attr_reader :format, :quiet, :commit, :auto_correct
+      attr_reader :format, :quiet, :commit, :auto_correct, :base_branch
 
       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
@@ -120,7 +123,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

@@ -5,10 +5,16 @@ require 'optparse'
 module Rubocop
   module Changes
     class Options
-      Options = Struct.new(:format, :quiet, :commit, :auto_correct)
+      Options = Struct.new(:format, :quiet, :commit, :auto_correct, :base_branch)
 
       def initialize
-        @args = Options.new(:simple, false, nil, false) # Defaults
+        @args = Options.new(
+          :simple,
+          false,
+          nil,
+          false,
+          ENV.fetch('RUBOCOP_CHANGES_BASE_BRANCH', 'main')
+        ) # Defaults
       end
 
       def parse!
@@ -21,6 +27,7 @@ module Rubocop
           parse_auto_correct!(opts)
           parse_help!(opts)
           parse_version!(opts)
+          parse_base_branch!(opts)
         end.parse!
 
         args
@@ -71,6 +78,13 @@ module Rubocop
         end
       end
 
+      def parse_base_branch!(opts)
+        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
+
       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.4.0'
+    VERSION = '0.7.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,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', '~> 0.80'
+  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.4.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Ferran Basora
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-05-17 00:00:00.000000000 Z
+date: 2022-07-20 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: '0.80'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.80'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   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.3.5
 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