git 1.0.4 → 1.0.5

data/lib/git/object.rb

@@ -124,6 +124,14 @@ module Git
       alias_method :subtrees, :trees
       alias_method :subdirectories, :trees
        
+      def full_tree
+        @base.lib.full_tree(@objectish)
+      end
+                  
+      def depth
+        @base.lib.tree_depth(@objectish)
+      end
+       
       private
       
         def setup
@@ -136,8 +144,8 @@ module Git
             @trees = {}
             @blobs = {}
             data = @base.lib.ls_tree(@objectish)
-            data['tree'].each { |k, d| @trees[k] = Tree.new(@base, d[:sha], d[:mode]) }
-            data['blob'].each { |k, d| @blobs[k] = Blob.new(@base, d[:sha], d[:mode]) }
+            data['tree'].each { |k, d| @trees[k] = Git::Object::Tree.new(@base, d[:sha], d[:mode]) }
+            data['blob'].each { |k, d| @blobs[k] = Git::Object::Blob.new(@base, d[:sha], d[:mode]) }
           end
         end
       
@@ -213,8 +221,8 @@ module Git
         end
         @committer = Git::Author.new(data['committer'])
         @author = Git::Author.new(data['author'])
-        @tree = Tree.new(@base, data['tree'])
-        @parents = data['parent'].map{ |sha| Commit.new(@base, sha) }
+        @tree = Git::Object::Tree.new(@base, data['tree'])
+        @parents = data['parent'].map{ |sha| Git::Object::Commit.new(@base, sha) }
         @message = data['message'].chomp
       end
             
@@ -259,7 +267,7 @@ module Git
           if sha == ''
             raise Git::GitTagNameDoesNotExist.new(objectish)
           end
-          return Tag.new(base, sha, objectish)
+          return Git::Object::Tag.new(base, sha, objectish)
         else
           if !type
             type = base.lib.object_type(objectish) 

data/lib/git/stash.rb

@@ -0,0 +1,26 @@
+module Git
+  class Stash
+    def initialize(base, message, existing=false)
+      @base = base
+      @message = message
+      save if existing == false
+    end
+    
+    def save
+      @saved = @base.lib.stash_save(@message)
+    end
+    
+    def saved?
+      @saved
+    end
+    
+    def message
+      @message
+    end
+    
+    def to_s
+      message
+    end
+    
+  end
+end

data/lib/git/stashes.rb

@@ -0,0 +1,49 @@
+module Git
+  
+  # object that holds all the available stashes
+  class Stashes
+    include Enumerable
+    
+    @base = nil
+    @stashes = nil
+    
+    def initialize(base)
+      @stashes = []
+      
+      @base = base
+            
+      @base.lib.stashes_all.each do |id, message|
+        @stashes.unshift(Git::Stash.new(@base, message, true))
+      end
+    end
+    
+    def save(message)
+      s = Git::Stash.new(@base, message)
+      @stashes.unshift(s) if s.saved?
+    end
+    
+    def apply(index=0)
+      @base.lib.stash_apply(index.to_i)
+    end
+    
+    def clear
+      @base.lib.stash_clear
+      @stashes = []
+    end
+
+    def size
+      @stashes.size
+    end
+    
+    def each
+      @stashes.each do |s|
+        yield s
+      end
+    end
+    
+    def [](index)
+      @stashes[index.to_i]
+    end
+    
+  end
+end

data/tests/files/working.git/info/refs

@@ -0,0 +1,10 @@
+5e53019b3238362144c2766f02a2c00d91fcc023	refs/heads/git_grep
+5e392652a881999392c2757cf9b783c5d47b67f7	refs/heads/master
+1cc8667014381e2788a94777532a788307f38d26	refs/heads/test
+3a9f195756f5bd26b67c5e1fffd92d68d61be14e	refs/heads/test_branches
+3a9f195756f5bd26b67c5e1fffd92d68d61be14e	refs/heads/test_object
+935badc874edd62a8629aaf103418092c73f0a56	refs/tags/gitsearch1
+546bec6f8872efa41d5d97a369f669165ecda0de	refs/tags/v2.5
+3a9f195756f5bd26b67c5e1fffd92d68d61be14e	refs/tags/v2.6
+3a9f195756f5bd26b67c5e1fffd92d68d61be14e	refs/tags/v2.7
+5e53019b3238362144c2766f02a2c00d91fcc023	refs/tags/v2.8

data/tests/files/working.git/objects/info/packs

@@ -0,0 +1,2 @@
+P pack-6e99d3a243c58205968336728d5637ce2a3b2aff.pack
+

data/tests/files/working/dot_git/config

@@ -1,3 +1,6 @@
+[user]
+        name = Scott Chacon
+        email = schacon@gmail.com
 [core]
 	repositoryformatversion = 0
 	filemode = true

data/tests/test_helper.rb

@@ -1,5 +1,6 @@
 require 'test/unit'
 require 'fileutils'
+require 'logger'
 require File.dirname(__FILE__) + '/../lib/git'
 
 class Test::Unit::TestCase
@@ -28,6 +29,16 @@ class Test::Unit::TestCase
     end
   end
   
+  
+  def with_temp_bare
+    in_temp_dir do |path|
+      g = Git.clone(@wbare, 'new')
+      Dir.chdir('new') do
+        yield g
+      end
+    end
+  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)

data/tests/units/test_config.rb

@@ -10,19 +10,19 @@ class TestConfig < Test::Unit::TestCase
   
   def test_config
     c = @git.config
-    assert_equal('scott Chacon', c['user.name'])
+    assert_equal('Scott Chacon', c['user.name'])
     assert_equal('false', c['core.bare'])
   end
   
   def test_read_config
-    assert_equal('scott Chacon', @git.config('user.name'))
+    assert_equal('Scott Chacon', @git.config('user.name'))
     assert_equal('false', @git.config('core.bare'))
   end
   
   def test_set_config
     in_temp_dir do |path|
       g = Git.clone(@wbare, 'bare')
-      assert_equal('scott Chacon', g.config('user.name'))
+      assert_equal('Scott Chacon', g.config('user.name'))
       g.config('user.name', 'bully')
       assert_equal('bully', g.config('user.name'))
     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_index_ops.rb

@@ -10,7 +10,7 @@ class TestIndexOps < Test::Unit::TestCase
   end
   
   def test_add
-    in_temp_dir(false) do |path|
+    in_temp_dir do |path|
       g = Git.clone(@wbare, 'new')
       Dir.chdir('new') do
         assert_equal('100644', g.status['example.txt'].mode_index)

data/tests/units/test_lib.rb

@@ -102,6 +102,15 @@ class TestLib < Test::Unit::TestCase
     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

data/tests/units/test_log.rb

@@ -1,10 +1,11 @@
 #!/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
 

data/tests/units/test_logger.rb

@@ -0,0 +1,38 @@
+#!/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_object.rb

@@ -72,6 +72,11 @@ class TestObject < Test::Unit::TestCase
     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))

data/tests/units/test_stashes.rb

@@ -0,0 +1,36 @@
+#!/usr/bin/env ruby
+
+require File.dirname(__FILE__) + '/../test_helper'
+
+class TestStashes < Test::Unit::TestCase
+  def setup
+    set_file_paths
+  end
+  
+  def test_stash_unstash
+    in_temp_dir do |path|
+      g = Git.clone(@wbare, 'stash_test')
+      Dir.chdir('stash_test') do
+        assert_equal(0, g.branch.stashes.size)
+        new_file('test-file1', 'blahblahblah1')
+        new_file('test-file2', 'blahblahblah2')
+        assert(g.status.untracked.assoc('test-file1'))
+
+        g.add
+
+        assert(g.status.added.assoc('test-file1'))
+      
+        g.branch.stashes.save('testing')
+      
+        g.reset
+        assert_nil(g.status.untracked.assoc('test-file1'))
+        assert_nil(g.status.added.assoc('test-file1'))
+
+        g.branch.stashes.apply
+
+        assert(g.status.added.assoc('test-file1'))
+      end
+    end
+  end
+  
+end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: git
 version: !ruby/object:Gem::Version 
-  version: 1.0.4
-date: 2007-11-19 00:00:00 -08:00
+  version: 1.0.5
+date: 2008-03-23 00:00:00 -07:00
 summary: A package for using Git in Ruby code.
 require_paths: 
 - lib
@@ -38,11 +38,14 @@ files:
 - lib/git/diff.rb
 - lib/git/index.rb
 - lib/git/lib.rb
+- lib/git/lib.rb.orig
 - lib/git/log.rb
 - lib/git/object.rb
 - lib/git/path.rb
 - lib/git/remote.rb
 - lib/git/repository.rb
+- lib/git/stash.rb
+- lib/git/stashes.rb
 - lib/git/status.rb
 - lib/git/working_directory.rb
 - tests/all_tests.rb
@@ -490,6 +493,7 @@ files:
 - tests/files/working.git/hooks/pre-rebase
 - tests/files/working.git/hooks/update
 - tests/files/working.git/info/exclude
+- tests/files/working.git/info/refs
 - tests/files/working.git/objects/00
 - tests/files/working.git/objects/01
 - tests/files/working.git/objects/02
@@ -856,6 +860,9 @@ files:
 - tests/files/working.git/objects/fb/8e78840d79085abf50edebf5b9d6b73ee0fb4c
 - tests/files/working.git/objects/fc/b49fa99454f804799a12095292edbca48779ab
 - tests/files/working.git/objects/fe/b2ccf88397c2d93f381176067be2727eba330b
+- tests/files/working.git/objects/info/packs
+- tests/files/working.git/objects/pack/pack-6e99d3a243c58205968336728d5637ce2a3b2aff.idx
+- tests/files/working.git/objects/pack/pack-6e99d3a243c58205968336728d5637ce2a3b2aff.pack
 - tests/files/working.git/refs/heads
 - tests/files/working.git/refs/tags
 - tests/files/working.git/refs/heads/git_grep
@@ -873,15 +880,18 @@ files:
 - tests/units/test_branch.rb
 - tests/units/test_config.rb
 - tests/units/test_diff.rb
+- tests/units/test_each_conflict.rb
 - tests/units/test_git_path.rb
 - tests/units/test_index_ops.rb
 - tests/units/test_init.rb
 - tests/units/test_lib.rb
 - tests/units/test_log.rb
+- tests/units/test_logger.rb
 - tests/units/test_merge.rb
 - tests/units/test_object.rb
 - tests/units/test_remotes.rb
 - tests/units/test_repack.rb
+- tests/units/test_stashes.rb
 - tests/units/test_tags.rb
 - tests/units/test_tree_ops.rb
 - doc/classes