git 1.0.2 → 1.0.3

data/lib/git/lib.rb

@@ -1,3 +1,5 @@
+require 'tempfile'
+
 module Git
   
   class GitExecuteError < StandardError 
@@ -13,8 +15,8 @@ module Git
     def initialize(base = nil)
       if base.is_a?(Git::Base)
         @git_dir = base.repo.path
-        @git_index_file = base.index.path   
-        @git_work_dir = base.dir.path
+        @git_index_file = base.index.path if base.index
+        @git_work_dir = base.dir.path if base.dir
       elsif base.is_a?(Hash)
         @git_dir = base[:repository]
         @git_index_file = base[:index] 
@@ -71,6 +73,10 @@ module Git
       command('rev-parse', string)
     end
     
+    def namerev(string)
+      command('name-rev', string).split[1]
+    end
+    
     def object_type(sha)
       command('cat-file', ['-t', sha])
     end
@@ -344,6 +350,76 @@ module Git
       command('repack', ['-a', '-d'])
     end
     
+    # reads a tree into the current index file
+    def read_tree(treeish, opts = {})
+      arr_opts = []
+      arr_opts << "--prefix=#{opts[:prefix]}" if opts[:prefix]
+      arr_opts << treeish.to_a.join(' ')
+      command('read-tree', arr_opts)
+    end
+    
+    def write_tree
+      command('write-tree')
+    end
+    
+    def commit_tree(tree, opts = {})
+      opts[:message] = "commit tree #{tree}" if !opts[:message]
+      t = Tempfile.new('commit-message') do |t|
+        t.write(opts[:message])
+      end
+      
+      arr_opts = []
+      arr_opts << tree
+      arr_opts << "-p #{opts[:parent]}" if opts[:parent]
+      opts[:parents].each { |p| arr_opts << "-p #{p.to_s}" } if opts[:parents]
+      arr_opts << "< #{t.path}"
+      command('commit-tree', arr_opts)
+    end
+    
+    def update_ref(branch, commit)
+      command('update-ref', [branch.to_s, commit.to_s])
+    end
+    
+    def checkout_index(opts = {})
+      arr_opts = []
+      arr_opts << "--prefix=#{opts[:prefix]}" if opts[:prefix]
+      arr_opts << "--force" if opts[:force]
+      arr_opts << "--all" if opts[:all]
+      arr_opts << ('-- ' + opts[:path_limiter]) if opts[:path_limiter].is_a? String
+      command('checkout-index', arr_opts)
+    end
+    
+    # creates an archive file
+    #
+    # options
+    #  :format  (zip, tar)
+    #  :prefix
+    #  :remote
+    #  :path
+    def archive(sha, file = nil, opts = {})
+      opts[:format] = 'zip' if !opts[:format]
+      
+      if opts[:format] == 'tgz'
+        opts[:format] = 'tar' 
+        opts[:add_gzip] = true
+      end
+      
+      if !file
+        file = Tempfile.new('archive').path
+      end
+      
+      arr_opts = []
+      arr_opts << "--format=#{opts[:format]}" if opts[:format]
+      arr_opts << "--prefix=#{opts[:prefix]}" if opts[:prefix]
+      arr_opts << "--remote=#{opts[:remote]}" if opts[:remote]
+      arr_opts << sha
+      arr_opts << opts[:path] if opts[:path]
+      arr_opts << '| gzip' if opts[:add_gzip]
+      arr_opts << "> #{file.to_s}"
+      command('archive', arr_opts)
+      return file
+    end
+    
     private
     
     def command_lines(cmd, opts = {})
@@ -370,7 +446,7 @@ module Git
           if $?.exitstatus == 1 && out == ''
             return ''
           end
-          raise Git::GitExecuteError.new(git_cmd + ':' + out.to_s)
+          raise Git::GitExecuteError.new(git_cmd + ':' + out.to_s) 
         end
         out
       end

data/lib/git/object.rb

@@ -3,22 +3,34 @@ module Git
   class GitTagNameDoesNotExist< StandardError 
   end
   
+  # represents a git object
   class Object
     
     class AbstractObject
-      attr_accessor :sha, :size, :type, :mode
+      attr_accessor :objectish, :size, :type, :mode
     
       @base = nil
-    
-      def initialize(base, sha)
+      @contents = nil
+      @size = nil
+      @sha = nil
+      
+      def initialize(base, objectish)
         @base = base
-        @sha = sha.to_s
-        @size = @base.lib.object_size(@sha)
+        @objectish = objectish.to_s
         setup
       end
-    
+
+      def sha
+        @sha || @sha = @base.lib.revparse(@objectish)
+      end
+      
+      def size
+        @size || @size = @base.lib.object_size(@objectish)
+      end
+      
+      # caches the contents of this call in memory
       def contents
-        @base.lib.object_contents(@sha)
+        @contents || @contents = @base.lib.object_contents(@objectish)
       end
       
       def contents_array
@@ -30,23 +42,44 @@ module Git
       end
       
       def to_s
-        @sha
+        sha
       end
       
       def grep(string, path_limiter = nil, opts = {})
-        default = {:object => @sha, :path_limiter => path_limiter}
+        default = {:object => sha, :path_limiter => path_limiter}
         grep_options = default.merge(opts)
         @base.lib.grep(string, grep_options)
       end
       
       def diff(objectish)
-        Git::Diff.new(@base, @sha, objectish)
+        Git::Diff.new(@base, @objectish, objectish)
       end
       
       def log(count = 30)
-        Git::Log.new(@base, count).object(@sha)
+        Git::Log.new(@base, count).object(@objectish)
       end
       
+      # creates an archive of this object (tree)
+      def archive(file = nil, opts = {})
+        @base.lib.archive(@objectish, file, opts)
+      end
+      
+      def tree?
+        @type == 'tree'
+      end
+      
+      def blob?
+        @type == 'blob'
+      end
+      
+      def commit?
+        @type == 'commit'
+      end
+       
+     def tag?
+       @type == 'tag'
+     end
+     
     end
   
     
@@ -57,9 +90,11 @@ module Git
         @mode = mode
       end
       
-      def setup
-        @type = 'blob'
-      end
+      private
+      
+        def setup
+          @type = 'blob'
+        end
     end
   
     class Tree < AbstractObject
@@ -71,11 +106,7 @@ module Git
         super(base, sha)
         @mode = mode
       end
-      
-      def setup
-        @type = 'tree'
-      end
-      
+            
       def children
         blobs.merge(subtrees)
       end
@@ -92,15 +123,19 @@ module Git
       end
       alias_method :subtrees, :trees
       alias_method :subdirectories, :trees
-        
+       
       private
       
+        def setup
+          @type = 'tree'
+        end 
+
         # actually run the git command
         def check_tree
           if !@trees
             @trees = {}
             @blobs = {}
-            data = @base.lib.ls_tree(@sha)
+            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]) }
           end
@@ -116,15 +151,15 @@ module Git
       @committer = nil
       @message = nil
       
-      def setup
-        @type = 'commit'
-      end
-      
       def message
         check_commit
         @message
       end
       
+      def name
+        @base.lib.namerev(sha)
+      end
+      
       def gtree
         check_commit
         Tree.new(@base, @tree)
@@ -164,13 +199,17 @@ module Git
       def diff_parent
         diff(parent)
       end
-      
+            
       private
       
+        def setup
+          @type = 'commit'
+        end
+  
         # see if this object has been initialized and do so if not
         def check_commit
           if !@tree
-            data = @base.lib.commit_data(@sha)
+            data = @base.lib.commit_data(@objectish)
             @committer = Git::Author.new(data['committer'])
             @author = Git::Author.new(data['author'])
             @tree = Tree.new(@base, data['tree'])
@@ -189,15 +228,18 @@ module Git
         @name = name
       end
       
-      def setup
-        @type = 'tag'
-      end
+      private
+        
+        def setup
+          @type = 'tag'
+        end
+        
     end
     
     class << self
       # if we're calling this, we don't know what type it is yet
       # so this is our little factory method
-      def new(base, objectish, is_tag = false)
+      def new(base, objectish, type = nil, is_tag = false)
         if is_tag
           sha = base.lib.tag_sha(objectish)
           if sha == ''
@@ -205,8 +247,9 @@ module Git
           end
           return Tag.new(base, sha, objectish)
         else
-          sha = base.lib.revparse(objectish)
-          type = base.lib.object_type(sha) 
+          if !type
+            type = base.lib.object_type(objectish) 
+          end
         end
         
         klass =
@@ -215,7 +258,7 @@ module Git
           when /commit/: Commit
           when /tree/:   Tree
           end
-        klass::new(base, sha)
+        klass::new(base, objectish)
       end
     end 
     

data/lib/git/path.rb

@@ -19,5 +19,9 @@ module Git
       File.writable?(@path)
     end
     
+    def to_s
+      @path
+    end
+    
   end
 end

data/tests/files/working.git/objects/0f/845a0a981bc2f61354fcdd2b6eafe2b2c55c2d

@@ -0,0 +1,3 @@
+x
��A� E]s
+.`�c�I�aj�hi`�x|�gp��_�<*۶�C�He�92x�Ln�ѣ�.�'6���0
[�ԁ�w�
��ǔ�	�4#��CB;���
+OYJՍ��~.He׷F���7�R[w�Jg��c��$u�t�����+����Q�����t�����X-

data/tests/files/working.git/objects/15/378a1f3eafe4c5ab4f890883356df917ee5539

@@ -0,0 +1,2 @@
+x
��Q
+�0D��)r
%i7�DO��l�mJ���7x�f����v��M�&? L"D����&� �U(!N�NM6�
&�D2��g�������Ih₆����\U��E\7{=����\�љ����pm��	�����z���`�����9��n��O��"�f��{Y

data/tests/files/working.git/objects/1c/c8667014381e2788a94777532a788307f38d26

@@ -0,0 +1 @@
+x
��A��0Eg�S��Ԗe(CaN�H�$���Va���3t��[<>����ϐ������%��$.��X����JTᒸ�u���	eXˬ+�(Yj���F��BA��Ӷ���f�7�v����q�?���ٴ��c��SWb���IǏ���1"��!�Ӟ�M?�t���e>X�

data/tests/files/working.git/objects/1d/9e4767a95047ca5e395714985afaedb186f4cd

@@ -0,0 +1 @@
+x
K��OR06`0��
���

data/tests/files/working.git/objects/23/751ef6c1fed1304ae1d07020aa73da6f2b93b0

@@ -0,0 +1 @@
+x
K��OR0�`0��

data/tests/files/working.git/objects/34/a566d193dc4702f03149969a2aad1443231560

@@ -0,0 +1 @@
+x
��Mn�0�9�/Ч�B���ԓ�., (1�;�C=Cw3��4\�}33�Y
�S�˜rQ?�N	��*�y�qAB'�D���˒<ƌXXɹIE%邙�f"/!S��.[k����W�z�G��E?Tj�i_�����&�ֶ���O�>�CN#��ٹ�^��&�i{-�nR�*ՠ���sx
�_�

data/tests/files/working.git/objects/3a/9f195756f5bd26b67c5e1fffd92d68d61be14e

@@ -0,0 +1,2 @@
+x
��Q
+�0D��)�ʦI�	��d�I�`MIV����߼�y��m[Fƒ֜af�v�9&�)�#J�$e�)��0��qع旂	�g��#����h�#w�H�

data/tests/files/working.git/objects/3c/c71b13d906e445da52785ddeff40dad1163d49

@@ -0,0 +1,2 @@
+x
M�A
+�@@�֞��g&,�a4�~�k�>���q�&U�d	����([~w"Ӭ������W>�u۵��F