rubocop_lineup 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 075fdaf5cee60b219ed373e3be7397eade34c3f10cf1eb9a001cba3529fe54cb
-  data.tar.gz: f79231f5be539e56b0749cb16fb1344d32a0259465d6c01928afb73606da694a
+  metadata.gz: ef6cd25bb513449b7e8a8e4393667bcc3f14eb7e368a75a05ec51cbe74a3aeec
+  data.tar.gz: 1c8777485957331c3446e24f20c8d8e04e8dfe0f3ac5ec7f1382c9fecb639c56
 SHA512:
-  metadata.gz: 818f4841252d4c2fec52f3ae629fc0f232d4975a57e6822615a345f7ec06573ff99bfb9092bfab7aedb3085d1e7f34821af31773abee2ee9cee41d2b7ecbf48b
-  data.tar.gz: 263d9e6a9c0728c428341afaa5156ef22551e48f8ce7cc5221ac9bfc3bb7d5c059869892a8a283532f7239c928ac8d4de136c20027ef43f9ae55f6dd3d6548b9
+  metadata.gz: a5b99a93b516be211e3b1442d2727b46df48b8c6b972b93745983e555e3bacd5a8eb8b2eea034ec420f9a6a29ecdc36fff45fa46e87cdfe1d1379f254ed80302
+  data.tar.gz: 5f6bfa3a6808c1d4e95ee1f21f63749a33f3196c266698be650081fbb9ab64b760ed16da397c0e50c927ed0df820faf19a1e65265e1728e8b1f42f4cfc229886

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/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RubocopLineup
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

data/rubocop_lineup.gemspec

@@ -28,6 +28,6 @@ Gem::Specification.new do |spec|
 
   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.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - chrismo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-24 00:00:00.000000000 Z
+date: 2020-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git
@@ -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