rubocop-git-kjanoudi 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac9436a5b688315f427ddfaa6113a1762e64f289
-  data.tar.gz: 9c55dba14255f08dbc001a8003d0457afd20d590
+  metadata.gz: 16ea38f8698bfd2bddfd851a475152b2d6e89c43
+  data.tar.gz: 7d11116a2ff191f7d118543c6ec7c09baa3c9eb0
 SHA512:
-  metadata.gz: 58a87e93b2977dff8a00f3b6ce16811fa2977b1c97c752d431f550933e0ef6948366d22c646b8ed2e6ce6dcd2dbec7bc5021b2dcf3986146c6be64a48b5915df
-  data.tar.gz: ed977b0168c8cf8bca7ceee01911785bfcc4d97ce75be97acaa84e7705786aa486ba077d92be3bd6f326bef2d6bbdb066b6f4e70094a0981b33f72da03729e67
+  metadata.gz: aed26b82da9268c540f910f3d413f8e0da87bfabde6a0ea077319f17e96872a46bd07a15b00a9096b87abe5cde83d685868d6c4d31d542842be949f1486fb8c1
+  data.tar.gz: c5f3b8e5bda766cd6823c248ac662fa18e1b42a399c28c4c7f0c16e4425720d00e67957778987210d84b8551954f6d9929641b43fae65dc954631d3c73e9c44c

data/lib/rubocop/git.rb

@@ -1,5 +1,7 @@
 require 'rubocop/git/version'
 require 'rubocop'
+require 'tempfile'
+require 'fileutils'
 
 module RuboCop
   module Git
@@ -15,5 +17,6 @@ module RuboCop
     autoload :Runner,            'rubocop/git/runner'
     autoload :StyleChecker,      'rubocop/git/style_checker'
     autoload :StyleGuide,        'rubocop/git/style_guide'
+    autoload :RuboComment,       'rubocop/git/rubo_comment'
   end
 end

data/lib/rubocop/git/patch.rb

@@ -4,15 +4,17 @@ class Patch
   RANGE_INFORMATION_LINE = /^@@ .+\+(?<line_number>\d+),/
   MODIFIED_LINE = /^\+(?!\+|\+)/
   NOT_REMOVED_LINE = /^[^-]/
+  PATCH_INFO_LINE = /\+([0-9,]+)/
 
   def initialize(body)
     @body = body || ''
+    @changes = []
   end
 
   def additions
     line_number = 0
 
-    lines.each_with_index.inject([]) do |additions, (content, patch_position)|
+    lines.each_with_index.inject(@changes) do |additions, (content, patch_position)|
       case content
       when RANGE_INFORMATION_LINE
         line_number = Regexp.last_match[:line_number].to_i
@@ -27,6 +29,31 @@ class Patch
     end
   end
 
+  # maps out additions line numbers to indicate start and end of code changes
+  # [[5,7], [11,11]] indicates changes from line 5, 6, 7 and then
+  # another one at 11
+  def additions_map
+    if @changes.empty?
+      self.additions
+    end
+
+    map = []
+    starting_line = ending_line = 0
+
+    @changes.each do |addition|
+      if starting_line == 0
+        starting_line = ending_line = addition.line_number
+      elsif addition.line_number == ( ending_line + 1 )
+        ending_line = addition.line_number
+      else # this row is not part of the last rows "group"
+        map.push([starting_line, ending_line])
+        starting_line = ending_line = addition.line_number
+      end
+    end
+    map.push([starting_line, ending_line])
+    map
+  end
+
   private
 
   def lines

data/lib/rubocop/git/rubo_comment.rb

@@ -0,0 +1,92 @@
+module RuboCop::Git
+class RuboComment
+  RUBOCOP_DISABLE = "# rubocop:disable all\n"
+  RUBOCOP_ENABLE = "# rubocop:enable all\n"
+  WHITE_SPACE = /^\s*/
+
+  def initialize(files)
+    @edit_map = {}
+    @files = files
+  end
+
+  # adds rubocop enable and disabled comments to files
+  # making sure only edited lines are processed by rubocop
+  def add_comments
+    @files.each do |file|
+      patch_info = Patch.new(file.patch).additions_map
+      temp_file = Tempfile.new('temp')
+
+      line_count = edited_line_count = current_patch = 0
+      in_patch = false
+      edit_locations = []
+
+      begin
+        File.open(file.filename, "r").each_line do |line|
+          line_count += 1
+          edited_line_count += 1
+
+          if line_count == patch_info[current_patch].first
+            temp_file.puts generate_spaces(line) + RUBOCOP_ENABLE
+            in_patch = true
+            edit_locations.push edited_line_count
+            edited_line_count += 1
+
+          elsif in_patch && patch_info[current_patch].last + 1 == line_count
+            temp_file.puts generate_spaces(line) + RUBOCOP_DISABLE
+            in_patch = false
+            edit_locations.push edited_line_count
+            edited_line_count += 1
+            current_patch += 1 unless (current_patch + 1) >= patch_info.size
+
+          elsif line_count == 1 #adds disable at top of file
+            temp_file.puts generate_spaces(line) + RUBOCOP_DISABLE
+            edit_locations.push edited_line_count
+            edited_line_count += 1
+
+          end
+          temp_file.puts line
+        end
+
+        temp_file.close
+        FileUtils.mv(temp_file.path, file.filename)
+        @edit_map[file.filename] = edit_locations
+      ensure
+        temp_file.close
+        temp_file.unlink
+      end
+    end
+  end
+
+  # removes all added comments that where added from add_comments
+  def remove_comments
+    @files.each do |file|
+      temp_file = Tempfile.new('temp')
+      line_count = 0
+
+      begin
+        File.open(file.filename, "r").each_line do |line|
+          line_count += 1
+          temp_file.puts line unless @edit_map[file.filename].find_index line_count
+        end
+        
+        temp_file.close
+        FileUtils.mv(temp_file.path, file.filename)
+      ensure
+        temp_file.close
+        temp_file.unlink
+      end
+    end
+  end
+
+  private
+
+  # generates whitespaces to make en/disable comments match line indent
+  # preventing rubocop errors
+  def generate_spaces(line)
+    whitespaces = ""
+    WHITE_SPACE.match(line).to_s.split('').size.times { whitespaces << " " }
+    whitespaces
+  end
+
+end
+end

data/lib/rubocop/git/runner.rb

@@ -9,8 +9,15 @@ module RuboCop
 
         @options = options
         @files = DiffParser.parse(git_diff(options))
+        rubo_comment = RuboComment.new(@files)
+
+        #adds comments to files and reparses diff after changes are made
+        rubo_comment.add_comments
+        @files = DiffParser.parse(git_diff(options))
 
         display_violations($stdout)
+        #removes comments after rubocop processing
+        rubo_comment.remove_comments
 
         exit(1) if violations.any?
       end
@@ -45,7 +52,7 @@ module RuboCop
       def display_violations(io)
         formatter = RuboCop::Formatter::ClangStyleFormatter.new(io)
         formatter.started(nil)
-
+        
         violations.map do |violation|
           formatter.file_finished(
             violation.filename,

data/lib/rubocop/git/version.rb

@@ -1,5 +1,5 @@
 module RuboCop
   module Git
-    VERSION = '0.1.3'
+    VERSION = '0.1.4'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-git-kjanoudi
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Masaki Takeuchi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-15 00:00:00.000000000 Z
+date: 2017-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -132,6 +132,7 @@ files:
 - lib/rubocop/git/patch.rb
 - lib/rubocop/git/pseudo_pull_request.rb
 - lib/rubocop/git/pseudo_resource.rb
+- lib/rubocop/git/rubo_comment.rb
 - lib/rubocop/git/runner.rb
 - lib/rubocop/git/style_checker.rb
 - lib/rubocop/git/style_guide.rb