checkstyle_filter-git 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e18bdb52a8261ab9b0dbbf4aef9c8e1e2d98e26d
-  data.tar.gz: b45931a545437dba683f7aabb1ca4a05765f26ae
+  metadata.gz: 48c2ee1c9b3596966f7f0ea3213e6f18aec1dbf4
+  data.tar.gz: a4848b617efeed1117ca57791c78a69c1bb23468
 SHA512:
-  metadata.gz: ba59856e2db9f7a5256bdcbbfa2d02412281059546a0c2259b63f562e7780c9a9d71246cf61d5145d5f45feba2d368bc01479d632a7aec088ddf86f422d84279
-  data.tar.gz: 0bf2d14735b346bec69c132dde49ee328ec2f67795c449107a5178da3e0e1bdba9734a8a35aa7756323a981a8c88b6155eec3fa95db1e264f70dc7468f3ddaf3
+  metadata.gz: 51445acca2a43ef41b9cdf4ea65e0df762f2034f69519ee9e8bf5041a13b0148fdce53f16e17910d927ccfca4e957ddf3d2293908fbdb1290af806e70c24f443
+  data.tar.gz: a3e6c37e3bda2c783cdfb81f8f1c4669b3f7d4d62b23e83dc9ea1fff86b9963d857a291f25046f447913aa042632181fad648f5589635f379cb5e257c052da7c

data/lib/checkstyle_filter/git/filter.rb

@@ -10,10 +10,12 @@ module CheckstyleFilter
         document = REXML::Document.new data
         document.elements.each('/checkstyle/file') do |file_element|
           file_name = file_element.attribute('name') && file_element.attribute('name').value
-          if file_in_patches?(file_name, patches)
+          file = file_relative_path_string(file_name)
+          patch = patches.find_patch_by_file(file)
+          if patch
             file_element.elements.each('error') do |error_element|
               line = error_element.attribute('line') && error_element.attribute('line').value.to_i
-              unless file_element_error_line_no_in_patches?(file_name, patches, line)
+              unless patch.changed_line_numbers.include?(line)
                 error_element.remove
               end
             end
@@ -27,30 +29,12 @@ module CheckstyleFilter
         document.to_s
       end
 
-      def self.file_in_patches?(file_name, patches)
-        patches
-          .map(&:file)
-          .map { |file| Pathname.new(file).expand_path }
-          .include?(Pathname.new(file_name).expand_path)
-      end
-
-      def self.file_element_error_line_no_in_patches?(file_name, patches, line_no)
-        diff_patches = patches
-                       .select { |patch| same_file?(patch.file, file_name) }
-        return false if diff_patches.empty?
-
-        modified_lines = Set.new
-        diff_patches.map do |patch|
-          patch.changed_lines.map do |line|
-            modified_lines << line.number
-          end
+      def self.file_relative_path_string(file_name)
+        if Pathname.new(file_name).absolute?
+          Pathname.new(file_name).relative_path_from(Pathname.new(Dir.pwd)).to_s
+        else
+          Pathname.new(file_name).relative_path_from(Pathname.new('.')).to_s
         end
-
-        modified_lines.include?(line_no)
-      end
-
-      def self.same_file?(one, other)
-        Pathname.new(one).expand_path == Pathname.new(other).expand_path
       end
     end
   end

data/lib/checkstyle_filter/git/version.rb

@@ -1,5 +1,5 @@
 module CheckstyleFilter
   module Git
-    VERSION = '1.0.1'
+    VERSION = '1.0.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: checkstyle_filter-git
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - sanemat
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-02-22 00:00:00.000000000 Z
+date: 2015-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor