git_diff 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa01fe77b7f1845c9feb7cb917b4f6ec852a7ea3
-  data.tar.gz: 9c2a059e515b676f57215214262cdb9fab89724e
+  metadata.gz: 880459816cc9946e902a423f2ced95ad11c507a7
+  data.tar.gz: 6d9541ae1bd4303750cb9d14d2968053dccad910
 SHA512:
-  metadata.gz: 551a65b09a2a618daaa345205f821666612ed6a8ad588fd8ef137b13d57e6ae4c2acfd0ea8b538b8f8f847baeb211779b83f061b1c8f57065c7778b25bb48a48
-  data.tar.gz: 907132b50e27f720f8d1397988a88258f967ae8bd7aada9403208afe7e3dc4872a55a054d43961cf7053f47e304147ecb1e86b207c8dd9de9b955e5f97adc4db
+  metadata.gz: 5357077be7040cba74dd3b16387ff1508120e33109f2e06ab63d719a61da7d9d8dafc8a035ac67187da854d920667759a816564beba776779187213401baf526
+  data.tar.gz: 8a4b2b47b2b1a726c4963b5be45f16b0bb40fa190ccbcb063fc42a99256b94ea3d5fb6e691f22845ba6fd1daa9633fdb7286ca0deb7aa19018f392f54846ca24

data/lib/git_diff/file.rb

@@ -1,16 +1,21 @@
 module GitDiff
   class File
 
-    attr_reader :a_path, :a_blob, :b_path, :b_blob, :b_mode, :hunks
+    attr_reader :a_path, :a_blob, :b_path, :b_blob, :b_mode, :hunks, :binary
 
     def self.from_string(string)
-      if /^diff --git/.match(string)
-        File.new
+      if path_info = /^diff --git(?: a\/(\S+))?(?: b\/(\S+))?/.match(string)
+        File.new(
+          a_path: path_info.captures[0] || '/dev/null',
+          b_path: path_info.captures[1] || '/dev/null'
+        )
       end
     end
 
-    def initialize
+    def initialize(a_path: '/dev/null', b_path: '/dev/null')
       @hunks = []
+      @a_path = a_path
+      @b_path = b_path
     end
 
     def <<(string)
@@ -38,6 +43,7 @@ module GitDiff
     def add_hunk(hunk)
       self.current_hunk = hunk
       hunks << current_hunk
+      @binary = false
     end
 
     def append_to_current_hunk(string)
@@ -60,6 +66,25 @@ module GitDiff
         @a_path = "/dev/null"
       when /^deleted file mode [0-9]{6}$/.match(string)
         @b_path = "/dev/null"
+      when mode_info = /^(old|new) mode ([0-9]{6})$/.match(string)
+        if mode_info.captures[0] == "old"
+          @a_mode = mode_info.captures[1]
+        else
+          @b_mode = mode_info.captures[1]
+        end
+      when rename_info = /^rename (from|to) (.*)$/.match(string)
+        if rename_info.captures[0] == "from"
+          @a_path = rename_info.captures[1]
+        else
+          @b_path = rename_info.captures[1]
+        end
+      when binary_info = /^Binary files (?:\/dev\/null|a\/(.*)) and (?:\/dev\/null|b\/(.*)) differ$/.match(string)
+        @binary = true
+        @a_path ||= binary_info[1] || "/dev/null"
+        @b_path ||= binary_info[2] || "/dev/null"
+      when /^similarity/.match(string)
+        # trash
+        true
       end
     end
   end

data/lib/git_diff/version.rb

@@ -1,3 +1,3 @@
 module GitDiff
-  VERSION = "0.3.1"
+  VERSION = "0.4.0"
 end

data/test/git_diff_test.rb

@@ -128,4 +128,56 @@ index 033b446..0e2d140 100644
       [186,186]
       ], second_hunk.lines.map { |line| line.line_number.pair }
   end
+
+  def test_binary_file_diff
+    diff = GitDiff.from_string 'diff --git a/app/assets/bin.eot b/app/assets/bin.eot
+new file mode 100644
+index 0000000..2cbab9c
+Binary files /dev/null and b/app/assets/bin.eot differ'
+
+    refute_nil diff
+    assert_instance_of GitDiff::Diff, diff
+
+    assert_equal 1, diff.files.count
+    file = diff.files[0]
+
+    assert file.binary
+    assert_equal '/dev/null', file.a_path
+    assert_equal "app/assets/bin.eot", file.b_path
+  end
+
+  def test_perm_change_diff
+    diff = GitDiff.from_string 'diff --git a/bin/setup b/bin/setup
+old mode 100644
+new mode 100755'
+
+    refute_nil diff
+    assert_instance_of GitDiff::Diff, diff
+
+    assert_equal 1, diff.files.count
+    file = diff.files[0]
+
+    assert_equal 0, file.hunks.count
+
+    assert_equal "bin/setup", file.a_path
+    assert_equal "bin/setup", file.b_path
+  end
+
+  def test_rename_diff
+    diff = GitDiff.from_string 'diff --git a/lib/path1/my_file.rb b/lib/path2/my_file2.rb
+similarity index 100%
+rename from lib/path1/my_file.rb
+rename to lib/path2/my_file2.rb'
+
+    refute_nil diff
+    assert_instance_of GitDiff::Diff, diff
+
+    assert_equal 1, diff.files.count
+    file = diff.files[0]
+
+    assert_equal 0, file.hunks.count
+
+    assert_equal "lib/path1/my_file.rb", file.a_path
+    assert_equal "lib/path2/my_file2.rb", file.b_path
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git_diff
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Andrew Olson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-30 00:00:00.000000000 Z
+date: 2018-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -119,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: A Ruby library for parsing git diffs.