@@ -1,5 +1,7 @@ *unreleased* +* Make sure triggers defined as a block inherit the scope of the task they are attached to, instead of the task they were called from [Jamis Buck] + * Make deploy:upload use the upload() helper for more efficient directory processing [Jamis Buck] * Make deploy:upload accept globs [Mark Imbriaco] CHANGELOG @@ -4,7 +4,7 @@ module Capistrano class Configuration module Callbacks def self.included(base) #:nodoc: - %w(initialize execute_task).each do |method| + %w(initialize invoke_task_directly).each do |method| base.send :alias_method, "#{method}_without_callbacks", method base.send :alias_method, method, "#{method}_with_callbacks" end @@ -18,13 +18,13 @@ module Capistrano @callbacks = {} end - def execute_task_with_callbacks(task) #:nodoc: + def invoke_task_directly_with_callbacks(task) #:nodoc: before = find_hook(task, :before) execute_task(before) if before trigger :before, task - result = execute_task_without_callbacks(task) + result = invoke_task_directly_without_callbacks(task) trigger :after, task lib/capistrano/configuration/callbacks.rb @@ -72,12 +72,12 @@ module Capistrano task_call_frames.last.task end - # Executes the task with the given name, including the before and after - # hooks. + # Executes the task with the given name, without invoking any associated + # callbacks. def execute_task(task) logger.debug "executing `#{task.fully_qualified_name}'" push_task_call_frame(task) - task.namespace.instance_eval(&task.body) + invoke_task_directly(task) ensure pop_task_call_frame end @@ -121,6 +121,11 @@ module Capistrano def pop_task_call_frame task_call_frames.pop end + + # Invokes the task's body directly, without setting up the call frame. + def invoke_task_directly(task) + task.namespace.instance_eval(&task.body) + end end end end \ No newline at end of file lib/capistrano/configuration/execution.rb @@ -12,9 +12,15 @@ class ConfigurationCallbacksTest < Test::Unit::TestCase end def execute_task(task) - @called << task + invoke_task_directly(task) end + protected + + def invoke_task_directly(task) + @called << task + end + include Capistrano::Configuration::Callbacks end test/configuration/callbacks_test.rb 0d415c677dc7f13c2b4c74ed6ebe65a08c1a2339 Jamis Buck jamis@37signals.com http://github.com/jamis/capistrano/commit/2ac1906a3ab0bda997ca3b028b9b20d222faf3fe 2ac1906a3ab0bda997ca3b028b9b20d222faf3fe 2008-06-05T20:00:19-07:00 2008-06-05T20:00:19-07:00 Make block-triggers scope to the task they are attached to. Prior to this, if you defined (e.g.) a before task using a block, like this: before :foo do puts "current task is #{current_task.name}" end And then, you invoked :foo like this: task :bar do run "something" foo end You'd see the before-foo block print "bar" as the name of the current task. This meant that any commands run in the foo before block would be scoped to the servers of :bar, when it really makes more sense to scope them to the servers of :foo. This commit makes it so that the before-foo block, above, would show "foo" as the name of the current task, rather than "bar". 7a296725662fbfe233f1d84045e6e8df02281cb1 Jamis Buck jamis@37signals.com