added 'archive' and tests

scott Chacon · scott Chacon · commit df27b5e7d6cb · 2007-11-14T10:24:22.000-08:00
diff --git a/lib/git/base.rb b/lib/git/base.rb
@@ -311,6 +311,11 @@ def add_tag(tag_name)
       tag(tag_name)
     end
     
+    # creates an archive file of the given tree-ish
+    def archive(treeish, file = nil, opts = {})
+      self.object(treeish).archive(file, opts)
+    end
+    
     # repacks the repository
     def repack
       self.lib.repack
diff --git a/lib/git/branch.rb b/lib/git/branch.rb
@@ -21,15 +21,18 @@ def initialize(base, name)
     end
     
     def gcommit
-      @gcommit = @base.object(name) if !@gcommit
+      @gcommit = @base.object(@full) if !@gcommit
       @gcommit
     end
     
     def checkout
       check_if_create
-      @base.checkout(@name)
+      @base.checkout(@full)
     end
     
+    def archive(file, opts = {})
+      @base.lib.archive(@full, file, opts)
+    end
     
     # g.branch('new_branch').in_branch do
     #   # create new file
diff --git a/lib/git/lib.rb b/lib/git/lib.rb
@@ -1,3 +1,5 @@
+require 'tempfile'
+
 module Git
   
   class GitExecuteError < StandardError 
@@ -344,6 +346,37 @@ def repack
       command('repack', ['-a', '-d'])
     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 = {})
@@ -367,10 +400,11 @@ def command(cmd, opts = {})
         #puts out
         #puts
         if $?.exitstatus > 0
+          puts $?.exitstatus
           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
diff --git a/lib/git/object.rb b/lib/git/object.rb
@@ -48,6 +48,11 @@ def log(count = 30)
         Git::Log.new(@base, count).object(@sha)
       end
       
+      # creates an archive of this object (tree)
+      def archive(file = nil, opts = {})
+        @base.lib.archive(@sha, file, opts)
+      end
+      
     end
   
     
diff --git a/tests/units/test_archive.rb b/tests/units/test_archive.rb
@@ -0,0 +1,44 @@
+#!/usr/bin/env ruby
+
+require File.dirname(__FILE__) + '/../test_helper'
+
+class TestArchive < Test::Unit::TestCase
+  
+  def setup
+    set_file_paths
+    @git = Git.open(@wdir)
+  end
+  
+  def tempfile
+    Tempfile.new('archive-test').path
+  end
+  
+  def test_archive
+    f = @git.archive('v2.6', tempfile)
+    assert(File.exists?(f))
+
+    f = @git.object('v2.6').archive(tempfile)  # writes to given file
+    assert(File.exists?(f))
+
+    f = @git.object('v2.6').archive # returns path to temp file
+    assert(File.exists?(f))
+
+    f = @git.object('v2.6').archive(tempfile, :format => 'zip')
+    assert(File.file?(f))
+
+    f = @git.object('v2.6').archive(tempfile, :format => 'tgz', :prefix => 'test/')
+    assert(File.exists?(f))
+    
+    f = @git.object('v2.6').archive(tempfile, :format => 'tar', :prefix => 'test/', :path => 'ex')
+    assert(File.exists?(f))
+
+    in_temp_dir do
+      c = Git.clone(@wbare, 'new')
+      c.chdir do
+        f = @git.remote('origin').branch('master').archive(tempfile, :format => 'tgz')
+        assert(File.exists?(f))
+      end
+    end
+  end
+  
+end
