git 1.0.5 → 1.1.1

data/tests/units/test_lib.rb

@@ -1,141 +0,0 @@
-#!/usr/bin/env ruby
-
-require File.dirname(__FILE__) + '/../test_helper'
-
-# tests all the low level git communication
-#
-# this will be helpful if we ever figure out how
-# to either build these in pure ruby or get git bindings working
-# because right now it forks for every call
-
-class TestLib < Test::Unit::TestCase
-  def setup
-    set_file_paths
-    @lib = Git.open(@wdir).lib
-  end
-  
-  def test_commit_data
-    data = @lib.commit_data('1cc8667014381')
-    assert_equal('scott Chacon <schacon@agadorsparticus.corp.reactrix.com> 1194561188 -0800', data['author'])
-    assert_equal('94c827875e2cadb8bc8d4cdd900f19aa9e8634c7', data['tree'])
-    assert_equal("test\n", data['message'])
-    assert_equal(["546bec6f8872efa41d5d97a369f669165ecda0de"], data['parent'])
-  end
-
-  # takes parameters, returns array of appropriate commit objects
-  # :count
-  # :since
-  # :between
-  # :object
-  def test_log_commits
-    a = @lib.log_commits :count => 10
-    assert(a.first.is_a?(String))
-    assert_equal(10, a.size)
-    
-    a = @lib.log_commits :count => 20, :since => '3 years ago'
-    assert(a.first.is_a?(String))
-    assert_equal(20, a.size)
-    
-    a = @lib.log_commits :count => 20, :since => '1 second ago'
-    assert_equal(0, a.size)
-    
-    a = @lib.log_commits :count => 20, :between => ['v2.5', 'v2.6']
-    assert_equal(2, a.size)
-    
-    a = @lib.log_commits :count => 20, :path_limiter => 'ex_dir/'
-    assert_equal(1, a.size)
-
-    a = @lib.full_log_commits :count => 20
-    assert_equal(20, a.size)
-  end
-  
-  def test_revparse
-    assert_equal('1cc8667014381e2788a94777532a788307f38d26', @lib.revparse('1cc8667014381')) # commit
-    assert_equal('94c827875e2cadb8bc8d4cdd900f19aa9e8634c7', @lib.revparse('1cc8667014381^{tree}')) #tree
-    assert_equal('ba492c62b6227d7f3507b4dcc6e6d5f13790eabf', @lib.revparse('v2.5:example.txt')) #blob
-  end
-  
-  def test_object_type
-    assert_equal('commit', @lib.object_type('1cc8667014381')) # commit
-    assert_equal('tree', @lib.object_type('1cc8667014381^{tree}')) #tree
-    assert_equal('blob', @lib.object_type('v2.5:example.txt')) #blob
-    assert_equal('commit', @lib.object_type('v2.5'))
-  end
-  
-  def test_object_size
-    assert_equal(265, @lib.object_size('1cc8667014381')) # commit
-    assert_equal(72, @lib.object_size('1cc8667014381^{tree}')) #tree
-    assert_equal(128, @lib.object_size('v2.5:example.txt')) #blob
-    assert_equal(265, @lib.object_size('v2.5'))
-  end
-  
-  def test_object_contents
-    commit =  "tree 94c827875e2cadb8bc8d4cdd900f19aa9e8634c7\n"
-    commit += "parent 546bec6f8872efa41d5d97a369f669165ecda0de\n"
-    commit += "author scott Chacon <schacon@agadorsparticus.corp.reactrix.com> 1194561188 -0800\n"
-    commit += "committer scott Chacon <schacon@agadorsparticus.corp.reactrix.com> 1194561188 -0800\n"
-    commit += "\ntest"
-    assert_equal(commit, @lib.object_contents('1cc8667014381')) # commit
-    
-    tree =  "040000 tree 6b790ddc5eab30f18cabdd0513e8f8dac0d2d3ed\tex_dir\n"
-    tree += "100644 blob 3aac4b445017a8fc07502670ec2dbf744213dd48\texample.txt"
-    assert_equal(tree, @lib.object_contents('1cc8667014381^{tree}')) #tree
-    
-    blob = "1\n1\n1\n1\n1\n1\n1\n1\n1\n1\n1\n1\n1\n1\n1\n1\n1\n1\n1\n1\n1\n1\n1\n1\n1\n1\n1\n1\n1\n1\n1\n1\n1\n1\n1\n1\n1\n1\n1\n1\n1\n1\n1\n1\n1\n1\n1\n1\n1\n1\n1\n1\n1\n1\n1\n1\n1\n1\n1\n1\n1\n1\n1\n2"
-    assert_equal(blob, @lib.object_contents('v2.5:example.txt')) #blob
-    
-  end
-
-  # returns Git::Branch object array
-  def test_branches_all
-    branches = @lib.branches_all
-    assert(branches.size > 0)
-    assert(branches.select { |b| b[1] }.size > 0)  # has a current branch
-    assert(branches.select { |b| /\//.match(b[0]) }.size > 0)   # has a remote branch
-    assert(branches.select { |b| !/\//.match(b[0]) }.size > 0)  # has a local branch
-    assert(branches.select { |b| /master/.match(b[0]) }.size > 0)  # has a master branch
-  end
-
-  def test_config_remote
-    config = @lib.config_remote('working')
-    assert_equal('../working.git', config['url'])
-    assert_equal('+refs/heads/*:refs/remotes/working/*', config['fetch'])
-  end
-  
-  
-  def test_ls_tree
-    tree = @lib.ls_tree('94c827875e2cadb8bc8d4cdd900f19aa9e8634c7')
-    assert_equal("3aac4b445017a8fc07502670ec2dbf744213dd48", tree['blob']['example.txt'][:sha])
-    assert_equal("100644", tree['blob']['example.txt'][:mode])
-    assert(tree['tree'])
-  end
-
-
-  # options this will accept
-  #  :treeish
-  #  :path_limiter
-  #  :ignore_case (bool)
-  #  :invert_match (bool)
-  def test_grep
-    match = @lib.grep('search', :object => 'gitsearch1')
-    assert_equal('to search one', match['gitsearch1:scott/text.txt'].assoc(6)[1])
-    assert_equal(2, match['gitsearch1:scott/text.txt'].size)
-    assert_equal(2, match.size)
-    
-    match = @lib.grep('search', :object => 'gitsearch1', :path_limiter => 'scott/new*')
-    assert_equal("you can't search me!", match["gitsearch1:scott/newfile"].first[1])
-    assert_equal(1, match.size)
-
-    match = @lib.grep('SEARCH', :object => 'gitsearch1')
-    assert_equal(0, match.size)
-        
-    match = @lib.grep('SEARCH', :object => 'gitsearch1', :ignore_case => true)
-    assert_equal("you can't search me!", match["gitsearch1:scott/newfile"].first[1])
-    assert_equal(2, match.size)
-    
-    match = @lib.grep('search', :object => 'gitsearch1', :invert_match => true)
-    assert_equal(6, match['gitsearch1:scott/text.txt'].size)
-    assert_equal(2, match.size)
-  end
-  
-end

data/tests/units/test_log.rb

@@ -1,49 +0,0 @@
-#!/usr/bin/env ruby
-require 'logger'
-require File.dirname(__FILE__) + '/../test_helper'
-
-class TestLog < Test::Unit::TestCase
-  def setup
-    set_file_paths
-    #@git = Git.open(@wdir, :log => Logger.new(STDOUT))
-    @git = Git.open(@wdir)
-  end
-
-  def test_get_log_entries
-    log = @git.log
-    assert(log.first.is_a?(Git::Object::Commit))
-  end
-  
-  def test_get_log_entries    
-    assert_equal(30, @git.log.size)
-    assert_equal(50, @git.log(50).size)
-    assert_equal(10, @git.log(10).size)
-  end
-
-  def test_get_log_to_s
-    assert_equal(@git.log.to_s.split("\n").first, @git.log.first.sha)
-  end
-  
-  def test_get_log_since
-    l = @git.log.since("2 seconds ago")
-    assert_equal(0, l.size)
-    
-    l = @git.log.since("2 years ago")
-    assert_equal(30, l.size)
-  end
-  
-  def test_get_log_since_file    
-    l = @git.log.object('example.txt')
-    assert_equal(30, l.size)
-  
-    l = @git.log.between('v2.5', 'test').path('example.txt')
-    assert_equal(1, l.size)
-  end
-  
-  def test_log_file_noexist
-    assert_raise Git::GitExecuteError do
-      @git.log.object('no-exist.txt').size
-    end
-  end
-  
-end

data/tests/units/test_logger.rb

@@ -1,38 +0,0 @@
-#!/usr/bin/env ruby
-require 'logger'
-require File.dirname(__FILE__) + '/../test_helper'
-
-class TestLogger < Test::Unit::TestCase
-
-  def setup
-    set_file_paths
-  end
-  
-  def test_logger
-    log = Tempfile.new('logfile')
-    log.close
-    
-    logger = Logger.new(log.path)
-    logger.level = Logger::DEBUG
-    
-    @git = Git.open(@wdir, :log => logger)
-    @git.branches.size
-    
-    logc = File.read(log.path)
-    assert(/INFO -- : git branch -a/.match(logc))
-    assert(/DEBUG -- : \* git_grep/.match(logc))
-
-    log = Tempfile.new('logfile')
-    log.close
-    logger = Logger.new(log.path)
-    logger.level = Logger::INFO
-    
-    @git = Git.open(@wdir, :log => logger)
-    @git.branches.size
-    
-    logc = File.read(log.path)
-    assert(/INFO -- : git branch -a/.match(logc))
-    assert(!/DEBUG -- : \* git_grep/.match(logc))
-  end
-  
-end

data/tests/units/test_merge.rb

@@ -1,104 +0,0 @@
-#!/usr/bin/env ruby
-
-require File.dirname(__FILE__) + '/../test_helper'
-
-class TestMerge < Test::Unit::TestCase
-  def setup
-    set_file_paths
-  end
-  
-  def test_branch_and_merge
-    in_temp_dir do |path|
-      g = Git.clone(@wbare, 'branch_merge_test')
-      Dir.chdir('branch_merge_test') do
-
-        g.branch('new_branch').in_branch('test') do
-          assert_equal('new_branch', g.current_branch)
-          new_file('new_file_1', 'hello')
-          new_file('new_file_2', 'hello')
-          g.add
-          true
-        end
-
-        assert_equal('master', g.current_branch)
-
-        new_file('new_file_3', 'hello')
-        g.add
-        
-        assert(!g.status['new_file_1'])  # file is not there
-        
-        assert(g.branch('new_branch').merge)
-        assert(g.status['new_file_1'])  # file has been merged in
-      end
-    end
-  end
-  
-  def test_branch_and_merge_two
-    in_temp_dir do |path|
-      g = Git.clone(@wbare, 'branch_merge_test')
-      Dir.chdir('branch_merge_test') do
-
-        g.branch('new_branch').in_branch('test') do
-          assert_equal('new_branch', g.current_branch)
-          new_file('new_file_1', 'hello')
-          new_file('new_file_2', 'hello')
-          g.add
-          true
-        end
-
-        g.branch('new_branch2').in_branch('test') do
-          assert_equal('new_branch2', g.current_branch)
-          new_file('new_file_3', 'hello')
-          new_file('new_file_4', 'hello')
-          g.add
-          true
-        end
-
-        g.branch('new_branch').merge('new_branch2')
-        assert(!g.status['new_file_3'])  # still in master branch
-
-        g.branch('new_branch').checkout
-        assert(g.status['new_file_3'])  # file has been merged in
-        
-        g.branch('master').checkout
-        g.merge(g.branch('new_branch'))
-        assert(g.status['new_file_3'])  # file has been merged in
-        
-      end
-    end
-  end
-  
-  def test_branch_and_merge_multiple
-    in_temp_dir do |path|
-      g = Git.clone(@wbare, 'branch_merge_test')
-      Dir.chdir('branch_merge_test') do
-
-        g.branch('new_branch').in_branch('test') do
-          assert_equal('new_branch', g.current_branch)
-          new_file('new_file_1', 'hello')
-          new_file('new_file_2', 'hello')
-          g.add
-          true
-        end
-
-        g.branch('new_branch2').in_branch('test') do
-          assert_equal('new_branch2', g.current_branch)
-          new_file('new_file_3', 'hello')
-          new_file('new_file_4', 'hello')
-          g.add
-          true
-        end
-
-        assert(!g.status['new_file_1'])  # still in master branch
-        assert(!g.status['new_file_3'])  # still in master branch
-
-        g.merge(['new_branch', 'new_branch2'])
-
-        assert(g.status['new_file_1'])  # file has been merged in
-        assert(g.status['new_file_3'])  # file has been merged in
-                
-      end
-    end
-  end
-  
-end

data/tests/units/test_object.rb

@@ -1,129 +0,0 @@
-#!/usr/bin/env ruby
-
-require File.dirname(__FILE__) + '/../test_helper'
-
-class TestObject < Test::Unit::TestCase
-  def setup
-    set_file_paths
-    @git = Git.open(@wdir)
-    
-    @commit = @git.gcommit('1cc8667014381')
-    @tree = @git.gtree('1cc8667014381^{tree}')
-    @blob = @git.gblob('v2.5:example.txt')
-  end
-  
-  def test_commit
-    o = @git.gcommit('1cc8667014381')
-    assert(o.is_a?(Git::Object::Commit))
-    assert(o.commit?)
-    assert(!o.tag?)
-    
-    assert_equal('94c827875e2cadb8bc8d4cdd900f19aa9e8634c7', o.gtree.to_s)
-    assert_equal('546bec6f8872efa41d5d97a369f669165ecda0de', o.parent.sha)
-    assert_equal(1, o.parents.size)
-    assert_equal('scott Chacon', o.author.name)
-    assert_equal('schacon@agadorsparticus.corp.reactrix.com', o.author.email)
-    assert_equal('11-08-07', o.author.date.strftime("%m-%d-%y"))
-    assert_equal('11-08-07', o.author_date.strftime("%m-%d-%y"))
-    assert_equal('scott Chacon', o.committer.name)
-    assert_equal('11-08-07', o.committer_date.strftime("%m-%d-%y"))
-    assert_equal('11-08-07', o.date.strftime("%m-%d-%y"))
-    assert_equal('test', o.message)
-    
-    assert_equal('tags/v2.5', o.parent.name)
-    assert_equal('master', o.parent.parent.name)
-    assert_equal('master~1', o.parent.parent.parent.name)
-    
-    o = @git.gcommit('HEAD')
-    assert(o.is_a?(Git::Object::Commit))
-    assert_equal('commit', o.type)
-    
-    o = @git.gcommit('test_object')
-    assert(o.is_a?(Git::Object::Commit))
-    assert_equal('commit', o.type)
-  end
-  
-  def test_commit_contents
-    o = @git.gcommit('1cc8667014381')
-    assert_equal('tree 94c827875e2cadb8bc8d4cdd900f19aa9e8634c7', o.contents_array[0])
-    assert_equal('parent 546bec6f8872efa41d5d97a369f669165ecda0de', o.contents_array[1])
-  end
-  
-  def test_object_to_s
-    assert_equal('1cc8667014381e2788a94777532a788307f38d26', @commit.sha)
-    assert_equal('94c827875e2cadb8bc8d4cdd900f19aa9e8634c7', @tree.sha)
-    assert_equal('ba492c62b6227d7f3507b4dcc6e6d5f13790eabf', @blob.sha)
-  end
-  
-  def test_object_size
-    assert_equal(265, @commit.size)
-    assert_equal(72, @tree.size)
-    assert_equal(128, @blob.size)
-  end
-  
-  def test_tree
-    o = @git.gtree('1cc8667014381^{tree}')
-    assert(o.is_a?(Git::Object::Tree))
-    assert(o.tree?)
-    
-    o = @git.gtree('v2.7^{tree}')
-    
-    assert_equal(2, o.children.size)
-    assert_equal(1, o.blobs.size)
-    assert_equal(1, o.subtrees.size)
-    assert_equal(1, o.trees['ex_dir'].blobs.size)
-
-    assert_equal(2, o.full_tree.size)
-    assert_equal("100644 blob e69de29bb2d1d6434b8b29ae775ad8c2e48c5391\tex_dir/ex.txt", o.full_tree.first)
-    
-    assert_equal(2, o.depth)
-    
-    o = @git.gtree('94c827875e2cadb8bc8d4cdd900f19aa9e8634c7')
-    assert(o.is_a?(Git::Object::Tree))
-    assert_equal('tree', o.type)
-  end
-  
-  def test_tree_contents
-    o = @git.gtree('1cc8667014381^{tree}')
-    assert_equal('040000 tree 6b790ddc5eab30f18cabdd0513e8f8dac0d2d3ed	ex_dir', o.contents_array.first)
-  end
-  
-  def test_blob
-    o = @git.gblob('ba492c62b6')
-    assert(o.is_a?(Git::Object::Blob))
-    assert(o.blob?)
-    
-    o = @git.gblob('v2.5:example.txt')
-    assert(o.is_a?(Git::Object::Blob))
-    assert_equal('blob', o.type)
-  end
-  
-  def test_blob_contents
-    o = @git.gblob('v2.6:example.txt')
-    assert_equal('replace with new text', o.contents)
-    assert_equal('replace with new text', o.contents)  # this should be cached
-  end
-  
-  def test_revparse
-    sha = @git.revparse('v2.6:example.txt')
-    assert_equal('1f09f2edb9c0d9275d15960771b363ca6940fbe3', sha)
-  end
-  
-  def test_grep
-    g = @git.gtree('a3db7143944dcfa0').grep('search') # there
-    assert_equal(3, g.to_a.flatten.size)
-    assert_equal(1, g.size)
-
-    assert_equal({}, @git.gtree('a3db7143944dcfa0').grep('34a566d193'))  # not there
-
-    g = @git.gcommit('gitsearch1').grep('search') # there
-    assert_equal(8, g.to_a.flatten.size)
-    assert_equal(2, g.size)
-    
-    g = @git.gcommit('gitsearch1').grep('search', 'scott/new*') # there
-    assert_equal(3, g.to_a.flatten.size)
-    assert_equal(1, g.size)
-  end
-  
-  
-end