capistrano_rsync_with_remote_cache 2.3.2 → 2.3.3

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 2
 :minor: 3
-:patch: 2
+:patch: 3

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

@@ -75,9 +75,9 @@ module Capistrano
         def command
           if configuration[:scm] == :subversion
             svn_info = IO.popen("svn info #{local_cache} | sed -n 's/URL: //p'")
-            svn_url = svn_info.gets.chomp
+            svn_url = svn_info.gets
             svn_info.close
-            if svn_url != configuration[:repository]
+            if svn_url && svn_url.chomp != configuration[:repository]
               logger.trace "repository has changed; removing old local cache"
               FileUtils.rm_rf local_cache
             end

data/test/capistrano_rsync_with_remote_cache_test.rb

@@ -117,7 +117,7 @@ class CapistranoRsyncWithRemoteCacheTest < Test::Unit::TestCase
     end
 
     context 'command' do
-      should 'recreate local cache if it detects subversion info has changed' do
+      should 'purge and recreate local cache if it detects subversion info has changed' do
         stub_configuration(:scm => :subversion, :repository => 'repository')        
 
         svn_info_stub = stub()
@@ -132,6 +132,32 @@ class CapistranoRsyncWithRemoteCacheTest < Test::Unit::TestCase
         @rwrc.send(:command)
       end
 
+      should 'not attempt to purge and recreate local cache that does not exist' do
+        stub_configuration(:scm => :subversion, :repository => 'repository')        
+
+        svn_info_stub = stub()
+        svn_info_stub.expects(:gets).returns(nil)
+        svn_info_stub.expects(:close)
+        IO.expects(:popen).with("svn info .rsync_cache | sed -n 's/URL: //p'").returns(svn_info_stub)
+
+        FileUtils.expects(:rm_rf).with('.rsync_cache').never
+
+        stub_creation_of_new_local_cache
+
+        @rwrc.send(:command)
+      end
+
+      should 'not attempt to purge and recreate local cache if the scm is not subversion' do
+        stub_configuration(:scm => :git, :repository => 'repository')        
+
+        IO.expects(:popen).with("svn info .rsync_cache | sed -n 's/URL: //p'").never
+        FileUtils.expects(:rm_rf).with('.rsync_cache').never
+
+        stub_creation_of_new_local_cache
+
+        @rwrc.send(:command)
+      end
+
       should 'update local cache if it exists' do
         File.expects(:exists?).with('.rsync_cache').returns(true)
         File.expects(:directory?).with('.rsync_cache').returns(true)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: capistrano_rsync_with_remote_cache
 version: !ruby/object:Gem::Version 
-  version: 2.3.2
+  version: 2.3.3
 platform: ruby
 authors: 
 - Mark Cornick
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-15 00:00:00 -04:00
+date: 2009-05-18 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency