titanous-git 1.1.0

data/tests/units/test_diff.rb

@@ -0,0 +1,88 @@
+#!/usr/bin/env ruby
+
+require File.dirname(__FILE__) + '/../test_helper'
+
+class TestDiff < Test::Unit::TestCase
+  def setup
+    set_file_paths
+    @git = Git.open(@wdir)
+    @diff = @git.diff('gitsearch1', 'v2.5')
+  end
+  
+  #def test_diff
+  #  g.diff
+  #  assert(1, d.size)
+  #end
+
+  def test_diff_tags
+    d = @git.diff('gitsearch1', 'v2.5')
+    assert_equal(3, d.size)
+    assert_equal(74, d.lines)
+    assert_equal(10, d.deletions)
+    assert_equal(64, d.insertions)
+  end
+
+  def test_diff_path
+    d = @git.diff('gitsearch1', 'v2.5').path('scott/')
+    assert_equal(d.from, 'gitsearch1')
+    assert_equal(d.to, 'v2.5')
+    assert_equal(2, d.size)
+    assert_equal(9, d.lines)
+    assert_equal(9, d.deletions)
+    assert_equal(0, d.insertions)
+  end
+  
+  def test_diff_objects
+    d = @git.diff('gitsearch1', @git.gtree('v2.5'))
+    assert(3, d.size)
+  end
+  
+  def test_object_diff
+    d = @git.gtree('v2.5').diff('gitsearch1')
+    assert_equal(3, d.size)
+    assert_equal(74, d.lines)
+    assert_equal(10, d.insertions)
+    assert_equal(64, d.deletions)
+    
+    d = @git.gtree('v2.6').diff(@git.gtree('gitsearch1'))
+    assert_equal(2, d.size)
+    assert_equal(9, d.lines)
+  end
+  
+  def test_diff_stats
+    s = @diff.stats
+    assert_equal(3, s[:total][:files])
+    assert_equal(74, s[:total][:lines])
+    assert_equal(10, s[:total][:deletions])
+    assert_equal(64, s[:total][:insertions])
+    
+    # per file
+    assert_equal(1, s[:files]["scott/newfile"][:deletions])
+  end
+  
+  def test_diff_hashkey
+    assert_equal('5d46068', @diff["scott/newfile"].src)
+    assert_nil(@diff["scott/newfile"].blob(:dst))
+    assert(@diff["scott/newfile"].blob(:src).is_a?(Git::Object::Blob))
+  end
+  
+  def test_patch
+    p = @git.diff('v2.8^', 'v2.8').patch
+    diff = "diff --git a/example.txt b/example.txt\nindex 1f09f2e..8dc79ae 100644\n--- a/example.txt\n+++ b/example.txt\n@@ -1 +1 @@\n-replace with new text\n+replace with new text - diff test"
+    assert_equal(diff, p)
+  end
+  
+  def test_diff_each
+    files = {}
+    @diff.each do |d|
+      files[d.path] = d
+    end
+    
+    assert(files['example.txt'])
+    assert_equal('100644', files['scott/newfile'].mode)
+    assert_equal('deleted', files['scott/newfile'].type)
+    assert_equal(160, files['scott/newfile'].patch.size)
+  end
+  
+  
+end

data/tests/units/test_each_conflict.rb

@@ -0,0 +1,49 @@
+#!/usr/bin/env ruby
+
+require File.dirname(__FILE__) + '/../test_helper'
+
+class TestEachConflict < Test::Unit::TestCase
+  
+  def setup
+    set_file_paths
+    #@git = Git.open(@wdir, :log => Logger.new(STDOUT))
+    @git = Git.open(@wdir)
+  end
+  
+  def test_conflicts
+    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
+          new_file('example.txt', "1\n2\n3")
+          g.add
+          true
+        end
+
+        g.branch('new_branch2').in_branch('test') do
+          new_file('example.txt', "1\n4\n3")
+          g.add
+          true
+        end
+
+        
+        g.merge('new_branch')
+        begin
+          g.merge('new_branch2')
+        rescue 
+        end
+        
+        g.each_conflict do |file, your, their|
+          assert_equal('example.txt', file)
+          assert_equal("1\n2\n3\n", File.read(your))
+          assert_equal("1\n4\n3\n", File.read(their))
+        end
+        
+      end
+    end
+  end
+  
+  
+  
+end

data/tests/units/test_git_path.rb

@@ -0,0 +1,45 @@
+#!/usr/bin/env ruby
+
+require File.dirname(__FILE__) + '/../test_helper'
+
+class TestGitPath < Test::Unit::TestCase
+  
+  def setup
+    set_file_paths
+    @git = Git.open(@wdir)
+  end
+  
+  def test_initalize_with_good_path_and_check_path
+    path = Git::Path.new(@git.index.to_s, true)
+    assert_equal @git.index.to_s, path.to_s
+  end
+  
+  def test_initialize_with_bad_path_and_check_path
+    assert_raises ArgumentError do
+      Git::Path.new('/this path does not exist', true)
+    end
+  end
+  
+  def test_initialize_with_bad_path_and_no_check
+    path = Git::Path.new('/this path does not exist', false)
+    assert_equal '/this path does not exist', path.to_s
+  end
+
+  def test_readables
+    assert(@git.dir.readable?)
+    assert(@git.index.readable?)
+    assert(@git.repo.readable?)
+  end
+  
+  def test_readables_in_temp_dir
+    in_temp_dir do |dir|
+      FileUtils.cp_r(@wdir, 'test')
+      g = Git.open(File.join(dir, 'test'))
+      
+      assert(g.dir.writable?)
+      assert(g.index.writable?)
+      assert(g.repo.writable?)
+    end
+  end
+  
+end

data/tests/units/test_index_ops.rb

@@ -0,0 +1,94 @@
+#!/usr/bin/env ruby
+
+require File.dirname(__FILE__) + '/../test_helper'
+
+class TestIndexOps < Test::Unit::TestCase
+  
+  def setup
+    set_file_paths
+    @git = Git.open(@wdir)
+  end
+  
+  def test_add
+    in_temp_dir do |path|
+      g = Git.clone(@wbare, 'new')
+      Dir.chdir('new') do
+        assert_equal('100644', g.status['example.txt'].mode_index)
+        
+        new_file('test-file', 'blahblahblah')
+        assert(g.status.untracked.assoc('test-file'))
+        
+        g.add
+        assert(g.status.added.assoc('test-file'))
+        assert(!g.status.untracked.assoc('test-file'))
+        assert(!g.status.changed.assoc('example.txt'))
+        
+        new_file('example.txt', 'hahahaha')
+        assert(g.status.changed.assoc('example.txt'))
+        
+        g.add
+        assert(g.status.changed.assoc('example.txt'))
+        
+        g.commit('my message')
+        assert(!g.status.changed.assoc('example.txt'))
+        assert(!g.status.added.assoc('test-file'))
+        assert(!g.status.untracked.assoc('test-file')) 
+        assert_equal('hahahaha', g.status['example.txt'].blob.contents)
+      end
+    end
+  end
+  
+  def test_add_array
+    in_temp_dir do |path|
+      g = Git.clone(@wbare, 'new')
+      Dir.chdir('new') do
+        
+        new_file('test-file1', 'blahblahblah1')
+        new_file('test-file2', 'blahblahblah2')
+        assert(g.status.untracked.assoc('test-file1'))
+        
+        g.add(['test-file1', 'test-file2'])
+        assert(g.status.added.assoc('test-file1'))
+        assert(g.status.added.assoc('test-file1'))
+        assert(!g.status.untracked.assoc('test-file1'))
+                
+        g.commit('my message')
+        assert(!g.status.added.assoc('test-file1'))
+        assert(!g.status.untracked.assoc('test-file1')) 
+        assert_equal('blahblahblah1', g.status['test-file1'].blob.contents)
+      end
+    end
+  end
+  
+  def test_remove
+    in_temp_dir do |path|
+      g = Git.clone(@wbare, 'remove_test')
+      Dir.chdir('remove_test') do
+        assert(g.status['example.txt'])
+        g.remove('example.txt')
+        assert(g.status.deleted.assoc('example.txt')) 
+        g.commit('deleted file')
+        assert(!g.status['example.txt'])
+      end
+    end
+  end
+  
+  def test_reset
+    in_temp_dir do |path|
+      g = Git.clone(@wbare, 'reset_test')
+      Dir.chdir('reset_test') do
+        new_file('test-file1', 'blahblahblah1')
+        new_file('test-file2', 'blahblahblah2')
+        assert(g.status.untracked.assoc('test-file1'))
+        
+        g.add(['test-file1', 'test-file2'])
+        assert(!g.status.untracked.assoc('test-file1'))
+        
+        g.reset
+        assert(g.status.untracked.assoc('test-file1'))
+        assert(!g.status.added.assoc('test-file1'))
+      end
+    end
+  end
+  
+end

data/tests/units/test_init.rb

@@ -0,0 +1,75 @@
+#!/usr/bin/env ruby
+
+require File.dirname(__FILE__) + '/../test_helper'
+
+class TestInit < Test::Unit::TestCase
+  def setup
+    set_file_paths
+  end
+
+  def test_open_simple
+    g = Git.open(@wdir)
+    assert_equal(g.dir.path, @wdir)
+    assert_equal(g.repo.path, File.join(@wdir, '.git'))
+    assert_equal(g.index.path, File.join(@wdir, '.git', 'index'))
+  end
+    
+  def test_open_opts 
+    g = Git.open @wdir, :repository => @wbare, :index => @index
+    assert_equal(g.repo.path, @wbare)
+    assert_equal(g.index.path, @index)
+  end
+  
+  def test_git_bare
+    g = Git.bare @wbare
+    assert_equal(g.repo.path, @wbare)
+  end
+  
+  #g = Git.init
+  #  Git.init('project')
+  #  Git.init('/home/schacon/proj', 
+  #		{ :git_dir => '/opt/git/proj.git', 
+  #		  :index_file => '/tmp/index'} )
+  def test_git_init
+    in_temp_dir do |path|
+      Git.init
+      assert(File.directory?(File.join(path, '.git')))
+      assert(File.exists?(File.join(path, '.git', 'config')))
+    end
+  end
+  
+  def test_git_init_remote_git
+    in_temp_dir do |dir|
+      assert(!File.exists?(File.join(dir, 'config')))
+      
+      in_temp_dir do |path|        
+        Git.init(path, :repository => dir)
+        assert(File.exists?(File.join(dir, 'config')))
+      end
+    end
+  end
+  
+  def test_git_clone
+    in_temp_dir do |path|      
+      g = Git.clone(@wbare, 'bare-co')
+      assert(File.exists?(File.join(g.repo.path, 'config')))
+      assert(g.dir)
+    end
+  end
+  
+  def test_git_clone_bare
+    in_temp_dir do |path|      
+      g = Git.clone(@wbare, 'bare.git', :bare => true)
+      assert(File.exists?(File.join(g.repo.path, 'config')))
+      assert_nil(g.dir)
+    end
+  end
+  
+  # trying to open a git project using a bare repo - rather than using Git.repo
+  def test_git_open_error
+    assert_raise ArgumentError do
+      g = Git.open @wbare
+    end
+  end
+  
+end

data/tests/units/test_lib.rb

@@ -0,0 +1,168 @@
+#!/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
+  
+  def test_object_contents_with_block
+    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"
+    
+    @lib.object_contents('1cc8667014381') do |f|
+      assert_equal(commit, f.read.chomp)
+    end
+    
+     # commit
+    
+    tree =  "040000 tree 6b790ddc5eab30f18cabdd0513e8f8dac0d2d3ed\tex_dir\n"
+    tree << "100644 blob 3aac4b445017a8fc07502670ec2dbf744213dd48\texample.txt"
+
+    @lib.object_contents('1cc8667014381^{tree}') do |f|
+      assert_equal(tree, f.read.chomp) #tree
+    end
+    
+    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"
+
+    @lib.object_contents('v2.5:example.txt') do |f|
+      assert_equal(blob, f.read.chomp) #blob
+    end
+  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