wulffeld-capistrano 2.5.8 → 2.5.8.1

data/lib/capistrano/recipes/deploy/scm/git.rb

@@ -127,58 +127,54 @@ module Capistrano
           configuration[:remote] || 'origin'
         end
 
-        # Performs a clone on the remote machine, then checkout on the branch
-        # you want to deploy.
-        # def checkout(revision, destination)
-        #   git    = command
-        #   remote = origin
-        # 
-        #   args = []
-        #   args << "-o #{remote}" unless remote == 'origin'
-        #   if depth = configuration[:git_shallow_clone]
-        #     args << "--depth #{depth}"
-        #   end
-        # 
-        #   execute = []
-        #   if args.empty?
-        #     execute << "#{git} clone #{verbose} #{configuration[:repository]} #{destination}"
-        #   else
-        #     execute << "#{git} clone #{verbose} #{args.join(' ')} #{configuration[:repository]} #{destination}"
-        #   end
-        # 
-        #   # checkout into a local branch rather than a detached HEAD
-        #   execute << "cd #{destination} && #{git} checkout #{verbose} -b deploy #{revision}"
-        #   
-        #   if configuration[:git_enable_submodules]
-        #     execute << "#{git} submodule #{verbose} init"
-        #     execute << "#{git} submodule #{verbose} sync"
-        #     execute << "#{git} submodule #{verbose} update"
-        #   end
-        #   puts "EXECUTING #{execute.inspect}"
-        #   execute.join(" && ")
-        # end
-        
+        # Extend the checkout cmd. If options[:use_archive] is set then use 'git archive' to export.
+        #
         # Based on:
         #   http://blog.crdlo.com/2009/01/git-project-deployment-with-capistrano.html
         #   http://groups.google.com/group/capistrano/browse_thread/thread/4ef8718ef9539ef1/c5cfb7be7d152bb8
-        #
-        # Use git archive to export repository.
+
+        # Performs a clone on the remote machine, then checkout on the branch
+        # you want to deploy.
         def checkout(revision, destination)
           git    = command
-          execute = []
           args = []
+          execute = []
 
-          args << "--remote=#{configuration[:repository]}"
-          if project = configuration[:project]
-            args << "#{revision}:#{project}"
+          if configuration[:use_archive]
+            args << "--remote=#{configuration[:repository]}"
+            if project = configuration[:project]
+              args << "#{revision}:#{project}"
+            else
+              args << revision
+            end
+
+            execute << "mkdir -p #{destination}"
+            execute << "cd #{destination}"
+            execute << "#{git} archive #{args.join(' ')} | tar xf -"
           else
-            args << revision
+            raise
+            remote = origin
+        
+            args << "-o #{remote}" unless remote == 'origin'
+            if depth = configuration[:git_shallow_clone]
+              args << "--depth #{depth}"
+            end
+        
+            if args.empty?
+              execute << "#{git} clone #{verbose} #{configuration[:repository]} #{destination}"
+            else
+              execute << "#{git} clone #{verbose} #{args.join(' ')} #{configuration[:repository]} #{destination}"
+            end
+        
+            # checkout into a local branch rather than a detached HEAD
+            execute << "cd #{destination} && #{git} checkout #{verbose} -b deploy #{revision}"
+          
+            if configuration[:git_enable_submodules]
+              execute << "#{git} submodule #{verbose} init"
+              execute << "#{git} submodule #{verbose} sync"
+              execute << "#{git} submodule #{verbose} update"
+            end
           end
-
-          execute << "mkdir -p #{destination}"
-          execute << "cd #{destination}"
-          execute << "#{git} archive #{args.join(' ')} | tar xf -"
-
           execute.join(" && ")
         end
         

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: wulffeld-capistrano
 version: !ruby/object:Gem::Version 
-  version: 2.5.8
+  version: 2.5.8.1
 platform: ruby
 authors: 
 - Jamis Buck