created do_deploy function to match rake tasks

jkutner · Jan 9, 2012 · 2247103 · 2247103
1 parent 97dc616
commit 2247103
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/lib/torquebox/remote_deploy_utils.rb b/lib/torquebox/remote_deploy_utils.rb
@@ -17,20 +17,20 @@ def stage(archive_file)
       def deploy(archive_file)
         with_config(archive_file) do |config, app_name|
           scp_upload(config, archive_file, "#{config.torquebox_home}/jboss/standalone/deployments/")
-          ssh_exec(config, "touch #{config.torquebox_home}/jboss/standalone/deployments/#{app_name}.dodeploy")
+          do_deploy(config, app_name)
         end
       end
 
       def deploy_from_stage(archive_file)
         with_config(archive_file) do |config, app_name|
           ssh_exec(config, "cp #{config.torquebox_home}/stage/#{app_name}.knob #{config.torquebox_home}/jboss/standalone/deployments")
-          ssh_exec(config, "touch #{config.torquebox_home}/jboss/standalone/deployments/#{app_name}.dodeploy")
+          do_deploy(config, app_name)
         end
       end
 
       def undeploy(archive_file)
         with_config(archive_file) do |config, app_name|
-          ssh_exec(config, "rm #{config.torquebox_home}/jboss/standalone/deployments/#{app_name}.*")
+          ssh_exec(config, "rm -f #{config.torquebox_home}/jboss/standalone/deployments/#{app_name}.knob*")
         end
       end
 
@@ -48,6 +48,10 @@ def prefix(config)
         config.sudo ? "sudo" : p
       end
 
+      def do_deploy(config, app_name)
+        ssh_exec(config, "touch #{config.torquebox_home}/jboss/standalone/deployments/#{app_name}.knob.dodeploy")
+      end
+
       def app_name(archive_file)
         File.basename(archive_file, ".knob")
       end