git-runner-deploy 0.1.1 → 0.1.2

data/git-runner-deploy.gemspec

@@ -16,5 +16,5 @@ Gem::Specification.new do |gem|
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.require_paths = ["lib"]
 
-  gem.add_dependency 'git-runner', '>= 0.1.1'
+  gem.add_dependency 'git-runner', '>= 0.1.2'
 end

data/lib/git-runner-deploy.rb

@@ -7,7 +7,7 @@ module GitRunner
 
     # Performs deployments using capistrano (cap deploy)
     class Deploy < Base
-      VERSION = '0.1.1'
+      VERSION = '0.1.2'
 
       attr_accessor :clone_directory
 
@@ -27,7 +27,6 @@ module GitRunner
         ensure_presence_of_capfile
         prepare_deploy_environment
         perform_deploy
-        cleanup_deploy_environment
 
         end_time = Time.now
 
@@ -63,13 +62,23 @@ module GitRunner
 
       def checkout_branch
         timestamp            = Time.now.strftime("%Y%m%d%H%M%S")
-        self.clone_directory = File.join(Configuration.tmp_directory, "#{branch.repository_name}-#{environment_from_branch(branch)}-#{timestamp}")
+        self.clone_directory = File.join(Configuration.tmp_directory, "#{branch.repository_name}")
 
-        Text.out("Checking out #{branch.name} to #{clone_directory}")
+        if File.exist?(clone_directory)
+          Text.out("Checking out #{branch.name} to #{clone_directory}")
+        else
+          Text.out("Checking out #{branch.name} to #{clone_directory} (fresh clone)")
+
+          execute(
+            "mkdir -p #{clone_directory}",
+            "git clone file://#{branch.repository_path} #{clone_directory}"
+          )
+        end
 
         execute(
-          "mkdir -p #{clone_directory}",
-          "git clone --depth=1 --branch=#{branch.name} file://#{branch.repository_path} #{clone_directory}"
+          "cd #{clone_directory}",
+          "git checkout #{branch.name}",
+          "git pull"
         )
       end
 
@@ -79,7 +88,7 @@ module GitRunner
         if uses_bundler?
           execute(
             "cd #{clone_directory}",
-            "bundle install --path=#{File.join(Configuration.tmp_directory, '.gems')}"
+            "bundle install --path=.git-runner/gems"
           )
         end
       end
@@ -116,14 +125,6 @@ module GitRunner
         end
       end
 
-      def cleanup_deploy_environment
-        Text.out("Cleaning deploy environment")
-        execute(
-          "rm -rf #{clone_directory}",
-          "cd #{branch.repository_path}"
-        )
-      end
-
       def environment_from_branch(branch)
         if branch.name == 'master'
           'production'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-runner-deploy
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.1.2
 description: Capistrano deploy module for git-runner
 email:
 - james@jamesbrooks.net