Do not install a switchtower stub in the script directory. Assume the switchtower executable is in the path.

git-svn-id: http://svn.rubyonrails.org/rails/tools/switchtower@2268 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

CHANGELOG

@@ -1,5 +1,7 @@
 *SVN*
 
+* Do not install a switchtower stub in the script directory. Assume the switchtower executable is in the path.
+
 * Remove trailing newlines from commands to prevent trailing backslash #2141
 
 * Default parameters work correctly with the generator #2218 [Scott Barron]

lib/switchtower/generators/rails/deployment/deployment_generator.rb

@@ -8,8 +8,6 @@ class DeploymentGenerator < Rails::Generator::NamedBase
 
   def manifest
     record do |m|
-      m.directory "script"
-      m.file "switchtower", File.join("script", "switchtower")
       m.directory "config"
       m.template "deploy.rb", File.join("config", "#{recipe_file}.rb")
       m.directory "lib/tasks"

lib/switchtower/generators/rails/deployment/templates/switchtower

@@ -1,12 +0,0 @@
-#!/usr/local/bin/ruby
-
-VENDOR = File.dirname(__FILE__) + "/../vendor"
-$:.unshift "#{VENDOR}/switchtower/lib"
-
-begin
-  require 'rubygems'
-rescue LoadError
-end
-
-require 'switchtower/cli'
-SwitchTower::CLI.execute!

lib/switchtower/generators/rails/deployment/templates/switchtower.rake

@@ -4,17 +4,17 @@
 
 desc "Push the latest revision into production using the release manager"
 task :deploy do
-  system "script/switchtower -vvvv -r config/<%= recipe_file %> -a deploy"
+  system "switchtower -vvvv -r config/<%= recipe_file %> -a deploy"
 end
 
 desc "Rollback to the release before the current release in production"
 task :rollback do
-  system "script/switchtower -vvvv -r config/<%= recipe_file %> -a rollback"
+  system "switchtower -vvvv -r config/<%= recipe_file %> -a rollback"
 end
 
 desc "Enumerate all available deployment tasks"
 task :show_deploy_tasks do
-  system "script/switchtower -r config/<%= recipe_file %> -a show_tasks"
+  system "switchtower -r config/<%= recipe_file %> -a show_tasks"
 end
 
 desc "Execute a specific action using the release manager"
@@ -24,5 +24,5 @@ task :remote_exec do
   end
 
   actions = ENV['ACTION'].split(",").map { |a| "-a #{a}" }.join(" ")
-  system "script/switchtower -vvvv -r config/<%= recipe_file %> #{actions}"
+  system "switchtower -vvvv -r config/<%= recipe_file %> #{actions}"
 end