unified_diff 0.3.3 → 0.3.4

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YTRlODc4Y2U4MWM2M2EwM2ZkMDFlNWNhZjBkZmM4NWE0ZjNlNDI0Mw==
+  data.tar.gz: !binary |-
+    Y2IyY2EzOTY1NjVlZDVhODRkMWVkOWQ4ZjZlOTIwYWZkMmIzZWExMA==
+SHA512:
+  metadata.gz: !binary |-
+    ODk5MjgyMjQ1MzRlOTgwODcxNjM4ZWQ2YmRiYmIzMjMzMjcxZjg0MTRmMmI0
+    MDlkYmUwNDcyZGNmOTkzNjRmYWU3YTJlZjNhM2Q4NDRlMjNkMjliY2ZlNDI5
+    M2I5YmQ0N2NlNTEzMGE3ZjIyMjBjZjlhYjUzMTRiN2JlNTEwYTQ=
+  data.tar.gz: !binary |-
+    ZWQ0NGJiMzBkNDAyZTBhYWYxNDljYTNjZjlkNDQwNTViMTdkZDY0NjU4Y2Ux
+    ZGVhYTE1YTBiNjAxZWI5NzY3ODgzY2EzMzk2MGMxZjhlNDcxYmE0NWRjNmJm
+    MGIxMjIzMjA5MDY1ZTczY2M5YjA4Nzc3YTFiYzgzNDRhZGIxZDU=

data/Gemfile

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

data/Gemfile.lock

@@ -1,14 +1,43 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    git (1.2.5)
-    jeweler (1.6.4)
-      bundler (~> 1.0)
+    addressable (2.3.5)
+    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)
+    highline (1.6.21)
+    jeweler (2.0.1)
+      builder
+      bundler (>= 1.0)
       git (>= 1.2.5)
+      github_api
+      highline (>= 1.6.15)
+      nokogiri (>= 1.5.10)
       rake
+      rdoc
+    json (1.8.1)
+    mini_portile (0.5.2)
     minitest (3.4.0)
     multi_json (1.3.6)
-    rake (0.9.2.2)
+    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)
+    rack (1.5.2)
+    rake (10.1.1)
+    rdoc (4.1.1)
+      json (~> 1.4)
     simplecov (0.6.4)
       multi_json (~> 1.0)
       simplecov-html (~> 0.5.3)
@@ -18,6 +47,6 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  jeweler (~> 1.6.0)
+  jeweler (~> 2.0.1)
   minitest
   simplecov

data/Rakefile

@@ -34,8 +34,8 @@ end
 
 task :default => :test
 
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
+require 'rdoc/task'
+RDoc::Task.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 
   rdoc.rdoc_dir = 'rdoc'

data/VERSION

@@ -1 +1 @@
-0.3.3
+0.3.4

data/lib/unified_diff/chunk.rb

@@ -58,7 +58,7 @@ module UnifiedDiff
       @raw_lines.select {|line| types.include?(line[0])}.map {|line| line[1..-1]}
     end
 
-   # Insert a new addition line into the list of lines for this chunk
+    # Insert a new addition line into the list of lines for this chunk
     #
     # @param [String] the line to be inserted (without '+' tag)
     # @return [Array] the new list of raw lines
@@ -82,5 +82,16 @@ module UnifiedDiff
       @raw_lines << " #{line}"
     end
 
+    # Insert a no newline at end of file line into the list of lines for this
+    # chunk
+    #
+    # http://www.gnu.org/software/diffutils/manual/html_node/Incomplete-Lines.html
+    #
+    # @param [String] the line to be inserted (without '\' tag)
+    # @return [Array] the new list of raw lines
+    def insert_no_newline_at_eof(line)
+      @raw_lines << "\\#{line}"
+    end
+
   end
 end

data/lib/unified_diff/diff.rb

@@ -24,6 +24,7 @@ module UnifiedDiff
     ADDED_PATTERN =     /^\+(.*)/
     REMOVED_PATTERN =   /^-(.*)/
     UNCHANGED_PATTERN = /^ (.*)/
+    NO_NEWLINE_PATTERN = /^\\(\s+No\s+newline\s+at\s+end\s+of\s+file)$/
 
     # Create and parse a unified diff
     #
@@ -74,6 +75,8 @@ module UnifiedDiff
           @working_chunk.send(:insert_removal, $1)
         when UNCHANGED_PATTERN
           @working_chunk.send(:insert_unchanged, $1)
+        when NO_NEWLINE_PATTERN
+          @working_chunk.send(:insert_no_newline_at_eof, $1)
         else
           raise UnifiedDiffException.new("Unknown Line Type for Line:\n#{line}")
         end

data/test/test_chunk.rb

@@ -14,13 +14,15 @@ class TestChunk < MiniTest::Unit::TestCase
     @chunk.send(:insert_unchanged,"foo")
     @chunk.send(:insert_addition, "bar")
     @chunk.send(:insert_removal,  "baz")
-    assert_equal [" foo","+bar","-baz"], @chunk.raw_lines
+    @chunk.send(:insert_no_newline_at_eof,  "noel")
+    assert_equal [" foo","+bar","-baz", "\\noel"], @chunk.raw_lines
   end
 
   def test_original_lines
     @chunk.send(:insert_unchanged,"foo")
     @chunk.send(:insert_removal,"bar")
     @chunk.send(:insert_addition,"baz")
+    @chunk.send(:insert_no_newline_at_eof,  "noel")
     assert_equal %w{foo bar}, @chunk.original_lines
   end
 
@@ -28,18 +30,21 @@ class TestChunk < MiniTest::Unit::TestCase
     @chunk.send(:insert_unchanged,"foo")
     @chunk.send(:insert_removal,"bar")
     @chunk.send(:insert_addition,"baz")
+    @chunk.send(:insert_no_newline_at_eof,  "noel")
     assert_equal %w{foo baz}, @chunk.modified_lines
   end
 
   def test_removed_lines
     @chunk.send(:insert_removal,'foo')
     @chunk.send(:insert_unchanged, 'bar')
+    @chunk.send(:insert_no_newline_at_eof,  "noel")
     assert_equal ['foo'], @chunk.removed_lines
   end
 
   def test_added_lines
     @chunk.send(:insert_addition,'foo')
     @chunk.send(:insert_unchanged, 'bar')
+    @chunk.send(:insert_no_newline_at_eof,  "noel")
     assert_equal ['foo'], @chunk.added_lines
   end
 

data/test/test_unified_diff.rb

@@ -204,4 +204,25 @@ class TestUnifiedDiff < MiniTest::Unit::TestCase
     assert_equal (5...12), @chunk.original_range
     assert_equal (5...12), @chunk.modified_range
   end
+
+  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
+    HEADER
+
+    chunk = <<-'CHUNK'.unindent
+      @@ -1,1 +1,1 @@
+      -noel
+      
+      +noll
+      
+    CHUNK
+
+    @diff = UnifiedDiff.parse(header + chunk)
+    @chunk = @diff.chunks.first
+    assert_equal chunk, @chunk.to_s
+    assert_equal ["noel"], @chunk.original_lines
+    assert_equal ["noll"], @chunk.modified_lines
+  end
 end

data/unified_diff.gemspec

@@ -2,14 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+# stub: unified_diff 0.3.4 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "unified_diff"
-  s.version = "0.3.3"
+  s.version = "0.3.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib"]
   s.authors = ["Ryan Neufeld"]
-  s.date = "2013-04-16"
+  s.date = "2014-03-12"
   s.description = "unified_diff parses unified diff contents into easy-to-use Ruby objects"
   s.email = "ryan@ryanneufeld.ca"
   s.extra_rdoc_files = [
@@ -34,25 +36,24 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/rkneufeld/unified_diff"
   s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.24"
+  s.rubygems_version = "2.2.2"
   s.summary = "Parse unified diffs in style"
 
   if s.respond_to? :specification_version then
-    s.specification_version = 3
+    s.specification_version = 4
 
     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<jeweler>, ["~> 1.6.0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 2.0.1"])
       s.add_development_dependency(%q<simplecov>, [">= 0"])
     else
       s.add_dependency(%q<minitest>, [">= 0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.6.0"])
+      s.add_dependency(%q<jeweler>, ["~> 2.0.1"])
       s.add_dependency(%q<simplecov>, [">= 0"])
     end
   else
     s.add_dependency(%q<minitest>, [">= 0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.6.0"])
+    s.add_dependency(%q<jeweler>, ["~> 2.0.1"])
     s.add_dependency(%q<simplecov>, [">= 0"])
   end
 end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: unified_diff
 version: !ruby/object:Gem::Version
-  version: 0.3.3
-  prerelease: 
+  version: 0.3.4
 platform: ruby
 authors:
 - Ryan Neufeld
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-16 00:00:00.000000000 Z
+date: 2014-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -30,23 +27,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 2.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -84,29 +77,25 @@ files:
 homepage: http://github.com/rkneufeld/unified_diff
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -685931603
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Parse unified diffs in style
 test_files: []