unified_diff 0.1.0

data/.document

@@ -0,0 +1,5 @@
+lib/**/*.rb
+bin/*
+- 
+features/**/*.feature
+LICENSE.txt

data/Gemfile

@@ -0,0 +1,8 @@
+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

@@ -0,0 +1,22 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    git (1.2.5)
+    jeweler (1.6.0)
+      bundler (~> 1.0.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)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (~> 1.0.0)
+  jeweler (~> 1.6.0)
+  minitest
+  simplecov

data/LICENSE.txt

@@ -0,0 +1,20 @@
+Copyright (c) 2011 Ryan Neufeld
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.rdoc

@@ -0,0 +1,19 @@
+= unified_diff
+
+Description goes here.
+
+== Contributing to unified_diff
+ 
+* Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet
+* Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it
+* Fork the project
+* Start a feature/bugfix branch
+* Commit and push until you are happy with your contribution
+* Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
+* Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
+
+== Copyright
+
+Copyright (c) 2011 Ryan Neufeld. See LICENSE.txt for
+further details.
+

data/Rakefile

@@ -0,0 +1,45 @@
+# encoding: utf-8
+
+require 'rubygems'
+require 'bundler'
+begin
+  Bundler.setup(:default, :development)
+rescue Bundler::BundlerError => e
+  $stderr.puts e.message
+  $stderr.puts "Run `bundle install` to install missing gems"
+  exit e.status_code
+end
+require 'rake'
+
+require 'jeweler'
+Jeweler::Tasks.new do |gem|
+  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
+  gem.name = "unified_diff"
+  gem.homepage = "http://github.com/rkneufeld/unified_diff"
+  gem.license = "MIT"
+  gem.summary = %Q{Parse unified diffs in style}
+  gem.description = %Q{unified_diff parses unified diff contents into easy-to-use Ruby objects}
+  gem.email = "ryan@ryanneufeld.ca"
+  gem.authors = ["Ryan Neufeld"]
+  # dependencies defined in Gemfile
+end
+Jeweler::RubygemsDotOrgTasks.new
+
+require 'rake/testtask'
+Rake::TestTask.new(:test) do |test|
+  test.libs << 'lib' << 'test'
+  test.pattern = 'test/**/test_*.rb'
+  test.verbose = true
+end
+
+task :default => :test
+
+require 'rake/rdoctask'
+Rake::RDocTask.new do |rdoc|
+  version = File.exist?('VERSION') ? File.read('VERSION') : ""
+
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title = "unified_diff #{version}"
+  rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end

data/VERSION

@@ -0,0 +1 @@
+0.1.0

data/lib/unified_diff/chunk.rb

@@ -0,0 +1,30 @@
+module UnifiedDiff
+  class Chunk
+    attr_reader :old_range,:new_range,:raw_lines
+    def initialize(ranges)
+      @old_range = ranges[:old]
+      @new_range = ranges[:new]
+      @raw_lines = []
+    end
+
+    def insert_addition(line)
+      @raw_lines << "+#{line}"
+    end
+
+    def insert_removal(line)
+      @raw_lines << "-#{line}"
+    end
+
+    def insert_unchanged(line)
+      @raw_lines << " #{line}"
+    end
+
+    def new_lines
+      @raw_lines.select {|line| line[0] == ' ' || line[0] == '+' }.map {|line| line[1..-1] }
+    end
+
+    def old_lines
+      @raw_lines.select {|line| line[0] == ' ' || line[0] == '-' }.map {|line| line[1..-1] }
+    end
+  end
+end

data/lib/unified_diff/diff.rb

@@ -0,0 +1,46 @@
+require 'time'
+module UnifiedDiff
+  class Diff
+    attr_reader :original, :old_file, :old_timestamp, :new_file, :new_timestamp, :chunks
+    class UnifiedDiffException < Exception; end
+
+    FILE_PATTERN =      /(.*)\t'{2}?(.*)'{2}?/
+    OLD_FILE_PATTERN =  /--- #{FILE_PATTERN}/
+    NEW_FILE_PATTERN =  /\+\+\+ #{FILE_PATTERN}/
+    CHUNK_PATTERN =     /@@ -(\d+),(\d+) \+(\d+),(\d+) @@/
+    ADDED_PATTERN =     /\+(.*)/
+    REMOVED_PATTERN =   /-(.*)/
+    UNCHANGED_PATTERN = / (.*)/
+
+    def initialize(diff)
+      @original = diff
+      parse
+    end
+
+  private
+
+    def parse
+      @chunks = []
+      @original.each_line do |line|
+        case line
+        when OLD_FILE_PATTERN
+          @old_file, @old_timestamp = $1, Time.parse($2)
+        when NEW_FILE_PATTERN
+          @new_file, @new_timestamp = $1, Time.parse($2)
+        when CHUNK_PATTERN
+          @working_chunk = Chunk.new(:old => ($1.to_i..$2.to_i), :new => ($3.to_i..$4.to_i))
+          @chunks << @working_chunk
+        when ADDED_PATTERN
+          @working_chunk.insert_addition($1)
+        when REMOVED_PATTERN
+          @working_chunk.insert_removal($1)
+        when UNCHANGED_PATTERN
+          @working_chunk.insert_unchanged($1)
+        else
+          raise UnifiedDiffException.new("Unknown Line Type for Line:\n#{line}")
+        end
+      end
+    end
+
+  end
+end

data/lib/unified_diff.rb

@@ -0,0 +1,8 @@
+module UnifiedDiff
+  def self.parse(diff)
+    UnifiedDiff::Diff.new(diff)
+  end
+ end
+
+require 'unified_diff/diff'
+require 'unified_diff/chunk'

data/test/helper.rb

@@ -0,0 +1,30 @@
+require 'rubygems'
+require 'bundler'
+
+begin
+  Bundler.setup(:default, :development)
+rescue Bundler::BundlerError => e
+  $stderr.puts e.message
+  $stderr.puts "Run `bundle install` to install missing gems"
+  exit e.status_code
+end
+
+gem 'minitest'
+require 'minitest/autorun'
+
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+
+# String extensions: http://stackoverflow.com/questions/3772864/how-do-i-remove-leading-whitespace-chars-from-ruby-heredoc/5638187#5638187
+class String
+  def unindent
+    gsub /^#{self[/\A\s*/]}/, ''
+  end
+end
+
+require 'simplecov'
+SimpleCov.start do
+  add_filter "/test/"
+end
+
+require 'unified_diff'

data/test/test_chunk.rb

@@ -0,0 +1,33 @@
+require 'helper'
+
+class TestChunk < MiniTest::Unit::TestCase
+  def setup
+    @chunk = UnifiedDiff::Chunk.new(old: (1..2), new: (1..3))
+  end
+
+  def test_ranges_accessible
+    assert_equal (1..2), @chunk.old_range
+    assert_equal (1..3), @chunk.new_range
+  end
+
+  def test_raw_lines_accessible_in_order
+    @chunk.insert_unchanged("foo")
+    @chunk.insert_addition( "bar")
+    @chunk.insert_removal(  "baz")
+    assert_equal [" foo","+bar","-baz"], @chunk.raw_lines
+  end
+
+  def test_old_lines
+    @chunk.insert_unchanged("foo")
+    @chunk.insert_removal("bar")
+    @chunk.insert_addition("baz")
+    assert_equal %w{foo bar}, @chunk.old_lines
+  end
+
+  def test_new_lines
+    @chunk.insert_unchanged("foo")
+    @chunk.insert_removal("bar")
+    @chunk.insert_addition("baz")
+    assert_equal %w{foo baz}, @chunk.new_lines
+  end
+end

data/test/test_unified_diff.rb

@@ -0,0 +1,79 @@
+require 'helper'
+
+class TestUnifiedDiff < MiniTest::Unit::TestCase
+  def setup
+    diff = <<-DIFF.unindent
+      --- old.txt	2011-05-31 11:14:13.000000000 -0500
+      +++ new.txt	2011-05-31 11:14:44.000000000 -0500
+      @@ -1,5 +1,5 @@
+       foo
+       bar
+      -baz
+      +Baz
+       qux
+       quux
+    DIFF
+    @diff = UnifiedDiff.parse(diff)
+  end
+
+  def test_setup_method_does_something
+    assert_equal UnifiedDiff::Diff, @diff.class
+  end
+
+  def test_parses_old_information
+    assert_equal "old.txt", @diff.old_file
+    assert_equal Time.parse('2011-05-31 11:14:13.000000000 -0500'), @diff.old_timestamp
+  end
+
+  def test_parses_new_filename
+    assert_equal "new.txt", @diff.new_file
+    assert_equal Time.parse('2011-05-31 11:14:44.000000000 -0500'), @diff.new_timestamp
+  end
+
+  def test_parses_chunk_header
+    @chunk = @diff.chunks.first
+    assert_equal (1..5), @chunk.old_range
+    assert_equal (1..5), @chunk.new_range
+  end
+
+  def test_parses_unchanged_line
+    skip "not performing line-type logic yet"
+  end
+
+  def test_parses_removed_lines
+    skip "not performing line-type logic yet"
+    @chunk = @diff.chunks.first
+    #assert_equal [3, 'baz'], @chunk.removed.first
+  end
+
+  def test_parses_added_lines
+    skip "not performing line-type logic yet"
+    @chunk = @diff.chunks.first
+    #assert_equal [3, 'Baz'], @chunk.added.first
+  end
+
+  def test_raises_on_invalid_line
+    diff = <<-DIFF.unindent
+      --- old.txt	2011-05-31 11:14:13.000000000 -0500
+      +++ new.txt	2011-05-31 11:14:44.000000000 -0500
+      @@ -1,1 +1,1 @@
+      &foo
+    DIFF
+    assert_raises(UnifiedDiff::Diff::UnifiedDiffException) { UnifiedDiff.parse(diff) }
+  end
+
+  def test_parses_multiple_chunks
+    diff = <<-DIFF.unindent
+      --- old.txt	2011-05-31 11:14:13.000000000 -0500
+      +++ new.txt	2011-05-31 11:14:44.000000000 -0500
+      @@ -1,1 +1,1 @@
+       -foo
+       +bar
+      @@ -4,4 +4,4 @@
+       -foo
+       +bar
+    DIFF
+    @diff = UnifiedDiff.parse(diff)
+    assert_equal 2, @diff.chunks.length
+  end
+end

data/unified_diff.gemspec

@@ -0,0 +1,62 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{unified_diff}
+  s.version = "0.1.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = [%q{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.extra_rdoc_files = [
+    "LICENSE.txt",
+    "README.rdoc"
+  ]
+  s.files = [
+    ".document",
+    "Gemfile",
+    "Gemfile.lock",
+    "LICENSE.txt",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "lib/unified_diff.rb",
+    "lib/unified_diff/chunk.rb",
+    "lib/unified_diff/diff.rb",
+    "test/helper.rb",
+    "test/test_chunk.rb",
+    "test/test_unified_diff.rb",
+    "unified_diff.gemspec"
+  ]
+  s.homepage = %q{http://github.com/rkneufeld/unified_diff}
+  s.licenses = [%q{MIT}]
+  s.require_paths = [%q{lib}]
+  s.rubygems_version = %q{1.8.4}
+  s.summary = %q{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
+end
+

metadata

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