dirtycop 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 195c9c805b5211cbeb8c7f4ab931b1dd7fa34c1b
-  data.tar.gz: 863300400e793bb3cd4d39bd8a2a7e7ef2fcd9f5
+  metadata.gz: 121d4582aab6c06fa5479d106e623ac34dfe9b43
+  data.tar.gz: 8f4d5b5330c2954bf5d0667b7d96908b59ea73bd
 SHA512:
-  metadata.gz: 53bad38e9728c722af674d1f3d1290b5496a02f3e21697eb108c1ab7e13b2a3f4275f2e63f65d192af72e9d9445068adda9d28a88799a2a48ae0b59154b848e9
-  data.tar.gz: caa55e47bd56b73c07c0d3ef01f767e5523447dffb14197343837ebb929d7d7a8d7ca7d3c5ef2d73ae5db90243b96f900d4bcaf2c13a9cc0bd60d912708e5165
+  metadata.gz: b443bb242d5444c345df81c0c5438e7fe59cda4fcefdddbf2c6f005dcef42c43f1f7fa3fa887c0ce0c3d8cee212bee011377041347d6f0cc4ee3811bd54b671e
+  data.tar.gz: 9e956db18397072297a03017d888ea41e9b4ddf915bbd79ae42cb71eefe056303cbffed06e3b4a6fee72b288465ae6c640f6ab412cdc68782dd1518233826c4d

data/.gitignore

@@ -31,3 +31,4 @@
 .rvmrc
 
 *.swp
+*.swo

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dirtycop (0.0.2)
+    dirtycop (0.0.3)
       rubocop
 
 GEM

data/bin/dirty

@@ -5,13 +5,11 @@ $LOAD_PATH.unshift(File.dirname(File.realpath(__FILE__)) + '/../lib/dirty')
 require 'benchmark'
 require 'cop'
 
-changed_files = `git diff --name-only | grep \.rb$`.split("\n") # list of changed ruby files
-
 cli = RuboCop::CLI.new
 result = 0
 
 time = Benchmark.realtime do
-  my_args = ARGV + changed_files
+  my_args = ARGV
   result = cli.run(my_args)
 end
 

data/dirtycop.gemspec

@@ -6,7 +6,7 @@ require 'dirty/cop/version'
 Gem::Specification.new do |spec|
   spec.name          = "dirtycop"
   spec.version       = Dirty::Cop::VERSION
-  spec.authors       = ["Adam Hess"]
+  spec.authors       = ["Adam Hess", 'Melch']
   spec.email         = ["adamhess1991@gmail.com"]
   spec.summary       = %q{Corrupt cop that avoids unchanged violations}
   spec.description   = %q{Takes your current diff as the input for rubocop}

data/lib/dirty/cop.rb

@@ -38,25 +38,32 @@
 #   unmodified code if they are reported in modified lines.
 
 require 'rubocop'
+# require 'pry'
 
 module DirtyCop
   extend self # In your face, style guide!
 
   def bury_evidence?(file, line)
-    process_bribe
     !report_offense_at?(file, line)
   end
 
-  def uncovered_targets
-    @files
+  def ref
+    'HEAD'
+  end
+
+  def files_to_inspect(whitelisted_files, args)
+    return @files ||= args unless args.empty?
+
+    @files ||= (changed_files(ref) & whitelisted_files)
   end
 
   def cover_up_unmodified(ref, only_changed_lines = true)
-    @files ||= files_modified_since(ref)
-    @line_filter ||= build_line_filter(@files, ref) if only_changed_lines
+    @line_filter ||= changed_files_and_lines(ref) if only_changed_lines
   end
 
   def process_bribe
+    # leaving this unused method as a placeholder of flags that purportedly work
+    # (potential feature set)
     only_changed_lines = true
 
     # I am specifying the ref above instead of getting it from args since
@@ -83,52 +90,62 @@ module DirtyCop
     # end
     # return unless ref
 
-    ref = 'HEAD'
-
     cover_up_unmodified ref, only_changed_lines
   end
 
-  private
-
   def report_offense_at?(file, line)
-    !@line_filter || @line_filter.fetch(file)[line] if @line_filter[file]
+    changed_lines_for_file(file).include? line
   end
 
-  def files_modified_since(ref)
-    `git diff --diff-filter=AM --name-only #{ref}`
+  def changed_lines_for_file(file)
+    changed_files_and_lines(ref)[file] || []
+  end
+
+  def changed_files(ref)
+    @changed_files ||= git_diff_name_only
       .lines
       .map(&:chomp)
       .grep(/\.rb$/)
       .map { |file| File.absolute_path(file) }
   end
 
-  def build_line_filter(_files, ref)
+  def git_diff_name_only
+    `git diff --diff-filter=AM --name-only #{ref}`
+  end
+
+  def changed_files_and_lines(ref)
     result = {}
 
-    suspects = files_modified_since(ref)
-    suspects.each do |file|
-      result[file] = lines_modified_since(file, ref)
+    changed_files(ref).each do |file|
+      result[file] = changed_lines(file, ref)
     end
 
     result
   end
 
-  def lines_modified_since(file, ref)
-    ranges =
-      `git diff -p -U0 #{ref} #{file}`
-      .lines
-      .grep(/^@@ -\d+(?:,\d+)? \+(\d+)(?:,(\d+))? @@/) { Regexp.last_match[1].to_i..(Regexp.last_match[1].to_i + Regexp.last_match[2].to_i) }
-      .reverse
-
-    mask = Array.new(ranges.first.end)
+  def git_diff(file, ref)
+    `git diff -p -U0 #{ref} #{file}`
+  end
 
-    ranges.each do |range|
-      range.each do |line|
-        mask[line] = true
+  def changed_lines(file, ref)
+    ranges = git_diff(file, ref)
+      .each_line
+      .grep(/@@ -(\d+)(?:,)?(\d+)? \+(\d+)(?:,)?(\d+)? @@/) {
+        [
+          Regexp.last_match[3].to_i,
+          (Regexp.last_match[4] || 1).to_i
+        ]
+      }.reverse
+
+    mask = Set.new
+
+    ranges.each do |changed_line_number, number_of_changed_lines|
+      number_of_changed_lines.times do |line_delta|
+        mask << changed_line_number + line_delta
       end
     end
 
-    mask
+    mask.to_a
   end
 
   def eat_a_donut
@@ -144,10 +161,7 @@ module RuboCop
     alias_method :find_unpatched, :find
 
     def find(args)
-      replacement = DirtyCop.uncovered_targets
-      return replacement if replacement
-
-      find_unpatched(args)
+      DirtyCop.files_to_inspect(find_unpatched(args), args)
     end
   end
 

data/lib/dirty/cop/version.rb

@@ -1,5 +1,5 @@
 module Dirty
   module Cop
-    VERSION = '0.0.3'
+    VERSION = '0.0.4'
   end
 end

data/spec/diff_mocks/company

@@ -0,0 +1,19 @@
+diff --git a/app/models/submittal_package.rb b/app/models/submittal_package.rb
+index 9ec391b..b39fff7 100755
+--- a/app/models/submittal_package.rb
++++ b/app/models/submittal_package.rb
+@@ -4 +4 @@
+-#
++# foo
+@@ -6,4 +6,4 @@
+-#  project_id                            :integer
+-#  specification_section_id              :integer
+-#  created_at                            :datetime
+-#  deleted_at                            :datetime
++#  project_id                            :integer foo
++#  specification_section_id              :integer foo
++#  created_at                            :datetime foo
++#  deleted_at                            :datetime foo
+@@ -12 +12 @@
+-#  created_by_id                         :integer
++#  created_by_id                         :integer foo

data/spec/diff_mocks/name_only

@@ -0,0 +1,2 @@
+lib/dirty/cop.rb
+spec/dirty/cop_spec.rb

data/spec/diff_mocks/user

@@ -0,0 +1,12 @@
+diff --git a/spec/models/submittal_log_spec.rb b/spec/models/submittal_log_spec.rb
+index f9c743f..de36350 100755
+--- a/spec/models/submittal_log_spec.rb
++++ b/spec/models/submittal_log_spec.rb
+@@ -2,2 +2,2 @@ require 'rails_helper'
+-require 'shared_examples_for_location_name_setter'
+-
++require 'shared_examples_for_location_name_setter' bar
++ bar
+@@ -6 +6 @@ RSpec.describe SubmittalLog, type: :model do
+-  let(:project) { FactoryGirl.create(:project, time_zone: "Pacific Time (US & Canada)") }
++  let(:project) { FactoryGirl.create(:project, time_zone: "Pacific Time (US & Canada)") } bar

data/spec/dirty/cop_spec.rb

@@ -0,0 +1,101 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+class RubocopTest
+  include DirtyCop
+end
+
+describe DirtyCop do
+  let(:rubocop) { RubocopTest.new }
+  let(:ref) { 'HEAD' }
+
+  describe '#files_to_inspect' do
+    context 'files passed in' do
+      it 'returns files passed into rubocop that have changes' do
+        files = ['company', 'user']
+        rubocop_allowed_files = ['dont_care']
+        result = rubocop.files_to_inspect(rubocop_allowed_files, files)
+        expect(result).to eq(files)
+      end
+    end
+
+    context 'no files passed in' do
+      it 'returns all files that have changes' do
+        changed_files = ['company', 'user']
+        rubocop_allowed_files = changed_files
+        rubocop.stub(:changed_files) { changed_files }
+
+        result = rubocop.files_to_inspect(rubocop_allowed_files, [])
+        expect(result).to eq(changed_files)
+      end
+
+      it 'returns files that have changes that are okayed by rubocop' do
+        changed_files = ['company', 'user', 'project']
+        rubocop_allowed_files = ['app', 'company', 'user']
+        rubocop.stub(:changed_files) { changed_files }
+
+        result = rubocop.files_to_inspect(rubocop_allowed_files, [])
+        expect(result).to eq(['company', 'user'])
+      end
+    end
+  end
+
+  describe '#changed_files' do
+    it 'returns an array of full path of files changed' do
+      rubocop.stub(:git_diff_name_only) { File.open('spec/diff_mocks/name_only') }
+      expected = [
+        "#{Dir.pwd}/lib/dirty/cop.rb",
+        "#{Dir.pwd}/spec/dirty/cop_spec.rb"
+      ]
+      expect(rubocop.changed_files(ref)).to eq(expected)
+    end
+  end
+
+  describe '#changed_lines' do
+    let(:file) { 'company' }
+
+    it 'returns an array, containing line numbers that have changed' do
+      rubocop.stub(:git_diff) { File.open('spec/diff_mocks/company') }
+      result = rubocop.changed_lines(file, ref)
+      expected = [4, 6, 7, 8, 9, 12]
+      expect(result.sort).to eq(expected)
+    end
+  end
+
+  describe '#report_offense_at?' do
+    it 'should respond if a line was changed at past file and line' do
+      changed_files_and_lines = {
+        'company' => [4, 6, 7, 8, 9, 12],
+        'user' => [2, 3, 6]
+      }
+      rubocop.stub(:changed_files_and_lines) { changed_files_and_lines }
+      expect(rubocop.report_offense_at?('company', 6)).to be_truthy
+      expect(rubocop.report_offense_at?('company', 1)).to be_falsy
+      expect(rubocop.report_offense_at?('other_file', 6)).to be_falsy
+    end
+
+    it 'should not blow up if no files were changed' do
+      changed_files_and_lines = {}
+      rubocop.stub(:changed_files_and_lines) { changed_files_and_lines }
+      expect(rubocop.report_offense_at?('company', 1)).to be_falsy
+    end
+  end
+
+  describe '#changed_files_and_lines' do
+    it 'should return a hash with filenames and changed lines' do
+      rubocop.stub(:changed_files) { %w(company user) }
+      rubocop.stub(:git_diff).with('company', 'HEAD') { File.open('spec/diff_mocks/company') }
+      rubocop.stub(:git_diff).with('user', 'HEAD') { File.open('spec/diff_mocks/user') }
+      expected = {
+        'company' => [4, 6, 7, 8, 9, 12],
+        'user' => [2, 3, 6]
+      }
+      result = rubocop.changed_files_and_lines(ref)
+      expect(result.keys).to eq(expected.keys)
+      result.keys.each do |key|
+        expect(result[key].sort).to eq(expected[key].sort)
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,3 @@
+# encoding: utf-8
+
+require 'dirty/cop'

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: dirtycop
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Adam Hess
+- Melch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-27 00:00:00.000000000 Z
+date: 2015-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -70,6 +71,11 @@ files:
 - dirtycop.gemspec
 - lib/dirty/cop.rb
 - lib/dirty/cop/version.rb
+- spec/diff_mocks/company
+- spec/diff_mocks/name_only
+- spec/diff_mocks/user
+- spec/dirty/cop_spec.rb
+- spec/spec_helper.rb
 homepage: ''
 licenses:
 - MIT
@@ -90,9 +96,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Corrupt cop that avoids unchanged violations
-test_files: []
-has_rdoc: 
+test_files:
+- spec/diff_mocks/company
+- spec/diff_mocks/name_only
+- spec/diff_mocks/user
+- spec/dirty/cop_spec.rb
+- spec/spec_helper.rb