square-circle-triangle-grit 1.1.2 → 1.1.3

data/test/test_commit.rb

@@ -0,0 +1,207 @@
+require File.dirname(__FILE__) + '/helper'
+
+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_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_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
+
+  # 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_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_blob
+    assert_equal 'f733bce6b57c0e5e353206e692b0e3105c2527f4', diffs[5].b_blob.id
+    assert_equal true, diffs[5].new_file
+  end
+
+  def test_diffs_on_initial_import
+    # git show --full-index 634396b2f541a9f2d58b00be1a07f0c358b999b3 > test/fixtures/diff_i
+
+    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_blob
+    assert_equal nil, diffs.first.b_mode
+    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_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'},
+      '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
+  end
+
+  # to_hash
+
+  def test_to_hash
+    old_tz, ENV["TZ"] = ENV["TZ"], "US/Pacific"
+    @c = Commit.create(@r, :id => '4c8124ffcf4039d292442eeccabdeca5af5c5017')
+    date = Time.parse('Wed Oct 10 03:06:12 -0400 2007')
+    expected = {
+      'parents' => ['id' => "634396b2f541a9f2d58b00be1a07f0c358b999b3"],
+      'committed_date' => date.xmlschema,
+      'tree' => "672eca9b7f9e09c22dcb128c283e8c3c8d7697a4",
+      'authored_date' => date.xmlschema,
+      'committer' => {'email' => "tom@mojombo.com", 'name' => "Tom Preston-Werner"},
+      'message' => "implement Grit#heads",
+      'author' => {'email' => "tom@mojombo.com", 'name' => "Tom Preston-Werner"},
+      'id' => "4c8124ffcf4039d292442eeccabdeca5af5c5017"
+    }
+
+    assert_equal expected, @c.to_hash
+  ensure
+    ENV["TZ"] = old_tz
+  end
+end

data/test/test_commit_stats.rb

@@ -0,0 +1,33 @@
+require File.dirname(__FILE__) + '/helper'
+
+class TestCommitStats < Test::Unit::TestCase
+  
+  def setup
+    File.expects(:exist?).returns(true)
+    @r = Repo.new(GRIT_REPO)
+
+    Git.any_instance.expects(:log).returns(fixture('log'))
+    @stats = @r.commit_stats
+  end
+  
+  def test_commit_stats
+    assert_equal 3, @stats.size
+  end
+
+  # to_hash
+
+  def test_to_hash
+    expected = {
+      "files"=>
+        [["examples/ex_add_commit.rb", 13, 0, 13],
+         ["examples/ex_index.rb", 1, 1, 2]],
+       "total"=>15,
+       "additions"=>14,
+       "id"=>"a49b96b339c525d7fd455e0ad4f6fe7b550c9543",
+       "deletions"=>1
+    }
+
+    assert_equal expected, @stats.assoc('a49b96b339c525d7fd455e0ad4f6fe7b550c9543')[1].to_hash
+  end
+
+end

data/test/test_commit_write.rb

@@ -0,0 +1,20 @@
+require File.dirname(__FILE__) + '/helper'
+
+class TestCommitWrite < Test::Unit::TestCase
+  def setup
+    @r = Repo.new(GRIT_REPO)
+  end
+
+  def test_commit
+    Git.any_instance.expects(:commit).returns(fixture('commit'))
+    results = @r.commit_index('my message')
+    assert_match /Created commit/, results
+  end
+
+  def test_commit_all
+    Git.any_instance.expects(:commit).returns(fixture('commit'))
+    results = @r.commit_all('my message')
+    assert_match /Created commit/, results
+  end
+  
+end

data/test/test_config.rb

@@ -0,0 +1,58 @@
+require File.dirname(__FILE__) + '/helper'
+
+class TestConfig < Test::Unit::TestCase
+  def setup
+    @r = Repo.new(GRIT_REPO)
+  end
+  
+  # data
+  
+  def test_bracketed_fetch
+    Git.any_instance.expects(:config).returns(fixture('simple_config'))
+    
+    config = @r.config
+    
+    assert_equal "git://github.com/mojombo/grit.git", config["remote.origin.url"]
+  end
+  
+  def test_bracketed_fetch_returns_nil
+    Git.any_instance.expects(:config).returns(fixture('simple_config'))
+    
+    config = @r.config
+    
+    assert_equal nil, config["unknown"]
+  end
+  
+  def test_fetch
+    Git.any_instance.expects(:config).returns(fixture('simple_config'))
+    
+    config = @r.config
+    
+    assert_equal "false", config.fetch("core.bare")
+  end
+  
+  def test_fetch_with_default
+    Git.any_instance.expects(:config).returns(fixture('simple_config'))
+    
+    config = @r.config
+    
+    assert_equal "default", config.fetch("unknown", "default")
+  end
+
+  def test_fetch_without_default_raises
+    Git.any_instance.expects(:config).returns(fixture('simple_config'))
+    
+    config = @r.config
+    
+    assert_raise(IndexError) do
+      config.fetch("unknown")
+    end
+  end
+  
+  def test_set_value
+    Git.any_instance.expects(:config).with({}, 'unknown', 'default')
+    
+    config = @r.config
+    config["unknown"] = "default"
+  end
+end

data/test/test_diff.rb

@@ -0,0 +1,18 @@
+require File.dirname(__FILE__) + '/helper'
+
+class TestDiff < Test::Unit::TestCase
+  def setup
+    @r = Repo.new(GRIT_REPO)
+  end
+  
+  # list_from_string
+  
+  def test_list_from_string_new_mode
+    output = fixture('diff_new_mode')
+    
+    diffs = Grit::Diff.list_from_string(@r, output)
+    assert_equal 2, diffs.size
+    assert_equal 10, diffs.first.diff.split("\n").size
+    assert_equal nil, diffs.last.diff
+  end
+end

data/test/test_file_index.rb

@@ -0,0 +1,56 @@
+require File.dirname(__FILE__) + '/helper'
+
+class TestFileIndex < Test::Unit::TestCase
+  
+  def setup_a
+    @findex = Grit::GitRuby::FileIndex.new(File.join(File.dirname(__FILE__), *%w[dot_git]))
+    @commit = 'c12f398c2f3c4068ca5e01d736b1c9ae994b2138'
+  end
+
+  def test_count_all 
+    setup_a
+    assert_equal 107, @findex.count_all
+  end
+
+  def test_count
+    setup_a
+    assert_equal 20, @findex.count(@commit)
+  end
+
+  def test_files
+    setup_a
+    files = @findex.files(@commit)
+    assert_equal 4, files.size
+    assert_equal "lib/grit/blob.rb", files.first
+  end
+
+  def test_commits_for
+    setup_a
+    commits = @findex.commits_for('lib/grit/blob.rb')
+    assert commits.include?('3e0955045cb189a7112015c26132152a94f637bf')
+    assert_equal 8, commits.size
+  end
+
+  def test_last_commits_array
+    setup_a
+    arr = @findex.last_commits(@commit, ['lib/grit/git.rb', 'lib/grit/actor.rb', 'lib/grit/commit.rb'])
+    assert_equal '74fd66519e983a0f29e16a342a6059dbffe36020', arr['lib/grit/git.rb']
+    assert_equal @commit, arr['lib/grit/commit.rb']
+    assert_equal nil, arr['lib/grit/actor.rb']
+  end
+  
+  def test_last_commits_pattern
+    setup_a
+    arr = @findex.last_commits(@commit, /lib\/grit\/[^\/]*$/)
+    assert_equal 10, arr.size
+    assert_equal @commit, arr['lib/grit/commit.rb']
+    assert_equal nil, arr['lib/grit/actor.rb']
+  end
+  
+  def test_last_commits_array
+    setup_a
+    arr = @findex.last_commits(@commit, ['lib/grit.rb', 'lib/grit/'])
+    assert_equal @commit, arr['lib/grit/']
+  end
+  
+end

data/test/test_git.rb

@@ -0,0 +1,84 @@
+require File.dirname(__FILE__) + '/helper'
+
+class TestGit < Test::Unit::TestCase
+  def setup
+    @git = Git.new(File.join(File.dirname(__FILE__), *%w[..]))
+  end
+  
+  def teardown
+    Grit.debug = false
+  end
+
+  def test_method_missing
+    assert_match(/^git version [\w\.]*$/, @git.version)
+  end
+  
+  def test_logs_stderr
+    Grit.debug = true
+    Grit.stubs(:log)
+    Grit.expects(:log).with(includes("git: 'bad' is not a git-command"))
+    @git.bad
+  end
+  
+  def testl_logs_stderr_when_skipping_timeout 
+    Grit.debug = true
+    Grit.stubs(:log)
+    Grit.expects(:log).with(includes("git: 'bad' is not a git-command"))
+    @git.bad :timeout => false
+  end
+  
+  def test_transform_options
+    assert_equal ["-s"], @git.transform_options({:s => true})
+    assert_equal ["-s '5'"], @git.transform_options({:s => 5})
+    
+    assert_equal ["--max-count"], @git.transform_options({:max_count => true})
+    assert_equal ["--max-count='5'"], @git.transform_options({:max_count => 5})
+    
+    assert_equal ["-s", "-t"], @git.transform_options({:s => true, :t => true}).sort
+  end
+
+  def test_uses_custom_sh_method
+    @git.expects(:sh)
+    @git.something
+  end
+
+  def test_can_skip_timeout
+    @git.expects(:wild_sh)
+    @git.something(:timeout => false)
+  end
+
+  def test_raises_if_too_many_bytes
+    @git.instance_variable_set(:@bytes_read, 6000000)
+    assert_raises Grit::Git::GitTimeout do
+      @git.version
+    end
+  end
+
+  def test_raises_on_slow_shell
+    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