le1t0-capistrano 2.5.18.016 → 2.5.18.017

data/CHANGELOG

@@ -1,3 +1,8 @@
+== 2.5.18.017 / Aug 13, 2010
+
+Support variables scopes (i.e. setting variables to different value for different servers)
+Support manipulating data when :up scping/sftping
+
 == 2.5.18.016 / Aug 12, 2010
 
 Add uploading files with parameterized file name

data/VERSION

@@ -1 +1 @@
-2.5.18.016
+2.5.18.017

data/le1t0-capistrano.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{le1t0-capistrano}
-  s.version = "2.5.18.016"
+  s.version = "2.5.18.017"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Le1t0"]
-  s.date = %q{2010-08-12}
+  s.date = %q{2010-08-13}
   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/roles.rb

@@ -63,10 +63,16 @@ module Capistrano
       # the roles as the remaining parameters:
       #
       #   server "master.example.com", :web, :app
-      def server(host, *roles)
+      def server(host, *roles, &block)
         options = roles.last.is_a?(Hash) ? roles.pop : {}
+        old_scope = @scope
+        @scope = host if block_given?
         raise ArgumentError, "you must associate a server with at least one role" if roles.empty?
         roles.each { |name| role(name, host, options) }
+        if block_given?
+          yield
+          @scope = old_scope
+        end
       end
     end
   end

data/lib/capistrano/configuration/variables.rb

@@ -16,6 +16,13 @@ module Capistrano
       # instance.
       attr_reader :variables
 
+      def scope(scope_name, &block)
+        old_scope = @scope
+        @scope = scope_name
+        yield
+        @scope = old_scope
+      end
+
       # Set a variable to the given value.
       def set(variable, *args, &block)
         if variable.to_s !~ /^[_a-z]/
@@ -32,7 +39,14 @@ module Capistrano
 
         value = args.empty? ? block : args.first
         sym = variable.to_sym
-        protect(sym) { @variables[sym] = value }
+        protect(sym) {
+          if @scope
+            @variables[@scope] ||= {}
+            @variables[@scope][sym] = value
+          else
+            @variables[sym] = value
+          end
+        }
       end
 
       alias :[]= :set
@@ -41,14 +55,29 @@ module Capistrano
       def unset(variable)
         sym = variable.to_sym
         protect(sym) do
-          @original_procs.delete(sym)
-          @variables.delete(sym)
+          if @scope
+            if @original_procs[@scope] && @original_procs[@scope][sym]
+              @original_procs[@scope].delete(sym)
+              @original_procs.delete(@scope) if @original_procs[@scope].empty?
+            else
+              @original_procs.delete(sym)
+            end
+            if @variables[@scope] && @variables[@scope][sym]
+              @variables[@scope].delete(sym)
+              @variables.delete(@scope) if @variables[@scope].empty?
+            else
+              @variables.delete(sym)
+            end
+          else
+            @original_procs.delete(sym)
+            @variables.delete(sym)
+          end
         end
       end
 
       # Returns true if the variable has been defined, and false otherwise.
       def exists?(variable)
-        @variables.key?(variable.to_sym)
+        (@scope && @variables[@scope] && @variables[@scope].key?(variable.to_sym)) || @variables.key?(variable.to_sym)
       end
 
       # If the variable was originally a proc value, it will be reset to it's
@@ -57,7 +86,11 @@ module Capistrano
       def reset!(variable)
         sym = variable.to_sym
         protect(sym) do
-          if @original_procs.key?(sym)
+          if @scope && @original_procs[@scope] && @original_procs[@scope].key?(sym)
+            @variables[@scope] ||= {}
+            @variables[@scope][sym] = @original_procs[@scope].delete(sym)
+            true
+          elsif @original_procs.key?(sym)
             @variables[sym] = @original_procs.delete(sym)
             true
           else
@@ -76,29 +109,53 @@ module Capistrano
 
         sym = variable.to_sym
         protect(sym) do
-          if !@variables.key?(sym)
-            return args.first unless args.empty?
-            return yield(variable) if block_given?
-            raise IndexError, "`#{variable}' not found"
-          end
-
-          if @variables[sym].respond_to?(:call)
-            @original_procs[sym] = @variables[sym]
-            @variables[sym] = @variables[sym].call
+          if @scope
+            if !exists?(variable)
+              return args.first unless args.empty?
+              return yield(variable) if block_given?
+              raise IndexError, "`#{variable}' not found"
+            end
+
+            if @variables[@scope] && @variables[@scope].respond_to?(:call)
+              @original_procs[@scope] ||= {}
+              @variables[@scope] ||= {}
+              @original_procs[@scope][sym] = @variables[@scope][sym]
+              @variables[@scope][sym] = @variables[@scope][sym].call
+            elsif @variables[sym].respond_to?(:call)
+              @original_procs[sym] = @variables[sym]
+              @variables[sym] = @variables[sym].call
+            end
+          else
+            if !@variables.key?(sym)
+              return args.first unless args.empty?
+              return yield(variable) if block_given?
+              raise IndexError, "`#{variable}' not found"
+            end
+
+            if @variables[sym].respond_to?(:call)
+              @original_procs[sym] = @variables[sym]
+              @variables[sym] = @variables[sym].call
+            end
           end
         end
 
-        @variables[sym]
+        (@scope && @variables[@scope] && @variables[@scope][sym]) || @variables[sym]
       end
 
       def [](variable)
         fetch(variable, nil)
       end
+      
+      def variables_has_key?(key)
+        (@scope && @variables[@scope] && @variables[@scope].has_key?(key)) || @variables.has_key?(key)
+      end
 
       def initialize_with_variables(*args) #:nodoc:
         initialize_without_variables(*args)
+        @scope = nil
         @variables = {}
         @original_procs = {}
+        @scoped_variable_locks = {}
         @variable_locks = Hash.new { |h,k| h[k] = Mutex.new }
 
         set :ssh_options, {}
@@ -107,16 +164,21 @@ module Capistrano
       private :initialize_with_variables
 
       def protect(variable)
-        @variable_locks[variable.to_sym].synchronize { yield }
+        if @scope && @scoped_variable_locks[@scope] && @scoped_variable_locks[@scope][variable.to_sym]
+          @scoped_variable_locks[@scope] ||= Hash.new { |h,k| h[k] = Mutex.new }
+          @scoped_variable_locks[@scope][variable.to_sym].synchronize { yield }
+        else
+          @variable_locks[variable.to_sym].synchronize { yield }
+        end
       end
       private :protect
 
       def respond_to_with_variables?(sym, include_priv=false) #:nodoc:
-        @variables.has_key?(sym) || respond_to_without_variables?(sym, include_priv)
+        variables_has_key?(sym) || respond_to_without_variables?(sym, include_priv)
       end
 
       def method_missing_with_variables(sym, *args, &block) #:nodoc:
-        if args.length == 0 && block.nil? && @variables.has_key?(sym)
+        if args.length == 0 && block.nil? && variables_has_key?(sym)
           self[sym]
         else
           method_missing_without_variables(sym, *args, &block)

data/lib/capistrano/transfer.rb

@@ -28,6 +28,7 @@ module Capistrano
       @from      = from
       @to        = to
       @sessions  = sessions
+      proc       = options.delete(:proc)
       @options   = options
       @callback  = block
 
@@ -36,7 +37,7 @@ module Capistrano
 
       @session_map = {}
 
-      prepare_transfers
+      prepare_transfers(proc)
     end
 
     def process!
@@ -97,7 +98,7 @@ module Capistrano
         @session_map
       end
 
-      def prepare_transfers
+      def prepare_transfers(proc)
         logger.info "#{transport} #{operation} #{from} -> #{to}" if logger
 
         @transfers = sessions.map do |session|
@@ -106,21 +107,23 @@ module Capistrano
 
           session_map[session] = case transport
             when :sftp
-              prepare_sftp_transfer(session_from, session_to, session)
+              prepare_sftp_transfer(session_from, session_to, session, proc)
             when :scp
-              prepare_scp_transfer(session_from, session_to, session)
+              prepare_scp_transfer(session_from, session_to, session, proc)
             else
               raise ArgumentError, "unsupported transport type: #{transport.inspect}"
             end
         end
       end
 
-      def prepare_scp_transfer(from, to, session)
+      def prepare_scp_transfer(from, to, session, proc)
         real_callback = callback || Proc.new do |channel, name, sent, total|
           logger.trace "[#{channel[:host]}] #{name}" if logger && sent == 0
         end
 
-        if direction == :up && from.is_a?(StringIO) && from.string =~ /%\{host\}/
+        if proc.is_a?(Proc)
+          from = proc.call(from.is_a?(StringIO) ? from.string : from, session.xserver.host)
+        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)
         end
@@ -166,7 +169,7 @@ module Capistrano
         end
       end
 
-      def prepare_sftp_transfer(from, to, session)
+      def prepare_sftp_transfer(from, to, session, proc)
         SFTPTransferWrapper.new(session) do |sftp|
           real_callback = Proc.new do |event, op, *args|
             if callback
@@ -183,7 +186,9 @@ module Capistrano
             :server  => session.xserver,
             :host    => session.xserver.host)
 
-          if direction == :up && from.is_a?(StringIO) && from.string =~ /%\{host\}/
+          if proc.is_a?(Proc)
+            from = proc.call(from.is_a?(StringIO) ? from.string : from, session.xserver.host)
+          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)
           end

metadata

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