git 1.0.3 → 1.0.4

data/lib/git/branch.rb

@@ -21,7 +21,7 @@ module Git
     end
     
     def gcommit
-      @gcommit = @base.object(@full) if !@gcommit
+      @gcommit = @base.gcommit(@full) if !@gcommit
       @gcommit
     end
     

data/lib/git/lib.rb

@@ -62,14 +62,29 @@ module Git
       arr_opts = ['--pretty=oneline']
       arr_opts << "-#{opts[:count]}" if opts[:count]
       arr_opts << "--since=\"#{opts[:since]}\"" if opts[:since].is_a? String
-      arr_opts << "#{opts[:between][0]}..#{opts[:between][1].to_s}" if (opts[:between] && opts[:between].size == 2)
+      arr_opts << "#{opts[:between][0].to_s}..#{opts[:between][1].to_s}" if (opts[:between] && opts[:between].size == 2)
       arr_opts << opts[:object] if opts[:object].is_a? String
       arr_opts << '-- ' + opts[:path_limiter] if opts[:path_limiter].is_a? String
       
-      command_lines('log', arr_opts).map { |l| l.split.first }
+      command_lines('log', arr_opts, true).map { |l| l.split.first }
+    end
+    
+    def full_log_commits(opts = {})
+      arr_opts = ['--pretty=raw']
+      arr_opts << "-#{opts[:count]}" if opts[:count]
+      arr_opts << "--since=\"#{opts[:since]}\"" if opts[:since].is_a? String
+      arr_opts << "#{opts[:between][0].to_s}..#{opts[:between][1].to_s}" if (opts[:between] && opts[:between].size == 2)
+      arr_opts << opts[:object] if opts[:object].is_a? String
+      arr_opts << '-- ' + opts[:path_limiter] if opts[:path_limiter].is_a? String
+      
+      full_log = command_lines('log', arr_opts, true)
+      process_commit_data(full_log)
     end
     
     def revparse(string)
+      if /\w{40}/.match(string)  # passing in a sha - just no-op it
+        return string
+      end
       command('rev-parse', string)
     end
     
@@ -87,28 +102,52 @@ module Git
     
     # returns useful array of raw commit object data
     def commit_data(sha)
+      sha = sha.to_s
+      cdata = command_lines('cat-file', ['commit', sha])
+      process_commit_data(cdata, sha)
+    end
+    
+    def process_commit_data(data, sha = nil)
       in_message = false
       
-      hsh = {'message' => '', 'parent' => []}
-      command_lines('cat-file', ['commit', sha.to_s]).each do |line|
-        if in_message
+      if sha
+        hsh = {'sha' => sha, 'message' => '', 'parent' => []}
+      else
+        hsh_array = []        
+      end
+    
+      data.each do |line|
+        if in_message && line != ''
           hsh['message'] += line + "\n"
         end
-        
+
         if (line != '') && !in_message
           data = line.split
           key = data.shift
           value = data.join(' ')
+          if key == 'commit'
+            sha = value
+            hsh_array << hsh if hsh
+            hsh = {'sha' => sha, 'message' => '', 'parent' => []}
+          end
           if key == 'parent'
             hsh[key] << value
           else
             hsh[key] = value
           end
+        elsif in_message && line == ''
+          in_message = false
         else
           in_message = true
         end
       end
-      hsh
+      
+      if hsh_array
+        hsh_array << hsh if hsh
+        hsh_array
+      else
+        hsh
+      end
     end
     
     def object_contents(sha)
@@ -422,34 +461,37 @@ module Git
     
     private
     
-    def command_lines(cmd, opts = {})
-      command(cmd, opts).split("\n")
+    def command_lines(cmd, opts = {}, chdir = true)
+      command(cmd, opts, chdir).split("\n")
     end
     
-    def command(cmd, opts = {})
-      ENV['GIT_DIR'] = @git_dir 
-      ENV['GIT_INDEX_FILE'] = @git_index_file 
-      ENV['GIT_WORK_DIR'] = @git_work_dir 
+    def command(cmd, opts = {}, chdir = true)
+      ENV['GIT_DIR'] = @git_dir if (@git_dir != ENV['GIT_DIR'])
+      ENV['GIT_INDEX_FILE'] = @git_index_file if (@git_index_file != ENV['GIT_INDEX_FILE'])
+      ENV['GIT_WORK_TREE'] = @git_work_dir if (@git_work_dir != ENV['GIT_WORK_TREE'])
       path = @git_work_dir || @git_dir || @path
-      Dir.chdir(path) do  
-        opts = opts.to_a.join(' ')
-        git_cmd = "git #{cmd} #{opts}"
+
+      opts = opts.to_a.join(' ')
+      git_cmd = "git #{cmd} #{opts}"
+
+      out = nil
+      if chdir && (Dir.getwd != path)
+        Dir.chdir(path) { out = `git #{cmd} #{opts} 2>&1`.chomp } 
+      else
         out = `git #{cmd} #{opts} 2>&1`.chomp
-        #puts path
-        #puts "gd: #{@git_work_dir}"
-        #puts "gi: #{@git_index_file}"
-        #puts "pp: #{@path}"
-        #puts git_cmd
-        #puts out
-        #puts
-        if $?.exitstatus > 0
-          if $?.exitstatus == 1 && out == ''
-            return ''
-          end
-          raise Git::GitExecuteError.new(git_cmd + ':' + out.to_s) 
+      end
+      
+      #puts git_cmd
+      #puts out
+      #puts
+      
+      if $?.exitstatus > 0
+        if $?.exitstatus == 1 && out == ''
+          return ''
         end
-        out
+        raise Git::GitExecuteError.new(git_cmd + ':' + out.to_s) 
       end
+      out
     end
     
   end

data/lib/git/log.rb

@@ -41,12 +41,12 @@ module Git
     
     def between(sha1, sha2 = nil)
       dirty_log
-      @between = [@base.lib.revparse(sha1), @base.lib.revparse(sha2)]
+      @between = [sha1, sha2]
       return self
     end
     
     def to_s
-      self.map { |c| c.sha }.join("\n")
+      self.map { |c| c.to_s }.join("\n")
     end
     
 
@@ -84,9 +84,9 @@ module Git
       
       # actually run the 'git log' command
       def run_log      
-        log = @base.lib.log_commits(:count => @count, :object => @object, 
+        log = @base.lib.full_log_commits(:count => @count, :object => @object, 
                                     :path_limiter => @path, :since => @since, :between => @between)
-        @commits = log.map { |l| Git::Object::Commit.new(@base, l) }
+        @commits = log.map { |c| Git::Object::Commit.new(@base, c['sha'], c) }
       end
       
   end

data/lib/git/object.rb

@@ -42,7 +42,7 @@ module Git
       end
       
       def to_s
-        sha
+        @objectish
       end
       
       def grep(string, path_limiter = nil, opts = {})
@@ -151,6 +151,13 @@ module Git
       @committer = nil
       @message = nil
       
+      def initialize(base, sha, init = nil)
+        super(base, sha)
+        if init
+          set_commit(init)
+        end
+      end
+      
       def message
         check_commit
         @message
@@ -199,6 +206,17 @@ module Git
       def diff_parent
         diff(parent)
       end
+      
+      def set_commit(data)
+        if data['sha']
+          @sha = data['sha']
+        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) }
+        @message = data['message'].chomp
+      end
             
       private
       
@@ -210,11 +228,7 @@ module Git
         def check_commit
           if !@tree
             data = @base.lib.commit_data(@objectish)
-            @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) }
-            @message = data['message'].chomp
+            set_commit(data)
           end
         end
       

data/tests/units/test_lib.rb

@@ -42,11 +42,11 @@ class TestLib < Test::Unit::TestCase
     a = @lib.log_commits :count => 20, :between => ['v2.5', 'v2.6']
     assert_equal(2, a.size)
     
-    a = @lib.log_commits :count => 20, :object => 'example.txt'
-    assert_equal(20, a.size)
-    
-    a = @lib.log_commits :count => 20, :object => 'ex_dir/ex.txt'
+    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

data/tests/units/test_log.rb

@@ -31,14 +31,11 @@ class TestLog < Test::Unit::TestCase
     assert_equal(30, l.size)
   end
   
-  def test_get_log_since_file
+  def test_get_log_since_file    
     l = @git.log.object('example.txt')
     assert_equal(30, l.size)
-    
-    l = @git.log.between('v2.5').object('example.txt')
-    assert_equal(3, l.size)
   
-    l = @git.log.between('v2.5', 'test').object('example.txt')
+    l = @git.log.between('v2.5', 'test').path('example.txt')
     assert_equal(1, l.size)
   end
   

data/tests/units/test_object.rb

@@ -50,9 +50,9 @@ class TestObject < Test::Unit::TestCase
   end
   
   def test_object_to_s
-    assert_equal('1cc8667014381e2788a94777532a788307f38d26', @commit.to_s)
-    assert_equal('94c827875e2cadb8bc8d4cdd900f19aa9e8634c7', @tree.to_s)
-    assert_equal('ba492c62b6227d7f3507b4dcc6e6d5f13790eabf', @blob.to_s)
+    assert_equal('1cc8667014381e2788a94777532a788307f38d26', @commit.sha)
+    assert_equal('94c827875e2cadb8bc8d4cdd900f19aa9e8634c7', @tree.sha)
+    assert_equal('ba492c62b6227d7f3507b4dcc6e6d5f13790eabf', @blob.sha)
   end
   
   def test_object_size

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: git
 version: !ruby/object:Gem::Version 
-  version: 1.0.3
-date: 2007-11-16 00:00:00 -08:00
+  version: 1.0.4
+date: 2007-11-19 00:00:00 -08:00
 summary: A package for using Git in Ruby code.
 require_paths: 
 - lib