grit 1.1.1 → 2.0.0

data/test/test_rubygit.rb

@@ -0,0 +1,192 @@
+require File.dirname(__FILE__) + '/helper'
+require 'tempfile'
+
+class TestRubyGit < Test::Unit::TestCase
+
+  def setup
+    @git = Git.new(File.join(File.dirname(__FILE__), *%w[dot_git]))
+    @commit_sha = '5e3ee1198672257164ce3fe31dea3e40848e68d5'
+    @tree_sha = 'cd7422af5a2e0fff3e94d6fb1a8fff03b2841881'
+    @blob_sha = '4232d073306f01cf0b895864e5a5cfad7dd76fce'
+  end
+
+  def test_init_gitdir
+    tf = Tempfile.new('gitdir')
+    temppath = tf.path
+    tf.unlink
+
+    git = Git.new(temppath)
+    git.init({})
+    assert File.exists?(File.join(temppath, 'config'))
+  end
+
+  def test_log_merge
+    c1 = '420eac97a826bfac8724b6b0eef35c20922124b7'
+    c2 = '30e367cef2203eba2b341dc9050993b06fd1e108'
+    out = @git.rev_list({:pretty => 'raw', :max_count => 10}, 'master')
+    assert_match "commit #{c1}", out
+    assert_match "commit #{c2}", out
+  end
+
+  def test_log_max_count
+    out = @git.rev_list({:max_count => 10}, 'master')
+    assert_equal 10, out.split("\n").size
+  end
+
+  def test_diff
+    commit1 = '2d3acf90f35989df8f262dc50beadc4ee3ae1560'
+    commit2 = '420eac97a826bfac8724b6b0eef35c20922124b7'
+    out = @git.diff({}, commit1, commit2)
+    assert_match 'index 6afcf64..9e78ddf 100644', out
+  end
+
+  def test_diff_single
+    commit1 = '2d3acf90f35989df8f262dc50beadc4ee3ae1560'
+    out = @git.diff({}, commit1, nil)
+    assert_match 'index ad42ff5..aa50f09 100644', out
+  end
+
+  def test_diff_full
+    commit1 = '2d3acf90f35989df8f262dc50beadc4ee3ae1560'
+    commit2 = '420eac97a826bfac8724b6b0eef35c20922124b7'
+    out = @git.diff({:full_index => true}, commit1, commit2)
+    assert_match 'index 6afcf64c80da8253fa47228eb09bc0eea217e5d1..9e78ddfaabf79f8314cc9a53a2f59775aee06bd7', out
+  end
+
+  def test_diff_add
+    commit1 = 'c9cf68fc61bd2634e90a4f6a12d88744e6297c4e'
+    commit2 = '7a8d32cb18a0ba2ff8bf86cadacc3fd2816da219'
+    out = @git.diff({}, commit1, commit2)
+    assert_match "--- /dev/null\n+++ b/test/test_tag.rb", out
+    assert_match "diff --git a/test/test_tag.rb b/test/test_tag.rb", out
+    assert_match 'index 0000000..2e3b0cb', out
+  end
+
+  def test_diff_remove
+    commit1 = 'c9cf68fc61bd2634e90a4f6a12d88744e6297c4e'
+    commit2 = '7a8d32cb18a0ba2ff8bf86cadacc3fd2816da219'
+    out = @git.diff({}, commit1, commit2)
+    assert_match "--- a/test/fixtures/diff_2\n+++ /dev/null", out
+    assert_match "diff --git a/test/fixtures/diff_2 b/test/fixtures/diff_2", out
+    assert_match 'index 0000000..2e3b0cb', out
+  end
+
+
+  def test_cat_file_contents_commit
+    out = @git.cat_file({:p => true}, @commit_sha)
+    assert_equal out, fixture('cat_file_commit_ruby')
+  end
+
+  def test_cat_file_contents_tree
+    out = @git.cat_file({:p => true}, @tree_sha)
+    assert_equal out, fixture('cat_file_tree_ruby').chomp
+  end
+
+  def test_cat_file_contents_blob
+    out = @git.cat_file({:p => true}, @blob_sha)
+    assert_equal out, fixture('cat_file_blob_ruby')
+  end
+
+  def test_cat_file_size
+    out = @git.cat_file({:s => true}, @tree_sha)
+    assert_equal '252', out
+  end
+
+  def test_ls_tree
+    out = @git.ls_tree({}, @tree_sha)
+    assert_equal out, fixture('cat_file_tree_ruby').chomp
+  end
+
+  def test_ls_tree_with_blobs
+    out = @git.ls_tree({}, @blob_sha)
+    assert_equal out, nil
+  end
+
+  def test_ls_tree_treeish
+    out = @git.ls_tree({}, 'testing')
+    assert_equal out, fixture('cat_file_tree_ruby').chomp
+  end
+
+  def test_ls_tree_paths
+    paths = ['History.txt', 'lib']
+    out = @git.ls_tree({}, @tree_sha, paths)
+    assert_equal out, fixture('ls_tree_paths_ruby').chomp
+  end
+
+  def test_ls_tree_paths_multi_single
+    paths = ['lib/grit.rb']
+    out = @git.ls_tree({}, @tree_sha, paths)
+    assert_equal out, "100644 blob 6afcf64c80da8253fa47228eb09bc0eea217e5d1\tlib/grit.rb"
+  end
+
+  def test_rev_list_pretty
+    out = @git.rev_list({:pretty => 'raw'}, 'master')
+    assert_equal out, fixture('rev_list_all')
+  end
+
+  def test_rev_list_raw_since
+    out = @git.rev_list({:since => Time.at(1204644738)}, 'master')
+    assert_match fixture('rev_list_since'), out  # I return slightly more for now
+  end
+
+  def test_rev_list_pretty_raw
+    out = @git.rev_list({:pretty => 'raw'}, 'f1964ad1919180dd1d9eae9d21a1a1f68ac60e77')
+    assert_match 'f1964ad1919180dd1d9eae9d21a1a1f68ac60e77', out
+    assert_equal out.split("\n").size, 654
+  end
+
+  def test_rev_list
+    out = @git.rev_list({}, 'master')
+    assert_equal out, fixture('rev_list_lines')
+  end
+
+  def test_rev_list_range
+    range = '30e367cef2203eba2b341dc9050993b06fd1e108..3fa4e130fa18c92e3030d4accb5d3e0cadd40157'
+    out = @git.rev_list({}, range)
+    assert_equal fixture('rev_list_range'), out
+  end
+
+  def test_ls_tree_paths_multi
+    paths = ['History.txt', 'lib/grit.rb']
+    out = @git.ls_tree({}, @tree_sha, paths)
+    assert_equal out, fixture('ls_tree_paths_ruby_deep').chomp
+  end
+
+  def test_ls_tree_path
+    paths = ['lib/']
+    out = @git.ls_tree({}, @tree_sha, paths)
+    assert_equal out, "100644 blob 6afcf64c80da8253fa47228eb09bc0eea217e5d1\tlib/grit.rb\n040000 tree 6244414d0229fb2bd58bc426a2afb5ba66773498\tlib/grit"
+  end
+
+  def test_ls_tree_path_deep
+    paths = ['lib/grit/']
+    out = @git.ls_tree({}, @tree_sha, paths)
+    assert_equal out, fixture('ls_tree_subdir').chomp
+  end
+
+  def test_file_type
+    out = @git.file_type(@tree_sha).to_s
+    assert_equal 'tree', out
+    out = @git.file_type(@blob_sha).to_s
+    assert_equal 'blob', out
+    out = @git.file_type(@commit_sha).to_s
+    assert_equal 'commit', out
+  end
+
+  #def test_ls_tree_noexist
+  #  puts out = @git.ls_tree({}, '6afcf64c80da8253fa47228eb09bc0eea217e5d0')
+  #end
+
+
+=begin
+  def test_ls_tree_grit_tree
+    paths = ['lib/grit.rb']
+    @repo = Grit::Repo.new('~/projects/github')
+    paths = ['app/models/event.rb']
+    puts out = @repo.git.ls_tree({}, 'master', ['app/models/event.rb'])
+    puts out = @repo.tree('master', paths).contents
+    assert_equal out, '100644 blob 6afcf64c80da8253fa47228eb09bc0eea217e5d1	lib/grit.rb'
+  end
+=end
+
+end

data/test/test_rubygit_alt.rb

@@ -0,0 +1,40 @@
+require File.dirname(__FILE__) + '/helper'
+require 'pp'
+
+class TestRubyGitAlt < Test::Unit::TestCase
+
+  def setup
+    @git1 = Grit::Repo.new(File.join(File.dirname(__FILE__), *%w[dot_git]), :is_bare => true)
+    @git2 = Grit::Repo.new(File.join(File.dirname(__FILE__), *%w[dot_git_clone]), :is_bare => true)
+    @git3 = Grit::Repo.new(File.join(File.dirname(__FILE__), *%w[dot_git_clone2]), :is_bare => true)
+    @commit_sha = 'ca8a30f5a7f0f163bbe3b6f0abf18a6c83b0687a'
+    @tree_sha = 'cd7422af5a2e0fff3e94d6fb1a8fff03b2841881'
+    @blob_sha = '4232d073306f01cf0b895864e5a5cfad7dd76fce'
+  end
+
+  def test_basic
+    sha_hex = [@commit_sha].pack("H*")
+    assert @git1.git.ruby_git.in_loose?(sha_hex)
+    assert @git2.git.ruby_git.in_loose?(sha_hex)
+    assert @git1.git.ruby_git.object_exists?(@commit_sha)
+    assert @git2.git.ruby_git.object_exists?(@commit_sha)
+    assert_equal 10, @git1.commits.size
+    assert_equal 10, @git2.commits.size
+  end
+
+  def test_clone_of_clone
+    sha_hex = [@commit_sha].pack("H*")
+    assert @git2.git.ruby_git.in_loose?(sha_hex)
+    assert @git3.git.ruby_git.in_loose?(sha_hex)
+    assert @git2.git.ruby_git.object_exists?(@commit_sha)
+    assert @git3.git.ruby_git.object_exists?(@commit_sha)
+    assert_equal 10, @git2.commits.size
+    assert_equal 10, @git3.commits.size
+  end
+
+  def test_tree_path
+    file = @git2.tree('master', ['test/test_head.rb']).contents.first.name
+    assert_equal file, 'test/test_head.rb'
+  end
+
+end

data/test/test_rubygit_index.rb

@@ -0,0 +1,76 @@
+require File.dirname(__FILE__) + '/helper'
+require 'pp'
+
+class TestRubyGitIndex < Test::Unit::TestCase
+
+  def setup
+    @base_repo = create_temp_repo(File.join(File.dirname(__FILE__), *%w[dot_git_iv2]))
+    @git = Grit::Repo.new(@base_repo, :is_bare => true)
+    @rgit = @git.git.ruby_git
+    @user = Actor.from_string("Tom Werner <tom@example.com>")
+  end
+
+  def teardown
+    FileUtils.rm_r(@base_repo)
+  end
+
+  def create_temp_repo(clone_path)
+    filename = 'git_test' + Time.now.to_i.to_s + rand(300).to_s.rjust(3, '0')
+    tmp_path = File.join("/tmp/", filename)
+    FileUtils.mkdir_p(tmp_path)
+    FileUtils.cp_r(clone_path, tmp_path)
+    File.join(tmp_path, 'dot_git_iv2')
+  end
+
+  def test_add_files
+    sha = @git.commits.first.tree.id
+
+    i = @git.index
+    i.read_tree(sha)
+    i.add('atester.rb', 'test stuff')
+    i.commit('message', [@git.commits.first], @user, nil, 'master')
+
+    b = @git.commits.first.tree/'atester.rb'
+    assert_equal 'f80c3b68482d5e1c8d24c9b8139340f0d0a928d0', b.id
+  end
+
+  def test_add_path_file
+    sha = @git.commits.first.tree.id
+
+    i = @git.index
+    i.read_tree(sha)
+    i.add('lib/atester.rb', 'test stuff')
+    i.commit('message', [@git.commits.first], @user, nil, 'master')
+
+    b = @git.commits.first.tree/'lib'/'atester.rb'
+    assert_equal 'f80c3b68482d5e1c8d24c9b8139340f0d0a928d0', b.id
+    b = @git.commits.first.tree/'lib'/'grit.rb'
+    assert_equal '77aa887449c28a922a660b2bb749e4127f7664e5', b.id
+  end
+
+  def test_ordered_properly
+    sha = @git.commits.first.tree.id
+
+    i = @git.index
+    i.read_tree(sha)
+    i.add('lib.rb', 'test stuff')
+    i.commit('message', [@git.commits.first], @user, nil, 'master')
+
+    tr = @git.commits.first.tree.contents
+    entries = tr.select { |c| c.name[0, 3] == 'lib' }.map { |c| c.name }
+    assert_equal 'lib.rb', entries[0]
+    assert_equal 'lib', entries[1]
+  end
+
+  def test_modify_file
+    sha = @git.commits.first.tree.id
+
+    i = @git.index
+    i.read_tree(sha)
+    i.add('README.txt', 'test more stuff')
+    i.commit('message', [@git.commits.first], @user, nil, 'master')
+
+    b = @git.commits.first.tree/'README.txt'
+    assert_equal 'e45d6b418e34951ddaa3e78e4fc4d3d92a46d3d1', b.id
+  end
+end

data/test/test_rubygit_iv2.rb

@@ -0,0 +1,28 @@
+require File.dirname(__FILE__) + '/helper'
+require 'pp'
+
+class TestRubyGitIv2 < Test::Unit::TestCase
+
+  def setup
+    @git = Grit::Repo.new(File.join(File.dirname(__FILE__), *%w[dot_git_iv2]), :is_bare => true)
+    @rgit = @git.git.ruby_git
+    @commit_sha = 'ca8a30f5a7f0f163bbe3b6f0abf18a6c83b0687a'
+    @tree_sha   = 'cd7422af5a2e0fff3e94d6fb1a8fff03b2841881'
+    @blob_sha   = '4232d073306f01cf0b895864e5a5cfad7dd76fce'
+  end
+
+  def test_basic
+    assert @rgit.object_exists?(@commit_sha)
+    assert_equal 10, @git.commits.size
+  end
+
+  def test_objects
+    commit = @rgit.get_object_by_sha1(@commit_sha)
+    assert_equal commit.author.email, 'schacon@gmail.com'
+    tree = @rgit.get_object_by_sha1(@tree_sha)
+    assert_equal 7, tree.entry.size
+    blob = @rgit.get_object_by_sha1(@blob_sha)
+    assert_match 'First public release', blob.content
+  end
+
+end

data/test/test_submodule.rb

@@ -0,0 +1,69 @@
+require File.dirname(__FILE__) + '/helper'
+
+class TestSubmodule < Test::Unit::TestCase
+  def setup
+    @r = Repo.new(GRIT_REPO)
+    @s = Submodule.allocate
+  end
+
+  # config
+
+  def test_config
+    data = fixture('gitmodules')
+    blob = stub(:data => data, :id => 'abc')
+    tree = stub(:'/' => blob)
+    commit = stub(:tree => tree)
+    repo = stub(:commit => commit)
+
+    config = Submodule.config(repo)
+
+    assert_equal "git://github.com/mojombo/glowstick", config['test/glowstick']['url']
+    assert_equal "git://github.com/mojombo/god", config['god']['url']
+  end
+
+  def test_config_with_windows_lineendings
+    data = fixture('gitmodules').gsub(/\n/, "\r\n")
+    blob = stub(:data => data, :id => 'abc')
+    tree = stub(:'/' => blob)
+    commit = stub(:tree => tree)
+    repo = stub(:commit => commit)
+
+    config = Submodule.config(repo)
+
+    assert_equal "git://github.com/mojombo/glowstick", config['test/glowstick']['url']
+    assert_equal "git://github.com/mojombo/god", config['god']['url']
+  end
+
+  def test_no_config
+    tree = stub(:'/' => nil)
+    commit = stub(:tree => tree)
+    repo = stub(:commit => commit)
+
+    config = Submodule.config(repo)
+
+    assert_equal({}, config)
+  end
+
+  def test_empty_config
+    blob = stub(:data => '', :id => 'abc')
+    tree = stub(:'/' => blob)
+    commit = stub(:tree => tree)
+    repo = stub(:commit => commit)
+
+    config = Submodule.config(repo)
+
+    assert_equal({}, config)
+  end
+
+  # inspect
+
+  def test_inspect
+    @t = Submodule.create(@r, :id => 'abc')
+    assert_equal %Q{#<Grit::Submodule "abc">}, @t.inspect
+  end
+
+  def test_basename
+    @submodule = Submodule.create(@r, :name => 'foo/bar')
+    assert_equal "bar", @submodule.basename
+  end
+end

data/test/test_tag.rb

@@ -0,0 +1,67 @@
+require File.dirname(__FILE__) + '/helper'
+
+class TestTag < Test::Unit::TestCase
+  def setup
+    @r = Repo.new(File.join(File.dirname(__FILE__), *%w[dot_git]), :is_bare => true)
+  end
+
+  # list_from_string size
+
+  def test_list_from_string_size
+    assert_equal 5, @r.tags.size
+  end
+
+  # list_from_string
+
+  def test_list_from_string
+    tag = @r.tags[1]
+
+    assert_equal 'not_annotated', tag.name
+    assert_equal 'ca8a30f5a7f0f163bbe3b6f0abf18a6c83b0687a', tag.commit.id
+  end
+
+  # list_from_string_for_signed_tag
+
+  def test_list_from_string_for_signed_tag
+    tag = @r.tags[2]
+
+    assert_equal 'v0.7.0', tag.name
+    assert_equal '7bcc0ee821cdd133d8a53e8e7173a334fef448aa', tag.commit.id
+  end
+
+  # list_from_string_for_annotated_tag
+
+  def test_list_from_string_for_annotated_tag
+    tag = @r.tags.first
+
+    assert_equal 'annotated', tag.name
+    assert_equal 'ca8a30f5a7f0f163bbe3b6f0abf18a6c83b0687a', tag.commit.id
+  end
+
+  # list_from_string_for_packed_tag
+
+  def test_list_from_string_for_packed_tag
+    tag = @r.tags[4]
+
+    assert_equal 'packed', tag.name
+    assert_equal 'ca8a30f5a7f0f163bbe3b6f0abf18a6c83b0687a', tag.commit.id
+  end
+
+  # list_from_string_for_packed_annotated_tag
+
+  def test_list_from_string_for_packed_annotated_tag
+    tag = @r.tags[3]
+
+    assert_equal 'packed_annotated', tag.name
+    assert_equal '7bcc0ee821cdd133d8a53e8e7173a334fef448aa', tag.commit.id
+  end
+
+
+  # inspect
+
+  def test_inspect
+    tag = @r.tags.last
+
+    assert_equal %Q{#<Grit::Tag "#{tag.name}">}, tag.inspect
+  end
+end