rugged 0.19.0 → 0.21.0

data/ext/rugged/rugged_diff_patch.c

@@ -1,169 +0,0 @@
-/*
- * The MIT License
- *
- * Copyright (c) 2012 GitHub, Inc
- *
- * 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.
- */
-
-#include "rugged.h"
-
-extern VALUE rb_cRuggedDiff;
-extern VALUE rb_cRuggedDiffDelta;
-VALUE rb_cRuggedDiffPatch;
-
-static void rb_git_diff_patch__free(git_diff_patch *patch)
-{
-	git_diff_patch_free(patch);
-}
-
-VALUE rugged_diff_patch_new(VALUE owner, git_diff_patch *patch)
-{
-	VALUE rb_patch = Data_Wrap_Struct(rb_cRuggedDiffPatch, NULL, rb_git_diff_patch__free, patch);
-	rugged_set_owner(rb_patch, owner);
-	return rb_patch;
-}
-
-/*
- *  call-seq:
- *    patch.each_hunk { |hunk| } -> self
- *    patch.each_hunk -> enumerator
- *
- *  If given a block, yields each hunk that is part of the patch.
- *
- *  If no block is given, an enumerator is returned instead.
- */
-static VALUE rb_git_diff_patch_each_hunk(VALUE self)
-{
-	git_diff_patch *patch;
-	const git_diff_range *range;
-	const char *header;
-	size_t header_len, lines_in_hunk;
-	int error = 0, hooks_count, h;
-
-	if (!rb_block_given_p()) {
-		return rb_funcall(self, rb_intern("to_enum"), 1, CSTR2SYM("each_hunk"), self);
-	}
-
-	Data_Get_Struct(self, git_diff_patch, patch);
-
-	hooks_count = git_diff_patch_num_hunks(patch);
-	for (h = 0; h < hooks_count; ++h) {
-		error = git_diff_patch_get_hunk(&range, &header, &header_len, &lines_in_hunk, patch, h);
-		if (error) break;
-
-		rb_yield(rugged_diff_hunk_new(self, h, range, header, header_len, lines_in_hunk));
-	}
-	rugged_exception_check(error);
-
-	return self;
-}
-
-/*
- *  call-seq:
- *    patch.hunk_count -> int
- *
- *  Returns the number of hunks in the patch.
- */
-static VALUE rb_git_diff_patch_hunk_count(VALUE self)
-{
-	git_diff_patch *patch;
-	Data_Get_Struct(self, git_diff_patch, patch);
-
-	return INT2FIX(git_diff_patch_num_hunks(patch));
-}
-
-/*
- *  call-seq:
- *    patch.delta -> delta
- *
- *  Returns the delta object associated with the patch.
- */
-static VALUE rb_git_diff_patch_delta(VALUE self)
-{
-	git_diff_patch *patch;
-	Data_Get_Struct(self, git_diff_patch, patch);
-
-	return rugged_diff_delta_new(rugged_owner(self), git_diff_patch_delta(patch));
-}
-
-/*
- *  call-seq:
- *    patch.additions -> int
- *
- *  Returns the number of addition lines in the patch.
- */
-static VALUE rb_git_diff_patch_additions(VALUE self)
-{
-	git_diff_patch *patch;
-	size_t additions;
-	Data_Get_Struct(self, git_diff_patch, patch);
-
-	git_diff_patch_line_stats(NULL, &additions, NULL, patch);
-
-	return INT2FIX(additions);
-}
-
-/*
- *  call-seq:
- *    patch.deletions -> int
- *
- *  Returns the number of deletion lines in the patch.
- */
-static VALUE rb_git_diff_patch_deletions(VALUE self)
-{
-	git_diff_patch *patch;
-	size_t deletions;
-	Data_Get_Struct(self, git_diff_patch, patch);
-
-	git_diff_patch_line_stats(NULL, NULL, &deletions, patch);
-
-	return INT2FIX(deletions);
-}
-
-/*
- *  call-seq:
- *    patch.context -> int
- *
- *  Returns the number of context lines in the patch.
- */
-static VALUE rb_git_diff_patch_context(VALUE self)
-{
-	git_diff_patch *patch;
-	size_t context;
-	Data_Get_Struct(self, git_diff_patch, patch);
-
-	git_diff_patch_line_stats(&context, NULL, NULL, patch);
-
-	return INT2FIX(context);
-}
-
-void Init_rugged_diff_patch(void)
-{
-	rb_cRuggedDiffPatch = rb_define_class_under(rb_cRuggedDiff, "Patch", rb_cObject);
-
-	rb_define_method(rb_cRuggedDiffPatch, "context", rb_git_diff_patch_context, 0);
-	rb_define_method(rb_cRuggedDiffPatch, "additions", rb_git_diff_patch_additions, 0);
-	rb_define_method(rb_cRuggedDiffPatch, "deletions", rb_git_diff_patch_deletions, 0);
-
-	rb_define_method(rb_cRuggedDiffPatch, "delta", rb_git_diff_patch_delta, 0);
-
-	rb_define_method(rb_cRuggedDiffPatch, "each_hunk", rb_git_diff_patch_each_hunk, 0);
-	rb_define_method(rb_cRuggedDiffPatch, "hunk_count", rb_git_diff_patch_hunk_count, 0);
-}

data/lib/rugged/diff/patch.rb

@@ -1,28 +0,0 @@
-module Rugged
-  class Diff
-    class Patch
-      include Enumerable
-      alias each each_hunk
-
-      alias size hunk_count
-      alias count hunk_count
-
-      attr_accessor :owner
-      alias diff owner
-
-      def inspect
-        "#<#{self.class.name}:#{object_id}>"
-      end
-
-      # Returns the number of changes in the patch.
-      def changes
-        additions + deletions
-      end
-
-      # Returns an Array containing all hunks of the patch.
-      def hunks
-        each_hunk.to_a
-      end
-    end
-  end
-end

data/test/blob_test.rb

@@ -1,341 +0,0 @@
-require "test_helper"
-
-class BlobTest < Rugged::TestCase
-  include Rugged::RepositoryAccess
-
-  def test_read_blob_data
-    oid = "fa49b077972391ad58037050f2a75f74e3671e92"
-    blob = @repo.lookup(oid)
-    assert_equal 9, blob.size
-    assert_equal "new file\n", blob.content
-    assert_equal :blob, blob.type
-    assert_equal oid, blob.oid
-    assert_equal "new file\n", blob.text
-  end
-
-  def test_blob_sloc
-    oid = "7771329dfa3002caf8c61a0ceb62a31d09023f37"
-    blob = @repo.lookup(oid)
-    assert_equal 328, blob.sloc
-  end
-
-  def test_blob_content_with_size
-    oid = "7771329dfa3002caf8c61a0ceb62a31d09023f37"
-    blob = @repo.lookup(oid)
-    content =  blob.content(10)
-    assert_equal "# Rugged\n*", content
-    assert_equal 10, content.size
-  end
-
-  def test_blob_content_with_size_gt_file_size
-    oid = "7771329dfa3002caf8c61a0ceb62a31d09023f37"
-    blob = @repo.lookup(oid)
-    content =  blob.content(1000000)
-    assert_equal blob.size, content.size
-  end
-
-  def test_blob_content_with_zero_size
-    oid = "7771329dfa3002caf8c61a0ceb62a31d09023f37"
-    blob = @repo.lookup(oid)
-    content =  blob.content(0)
-    assert_equal '', content
-  end
-
-  def test_blob_content_with_negative_size
-    oid = "7771329dfa3002caf8c61a0ceb62a31d09023f37"
-    blob = @repo.lookup(oid)
-    content =  blob.content(-100)
-    assert_equal blob.size, content.size
-  end
-
-  def test_blob_text_with_max_lines
-    oid = "7771329dfa3002caf8c61a0ceb62a31d09023f37"
-    blob = @repo.lookup(oid)
-    assert_equal "# Rugged\n", blob.text(1)
-  end
-
-  def test_blob_text_with_lines_gt_file_lines
-    oid = "7771329dfa3002caf8c61a0ceb62a31d09023f37"
-    blob = @repo.lookup(oid)
-    text = blob.text(1000000)
-    assert_equal 464, text.lines.count
-  end
-
-  def test_blob_text_with_zero_lines
-    oid = "7771329dfa3002caf8c61a0ceb62a31d09023f37"
-    blob = @repo.lookup(oid)
-    text = blob.text(0)
-    assert_equal '', text
-  end
-
-  def test_blob_text_with_negative_lines
-    oid = "7771329dfa3002caf8c61a0ceb62a31d09023f37"
-    blob = @repo.lookup(oid)
-    text = blob.text(-100)
-    assert_equal 464, text.lines.count
-  end
-
-  def test_blob_text_default_encoding
-    oid = "7771329dfa3002caf8c61a0ceb62a31d09023f37"
-    blob = @repo.lookup(oid)
-    assert_equal Encoding::UTF_8, blob.text.encoding
-  end
-
-  def test_blob_text_set_encoding
-    oid = "7771329dfa3002caf8c61a0ceb62a31d09023f37"
-    blob = @repo.lookup(oid)
-    assert_equal Encoding::ASCII_8BIT, blob.text(0, Encoding::ASCII_8BIT).encoding
-  end
-end
-
-class BlobWriteTest < Rugged::TestCase
-  include Rugged::TempRepositoryAccess
-
-  def test_fetch_blob_content_with_nulls
-    content = "100644 example_helper.rb\x00\xD3\xD5\xED\x9DA4_"+
-               "\xE3\xC3\nK\xCD<!\xEA-_\x9E\xDC=40000 examples\x00"+
-               "\xAE\xCB\xE9d!|\xB9\xA6\x96\x024],U\xEE\x99\xA2\xEE\xD4\x92"
-
-    content.force_encoding('binary') if content.respond_to?(:force_encoding)
-
-    oid = @repo.write(content, 'tree')
-    blob = @repo.lookup(oid)
-    assert_equal content, blob.read_raw.data
-  end
-
-  def test_write_blob_data
-    assert_equal '1d83f106355e4309a293e42ad2a2c4b8bdbe77ae',
-      Rugged::Blob.from_buffer(@repo, "a new blob content")
-  end
-
-  def test_write_blob_from_workdir
-    assert_equal '1385f264afb75a56a5bec74243be9b367ba4ca08',
-      Rugged::Blob.from_workdir(@repo, "README")
-  end
-
-  def test_write_blob_from_disk
-    file_path = File.join(TEST_DIR, (File.join('fixtures', 'archive.tar.gz')))
-    File.open(file_path, 'rb') do |file|
-      oid = Rugged::Blob.from_disk(@repo, file.path)
-      assert oid
-
-      blob = @repo.lookup(oid)
-      file.rewind
-      assert_equal file.read, blob.content
-    end
-  end
-
-  def test_blob_is_binary
-    binary_file_path = File.join(TEST_DIR, (File.join('fixtures', 'archive.tar.gz')))
-    binary_blob = @repo.lookup(Rugged::Blob.from_disk(@repo, binary_file_path))
-    assert binary_blob.binary?
-
-    text_file_path = File.join(TEST_DIR, (File.join('fixtures', 'text_file.md')))
-    text_blob = @repo.lookup(Rugged::Blob.from_disk(@repo, text_file_path))
-    refute text_blob.binary?
-  end
-end
-
-class BlobDiffTest < Rugged::SandboxedTestCase
-  def test_diff_blob
-    repo = sandbox_init("diff")
-
-    a = repo.lookup("d70d245ed97ed2aa596dd1af6536e4bfdb047b69")
-    b = repo.lookup("7a9e0b02e63179929fed24f0a3e0f19168114d10")
-
-    blob  = repo.lookup(a.tree["readme.txt"][:oid])
-    other = repo.lookup(b.tree["readme.txt"][:oid])
-
-    patch = blob.diff(other)
-
-    assert_equal :modified, patch.delta.status
-
-    hunks = []
-    patch.each_hunk do |hunk|
-      assert_instance_of Rugged::Diff::Hunk, hunk
-      hunks << hunk
-    end
-    assert_equal 3, hunks.size
-
-    assert hunks[0].header.start_with? "@@ -1,4 +1,4 @@"
-    assert hunks[1].header.start_with? "@@ -7,10 +7,6 @@"
-    assert hunks[2].header.start_with? "@@ -24,12 +20,9 @@"
-
-    lines = []
-    hunks[0].each_line do |line|
-      lines << line
-    end
-    assert_equal 5, lines.size
-
-    assert_equal :deletion, lines[0].line_origin
-    assert_equal "The Git feature that really makes it stand apart from nearly every other SCM\n", lines[0].content
-
-    assert_equal :addition, lines[1].line_origin
-    assert_equal "The Git feature that r3ally mak3s it stand apart from n3arly 3v3ry other SCM\n", lines[1].content
-
-    assert_equal :context, lines[2].line_origin
-    assert_equal "out there is its branching model.\n", lines[2].content
-
-    assert_equal :context, lines[3].line_origin
-    assert_equal "\n", lines[3].content
-
-    assert_equal :context, lines[4].line_origin
-    assert_equal "Git allows and encourages you to have multiple local branches that can be\n", lines[4].content
-  end
-
-  def test_diff_string
-    repo = sandbox_init("diff")
-
-    a = repo.lookup("d70d245ed97ed2aa596dd1af6536e4bfdb047b69")
-    b = repo.lookup("7a9e0b02e63179929fed24f0a3e0f19168114d10")
-
-    blob  = repo.lookup(a.tree["readme.txt"][:oid])
-    other = repo.lookup(b.tree["readme.txt"][:oid]).content
-
-    patch = blob.diff(other)
-
-    assert_equal :modified, patch.delta.status
-
-    hunks = []
-    patch.each_hunk do |hunk|
-      assert_instance_of Rugged::Diff::Hunk, hunk
-      hunks << hunk
-    end
-    assert_equal 3, hunks.size
-
-    assert hunks[0].header.start_with? "@@ -1,4 +1,4 @@"
-    assert hunks[1].header.start_with? "@@ -7,10 +7,6 @@"
-    assert hunks[2].header.start_with? "@@ -24,12 +20,9 @@"
-
-    lines = []
-    hunks[0].each_line do |line|
-      lines << line
-    end
-    assert_equal 5, lines.size
-
-    assert_equal :deletion, lines[0].line_origin
-    assert_equal "The Git feature that really makes it stand apart from nearly every other SCM\n", lines[0].content
-
-    assert_equal :addition, lines[1].line_origin
-    assert_equal "The Git feature that r3ally mak3s it stand apart from n3arly 3v3ry other SCM\n", lines[1].content
-
-    assert_equal :context, lines[2].line_origin
-    assert_equal "out there is its branching model.\n", lines[2].content
-
-    assert_equal :context, lines[3].line_origin
-    assert_equal "\n", lines[3].content
-
-    assert_equal :context, lines[4].line_origin
-    assert_equal "Git allows and encourages you to have multiple local branches that can be\n", lines[4].content
-  end
-
-  def test_diff_nil
-    repo = sandbox_init("diff")
-
-    a = repo.lookup("d70d245ed97ed2aa596dd1af6536e4bfdb047b69")
-
-    blob  = repo.lookup(a.tree["readme.txt"][:oid])
-
-    patch = blob.diff(nil)
-
-    assert_equal :deleted, patch.delta.status
-
-    hunks = []
-    patch.each_hunk do |hunk|
-      assert_instance_of Rugged::Diff::Hunk, hunk
-      hunks << hunk
-    end
-    assert_equal 1, hunks.size
-
-    assert hunks[0].header.start_with? "@@ -1,35 +0,0 @@"
-
-    lines = []
-    hunks[0].each_line do |line|
-      lines << line
-    end
-    assert_equal 35, lines.size
-
-    lines.each do |line|
-      assert_equal :deletion, line.line_origin
-    end
-  end
-
-  def test_diff_with_paths
-    repo = sandbox_init("diff")
-
-    a = repo.lookup("d70d245ed97ed2aa596dd1af6536e4bfdb047b69")
-    b = repo.lookup("7a9e0b02e63179929fed24f0a3e0f19168114d10")
-
-    blob  = repo.lookup(a.tree["readme.txt"][:oid])
-    other = repo.lookup(b.tree["readme.txt"][:oid])
-
-    patch = blob.diff(other, :old_path => "old_readme.txt", :new_path => "new_readme.txt")
-    assert_equal "old_readme.txt", patch.delta.old_file[:path]
-    assert_equal "new_readme.txt", patch.delta.new_file[:path]
-  end
-end
-
-class BlobCreateFromChunksTest < Rugged::TestCase
-  include Rugged::TempRepositoryAccess
-
-  def test_write_blob_from_chunks_with_hintpath
-    file_path= File.join(TEST_DIR, (File.join('fixtures', 'archive.tar.gz')))
-    File.open(file_path, 'rb') do |io|
-      oid = Rugged::Blob.from_chunks(@repo, io, 'archive.tar.gz2')
-      io.rewind
-      blob = @repo.lookup(oid)
-      assert_equal io.read, blob.content
-    end
-  end
-
-  def test_write_blob_from_chunks_without_hintpath
-    file_path= File.join(TEST_DIR, (File.join('fixtures', 'archive.tar.gz')))
-    File.open(file_path, 'rb') do |io|
-      oid = Rugged::Blob.from_chunks(@repo, io)
-      io.rewind
-      blob = @repo.lookup(oid)
-      assert_equal io.read, blob.content
-    end
-  end
-
-  class BrokenIO
-    def read(length)
-      raise IOError
-    end
-  end
-
-  def test_write_blob_from_chunks_broken_io
-    oid = Rugged::Blob.from_chunks(@repo, BrokenIO.new)
-    blob = @repo.lookup(oid)
-    assert_equal 'e69de29bb2d1d6434b8b29ae775ad8c2e48c5391',
-      blob.oid
-    assert_equal 0, blob.size
-  end
-
-  class OverflowIO
-    def initialize()
-      @called = false
-    end
-
-    def read(size)
-      res = @called ? nil : 'a' * size * 4
-      @called = true
-      res
-    end
-  end
-
-  def test_write_blob_from_chunks_overflow_io
-    assert Rugged::Blob.from_chunks(@repo, OverflowIO.new)
-  end
-
-  class BadIO
-    def read(length)
-      :invalid_data
-    end
-  end
-
-  def test_write_blob_from_chunks_bad_io
-    assert Rugged::Blob.from_chunks(@repo, BadIO.new)
-  end
-
-end