lib/capistrano/processable.rb lib/capistrano/transfer.rb @@ -16,6 +16,7 @@ Gem::Specification.new do |s| s.add_dependency 'net-ssh', ">= 1.99.2" s.add_dependency 'net-sftp', ">= 1.99.1" + s.add_dependency 'net-scp', ">= 0.99.0" s.add_dependency 'net-ssh-gateway', ">= 0.99.0" s.add_dependency 'highline' capistrano.gemspec @@ -1,31 +1,11 @@ require 'capistrano/errors' +require 'capistrano/processable' module Capistrano # This class encapsulates a single command to be executed on a set of remote # machines, in parallel. class Command - module Processable - def process_iteration(wait=nil, &block) - sessions.each { |session| session.preprocess } - return false if block && !block.call(self) - - readers = sessions.map { |session| session.listeners.keys }.flatten.reject { |io| io.closed? } - writers = readers.select { |io| io.respond_to?(:pending_write?) && io.pending_write? } - - readers, writers, = IO.select(readers, writers, nil, wait) - - if readers - sessions.each do |session| - ios = session.listeners.keys - session.postprocess(ios & readers, ios & writers) - end - end - - true - end - end - include Processable attr_reader :command, :sessions, :options lib/capistrano/command.rb @@ -1,4 +1,4 @@ -require 'capistrano/upload' +require 'capistrano/transfer' module Capistrano class Configuration @@ -9,22 +9,29 @@ module Capistrano # by the current task. If <tt>:mode</tt> is specified it is used to # set the mode on the file. def put(data, path, options={}) - execute_on_servers(options) do |servers| - targets = servers.map { |s| sessions[s] } - Upload.process(targets, path, :data => data, :mode => options[:mode], :logger => logger) - end + upload(StringIO.new(data), path, options) end - # Get file remote_path from FIRST server targetted by + # Get file remote_path from FIRST server targeted by # the current task and transfer it to local machine as path. # # get "#{deploy_to}/current/log/production.log", "log/production.log.web" - def get(remote_path, path, options = {}) - execute_on_servers(options.merge(:once => true)) do |servers| - logger.info "downloading `#{servers.first.host}:#{remote_path}' to `#{path}'" - sftp = sessions[servers.first].sftp - sftp.download! remote_path, path - logger.debug "download finished" + def get(remote_path, path, options={}, &block) + download(remote_path, path, options.merge(:once => true), &block) + end + + def upload(from, to, options={}, &block) + transfer(:up, from, to, options, &block) + end + + def download(from, to, options={}, &block) + transfer(:down, from, to, options, &block) + end + + def transfer(direction, from, to, options={}, &block) + execute_on_servers(options) do |servers| + targets = servers.map { |s| sessions[s] } + Transfer.process(direction, from, to, targets, options.merge(:logger => logger), &block) end end lib/capistrano/configuration/actions/file_transfer.rb @@ -10,6 +10,6 @@ module Capistrano end class ConnectionError < RemoteError; end - class UploadError < RemoteError; end + class TransferError < RemoteError; end class CommandError < RemoteError; end end lib/capistrano/errors.rb @@ -253,7 +253,7 @@ HELP end end - # All open sessions + # All open sessions, needed to satisfy the Command::Processable include def sessions configuration.sessions.values end lib/capistrano/shell.rb lib/capistrano/upload.rb d099e45c6b6fda913550d61433523da416e79106 Jamis Buck jamis@37signals.com http://github.com/jamis/capistrano/commit/06bfd0274ce858aa9cd97af200019d68695b3b9d 06bfd0274ce858aa9cd97af200019d68695b3b9d 2008-04-24T21:54:50-07:00 2008-04-24T08:51:54-07:00 generic file transfer mechanism using either SFTP or SCP bde3da4395b84085b7ecc0d6f15349a494e3f776 Jamis Buck jamis@37signals.com