feat(patches): use Patches.parse instead of DiffParser.parse

sanemat · sanemat · commit 6597e6d52f6a · 2015-10-02T00:53:05.000+09:00
diff --git a/lib/git_diff_parser/patches.rb b/lib/git_diff_parser/patches.rb
@@ -7,6 +7,41 @@ def self.[](*ary)
       new(ary)
     end
 
+    # @param contents [String] `git diff` result
+    #
+    # @return [Patches<Patch>] parsed object
+    def self.parse(contents)
+      body = false
+      file_name = ''
+      patch = []
+      lines = contents.lines
+      line_count = lines.count
+      parsed = new
+      lines.each_with_index do |line, count|
+        case line.chomp
+        when /^diff/
+          unless patch.empty?
+            parsed << Patch.new(patch.join("\n") + "\n", file: file_name)
+            patch.clear
+            file_name = ''
+          end
+          body = false
+        when /^\-\-\-/
+        when %r{^\+\+\+ b/(?<file_name>.*)}
+          file_name = Regexp.last_match[:file_name]
+          body = true
+        when /^(?<body>[\ @\+\-\\].*)/
+          patch << Regexp.last_match[:body] if body
+          if !patch.empty? && body && line_count == count + 1
+            parsed << Patch.new(patch.join("\n") + "\n", file: file_name)
+            patch.clear
+            file_name = ''
+          end
+        end
+      end
+      parsed
+    end
+
     # @return [Patches<Patch>]
     def initialize(*args)
       super Array.new(*args)
diff --git a/spec/git_diff_parser/diff_parser_spec.rb b/spec/git_diff_parser/diff_parser_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 module GitDiffParser
-  describe DiffParser do
+  describe Patches do
     describe '#parse' do
       let(:file0) { 'lib/saddler/reporter/github.rb' }
       let(:body0) { File.read('spec/support/fixtures/file0.diff') }
@@ -13,7 +13,7 @@ module GitDiffParser
       let(:body3) { File.read('spec/support/fixtures/file3.diff') }
       it 'returns parsed patches' do
         diff_body = File.read('spec/support/fixtures/d1bd180-c27866c.diff')
-        patches = DiffParser.parse(diff_body)
+        patches = Patches.parse(diff_body)
 
         expect(patches.size).to eq 4
         expect(patches[0].file).to eq file0
