unified_diff 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 19a9a1b715b01049a5ccabf9e9e86feb84042fbd
-  data.tar.gz: c3b9153ea0080ff4b5b1db815f13f63259299d48
+  metadata.gz: 5c097d48e44a0fe16367b5522145d280ccf3772c
+  data.tar.gz: d3d26d208a1d2941595137c4ec2356f53f863e88
 SHA512:
-  metadata.gz: 4a3eeca0762bb242e46625f0730f94fdfd85c048ce7a6bcb548a50d68f9161c9ed16025d3eeec655d6fda1977cf9e5d0554b46a2f1c6336d518910a2715f9902
-  data.tar.gz: f6c3a7e5e05deb85ecaac34641804c39333634a8a2ea65c95635965f64bdd7faf247c47acb8dd17e5989ae3ca3b0e43da2bce4da1e71672be8e28229ac246af0
+  metadata.gz: 74b9087bf68d10c2c7e1c7d8a8a10b1b416ffed7d0e846481d4f902846e04d1f2b4da6d8ee798e0cac85807bed7398d58117b33c8e1ffa1d27d051d1dad37c36
+  data.tar.gz: 8f17bc3572c9fbd896aa45e69b3d8be26eb4c5411cb424a11b9fe78a9fa45fd43032300f6a14cb119a3d6d782805d308c7d5a2889e6e4388a8e6afa227c97bf2

data/Gemfile.lock

@@ -1,19 +1,23 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    addressable (2.3.5)
+    addressable (2.3.6)
     builder (3.2.2)
-    faraday (0.7.6)
-      addressable (~> 2.2)
-      multipart-post (~> 1.1)
-      rack (~> 1.1)
-    git (1.2.6)
-    github_api (0.4.10)
-      faraday (~> 0.7.6)
-      hashie (~> 1.2.0)
-      multi_json (~> 1.0)
-      oauth2 (~> 0.5.2)
-    hashie (1.2.0)
+    descendants_tracker (0.0.4)
+      thread_safe (~> 0.3, >= 0.3.1)
+    docile (1.1.5)
+    faraday (0.9.0)
+      multipart-post (>= 1.2, < 3)
+    git (1.2.8)
+    github_api (0.12.0)
+      addressable (~> 2.3)
+      descendants_tracker (~> 0.0.4)
+      faraday (~> 0.8, < 0.10)
+      hashie (>= 3.2)
+      multi_json (>= 1.7.5, < 2.0)
+      nokogiri (~> 1.6.3)
+      oauth2
+    hashie (3.2.0)
     highline (1.6.21)
     jeweler (2.0.1)
       builder
@@ -25,23 +29,30 @@ GEM
       rake
       rdoc
     json (1.8.1)
-    mini_portile (0.5.2)
-    minitest (3.4.0)
-    multi_json (1.3.6)
-    multipart-post (1.2.0)
-    nokogiri (1.6.1)
-      mini_portile (~> 0.5.0)
-    oauth2 (0.5.2)
-      faraday (~> 0.7)
-      multi_json (~> 1.0)
+    jwt (1.0.0)
+    mini_portile (0.6.0)
+    minitest (5.4.0)
+    multi_json (1.10.1)
+    multi_xml (0.5.5)
+    multipart-post (2.0.0)
+    nokogiri (1.6.3.1)
+      mini_portile (= 0.6.0)
+    oauth2 (1.0.0)
+      faraday (>= 0.8, < 0.10)
+      jwt (~> 1.0)
+      multi_json (~> 1.3)
+      multi_xml (~> 0.5)
+      rack (~> 1.2)
     rack (1.5.2)
-    rake (10.1.1)
+    rake (10.3.2)
     rdoc (4.1.1)
       json (~> 1.4)
-    simplecov (0.6.4)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.5.3)
-    simplecov-html (0.5.3)
+    simplecov (0.9.0)
+      docile (~> 1.1.0)
+      multi_json
+      simplecov-html (~> 0.8.0)
+    simplecov-html (0.8.0)
+    thread_safe (0.3.4)
 
 PLATFORMS
   ruby

data/VERSION

@@ -1 +1 @@
-0.3.5
+0.3.6

data/lib/unified_diff/diff.rb

@@ -5,8 +5,8 @@ module UnifiedDiff
     class UnifiedDiffException < Exception; end
 
     FILE_PATTERN =      /([^\t\n]+)(?:\t'{2}?([^']+)'{2}?)?/
-    OLD_FILE_PATTERN =  /--- #{FILE_PATTERN}/
-    NEW_FILE_PATTERN =  /\+\+\+ #{FILE_PATTERN}/
+    OLD_FILE_PATTERN =  /^--- #{FILE_PATTERN}/
+    NEW_FILE_PATTERN =  /^\+\+\+ #{FILE_PATTERN}/
     # Match assignment is tricky for CHUNK_PATTERN
     # $1 and $3 are static, but $2 and $4 can be nil
     #

data/test/test_chunk.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class TestChunk < MiniTest::Unit::TestCase
+class TestChunk < Minitest::Test
   def setup
     @chunk = UnifiedDiff::Chunk.new(original: (1..2), modified: (1..3))
   end

data/test/test_unified_diff.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class TestUnifiedDiff < MiniTest::Unit::TestCase
+class TestUnifiedDiff < Minitest::Test
   def setup
     @original = <<-DIFF.unindent
       --- original.txt	2011-05-31 11:14:13.000000000 -0500
@@ -147,7 +147,7 @@ class TestUnifiedDiff < MiniTest::Unit::TestCase
   # containing one line:
   # foo
   #
-  # and 
+  # and
   # odd_line_modified
   # containing five lines:
   # foo
@@ -178,7 +178,7 @@ class TestUnifiedDiff < MiniTest::Unit::TestCase
     # 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
@@ -189,7 +189,7 @@ class TestUnifiedDiff < MiniTest::Unit::TestCase
     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
+      @@ -5,7 +5,7 @@ class TestUnifiedDiff < Minitest::Test
        @original = <<-DIFF.unindent
        --- original.txt 2011-05-31 11:14:13.000000000 -0500
        +++ modified.txt 2011-05-31 11:14:44.000000000 -0500
@@ -207,8 +207,8 @@ class TestUnifiedDiff < MiniTest::Unit::TestCase
 
   def test_no_newline_at_eof
     header = <<-HEADER.unindent
-      --- a   2014-02-26 16:19:13.000000000 -0800
-      +++ b   2014-02-26 16:19:13.000000000 -0800
+      --- a	2014-02-26 16:19:13.000000000 -0800
+      +++ b	2014-02-26 16:19:13.000000000 -0800
     HEADER
 
     chunk = <<-'CHUNK'.unindent
@@ -225,4 +225,47 @@ class TestUnifiedDiff < MiniTest::Unit::TestCase
     assert_equal ["noel"], @chunk.original_lines
     assert_equal ["noll"], @chunk.modified_lines
   end
+
+  def test_pluses
+    header = <<-HEADER.unindent
+      --- a	2014-07-26 21:44:41.068596411 -0700
+      +++ b	2014-08-03 05:18:34.411245070 -0700
+    HEADER
+
+    chunk = <<-'CHUNK'.unindent
+      @@ -0,0 +1,5 @@
+      ++++++++ ++++++ +++
+      ++ some heading
+      + stuff +++++++++ stuff
+      ++++ a
+      +some body
+    CHUNK
+
+    @diff = UnifiedDiff.parse(header + chunk)
+    @chunk = @diff.chunks.first
+    assert_equal chunk, @chunk.to_s
+    assert_equal 5, @chunk.added_lines.length
+  end
+
+  def test_hyphens
+    header = <<-HEADER.unindent
+      --- a	2014-07-26 21:44:41.068596411 -0700
+      +++ b	2014-08-03 05:18:34.411245070 -0700
+    HEADER
+
+    chunk = <<-'CHUNK'.unindent
+      @@ -1,5 +0,0 @@
+      -------- ------ ---
+      -- some heading
+      - stuff --------- stuff
+      ---- a
+      -some body
+    CHUNK
+
+    @diff = UnifiedDiff.parse(header + chunk)
+    @chunk = @diff.chunks.first
+    assert_equal chunk, @chunk.to_s
+    assert_equal 5, @chunk.removed_lines.length
+  end
+
 end

data/unified_diff.gemspec

@@ -2,11 +2,11 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: unified_diff 0.3.5 ruby lib
+# stub: unified_diff 0.3.6 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "unified_diff"
-  s.version = "0.3.5"
+  s.version = "0.3.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: unified_diff
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - Ryan Neufeld