git 1.0.1 → 1.0.2

data/README

@@ -2,6 +2,15 @@
 
 Library for using Git in Ruby.
 
+= Homepage
+
+The Ruby/Git homepage is currently at : 
+
+http://jointheconversation.org/rubygit
+
+Git public hosting of the project source code is at:
+
+http://repo.or.cz/w/rubygit.git
 
 = Roadmap
 
@@ -46,6 +55,23 @@ Here are the operations that need read permission only.
    g.gblob(treeish)
    g.gcommit(treeish)
    
+   
+   commit = g.gcommit('1cc8667014381')
+    commit.gtree
+    commit.parent.sha
+    commit.parents.size
+    commit.author.name
+    commit.author.email
+    commit.author.date.strftime("%m-%d-%y")
+    commit.committer.name
+    commit.date.strftime("%m-%d-%y")
+    commit.message
+   
+  tree = g.gtree("HEAD^{tree}")
+    tree.blobs
+    tree.subtrees
+    tree.children # blobs and subtrees
+   
    g.revparse('v2.5:Makefile')
    
    g.branches # returns Git::Branch objects
@@ -149,4 +175,4 @@ And here are the operations that will need to write to your git repository.
    g.repack
 
    g.push
-   g.push(g.remote('name'))
+   g.push(g.remote('name'))

data/doc/classes/Git.html

@@ -167,6 +167,19 @@ Class <a href="Git/WorkingDirectory.html" class="link">Git::WorkingDirectory</a>
 
     </div>
 
+    <div id="constants-list">
+      <h3 class="section-bar">Constants</h3>
+
+      <div class="name-list">
+        <table summary="Constants">
+        <tr class="top-aligned-row context-row">
+          <td class="context-item-name">VERSION</td>
+          <td>=</td>
+          <td class="context-item-value">'1.0.1'</td>
+        </tr>
+        </table>
+      </div>
+    </div>
 
 
 
@@ -191,7 +204,7 @@ Class <a href="Git/WorkingDirectory.html" class="link">Git::WorkingDirectory</a>
             onclick="toggleCode('M000001-source');return false;">[Source]</a></p>
           <div class="method-source-code" id="M000001-source">
 <pre>
-<span class="ruby-comment cmt"># File lib/git.rb, line 34</span>
+<span class="ruby-comment cmt"># File lib/git.rb, line 36</span>
   <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">bare</span>(<span class="ruby-identifier">git_dir</span>)
     <span class="ruby-constant">Base</span>.<span class="ruby-identifier">bare</span>(<span class="ruby-identifier">git_dir</span>)
   <span class="ruby-keyword kw">end</span>
@@ -214,7 +227,7 @@ Class <a href="Git/WorkingDirectory.html" class="link">Git::WorkingDirectory</a>
             onclick="toggleCode('M000004-source');return false;">[Source]</a></p>
           <div class="method-source-code" id="M000004-source">
 <pre>
-<span class="ruby-comment cmt"># File lib/git.rb, line 46</span>
+<span class="ruby-comment cmt"># File lib/git.rb, line 48</span>
   <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">clone</span>(<span class="ruby-identifier">repository</span>, <span class="ruby-identifier">name</span>, <span class="ruby-identifier">options</span> = {})
     <span class="ruby-constant">Base</span>.<span class="ruby-identifier">clone</span>(<span class="ruby-identifier">repository</span>, <span class="ruby-identifier">name</span>, <span class="ruby-identifier">options</span>)
   <span class="ruby-keyword kw">end</span>
@@ -237,7 +250,7 @@ Class <a href="Git/WorkingDirectory.html" class="link">Git::WorkingDirectory</a>
             onclick="toggleCode('M000003-source');return false;">[Source]</a></p>
           <div class="method-source-code" id="M000003-source">
 <pre>
-<span class="ruby-comment cmt"># File lib/git.rb, line 42</span>
+<span class="ruby-comment cmt"># File lib/git.rb, line 44</span>
   <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">init</span>(<span class="ruby-identifier">working_dir</span> = <span class="ruby-value str">'.'</span>, <span class="ruby-identifier">options</span> = {})
     <span class="ruby-constant">Base</span>.<span class="ruby-identifier">init</span>(<span class="ruby-identifier">working_dir</span>, <span class="ruby-identifier">options</span>)
   <span class="ruby-keyword kw">end</span>
@@ -260,7 +273,7 @@ Class <a href="Git/WorkingDirectory.html" class="link">Git::WorkingDirectory</a>
             onclick="toggleCode('M000002-source');return false;">[Source]</a></p>
           <div class="method-source-code" id="M000002-source">
 <pre>
-<span class="ruby-comment cmt"># File lib/git.rb, line 38</span>
+<span class="ruby-comment cmt"># File lib/git.rb, line 40</span>
   <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">open</span>(<span class="ruby-identifier">working_dir</span>, <span class="ruby-identifier">options</span> = {})
     <span class="ruby-constant">Base</span>.<span class="ruby-identifier">open</span>(<span class="ruby-identifier">working_dir</span>, <span class="ruby-identifier">options</span>)
   <span class="ruby-keyword kw">end</span>

data/doc/created.rid

@@ -1 +1 @@
-Mon Nov 12 10:52:42 PST 2007
+Mon Nov 12 11:08:01 PST 2007

data/doc/files/README.html

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Mon Nov 12 10:51:20 PST 2007</td>
+      <td>Mon Nov 12 11:07:58 PST 2007</td>
     </tr>
     </table>
   </div>
@@ -73,6 +73,21 @@
 <p>
 Library for using <a href="../classes/Git.html">Git</a> in Ruby.
 </p>
+<h1>Homepage</h1>
+<p>
+The Ruby/<a href="../classes/Git.html">Git</a> homepage is currently at :
+</p>
+<p>
+<a
+href="http://jointheconversation.org/rubygit">jointheconversation.org/rubygit</a>
+</p>
+<p>
+<a href="../classes/Git.html">Git</a> public hosting of the project source
+code is at:
+</p>
+<p>
+<a href="http://repo.or.cz/w/rubygit.git">repo.or.cz/w/rubygit.git</a>
+</p>
 <h1>Roadmap</h1>
 <p>
 Right now I&#8217;m forking calls to the &#8216;git&#8217; binary, but

data/doc/files/lib/git_rb.html

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Sat Nov 10 16:21:26 PST 2007</td>
+      <td>Mon Nov 12 10:59:30 PST 2007</td>
     </tr>
     </table>
   </div>

data/lib/git.rb

@@ -21,15 +21,11 @@ require 'git/remote'
 
 require 'git/diff'
 require 'git/status'
-=begin
 require 'git/author'
-require 'git/file'
-
-require 'git/sha'
-require 'git/ref'
-=end
 
 module Git
+
+  VERSION = '1.0.2'
   
   def self.bare(git_dir)
     Base.bare(git_dir)

data/lib/git/author.rb

@@ -0,0 +1,14 @@
+module Git
+  class Author
+    attr_accessor :name, :email, :date
+    
+    def initialize(author_string)
+      if m = /(.*?) <(.*?)> (\d+) (.*)/.match(author_string)
+        @name = m[1]
+        @email = m[2]
+        @date = Time.at(m[3].to_i)
+      end
+    end
+    
+  end
+end

data/lib/git/lib.rb

@@ -79,10 +79,46 @@ module Git
       command('cat-file', ['-s', sha]).to_i
     end
     
+    # returns useful array of raw commit object data
+    def commit_data(sha)
+      in_message = false
+      
+      hsh = {'message' => '', 'parent' => []}
+      command_lines('cat-file', ['commit', sha.to_s]).each do |line|
+        if in_message
+          hsh['message'] += line + "\n"
+        end
+        
+        if (line != '') && !in_message
+          data = line.split
+          key = data.shift
+          value = data.join(' ')
+          if key == 'parent'
+            hsh[key] << value
+          else
+            hsh[key] = value
+          end
+        else
+          in_message = true
+        end
+      end
+      hsh
+    end
+    
     def object_contents(sha)
       command('cat-file', ['-p', sha])
     end
 
+    def ls_tree(sha)
+      data = {'blob' => {}, 'tree' => {}}
+      command_lines('ls-tree', sha.to_s).each do |line|
+        (info, filenm) = line.split("\t")
+        (mode, type, sha) = info.split
+        data[type][filenm] = {:mode => mode, :sha => sha}
+      end
+      data
+    end
+
     def branches_all
       arr = []
       command_lines('branch', '-a').each do |b| 

data/lib/git/object.rb

@@ -12,7 +12,7 @@ module Git
     
       def initialize(base, sha)
         @base = base
-        @sha = sha
+        @sha = sha.to_s
         @size = @base.lib.object_size(@sha)
         setup
       end
@@ -51,21 +51,134 @@ module Git
   
     
     class Blob < AbstractObject
+      
+      def initialize(base, sha, mode = nil)
+        super(base, sha)
+        @mode = mode
+      end
+      
       def setup
         @type = 'blob'
       end
     end
   
     class Tree < AbstractObject
+      
+      @trees = nil
+      @blobs = nil
+      
+      def initialize(base, sha, mode = nil)
+        super(base, sha)
+        @mode = mode
+      end
+      
       def setup
         @type = 'tree'
       end
+      
+      def children
+        blobs.merge(subtrees)
+      end
+      
+      def blobs
+        check_tree
+        @blobs
+      end
+      alias_method :files, :blobs
+      
+      def trees
+        check_tree
+        @trees
+      end
+      alias_method :subtrees, :trees
+      alias_method :subdirectories, :trees
+        
+      private
+      
+        # actually run the git command
+        def check_tree
+          if !@trees
+            @trees = {}
+            @blobs = {}
+            data = @base.lib.ls_tree(@sha)
+            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]) }
+          end
+        end
+      
     end
   
     class Commit < AbstractObject
+      
+      @tree = nil
+      @parents = nil
+      @author = nil
+      @committer = nil
+      @message = nil
+      
       def setup
         @type = 'commit'
       end
+      
+      def message
+        check_commit
+        @message
+      end
+      
+      def gtree
+        check_commit
+        Tree.new(@base, @tree)
+      end
+      
+      def parent
+        parents.first
+      end
+      
+      # array of all parent commits
+      def parents
+        check_commit
+        @parents        
+      end
+      
+      # git author
+      def author     
+        check_commit
+        @author
+      end
+      
+      def author_date
+        author.date
+      end
+      
+      # git author
+      def committer
+        check_commit
+        @committer
+      end
+      
+      def committer_date 
+        committer.date
+      end
+      alias_method :date, :committer_date
+
+      def diff_parent
+        diff(parent)
+      end
+      
+      private
+      
+        # see if this object has been initialized and do so if not
+        def check_commit
+          if !@tree
+            data = @base.lib.commit_data(@sha)
+            @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
+        end
+      
     end
   
     class Tag < AbstractObject

data/tests/test_helper.rb

@@ -22,17 +22,18 @@ class Test::Unit::TestCase
   end
   
   def teardown
-    if @wdir
-      FileUtils.rm_r(@wdir)
+    if @tmp_path
+      #puts "teardown #{@tmp_path}"
+      FileUtils.rm_r(@tmp_path)
     end
   end
   
   def create_temp_repo(clone_path)
-    filename = 'git_test' + Time.now.to_i.to_s + rand(300).to_s
-    tmp_path = File.join("/tmp/", filename)
-    FileUtils.mkdir_p(tmp_path)
-    FileUtils.cp_r(clone_path, tmp_path)
-    tmp_path = File.join(tmp_path, 'working')
+    filename = 'git_test' + Time.now.to_i.to_s + rand(300).to_s.rjust(3, '0')
+    @tmp_path = File.join("/tmp/", filename)
+    FileUtils.mkdir_p(@tmp_path)
+    FileUtils.cp_r(clone_path, @tmp_path)
+    tmp_path = File.join(@tmp_path, 'working')
     Dir.chdir(tmp_path) do
       FileUtils.mv('dot_git', '.git')
     end
@@ -40,7 +41,7 @@ class Test::Unit::TestCase
   end
   
   def in_temp_dir(remove_after = true)
-    filename = 'git_test' + Time.now.to_i.to_s + rand(300).to_s
+    filename = 'git_test' + Time.now.to_i.to_s + rand(300).to_s.rjust(3, '0')
     tmp_path = File.join("/tmp/", filename)
     FileUtils.mkdir(tmp_path)
     Dir.chdir tmp_path do

data/tests/units/test_lib.rb

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

data/tests/units/test_object.rb

@@ -16,6 +16,18 @@ class TestObject < Test::Unit::TestCase
     o = @git.object('1cc8667014381')
     assert(o.is_a?(Git::Object::Commit))
     
+    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)
+    
     o = @git.object('HEAD')
     assert(o.is_a?(Git::Object::Commit))
     assert_equal('commit', o.type)
@@ -47,6 +59,13 @@ class TestObject < Test::Unit::TestCase
     o = @git.object('1cc8667014381^{tree}')
     assert(o.is_a?(Git::Object::Tree))
     
+    o = @git.object('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)
+    
     o = @git.object('94c827875e2cadb8bc8d4cdd900f19aa9e8634c7')
     assert(o.is_a?(Git::Object::Tree))
     assert_equal('tree', o.type)

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: git
 version: !ruby/object:Gem::Version 
-  version: 1.0.1
+  version: 1.0.2
 date: 2007-11-12 00:00:00 -08:00
 summary: A package for using Git in Ruby code.
 require_paths: 
@@ -31,6 +31,7 @@ authors:
 files: 
 - lib/git
 - lib/git.rb
+- lib/git/author.rb
 - lib/git/base.rb
 - lib/git/branch.rb
 - lib/git/branches.rb