capistrano_rsync_with_remote_cache 2.3.8 → 2.4.0

data/README.rdoc

@@ -3,16 +3,16 @@
 == Description
 
 This gem provides a deployment strategy for Capistrano which combines the
-<tt>rsync</tt> command with a remote cache, allowing fast deployments from SCM 
+<tt>rsync</tt> command with a remote cache, allowing fast deployments from SCM
 repositories behind firewalls.
 
 == Requirements
 
 This gem supports Subversion, Git, Mercurial and Bazaar. Only Subversion and
-Git have been extensively tested. This gem is unlikely to be supported for 
+Git have been extensively tested. This gem is unlikely to be supported for
 other SCM systems.
 
-This gem requires the <tt>rsync</tt> command-line utilities on the local and 
+This gem requires the <tt>rsync</tt> command-line utilities on the local and
 remote hosts. It also requires either <tt>svn</tt>, <tt>git</tt>, <tt>hg</tt>
 or <tt>bzr</tt> on the local host, but not the remote host.
 
@@ -32,41 +32,47 @@ To use this deployment strategy, add this line to your <tt>deploy.rb</tt> file:
 
 This strategy maintains two cache directories:
 
-* The local cache directory is a checkout from the SCM repository. The local 
-  cache directory is specified with the <tt>:local_cache</tt> variable in the 
-  configuration. If not specified, it will default to <tt>.rsync_cache</tt> 
+* The local cache directory is a checkout from the SCM repository. The local
+  cache directory is specified with the <tt>:local_cache</tt> variable in the
+  configuration. If not specified, it will default to <tt>.rsync_cache</tt>
   in the same directory as the Capfile.
-  
-* The remote cache directory is an <tt>rsync</tt> copy of the local cache directory. 
+
+* The remote cache directory is an <tt>rsync</tt> copy of the local cache directory.
   The remote cache directory is specified with the <tt>:repository_cache</tt> variable
-  in the configuration (this name comes from the <tt>:remote_cache</tt> strategy that 
-  ships with Capistrano, and has been maintained for compatibility.) If not 
-  specified, it will default to <tt>shared/cached-copy</tt> (again, for compatibility 
+  in the configuration (this name comes from the <tt>:remote_cache</tt> strategy that
+  ships with Capistrano, and has been maintained for compatibility.) If not
+  specified, it will default to <tt>shared/cached-copy</tt> (again, for compatibility
   with remote_cache.)
 
-Deployment happens in three major steps. First, the local cache directory is 
+Deployment happens in three major steps. First, the local cache directory is
 processed. There are three possibilities:
 
-* If the local cache does not exist, it is created with a checkout of the 
+* If the local cache does not exist, it is created with a checkout of the
   revision to be deployed.
-* If the local cache exists and matches the <tt>:repository</tt> variable, it is 
+* If the local cache exists and matches the <tt>:repository</tt> variable, it is
   updated to the revision to be deployed.
-* If the local cache exists and does not match the <p>:repository</p> variable, 
-  the local cache is purged and recreated with a checkout of the revision 
+* If the local cache exists and does not match the <p>:repository</p> variable,
+  the local cache is purged and recreated with a checkout of the revision
   to be deployed.
 * If the local cache exists but is not a directory, an exception is raised
 
-Second, <tt>rsync</tt> runs on the local side to sync the remote cache to the local 
-cache. When the <tt>rsync</tt> is complete, the remote cache should be an exact 
+Second, <tt>rsync</tt> runs on the local side to sync the remote cache to the local
+cache. When the <tt>rsync</tt> is complete, the remote cache should be an exact
 replica of the local cache.
 
-Finally, a copy of the remote cache is made in the appropriate release 
-directory. The end result is the same as if the code had been checked out 
+Finally, a copy of the remote cache is made in the appropriate release
+directory. The end result is the same as if the code had been checked out
 directly on the remote server, as in the default strategy.
 
+== Contributors
+
+Thanks to the people who submitted patches:
+
+* {S. Brent Faulkner}[http://github.com/sbfaulkner]
+
 == License
 
-Copyright (c) 2007 - 2010 Patrick Reagan (patrick.reagan@viget.com) & Mark Cornick 
+Copyright (c) 2007 - 2010 Patrick Reagan (patrick.reagan@viget.com) & Mark Cornick
 
 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation

data/Rakefile

@@ -4,7 +4,7 @@ require 'rake/testtask'
 
 spec = Gem::Specification.new do |s|
   s.name             = 'capistrano_rsync_with_remote_cache'
-  s.version          = '2.3.8'
+  s.version          = '2.4.0'
   s.has_rdoc         = true
   s.extra_rdoc_files = %w(README.rdoc)
   s.rdoc_options     = %w(--main README.rdoc)
@@ -13,7 +13,7 @@ spec = Gem::Specification.new do |s|
   s.email            = 'patrick.reagan@viget.com'
   s.homepage         = 'http://www.viget.com/extend/'
   s.files            = %w(README.rdoc Rakefile) + Dir.glob("{lib,test}/**/*")
-  
+
   s.add_dependency('capistrano', '>=2.1.0')
 end
 

data/lib/capistrano/recipes/deploy/strategy/rsync_with_remote_cache.rb

@@ -44,15 +44,15 @@ module Capistrano
         end
         
         def rsync_command_for(server)
-          "rsync #{rsync_options} --rsh='ssh -p #{ssh_port}' #{local_cache_path}/ #{rsync_host(server)}:#{repository_cache_path}/"
+          "rsync #{rsync_options} --rsh='ssh -p #{ssh_port(server)}' #{local_cache_path}/ #{rsync_host(server)}:#{repository_cache_path}/"
         end
         
         def mark_local_cache
           File.open(File.join(local_cache_path, 'REVISION'), 'w') {|f| f << revision }
         end
         
-        def ssh_port
-          ssh_options[:port] || 22
+        def ssh_port(server)
+          server.port || ssh_options[:port] || 22
         end
         
         def local_cache_path

data/test/capistrano_rsync_with_remote_cache_test.rb

@@ -103,12 +103,20 @@ class CapistranoRsyncWithRemoteCacheTest < Test::Unit::TestCase
     
     should "know the default SSH port" do
       @strategy.stubs(:ssh_options).with().returns({})
-      @strategy.ssh_port.should == 22
+      server = stub(:port => nil)
+      @strategy.ssh_port(server).should == 22
     end
     
     should "be able to override the default SSH port" do
       @strategy.stubs(:ssh_options).with().returns({:port => 95})
-      @strategy.ssh_port.should == 95
+      server = stub(:port => nil)
+      @strategy.ssh_port(server).should == 95
+    end
+
+    should "be able to override the default SSH port for each server" do
+      @strategy.stubs(:ssh_options).with().returns({:port => 95})
+      server = stub(:port => 123)
+      @strategy.ssh_port(server).should == 123
     end
 
     should "know the default repository cache" do

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 2
-  - 3
-  - 8
-  version: 2.3.8
+  - 4
+  - 0
+  version: 2.4.0
 platform: ruby
 authors: 
 - Patrick Reagan
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-08 00:00:00 -04:00
+date: 2010-06-29 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency