capistrano_rsync_with_remote_cache 2.3.1 → 2.3.2

data/VERSION.yml

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

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

@@ -1,4 +1,5 @@
 require 'capistrano/recipes/deploy/strategy/remote'
+require 'fileutils'
 
 module Capistrano
   module Deploy
@@ -72,10 +73,14 @@ module Capistrano
         #
         # TODO: punt in some sensible way if local_cache exists but is a regular file.
         def command
-          if (configuration[:scm] == :subversion &&
-              `svn info #{local_cache} | sed -n 's/URL: //p'`.strip != configuration[:repository])
-            logger.trace "repository has changed; removing old local cache"
-            system("rm -rf #{local_cache}")
+          if configuration[:scm] == :subversion
+            svn_info = IO.popen("svn info #{local_cache} | sed -n 's/URL: //p'")
+            svn_url = svn_info.gets.chomp
+            svn_info.close
+            if svn_url != configuration[:repository]
+              logger.trace "repository has changed; removing old local cache"
+              FileUtils.rm_rf local_cache
+            end
           end
           if File.exists?(local_cache) && File.directory?(local_cache)
             logger.trace "updating local cache to revision #{revision}"

data/test/capistrano_rsync_with_remote_cache_test.rb

@@ -9,20 +9,21 @@ class CapistranoRsyncWithRemoteCacheTest < Test::Unit::TestCase
     @rwrc.expects(:configuration).at_least_once.returns(hash)
   end
 
+  def stub_creation_of_new_local_cache
+    File.expects(:exists?).with('.rsync_cache').times(2).returns(false)
+    File.expects(:directory?).with(File.dirname('.rsync_cache')).returns(false)
+    Dir.expects(:mkdir).with(File.dirname('.rsync_cache'))
+    source_stub = stub()
+    source_stub.expects(:checkout)
+    @rwrc.expects(:source).returns(source_stub)
+  end
+  
   context 'RsyncWithRemoteCache' do
     setup do
       @rwrc = Capistrano::Deploy::Strategy::RsyncWithRemoteCache.new
-
       logger_stub = stub()
       logger_stub.stubs(:trace)
       @rwrc.stubs(:logger).returns(logger_stub)
-
-      # FIXME: this is lame
-      class << @rwrc
-        def `(cmd)
-          '\n'
-        end
-      end
     end
 
     should 'deploy!' do
@@ -116,22 +117,19 @@ class CapistranoRsyncWithRemoteCacheTest < Test::Unit::TestCase
     end
 
     context 'command' do
-      should 'remove local cache dir if it detects subversion info has changed' do
-        stub_configuration(:scm => :subversion)
+      should 'recreate local cache if it detects subversion info has changed' do
+        stub_configuration(:scm => :subversion, :repository => 'repository')        
 
-        @rwrc.expects(:`).returns('something else')
-        @rwrc.expects(:system).with("rm -rf .rsync_cache")
+        svn_info_stub = stub()
+        svn_info_stub.expects(:gets).returns("URL: url\n")
+        svn_info_stub.expects(:close)
+        IO.expects(:popen).with("svn info .rsync_cache | sed -n 's/URL: //p'").returns(svn_info_stub)
 
-        File.expects(:exists?).with('.rsync_cache').times(2).returns(false)
-        File.expects(:directory?).with(File.dirname('.rsync_cache')).returns(false)
-        Dir.expects(:mkdir).with(File.dirname('.rsync_cache'))
+        FileUtils.expects(:rm_rf).with('.rsync_cache')
 
-        source_stub = stub()
-        source_stub.expects(:checkout)
-        @rwrc.expects(:source).returns(source_stub)
+        stub_creation_of_new_local_cache
 
         @rwrc.send(:command)
-
       end
 
       should 'update local cache if it exists' do
@@ -144,13 +142,8 @@ class CapistranoRsyncWithRemoteCacheTest < Test::Unit::TestCase
         @rwrc.send(:command)
       end
 
-      should 'update local cache if it does not exist' do
-        File.expects(:exists?).with('.rsync_cache').times(2).returns(false)
-        File.expects(:directory?).with(File.dirname('.rsync_cache')).returns(false)
-        Dir.expects(:mkdir).with(File.dirname('.rsync_cache'))
-        source_stub = stub()
-        source_stub.expects(:checkout)
-        @rwrc.expects(:source).returns(source_stub)
+      should 'create local cache if it does not exist' do
+        stub_creation_of_new_local_cache
 
         @rwrc.send(:command)
       end

metadata

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