rubocop_lineup 0.2.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 2a55e094b399226f398dbad21723ff58589c3988
-  data.tar.gz: 9f56dead4432a8a87c85d070093d311600500e9d
+SHA256:
+  metadata.gz: 3e492d503ab9687aee7fa158ef3ecb9c0fd36aa27a99dce4b94e698a3e3100ac
+  data.tar.gz: 158b2a8782b44f2dd5783eef874ce57b9144495252cdd9039d1ae4422212bf6a
 SHA512:
-  metadata.gz: e75a2f07204d1a6cfeadbcb71051c2f9ecff7194909f32dd5c01ca709e5fd0719f68ad2d0fa3f3f078e9f8b15db894e14068e51ac2c2dbca76fe2ea829745095
-  data.tar.gz: a01da1538723ff07e023a9549d38d7246a80dab6acb64c5b4a57c1ea5a3557c848a5707255c1cac3dc63c10e2805a1c972f2eb6bea6a82e34239f938361abe33
+  metadata.gz: 60681a39fd3bdf79ed02066af766b0852f127853bb9b1be6db5eb54daf3de1260f3b7e206da200a214a4ad5c6df1b0916df55f3c980e01038155598d48f8b5b6
+  data.tar.gz: c211247847d7c752e9b5dc33e6b8fe6b74292a3c4c5ef5cff9c5312370dfcb529b05f3a6874becfcf0a26f0a1e38588dd717c1375dc925ac37aa3ced102c902d

data/.gitignore

@@ -1,9 +1,10 @@
-/.bundle/
+**/.bundle/
 /.yardoc
 /_yardoc/
 /bin/
 /coverage/
 /doc/
+/gemfiles/*lock
 /pkg/
 /spec/reports/
 /tmp/
@@ -12,3 +13,6 @@
 .rspec_status
 
 Gemfile.lock
+
+# Don't commit built gems
+*.gem

data/.rubocop.yml

@@ -1,5 +1,5 @@
 AllCops:
-  TargetRubyVersion: "2.1"
+  TargetRubyVersion: 2.4
   Exclude:
   - "bin/**"
 

data/.ruby-version

@@ -1 +1 @@
-2.4.4
+2.6.3

data/.travis.yml

@@ -1,5 +1,21 @@
-sudo: false
 language: ruby
+
 rvm:
-  - 2.4.4
-before_install: gem install bundler -v 1.16.1
+  - 2.4.6
+  - 2.5.5
+  - 2.6.3
+
+gemfile:
+  - gemfiles/rubocop_latest.gemfile
+  - gemfiles/rubocop_0.86.0.gemfile
+  - gemfiles/rubocop_0.82.0.gemfile
+  - gemfiles/rubocop_0.77.0.gemfile
+  - gemfiles/rubocop_0.69.0.gemfile
+  - gemfiles/rubocop_0.61.1.gemfile
+  - gemfiles/rubocop_0.58.2.gemfile
+  - gemfiles/rubocop_0.56.0.gemfile
+  - gemfiles/rubocop_0.52.1.gemfile
+  - gemfiles/rubocop_0.46.0.gemfile
+
+
+before_install: gem install bundler -v 1.17.3

data/Appraisals

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+appraise "rubocop-latest" do
+  gem "rubocop"
+end
+
+appraise "rubocop-0.86.0" do
+  gem "rubocop", "0.86.0"
+end
+
+appraise "rubocop-0.82.0" do
+  gem "rubocop", "0.82.0"
+end
+
+appraise "rubocop-0.77.0" do
+  gem "rubocop", "0.77.0"
+end
+
+appraise "rubocop-0.69.0" do
+  gem "rubocop", "0.69.0"
+end
+
+appraise "rubocop-0.61.1" do
+  gem "rubocop", "0.61.1"
+end
+
+appraise "rubocop-0.58.2" do
+  gem "rubocop", "0.58.2"
+end
+
+appraise "rubocop-0.56.0" do
+  gem "rubocop", "0.56.0"
+end
+
+appraise "rubocop-0.52.1" do
+  gem "rubocop", "0.52.1"
+end
+
+appraise "rubocop-0.46.0" do
+  gem "rubocop", "0.46.0"
+end

data/Gemfile

@@ -6,3 +6,7 @@ git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 
 # Specify your gem's dependencies in rubocop_lineup.gemspec
 gemspec
+
+group :development do
+  gem "appraisal"
+end

data/README.md

@@ -1,5 +1,7 @@
 # RubocopLineup
 
+[![Build Status](https://travis-ci.com/mysterysci/rubocop_lineup.svg?branch=master)](https://travis-ci.com/mysterysci/rubocop_lineup)
+
 ![Image of Old-Timey Police Lineup](https://upload.wikimedia.org/wikipedia/commons/0/04/Oppstilling-2.jpg)
 
 If yer trying to bring in a new sheriff to the wild, wild west of your legacy codebase,

data/gemfiles/rubocop_0.46.0.gemfile

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rubocop", "0.46.0"
+
+group :development do
+  gem "appraisal"
+end
+
+gemspec path: "../"

data/gemfiles/rubocop_0.52.1.gemfile

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rubocop", "0.52.1"
+
+group :development do
+  gem "appraisal"
+end
+
+gemspec path: "../"

data/gemfiles/rubocop_0.56.0.gemfile

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rubocop", "0.56.0"
+
+group :development do
+  gem "appraisal"
+end
+
+gemspec path: "../"

data/gemfiles/rubocop_0.58.2.gemfile

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rubocop", "0.58.2"
+
+group :development do
+  gem "appraisal"
+end
+
+gemspec path: "../"

data/gemfiles/rubocop_0.61.1.gemfile

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rubocop", "0.61.1"
+
+group :development do
+  gem "appraisal"
+end
+
+gemspec path: "../"

data/gemfiles/rubocop_0.69.0.gemfile

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rubocop", "0.69.0"
+
+group :development do
+  gem "appraisal"
+end
+
+gemspec path: "../"

data/gemfiles/rubocop_0.77.0.gemfile

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rubocop", "0.77.0"
+
+group :development do
+  gem "appraisal"
+end
+
+gemspec path: "../"

data/gemfiles/rubocop_0.82.0.gemfile

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rubocop", "0.82.0"
+
+group :development do
+  gem "appraisal"
+end
+
+gemspec path: "../"

data/gemfiles/rubocop_0.86.0.gemfile

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rubocop", "0.86.0"
+
+group :development do
+  gem "appraisal"
+end
+
+gemspec path: "../"

data/gemfiles/rubocop_latest.gemfile

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rubocop"
+
+group :development do
+  gem "appraisal"
+end
+
+gemspec path: "../"

data/lib/rubocop_lineup.rb

@@ -4,6 +4,7 @@ require "rubocop_lineup/version"
 require "rubocop_lineup/line_number_calculator"
 require "rubocop_lineup/diff_liner"
 require "rubocop_lineup/duck_punch_rubocop"
+require "yaml"
 
 module RubocopLineup
   # This defaults the parent branch to 'master'. This is a reasonable
@@ -12,11 +13,13 @@ module RubocopLineup
   # parent branch. There are ways to calculate the parent branch name
   # that cover common cases, but that's more complicated and may be added
   # in a future version.
-  def self.line_em_up(directory, parent_branch = "master")
+  def self.line_em_up(directory, base_branch = nil)
+    base_branch ||= base_branch_from_config || "master"
+
     @line_em_up ||= begin
       Dir.chdir(directory) do
         uncommitted = DiffLiner.diff_uncommitted.file_line_changes
-        committed_on_branch = DiffLiner.diff_branch(parent_branch).file_line_changes
+        committed_on_branch = DiffLiner.diff_branch(base_branch).file_line_changes
 
         # When a file has committed changes AND uncommitted_changes,
         # we will only include the lines from the uncommitted changes
@@ -31,4 +34,16 @@ module RubocopLineup
   def self.reset
     @line_em_up = nil
   end
+
+  def self.rubocop_lineup_config_file
+    ".rubocop_lineup.yml"
+  end
+
+  def self.base_branch_from_config
+    return unless File.exist?(rubocop_lineup_config_file)
+
+    settings = YAML.load_file(rubocop_lineup_config_file)
+
+    settings[:base_branch]
+  end
 end

data/lib/rubocop_lineup/duck_punch_rubocop.rb

@@ -9,9 +9,16 @@ module DuckPunch
       files_hash = RubocopLineup.line_em_up(Dir.pwd)
       return false unless files_hash.key?(source_file)
 
-      offending_lines = (line_number..(last_line || line_number)).to_a
       changed_line_numbers = files_hash[source_file]
-      (changed_line_numbers & offending_lines).empty? ? false : super
+      changed_line_numbers.include?(line_number) ? super : false
+
+      # Removing support for any line of a block where one or more lines were changed.
+      # It's too unpredictable. Linter cops should probably never do this, but I'm
+      # not sure how to go about that right now.
+      #
+      # offending_lines = (line_number..(last_line || line_number)).to_a
+      # changed_line_numbers = files_hash[source_file]
+      # (changed_line_numbers & offending_lines).empty? ? false : super
     end
 
     def last_line
@@ -26,9 +33,14 @@ module DuckPunch
   end
 
   module TargetFinder
-    def find(args)
+    def find(args, mode=nil)
       # returns an array of full file paths that are the files to inspect.
-      files = super(args)
+      if mode
+        files = super(args, mode)
+      else
+        # legacy support before mode was added in rubocop
+        files = super(args)
+      end
       files_hash = RubocopLineup.line_em_up(Dir.pwd)
       files & files_hash.keys
     end

data/lib/rubocop_lineup/line_number_calculator.rb

@@ -6,9 +6,7 @@ module RubocopLineup
     # presumes the text has been parsed already to just the -/+ bits
     # e.g. "-1 +1"
     def self.git_line_summary_to_numbers(text)
-      # TODO: Ruby Golf this - a regex with proper grouping could probably be better.
-      _changed, added = text.split(/ /).reject(&:empty?)
-      start, count = added.sub(/^-/, "").split(/,/).map(&:to_i)
+      start, count = text.scan(/\+(.*)/).join.scan(/\d+/).flatten.map(&:to_i)
       count ||= 1
       (start..(start + count - 1)).to_a
     end

data/lib/rubocop_lineup/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RubocopLineup
-  VERSION = "0.2.0".freeze
+  VERSION = "0.6.0"
 end

data/rubocop_lineup.gemspec

@@ -21,13 +21,13 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = "~> 2.1"
+  spec.required_ruby_version = "~> 2.4"
 
   spec.add_dependency "git", "~> 1.3"
-  spec.add_dependency "rubocop", "~> 0.55"
+  spec.add_dependency "rubocop", "~> 0.35"
 
-  spec.add_development_dependency "bundler", "~> 1.16"
+  spec.add_development_dependency "bundler", "> 1.16"
   spec.add_development_dependency "pry"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", "~> 12.3"
   spec.add_development_dependency "rspec", "~> 3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubocop_lineup
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.6.0
 platform: ruby
 authors:
 - chrismo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-16 00:00:00.000000000 Z
+date: 2020-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git
@@ -30,26 +30,26 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.55'
+        version: '0.35'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.55'
+        version: '0.35'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '1.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '1.16'
 - !ruby/object:Gem::Dependency
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -106,12 +106,23 @@ files:
 - ".rubocop.yml"
 - ".ruby-version"
 - ".travis.yml"
+- Appraisals
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - bin/console
 - bin/setup
+- gemfiles/rubocop_0.46.0.gemfile
+- gemfiles/rubocop_0.52.1.gemfile
+- gemfiles/rubocop_0.56.0.gemfile
+- gemfiles/rubocop_0.58.2.gemfile
+- gemfiles/rubocop_0.61.1.gemfile
+- gemfiles/rubocop_0.69.0.gemfile
+- gemfiles/rubocop_0.77.0.gemfile
+- gemfiles/rubocop_0.82.0.gemfile
+- gemfiles/rubocop_0.86.0.gemfile
+- gemfiles/rubocop_latest.gemfile
 - lib/rubocop_lineup.rb
 - lib/rubocop_lineup/diff_liner.rb
 - lib/rubocop_lineup/duck_punch_rubocop.rb
@@ -130,15 +141,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
     - !ruby/object:Gem::Version
-      version: '2.1'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Rubocop plugin to restrict cops to only changed lines.