grit 1.0.1 → 1.1.0

data/test/helper.rb

@@ -2,6 +2,7 @@ require File.join(File.dirname(__FILE__), *%w[.. lib grit])
 
 require 'rubygems'
 require 'test/unit'
+gem "mocha", ">=0"
 require 'mocha'
 
 GRIT_REPO = File.join(File.dirname(__FILE__), *%w[..])

data/test/test_blob.rb

@@ -5,51 +5,50 @@ class TestBlob < Test::Unit::TestCase
     @r = Repo.new(GRIT_REPO)
     @b = Blob.allocate
   end
-  
+
   # blob
   def test_nosuch_blob
     t = @r.blob('blahblah')
-    puts t.data
     assert t.is_a?(Blob)
   end
-  
+
   def test_data_should_return_blob_contents
     Git.any_instance.expects(:cat_file).returns(fixture('cat_file_blob'))
     blob = Blob.create(@r, :id => 'abc')
     assert_equal "Hello world", blob.data
   end
-  
+
   def test_data_should_cache
     Git.any_instance.expects(:cat_file).returns(fixture('cat_file_blob')).times(1)
     blob = Blob.create(@r, :id => 'abc')
     blob.data
     blob.data
   end
-  
+
   # size
-  
+
   def test_size_should_return_file_size
     Git.any_instance.expects(:cat_file).returns(fixture('cat_file_blob_size'))
     blob = Blob.create(@r, :id => 'abc')
     assert_equal 11, blob.size
   end
-  
+
   # data
-  
+
   # mime_type
-  
+
   def test_mime_type_should_return_mime_type_for_known_types
     blob = Blob.create(@r, :id => 'abc', :name => 'foo.png')
     assert_equal "image/png", blob.mime_type
   end
-  
+
   def test_mime_type_should_return_text_plain_for_unknown_types
     blob = Blob.create(@r, :id => 'abc')
     assert_equal "text/plain", blob.mime_type
   end
-  
+
   # blame
-  
+
   def test_blame
     Git.any_instance.expects(:blame).returns(fixture('blame'))
     b = Blob.blame(@r, 'master', 'lib/grit.rb')
@@ -69,11 +68,16 @@ class TestBlob < Test::Unit::TestCase
     # c.expects(:__bake__).times(1)
     # assert_equal Tree, c.tree.class
   end
-  
+
   # inspect
-  
+
   def test_inspect
     @b = Blob.create(@r, :id => 'abc')
     assert_equal %Q{#<Grit::Blob "abc">}, @b.inspect
   end
+  
+  def test_basename
+    @b = Blob.create(@r, :name => 'foo/bar.rb')
+    assert_equal "bar.rb", @b.basename
+  end
 end

data/test/test_commit.rb

@@ -4,78 +4,78 @@ class TestCommit < Test::Unit::TestCase
   def setup
     @r = Repo.new(File.join(File.dirname(__FILE__), *%w[dot_git]), :is_bare => true)
   end
-  
+
   # __bake__
-  
+
   def test_bake
     Git.any_instance.expects(:rev_list).returns(fixture('rev_list_single'))
     @c = Commit.create(@r, :id => '4c8124ffcf4039d292442eeccabdeca5af5c5017')
     @c.author # bake
-    
+
     assert_equal "Tom Preston-Werner", @c.author.name
     assert_equal "tom@mojombo.com", @c.author.email
   end
-  
+
   # short_name
-  
+
   def test_id_abbrev
     assert_equal '80f136f', @r.commit('80f136f500dfdb8c3e8abf4ae716f875f0a1b57f').id_abbrev
   end
-  
+
   # count
-  
+
   def test_count
     assert_equal 107, Commit.count(@r, 'master')
   end
-  
+
   # diff
-  
+
   def test_diff
     # git diff --full-index 91169e1f5fa4de2eaea3f176461f5dc784796769 > test/fixtures/diff_p
-    
+
     Git.any_instance.expects(:diff).with({:full_index => true}, 'master').returns(fixture('diff_p'))
     diffs = Commit.diff(@r, 'master')
-    
+
     assert_equal 15, diffs.size
-    
+
     assert_equal '.gitignore', diffs.first.a_path
     assert_equal '.gitignore', diffs.first.b_path
-    assert_equal '4ebc8aea50e0a67e000ba29a30809d0a7b9b2666', diffs.first.a_commit.id
-    assert_equal '2dd02534615434d88c51307beb0f0092f21fd103', diffs.first.b_commit.id
+    assert_equal '4ebc8aea50e0a67e000ba29a30809d0a7b9b2666', diffs.first.a_blob.id
+    assert_equal '2dd02534615434d88c51307beb0f0092f21fd103', diffs.first.b_blob.id
     assert_equal '100644', diffs.first.b_mode
     assert_equal false, diffs.first.new_file
     assert_equal false, diffs.first.deleted_file
     assert_equal "--- a/.gitignore\n+++ b/.gitignore\n@@ -1 +1,2 @@\n coverage\n+pkg", diffs.first.diff
-    
+
     assert_equal 'lib/grit/actor.rb', diffs[5].a_path
-    assert_equal nil, diffs[5].a_commit
-    assert_equal 'f733bce6b57c0e5e353206e692b0e3105c2527f4', diffs[5].b_commit.id
+    assert_equal nil, diffs[5].a_blob
+    assert_equal 'f733bce6b57c0e5e353206e692b0e3105c2527f4', diffs[5].b_blob.id
     assert_equal true, diffs[5].new_file
   end
-  
+
   def test_diff_with_two_commits
     # git diff --full-index 59ddc32 13d27d5 > test/fixtures/diff_2
     Git.any_instance.expects(:diff).with({:full_index => true}, '59ddc32', '13d27d5').returns(fixture('diff_2'))
     diffs = Commit.diff(@r, '59ddc32', '13d27d5')
-    
+
     assert_equal 3, diffs.size
     assert_equal %w(lib/grit/commit.rb test/fixtures/show_empty_commit test/test_commit.rb), diffs.collect { |d| d.a_path }
   end
-  
+
   def test_diff_with_files
     # git diff --full-index 59ddc32 -- lib > test/fixtures/diff_f
     Git.any_instance.expects(:diff).with({:full_index => true}, '59ddc32', '--', 'lib').returns(fixture('diff_f'))
     diffs = Commit.diff(@r, '59ddc32', %w(lib))
-    
+
     assert_equal 1, diffs.size
     assert_equal 'lib/grit/diff.rb', diffs.first.a_path
   end
-  
+
   def test_diff_with_two_commits_and_files
     # git diff --full-index 59ddc32 13d27d5 -- lib > test/fixtures/diff_2f
     Git.any_instance.expects(:diff).with({:full_index => true}, '59ddc32', '13d27d5', '--', 'lib').returns(fixture('diff_2f'))
     diffs = Commit.diff(@r, '59ddc32', '13d27d5', %w(lib))
-    
+
     assert_equal 1, diffs.size
     assert_equal 'lib/grit/commit.rb', diffs.first.a_path
   end
@@ -83,25 +83,25 @@ class TestCommit < Test::Unit::TestCase
   # diffs
   def test_diffs
     # git diff --full-index 91169e1f5fa4de2eaea3f176461f5dc784796769 > test/fixtures/diff_p
-    
+
     Git.any_instance.expects(:diff).returns(fixture('diff_p'))
     @c = Commit.create(@r, :id => '91169e1f5fa4de2eaea3f176461f5dc784796769')
     diffs = @c.diffs
-    
+
     assert_equal 15, diffs.size
-    
+
     assert_equal '.gitignore', diffs.first.a_path
     assert_equal '.gitignore', diffs.first.b_path
-    assert_equal '4ebc8aea50e0a67e000ba29a30809d0a7b9b2666', diffs.first.a_commit.id
-    assert_equal '2dd02534615434d88c51307beb0f0092f21fd103', diffs.first.b_commit.id
+    assert_equal '4ebc8aea50e0a67e000ba29a30809d0a7b9b2666', diffs.first.a_blob.id
+    assert_equal '2dd02534615434d88c51307beb0f0092f21fd103', diffs.first.b_blob.id
     assert_equal '100644', diffs.first.b_mode
     assert_equal false, diffs.first.new_file
     assert_equal false, diffs.first.deleted_file
     assert_equal "--- a/.gitignore\n+++ b/.gitignore\n@@ -1 +1,2 @@\n coverage\n+pkg", diffs.first.diff
-    
+
     assert_equal 'lib/grit/actor.rb', diffs[5].a_path
-    assert_equal nil, diffs[5].a_commit
-    assert_equal 'f733bce6b57c0e5e353206e692b0e3105c2527f4', diffs[5].b_commit.id
+    assert_equal nil, diffs[5].a_blob
+    assert_equal 'f733bce6b57c0e5e353206e692b0e3105c2527f4', diffs[5].b_blob.id
     assert_equal true, diffs[5].new_file
   end
 
@@ -111,56 +111,73 @@ class TestCommit < Test::Unit::TestCase
     Git.any_instance.expects(:show).with({:full_index => true, :pretty => 'raw'}, '634396b2f541a9f2d58b00be1a07f0c358b999b3').returns(fixture('diff_i'))
     @c = Commit.create(@r, :id => '634396b2f541a9f2d58b00be1a07f0c358b999b3')
     diffs = @c.diffs
-    
+
     assert_equal 10, diffs.size
-    
+
     assert_equal 'History.txt', diffs.first.a_path
     assert_equal 'History.txt', diffs.first.b_path
-    assert_equal nil, diffs.first.a_commit
+    assert_equal nil, diffs.first.a_blob
     assert_equal nil, diffs.first.b_mode
-    assert_equal '81d2c27608b352814cbe979a6acd678d30219678', diffs.first.b_commit.id
+    assert_equal '81d2c27608b352814cbe979a6acd678d30219678', diffs.first.b_blob.id
     assert_equal true, diffs.first.new_file
     assert_equal false, diffs.first.deleted_file
     assert_equal "--- /dev/null\n+++ b/History.txt\n@@ -0,0 +1,5 @@\n+== 1.0.0 / 2007-10-09\n+\n+* 1 major enhancement\n+  * Birthday!\n+", diffs.first.diff
 
-    
+
     assert_equal 'lib/grit.rb', diffs[5].a_path
-    assert_equal nil, diffs[5].a_commit
-    assert_equal '32cec87d1e78946a827ddf6a8776be4d81dcf1d1', diffs[5].b_commit.id
+    assert_equal nil, diffs[5].a_blob
+    assert_equal '32cec87d1e78946a827ddf6a8776be4d81dcf1d1', diffs[5].b_blob.id
     assert_equal true, diffs[5].new_file
   end
-  
+
   def test_diffs_on_initial_import_with_empty_commit
     Git.any_instance.expects(:show).with(
-      {:full_index => true, :pretty => 'raw'}, 
+      {:full_index => true, :pretty => 'raw'},
       '634396b2f541a9f2d58b00be1a07f0c358b999b3'
     ).returns(fixture('show_empty_commit'))
-    
+
     @c = Commit.create(@r, :id => '634396b2f541a9f2d58b00be1a07f0c358b999b3')
     diffs = @c.diffs
-    
+
     assert_equal [], diffs
   end
-  
+
   def test_diffs_with_mode_only_change
     Git.any_instance.expects(:diff).returns(fixture('diff_mode_only'))
     @c = Commit.create(@r, :id => '91169e1f5fa4de2eaea3f176461f5dc784796769')
     diffs = @c.diffs
-    
+
     assert_equal 23, diffs.size
     assert_equal '100644', diffs[0].a_mode
     assert_equal '100755', diffs[0].b_mode
   end
-  
+
   # to_s
-  
+
   def test_to_s
     @c = Commit.create(@r, :id => 'abc')
     assert_equal "abc", @c.to_s
   end
-  
+
+  # to_patch
+
+  def test_to_patch
+    @c = Commit.create(@r, :id => '80f136f500dfdb8c3e8abf4ae716f875f0a1b57f')
+
+    patch = @c.to_patch
+    
+    assert patch.include?('From 80f136f500dfdb8c3e8abf4ae716f875f0a1b57f Mon Sep 17 00:00:00 2001')
+    assert patch.include?('From: tom <tom@taco.(none)>')
+    assert patch.include?('Date: Tue, 20 Nov 2007 17:27:42 -0800')
+    assert patch.include?('Subject: [PATCH] fix tests on other machines')
+    assert patch.include?('test/test_reality.rb |   30 +++++++++++++++---------------')
+    assert patch.include?('@@ -1,17 +1,17 @@')
+    assert patch.include?('+#     recurse(t)')
+    assert patch.include?("1.6.")
+  end
+
   # inspect
-  
+
   def test_inspect
     @c = Commit.create(@r, :id => 'abc')
     assert_equal %Q{#<Grit::Commit "abc">}, @c.inspect

data/test/test_git.rb

@@ -55,10 +55,30 @@ class TestGit < Test::Unit::TestCase
   end
 
   def test_raises_on_slow_shell
-    Grit::Git.git_timeout = 0.001
+    Grit::Git.git_timeout = 0.0000001
     assert_raises Grit::Git::GitTimeout do
       @git.version
     end
     Grit::Git.git_timeout = 5.0
   end
+  
+  def test_it_really_shell_escapes_arguments_to_the_git_shell
+    @git.expects(:sh).with("#{Git.git_binary} --git-dir='#{@git.git_dir}' foo --bar='bazz\\'er'")
+    @git.foo(:bar => "bazz'er")
+    @git.expects(:sh).with("#{Git.git_binary} --git-dir='#{@git.git_dir}' bar -x 'quu\\'x'")
+    @git.bar(:x => "quu'x")
+  end
+  
+  def test_it_shell_escapes_the_standalone_argument
+    @git.expects(:sh).with("#{Git.git_binary} --git-dir='#{@git.git_dir}' foo 'bar\\'s'")
+    @git.foo({}, "bar's")
+    
+    @git.expects(:sh).with("#{Git.git_binary} --git-dir='#{@git.git_dir}' foo 'bar' '\\; echo \\'noooo\\''")
+    @git.foo({}, "bar", "; echo 'noooo'")
+  end
+  
+  def test_piping_should_work_on_1_9
+    @git.expects(:sh).with("#{Git.git_binary} --git-dir='#{@git.git_dir}' archive 'master' | gzip")
+    @git.archive({}, "master", "| gzip")
+  end
 end

data/test/test_repo.rb

@@ -318,4 +318,30 @@ class TestRepo < Test::Unit::TestCase
     Git.any_instance.expects(:log).with({:pretty => 'raw', :max_count => 1}, 'master', '--', 'file.rb').returns(fixture('rev_list'))
     @r.log('master', 'file.rb', :max_count => 1)
   end
+  
+  # commit_deltas_from
+  
+  def test_commit_deltas_from_nothing_new
+    other_repo = Repo.new(GRIT_REPO)
+    @r.git.expects(:rev_list).with({}, "master").returns(fixture("rev_list_delta_b"))
+    other_repo.git.expects(:rev_list).with({}, "master").returns(fixture("rev_list_delta_a"))
+    
+    delta_blobs = @r.commit_deltas_from(other_repo)
+    assert_equal 0, delta_blobs.size
+  end
+  
+  def test_commit_deltas_from_when_other_has_new
+    other_repo = Repo.new(GRIT_REPO)
+    @r.git.expects(:rev_list).with({}, "master").returns(fixture("rev_list_delta_a"))
+    other_repo.git.expects(:rev_list).with({}, "master").returns(fixture("rev_list_delta_b"))
+    %w[
+      4c8124ffcf4039d292442eeccabdeca5af5c5017
+      634396b2f541a9f2d58b00be1a07f0c358b999b3
+      ab25fd8483882c3bda8a458ad2965d2248654335
+    ].each do |ref|
+      Commit.expects(:find_all).with(other_repo, ref, :max_count => 1).returns([stub()])
+    end
+    delta_blobs = @r.commit_deltas_from(other_repo)
+    assert_equal 3, delta_blobs.size
+  end
 end

data/test/test_rubygit.rb

@@ -87,17 +87,22 @@ class TestRubyGit < Test::Unit::TestCase
     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)

data/test/test_submodule.rb

@@ -21,6 +21,19 @@ class TestSubmodule < Test::Unit::TestCase
     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)
@@ -48,4 +61,9 @@ class TestSubmodule < Test::Unit::TestCase
     @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

@@ -4,22 +4,64 @@ 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
-    tags = @r.tags
-    
-    assert_equal 1, tags.size
-    assert_equal 'v0.7.0', tags.first.name
-    assert_equal 'f0055fda16c18fd8b27986dbf038c735b82198d7', tags.first.commit.id
+    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.first
-    
+    tag = @r.tags.last
+
     assert_equal %Q{#<Grit::Tag "#{tag.name}">}, tag.inspect
   end
 end