From 08937e661986643b1e7169c1b6cdd85a119c6476 Mon Sep 17 00:00:00 2001
From: Pavel Valodzka <pavel@valodzka.name>
Date: Sun, 31 Jan 2010 13:17:09 +0000
Subject: [PATCH] refactor methods in deploy

---
 chef/lib/chef/provider/deploy.rb | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/chef/lib/chef/provider/deploy.rb b/chef/lib/chef/provider/deploy.rb
index c6fc41b761a..dca85b021d2 100644
--- a/chef/lib/chef/provider/deploy.rb
+++ b/chef/lib/chef/provider/deploy.rb
@@ -59,8 +59,8 @@ def run(command, &block)
       end
 
       def action_deploy
-        if all_releases.include?(release_path)
-          if all_releases[-1] == release_path
+        if deployed?(release_path)
+          if current_release?(release_path) 
             Chef::Log.debug("#{@new_resource} is the latest version")
           else
             action_rollback
@@ -72,7 +72,8 @@ def action_deploy
       end
 
       def action_force_deploy
-        if all_releases.include?(release_path)
+        if deployed?(release_path)
+          Chef::Log.info("Already deployed app at #{release_path}, forcing.")
           FileUtils.rm_rf(release_path)
           Chef::Log.info("#{@new_resource} forcing deploy of already deployed app at #{release_path}")
         end
@@ -338,6 +339,13 @@ def run_callback_from_file(callback_file)
         end
       end
 
+      def deployed?(release)
+        all_releases.include?(release)
+      end
+
+      def current_release?(release)
+        all_releases[-1] == release
+      end
     end
   end
 end