merge a grumpy stash

Author: danielsdeleo

chef/lib/chef/provider/deploy.rb

@@ -60,6 +60,34 @@ def run(command, &block)
       end
 
       def action_deploy
+        if all_releases.include?(release_path)
+          Chef::Log.info("Already deployed app at #{release_path}, skipping. Use action :force_deploy to force.")
+        else
+          deploy
+        end
+      end
+      
+      def action_force_deploy
+        if all_releases.include?(release_path)
+          Chef::Log.info("Already deployed app at #{release_path}, forcing.")
+          FileUtils.rm_rf(release_path)
+        end
+        deploy
+      end
+      
+      def action_rollback
+        @release_path = all_releases[-2]
+        raise RuntimeError, "There is no release to rollback to!" unless @release_path
+        release_to_nuke = all_releases.last
+        Chef::Log.info "rolling back to previous release: #{release_path}"
+        symlink
+        Chef::Log.info "removing last release: #{release_to_nuke}"
+        FileUtils.rm_rf release_to_nuke
+        Chef::Log.info "restarting with previous release"
+        restart
+      end
+      
+      def deploy
         Chef::Log.info "deploying branch: #{@new_resource.branch}"
         enforce_ownership
         update_cached_repo
@@ -76,18 +104,6 @@ def action_deploy
         cleanup!
       end
 
-      def action_rollback
-        @release_path = all_releases[-2]
-        raise RuntimeError, "There is no release to rollback to!" unless @release_path
-        release_to_nuke = all_releases.last
-        Chef::Log.info "rolling back to previous release: #{release_path}"
-        symlink
-        Chef::Log.info "removing last release: #{release_to_nuke}"
-        FileUtils.rm_rf release_to_nuke
-        Chef::Log.info "restarting with previous release"
-        restart
-      end
-      
       def callback(what, callback_code=nil)
         @collection = Chef::ResourceCollection.new
         case callback_code
@@ -162,8 +178,8 @@ def update_cached_repo
       def copy_cached_repo
         Chef::Log.info "copying the cached checkout to #{release_path}"
         FileUtils.mkdir_p(@new_resource.deploy_to + "/releases")
-        FileUtils.cp_r(@new_resource.destination, release_path, :preserve => true)
-        release_created
+        FileUtils.cp_r("#{@new_resource.destination}.", release_path, :preserve => true)
+        release_created(release_path)
       end
 
       def enforce_ownership
@@ -213,7 +229,7 @@ def purge_tempfiles_from_current_release
 
       # Internal callback, called after copy_cached_repo.
       # Override if you need to keep state externally.
-      def release_created
+      def release_created(release_path)
       end
 
       # Internal callback, called during cleanup! for each old release removed.

chef/spec/unit/provider/deploy_spec.rb

@@ -51,9 +51,35 @@
     @provider.should_receive(:restart)
     @provider.should_receive(:callback).with(:after_restart, nil)
     @provider.should_receive(:cleanup!)
+    @provider.deploy
+  end
+  
+  it "does not deploy when using the :deploy action if there is already a deploy at release_path" do
+    @provider.stub!(:all_releases).and_return([@expected_release_dir])
+    @provider.should_not_receive(:enforce_ownership)
+    @provider.should_not_receive(:update_cached_repo)
+    @provider.action_deploy
+  end
+  
+  it "calls deploy when deploying a new release" do
+    @provider.stub!(:all_releases).and_return([])
+    @provider.should_receive(:deploy)
     @provider.action_deploy
   end
 
+  it "Removes the old release before deploying when force deploying over it" do
+    @provider.stub!(:all_releases).and_return([@expected_release_dir])
+    FileUtils.should_receive(:rm_rf).with(@expected_release_dir)
+    @provider.should_receive(:deploy)
+    @provider.action_force_deploy
+  end
+  
+  it "deploys as normal when force deploying and there's no prior release at the same path" do
+    @provider.stub!(:all_releases).and_return([])
+    @provider.should_receive(:deploy)
+    @provider.action_force_deploy
+  end
+  
   it "sets the release path to the penultimate release, symlinks, and rm's the last release on rollback" do
     @provider.unstub!(:release_path)
     all_releases = ["/my/deploy/dir/releases/20040815162342", "/my/deploy/dir/releases/20040700000000",
@@ -118,7 +144,7 @@
 
   it "makes a copy of the cached repo in releases dir" do
     FileUtils.should_receive(:mkdir_p).with("/my/deploy/dir/releases")
-    FileUtils.should_receive(:cp_r).with( "/my/deploy/dir/shared/cached-copy/", 
+    FileUtils.should_receive(:cp_r).with( "/my/deploy/dir/shared/cached-copy/.", 
                                           @expected_release_dir, 
                                           :preserve => true)
     @provider.copy_cached_repo