@@ -24,7 +24,7 @@ module Capistrano # Step 2: Update the remote cache. logger.trace "copying local cache to remote" find_servers(:except => { :no_release => true }).each do |server| - system("rsync #{rsync_options} #{local_cache}/ #{rsync_host(server)}:#{repository_cache}/") + system("rsync #{rsync_options} --rsh='ssh -p #{ssh_port}' #{local_cache}/ #{rsync_host(server)}:#{repository_cache}/") end # Step 3: Copy the remote cache into place. @@ -61,6 +61,10 @@ module Capistrano configuration[:rsync_options] || "-az --delete" end + def ssh_port + ssh_options[:port] || 22 + end + # Returns the host used in the rsync command, prefixed with user@ if user is specified in Capfile. def rsync_host(server) if configuration[:user] lib/capistrano/recipes/deploy/strategy/rsync_with_remote_cache.rb @@ -9,6 +9,10 @@ class CapistranoRsyncWithRemoteCacheTest < Test::Unit::TestCase @rwrc.expects(:configuration).at_least_once.returns(hash) end + def stub_ssh_options(hash) + @rwrc.expects(:ssh_options).at_least_once.returns(hash) + end + context 'RsyncWithRemoteCache' do setup do @rwrc = Capistrano::Deploy::Strategy::RsyncWithRemoteCache.new @@ -19,6 +23,7 @@ class CapistranoRsyncWithRemoteCacheTest < Test::Unit::TestCase should 'deploy!' do stub_configuration(:deploy_to => 'deploy_to', :release_path => 'release_path', :scm => :subversion) + stub_ssh_options(:port => nil) @rwrc.stubs(:shared_path).returns('shared') # Step 1: Update the local cache. @@ -30,7 +35,7 @@ class CapistranoRsyncWithRemoteCacheTest < Test::Unit::TestCase # Step 2: Update the remote cache. server_stub = stub(:host => 'host') - @rwrc.expects(:system).with("rsync -az --delete .rsync_cache/ host:shared/cached-copy/") + @rwrc.expects(:system).with("rsync -az --delete --rsh='ssh -p 22' .rsync_cache/ host:shared/cached-copy/") @rwrc.expects(:find_servers).returns([server_stub]) # Step 3: Copy the remote cache into place. @@ -91,6 +96,18 @@ class CapistranoRsyncWithRemoteCacheTest < Test::Unit::TestCase end end + context 'ssh_port' do + should 'return specified port if present in configuration' do + stub_ssh_options(:port => 2222) + assert_equal 2222, @rwrc.send(:ssh_port) + end + + should 'return default port if not present in configuration' do + stub_ssh_options(:port => nil) + assert_equal 22, @rwrc.send(:ssh_port) + end + end + context 'rsync_host' do setup do @server_stub = stub(:host => 'host') test/capistrano_rsync_with_remote_cache_test.rb 1c31d1a2001c646d7e052e9d9e6920768ee0cafb Mark Cornick mcornick@gmail.com http://github.com/vigetlabs/capistrano_rsync_with_remote_cache/commit/2bfb0f6f6c8f696fa66f34a1dbe1e324bafa737b 2bfb0f6f6c8f696fa66f34a1dbe1e324bafa737b 2009-09-08T07:50:34-07:00 2009-09-08T07:50:34-07:00 respect ssh_options[:port] in rsync; closes #2 97bea1ab974627fcd563982fb293a3f3c3b97532 Mark Cornick mcornick@gmail.com