HeSYINUvSBZfxqA-capistrano 2.5.21 → 2.5.22

data/VERSION

@@ -1 +1 @@
-2.5.21
+2.5.22

data/lib/capistrano/configuration/callbacks.rb

@@ -18,13 +18,13 @@ module Capistrano
         @callbacks = {}
       end
 
-      def invoke_task_directly_with_callbacks(task) #:nodoc:
+      def invoke_task_directly_with_callbacks(task, meh=nil) #:nodoc:
         before = find_hook(task, :before)
         execute_task(before) if before
 
         trigger :before, task
 
-        result = invoke_task_directly_without_callbacks(task)
+        result = invoke_task_directly_without_callbacks(task, meh)
 
         trigger :after, task
 
@@ -145,4 +145,4 @@ module Capistrano
 
     end
   end
-end
+end

data/lib/capistrano/configuration/execution.rb

@@ -1,5 +1,20 @@
 require 'capistrano/errors'
 
+class Defer
+  def initialize(old_self, context)
+    @old_self = old_self
+    @context = context
+  end
+
+  def context
+    @context
+  end
+
+  def method_missing(method, *args, &block)
+    @old_self.send method, *args, &block
+  end
+end
+
 module Capistrano
   class Configuration
     module Execution
@@ -83,10 +98,10 @@ module Capistrano
 
       # Executes the task with the given name, without invoking any associated
       # callbacks.
-      def execute_task(task)
+      def execute_task(task, path)
         logger.debug "executing `#{task.fully_qualified_name}'"
         push_task_call_frame(task)
-        invoke_task_directly(task)
+        invoke_task_directly(task, path)
       ensure
         pop_task_call_frame
       end
@@ -95,10 +110,10 @@ module Capistrano
       # execute it. If no such task exists, a Capistrano::NoSuchTaskError will
       # be raised.
       def find_and_execute_task(path, hooks={})
-        task = find_task(path) or raise NoSuchTaskError, "the task `#{path}' does not exist"
+        task = find_task(path) || find_task("default") or raise NoSuchTaskError, "the task `#{path}' does not exist"
 
         trigger(hooks[:before], task) if hooks[:before]
-        result = execute_task(task)
+        result = execute_task(task, path)
         trigger(hooks[:after], task) if hooks[:after]
 
         result
@@ -135,9 +150,10 @@ module Capistrano
       end
 
       # Invokes the task's body directly, without setting up the call frame.
-      def invoke_task_directly(task)
-        task.namespace.instance_eval(&task.body)
+      def invoke_task_directly(task, path)
+        defer = Defer.new(task.namespace, { :task => task, :path => path })
+        defer.instance_eval(&task.body)
       end
     end
   end
-end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: HeSYINUvSBZfxqA-capistrano
 version: !ruby/object:Gem::Version 
-  hash: 49
+  hash: 55
   prerelease: 
   segments: 
   - 2
   - 5
-  - 21
-  version: 2.5.21
+  - 22
+  version: 2.5.22
 platform: ruby
 authors: 
 - Jamis Buck
@@ -20,7 +20,9 @@ date: 2011-03-22 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  name: highline
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -29,12 +31,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  prerelease: false
   type: :runtime
-  requirement: *id001
-  name: highline
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  name: net-ssh
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -45,12 +47,12 @@ dependencies:
         - 0
         - 14
         version: 2.0.14
-  prerelease: false
   type: :runtime
-  requirement: *id002
-  name: net-ssh
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  name: net-sftp
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -61,12 +63,12 @@ dependencies:
         - 0
         - 0
         version: 2.0.0
-  prerelease: false
   type: :runtime
-  requirement: *id003
-  name: net-sftp
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  name: net-scp
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -77,12 +79,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  prerelease: false
   type: :runtime
-  requirement: *id004
-  name: net-scp
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  name: net-ssh-gateway
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -93,12 +95,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  prerelease: false
   type: :runtime
-  requirement: *id005
-  name: net-ssh-gateway
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  name: mocha
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -107,10 +109,8 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  prerelease: false
   type: :development
-  requirement: *id006
-  name: mocha
+  version_requirements: *id006
 description: Capistrano is a utility and framework for executing commands in parallel on multiple remote machines, via SSH.
 email: 
 - jamis@jamisbuck.org
@@ -126,7 +126,6 @@ files:
 - .gitignore
 - CHANGELOG
 - Gemfile
-- Gemfile.lock
 - HeSYINUvSBZfxqA-capistrano.gemspec
 - README.mdown
 - Rakefile
@@ -191,7 +190,6 @@ files:
 - lib/capistrano/task_definition.rb
 - lib/capistrano/transfer.rb
 - lib/capistrano/version.rb
-- rvmrc.sample
 - test/cli/execute_test.rb
 - test/cli/help_test.rb
 - test/cli/options_test.rb
@@ -263,7 +261,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.5.3
 signing_key: 
 specification_version: 3
 summary: Capistrano - Welcome to easy deployment with Ruby over SSH

data/Gemfile.lock

@@ -1,31 +0,0 @@
-PATH
-  remote: .
-  specs:
-    HeSYINUvSBZfxqA-capistrano (2.5.21)
-      highline
-      net-scp (>= 1.0.0)
-      net-sftp (>= 2.0.0)
-      net-ssh (>= 2.0.14)
-      net-ssh-gateway (>= 1.0.0)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    highline (1.6.2)
-    metaclass (0.0.1)
-    mocha (0.10.0)
-      metaclass (~> 0.0.1)
-    net-scp (1.0.4)
-      net-ssh (>= 1.99.1)
-    net-sftp (2.0.5)
-      net-ssh (>= 2.0.9)
-    net-ssh (2.2.1)
-    net-ssh-gateway (1.1.0)
-      net-ssh (>= 1.99.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  HeSYINUvSBZfxqA-capistrano!
-  mocha

data/rvmrc.sample

@@ -1 +0,0 @@
-rvm use 1.8.7@capistrano-devel --create