Merge pull request #758 from capistrano/fix/before-namespacing

Correctly infer namespace in task enhancements

lib/capistrano/dsl/task_enhancements.rb

@@ -6,9 +6,10 @@ module Capistrano
     end
 
     def after(task, post_task, *args, &block)
-      post_task = Rake::Task.define_task(post_task, *args, &block) if block_given?
+      Rake::Task.define_task(post_task, *args, &block) if block_given?
+      post_task = Rake::Task[post_task]
       Rake::Task[task].enhance do
-        invoke(post_task)
+        post_task.invoke
       end
     end
 

lib/capistrano/tasks/deploy.rake

@@ -200,6 +200,7 @@ namespace :deploy do
     end
   end
 
+  task :restart
   task :failed
 
 end

lib/capistrano/templates/deploy.rb.erb

@@ -17,7 +17,6 @@ set :repo_url, 'git@example.com:me/my_repo.git'
 # set :keep_releases, 5
 
 namespace :deploy do
-  after :publishing, :restart
 
   desc 'Restart application'
   task :restart do
@@ -27,6 +26,8 @@ namespace :deploy do
     end
   end
 
+  after :publishing, :restart
+
   after :restart, :clear_cache do
     on roles(:web), in: :groups, limit: 3, wait: 10 do
       # Here we can do anything such as: