Kill the "deploy:app" namespace and move those tasks into deploy, directly.

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

CHANGELOG

@@ -1,5 +1,7 @@
 *SVN*
 
+* Kill the "deploy:app" namespace and move those tasks into deploy, directly. [Jamis Buck]
+
 * Make sure 'desc' applies to the next defined task, in any namespace. [Jamis Buck]
 
 * Fix shell so that servers for a task are correctly discovered. [Jamis Buck]

lib/capistrano/recipes/compat.rb

@@ -24,9 +24,9 @@ map.each do |old, new|
   end"
 end
 
-desc "DEPRECATED: See deploy:app:start."
+desc "DEPRECATED: See deploy:start."
 task :spinner do
-  warn "[DEPRECATED] `spinner' is deprecated. Use `deploy:app:start' instead."
+  warn "[DEPRECATED] `spinner' is deprecated. Use `deploy:start' instead."
   set :runner, fetch(:spinner_user, "app")
-  deploy.app.start
+  deploy.start
 end

lib/capistrano/recipes/deploy.rb

@@ -348,15 +348,14 @@ namespace :deploy do
     deployed your application before, or if your application is (for some \
     other reason) not currently running. It will deploy the code, run any \
     pending migrations, and then instead of invoking `deploy:restart', it will
-    invoke `deploy:app:start' to fire up the application servers.
+    invoke `deploy:start' to fire up the application servers.
   DESC
   task :cold do
     update
     migrate
-    app.start
+    start
   end
 
-  namespace :app do
   desc <<-DESC
     Start the application servers. This will attempt to invoke a script \
     in your application called `script/spin', which must know how to start \
@@ -393,7 +392,6 @@ namespace :deploy do
     invoke_command "#{current_path}/script/process/reaper -a kill -r dispatch.spawner.pid", :via => via, :as => as
     invoke_command "#{current_path}/script/process/reaper -a kill", :via => via, :as => as
   end
-  end
 
   namespace :pending do
     desc <<-DESC