unified_diff 0.3.2 → 0.3.3

data/Gemfile

@@ -2,7 +2,6 @@ source "http://rubygems.org"
 
 group :development do
   gem 'minitest'
-  gem "bundler", "~> 1.0.0"
   gem "jeweler", "~> 1.6.0"
   gem 'simplecov'
 end

data/Gemfile.lock

@@ -2,21 +2,22 @@ GEM
   remote: http://rubygems.org/
   specs:
     git (1.2.5)
-    jeweler (1.6.0)
-      bundler (~> 1.0.0)
+    jeweler (1.6.4)
+      bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    minitest (2.1.0)
-    rake (0.9.0)
-    simplecov (0.4.2)
-      simplecov-html (~> 0.4.4)
-    simplecov-html (0.4.5)
+    minitest (3.4.0)
+    multi_json (1.3.6)
+    rake (0.9.2.2)
+    simplecov (0.6.4)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.5.3)
+    simplecov-html (0.5.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.0.0)
   jeweler (~> 1.6.0)
   minitest
   simplecov

data/VERSION

@@ -1 +1 @@
-0.3.2
+0.3.3

data/lib/unified_diff/diff.rb

@@ -4,14 +4,23 @@ module UnifiedDiff
     attr_reader :original, :original_file, :original_timestamp, :modified_file, :modified_timestamp, :chunks
     class UnifiedDiffException < Exception; end
 
-    FILE_PATTERN =      /(.*)\t'{2}?(.*)'{2}?/
+    FILE_PATTERN =      /([^\t\n]+)(?:\t'{2}?([^']+)'{2}?)?/
     OLD_FILE_PATTERN =  /--- #{FILE_PATTERN}/
     NEW_FILE_PATTERN =  /\+\+\+ #{FILE_PATTERN}/
     # Match assignment is tricky for CHUNK_PATTERN
-    # $1,$2 are static, but $3,$4,$5 vary
-    # if pattern is X,Y then $3 = X,Y, $4 = X, $5 = Y
-    # if pattern is X   then $3 = X
-    CHUNK_PATTERN =     /@@ -(\d+),(\d+) \+((\d+),(\d+)|(\d+)) @@/ 
+    # $1 and $3 are static, but $2 and $4 can be nil
+    #
+    # "In many versions of GNU diff, each range can omit the comma and 
+    #  trailing value s, in which case s defaults to 1. Note that the 
+    #  only really interesting value is the l line number of the first 
+    #  range; all the other values can be computed from the diff." 
+    #      -- http://en.wikipedia.org/wiki/Diff#Unified_format
+    #
+    # Pattern -W,X +Y,Z has $1 = W, $2 = X,   $3 = Y, $4 = Z
+    # Pattern -W +Y,Z   has $1 = W, $2 = nil, $3 = Y, $4 = Z
+    # Pattern -W +Y     has $1 = W, $2 = nil, $3 = Y, $4 = nil
+    # Pattern -W,X +Y   has $1 = W, $2 = X,   $3 = Y, $4 = nil
+    CHUNK_PATTERN =     /^@@\s+-(\d+)(?:,(\d+))?\s+\+(\d+)(?:,(\d+))?\s+@@/ 
     ADDED_PATTERN =     /^\+(.*)/
     REMOVED_PATTERN =   /^-(.*)/
     UNCHANGED_PATTERN = /^ (.*)/
@@ -39,18 +48,23 @@ module UnifiedDiff
       @original.each_line do |line|
         case line
         when OLD_FILE_PATTERN
-          @original_file, @original_timestamp = $1, Time.parse($2)
+          @original_file = $1
+          @original_timestamp = Time.parse($2) if $2
         when NEW_FILE_PATTERN
-          @modified_file, @modified_timestamp = $1, Time.parse($2)
+          @modified_file = $1
+          @modified_timestamp = Time.parse($2) if $2
         when CHUNK_PATTERN
           old_begin = $1.to_i
-          old_end = old_begin + $2.to_i
-          if $3.include?(',') # Will match if non-edge case encountered
-            new_begin = $4.to_i
-            new_end = new_begin + $5.to_i
+          if $2.nil?
+            old_end = old_begin + 1
+          else
+            old_end = old_begin + $2.to_i
+          end
+          new_begin = $3.to_i
+          if $4.nil?
+            new_end = new_begin+1
           else
-            new_begin = $3.to_i
-            new_end = new_begin + 1
+            new_end = new_begin + $4.to_i
           end
           @working_chunk = Chunk.new(original: (old_begin...old_end), modified: (new_begin...new_end))
           @chunks << @working_chunk

data/test/test_unified_diff.rb

@@ -5,7 +5,7 @@ class TestUnifiedDiff < MiniTest::Unit::TestCase
     @original = <<-DIFF.unindent
       --- original.txt	2011-05-31 11:14:13.000000000 -0500
       +++ modified.txt	2011-05-31 11:14:44.000000000 -0500
-      @@ -1,5 +1,5 @@
+      @@ -1,5 +1,5 @@ Optional Text goes here.
        foo
        bar
       -baz
@@ -25,6 +25,42 @@ class TestUnifiedDiff < MiniTest::Unit::TestCase
     assert_equal Time.parse('2011-05-31 11:14:13.000000000 -0500'), @diff.original_timestamp
   end
 
+  def test_parses_original_information_with_single_quotes
+    original = <<-DIFF.unindent
+      --- original.txt	''2011-05-31 11:14:13.000000000 -0500''
+      +++ modified.txt	''2011-05-31 11:14:44.000000000 -0500''
+      @@ -1,5 +1,5 @@ Optional Text goes here.
+       foo
+       bar
+      -baz
+      +Baz
+       qux
+       quux
+    DIFF
+    diff = UnifiedDiff.parse(original)
+
+    assert_equal "modified.txt", diff.modified_file
+    assert_equal Time.parse('2011-05-31 11:14:44.000000000 -0500'), diff.modified_timestamp
+  end
+
+  def test_parses_original_information_without_dates
+    original = <<-DIFF.unindent
+      --- original.txt
+      +++ modified.txt
+      @@ -1,5 +1,5 @@ Optional Text goes here.
+       foo
+       bar
+      -baz
+      +Baz
+       qux
+       quux
+    DIFF
+    diff = UnifiedDiff.parse(original)
+
+    assert_equal "modified.txt", diff.modified_file
+    assert_nil diff.modified_timestamp
+  end
+
   def test_parses_modified_filename
     assert_equal "modified.txt", @diff.modified_file
     assert_equal Time.parse('2011-05-31 11:14:44.000000000 -0500'), @diff.modified_timestamp
@@ -105,4 +141,67 @@ class TestUnifiedDiff < MiniTest::Unit::TestCase
     @chunk = @diff.chunks.first
     assert_equal (1...2), @chunk.modified_range
   end
+
+  # For files:
+  # odd_line_original
+  # containing one line:
+  # foo
+  #
+  # and 
+  # odd_line_modified
+  # containing five lines:
+  # foo
+  # bar
+  # Baz
+  # qux
+  # quux
+  def test_handles_one_element_origin_chunk_range
+    diff = <<-DIFF.unindent
+      --- original.txt	2012-09-06 16:56:08.320483113 -0400
+      +++ modified.txt	2012-09-06 16:56:44.488483939 -0400
+      @@ -1 +1,5 @@
+       foo
+      +bar
+      +Baz
+      +qux
+      +quux
+    DIFF
+    @diff = UnifiedDiff.parse(diff)
+    @chunk = @diff.chunks.first
+    assert_equal (1...2), @chunk.original_range
+    assert_equal (1...6), @chunk.modified_range
+    assert_equal 0, @chunk.removed_lines.length
+    assert_equal 4, @chunk.added_lines.length
+  end
+
+  def test_handles_chunks_within_chunks
+    # Hand modified git diff -U of this file to create this diff.
+    # The git version of unified does not have a timestamp after
+    # the filename.
+    # 
+    # The lines:
+    # --- a/test/test_unified_diff.rb	2012-09-06 16:56:08.320483113 -0400
+    # +++ b/test/test_unified_diff.rb	2012-09-06 16:56:44.488483939 -0400
+    # are really supposed to be:
+    # --- a/test/test_unified_diff.rb
+    # +++ b/test/test_unified_diff.rb
+    # That may well be a new issue.
+    diff = <<-DIFF.unindent
+      --- a/test/test_unified_diff.rb	2012-09-06 16:56:08.320483113 -0400
+      +++ b/test/test_unified_diff.rb	2012-09-06 16:56:44.488483939 -0400
+      @@ -5,7 +5,7 @@ class TestUnifiedDiff < MiniTest::Unit::TestCase
+       @original = <<-DIFF.unindent
+       --- original.txt 2011-05-31 11:14:13.000000000 -0500
+       +++ modified.txt 2011-05-31 11:14:44.000000000 -0500
+      -      @@ -1,5 +1,5 @@
+      +      @@ -1,5 +1,5 @@ Optional Text goes here.
+              foo
+              bar
+             -baz
+    DIFF
+    @diff = UnifiedDiff.parse(diff)
+    @chunk = @diff.chunks.first
+    assert_equal (5...12), @chunk.original_range
+    assert_equal (5...12), @chunk.modified_range
+  end
 end

data/unified_diff.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{unified_diff}
-  s.version = "0.3.2"
+  s.name = "unified_diff"
+  s.version = "0.3.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ryan Neufeld"]
-  s.date = %q{2011-06-01}
-  s.description = %q{unified_diff parses unified diff contents into easy-to-use Ruby objects}
-  s.email = %q{ryan@ryanneufeld.ca}
+  s.date = "2013-04-16"
+  s.description = "unified_diff parses unified diff contents into easy-to-use Ruby objects"
+  s.email = "ryan@ryanneufeld.ca"
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.rdoc"
@@ -32,29 +32,26 @@ Gem::Specification.new do |s|
     "test/test_unified_diff.rb",
     "unified_diff.gemspec"
   ]
-  s.homepage = %q{http://github.com/rkneufeld/unified_diff}
+  s.homepage = "http://github.com/rkneufeld/unified_diff"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
-  s.summary = %q{Parse unified diffs in style}
+  s.rubygems_version = "1.8.24"
+  s.summary = "Parse unified diffs in style"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<minitest>, [">= 0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.0"])
       s.add_development_dependency(%q<simplecov>, [">= 0"])
     else
       s.add_dependency(%q<minitest>, [">= 0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.0"])
       s.add_dependency(%q<simplecov>, [">= 0"])
     end
   else
     s.add_dependency(%q<minitest>, [">= 0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.0"])
     s.add_dependency(%q<simplecov>, [">= 0"])
   end

metadata

@@ -1,72 +1,72 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: unified_diff
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.3.3
   prerelease: 
-  version: 0.3.2
 platform: ruby
-authors: 
+authors:
 - Ryan Neufeld
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-01 00:00:00 -05:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-04-16 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: bundler
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 1.0.0
-  type: :development
-  prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.6.0
   type: :development
   prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.0
+- !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id004
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: unified_diff parses unified diff contents into easy-to-use Ruby objects
 email: ryan@ryanneufeld.ca
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
-files: 
+files:
 - .document
 - Gemfile
 - Gemfile.lock
@@ -81,36 +81,32 @@ files:
 - test/test_chunk.rb
 - test/test_unified_diff.rb
 - unified_diff.gemspec
-has_rdoc: true
 homepage: http://github.com/rkneufeld/unified_diff
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: -1898865572022610731
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -685931603
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Parse unified diffs in style
 test_files: []
-