From fb5144ca9678bf0aad38d59cc5eaab524e4f62cc Mon Sep 17 00:00:00 2001
From: Jamis Buck <jamis@37signals.com>
Date: Sat, 3 Sep 2005 15:27:26 +0000
Subject: [PATCH] Default the application name to Application when using
 --apply-to

git-svn-id: http://svn.rubyonrails.org/rails/tools/switchtower@2118 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
---
 CHANGELOG              | 2 ++
 lib/switchtower/cli.rb | 9 +++------
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 0a90c785..e0e9823b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,7 @@
 *SVN*
 
+* Default the application name to "Application" when using --apply-to
+
 * Show the help screen instead of an error when no arguments are given
 
 * Make SwitchTower easier to invoke programmatically via SwitchTower::CLI
diff --git a/lib/switchtower/cli.rb b/lib/switchtower/cli.rb
index ac33ac52..947bfe06 100644
--- a/lib/switchtower/cli.rb
+++ b/lib/switchtower/cli.rb
@@ -72,7 +72,7 @@ module SwitchTower
         opts.separator "Framework Integration Options --------"
         opts.separator ""
 
-        opts.on("-A", "--apply-to [DIRECTORY]",
+        opts.on("-A", "--apply-to DIRECTORY",
           "Create a minimal set of scripts and recipes to use",
           "switchtower with the application at the given",
           "directory. (Currently only works with Rails apps.)"
@@ -112,10 +112,9 @@ module SwitchTower
         opts.separator <<DETAIL.split(/\n/)
 You can use the --apply-to switch to generate a minimal set of switchtower
 scripts and recipes for an application. Just specify the path to the application
-as the argument to --apply-to, and then specify the name of your application,
-like this:
+as the argument to --apply-to, like this:
 
-  switchtower --apply-to ~/projects/myapp MyApplication
+  switchtower --apply-to ~/projects/myapp
 
 You'll wind up with a sample deployment recipe in config/deploy.rb, some new
 rake tasks in config/tasks, and a switchtower script in your script directory.
@@ -197,8 +196,6 @@ DETAIL
         else
           @options[:application] = args.shift
           @options[:recipe_file] = args.shift
-
-          abort "You must specify the name of the application" if @options[:application].nil?
         end
       end
   end