le1t0-capistrano 2.5.18.017 → 2.5.18.018

data/CHANGELOG

@@ -1,3 +1,7 @@
+== 2.5.18.018 / Aug 20, 2010
+
+fix uploading-files-with-parameterized-file-name
+
 == 2.5.18.017 / Aug 13, 2010
 
 Support variables scopes (i.e. setting variables to different value for different servers)

data/VERSION

@@ -1 +1 @@
-2.5.18.017
+2.5.18.018

data/le1t0-capistrano.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{le1t0-capistrano}
-  s.version = "2.5.18.017"
+  s.version = "2.5.18.018"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Le1t0"]
-  s.date = %q{2010-08-13}
+  s.date = %q{2010-08-20}
   s.description = %q{Capistrano is a utility and framework for executing commands in parallel on multiple remote machines, via SSH.}
   s.email = ["dev@ewout.to"]
   s.executables = ["capify", "cap"]

data/lib/capistrano/configuration/variables.rb

@@ -19,8 +19,9 @@ module Capistrano
       def scope(scope_name, &block)
         old_scope = @scope
         @scope = scope_name
-        yield
+        result = yield
         @scope = old_scope
+        result
       end
 
       # Set a variable to the given value.

data/lib/capistrano/transfer.rb

@@ -122,10 +122,11 @@ module Capistrano
         end
 
         if proc.is_a?(Proc)
-          from = proc.call(from.is_a?(StringIO) ? from.string : from, session.xserver.host)
+          from_string = proc.call(from.is_a?(StringIO) ? from.string : from, session.xserver.host)
+          from = File.exist?(from_string) || from_string.is_a?(StringIO) ? from_string : StringIO.new(from_string.to_s)
         elsif direction == :up && from.is_a?(StringIO) && from.string =~ /%\{host\}/
           from_string = from.string.gsub(/%\{host\}/, session.xserver.host)
-          from = File.exist?(from_string) ? from_string : StringIO.new(from_string)
+          from = File.exist?(from_string) || from_string.is_a?(StringIO) ? from_string : StringIO.new(from_string.to_s)
         end
 
         channel = case direction
@@ -187,10 +188,11 @@ module Capistrano
             :host    => session.xserver.host)
 
           if proc.is_a?(Proc)
-            from = proc.call(from.is_a?(StringIO) ? from.string : from, session.xserver.host)
+            from_string = proc.call(from.is_a?(StringIO) ? from.string : from, session.xserver.host)
+            from = File.exist?(from_string) || from_string.is_a?(StringIO) ? from_string : StringIO.new(from_string.to_s)
           elsif direction == :up && from.is_a?(StringIO) && from.string =~ /%\{host\}/
             from_string = from.string.gsub(/%\{host\}/, session.xserver.host)
-            from = File.exist?(from_string) ? from_string : StringIO.new(from_string)
+            from = File.exist?(from_string) || from_string.is_a?(StringIO) ? from_string : StringIO.new(from_string.to_s)
           end
 
           case direction

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 2
   - 5
   - 18
-  - 17
-  version: 2.5.18.017
+  - 18
+  version: 2.5.18.018
 platform: ruby
 authors: 
 - Le1t0
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-13 00:00:00 +02:00
+date: 2010-08-20 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency