0
@@ -1,5 +1,7 @@
0
 *SVN*
0
 
0
+* Add :copy_remote_dir variable for the :copy strategy, to indicate where the archive should be copied to on the remote servers [Jamis Buck]
0
+
0
 * Make the awk use in the dependencies code work with POSIX awk [mcornick]
0
 
0
 * Make variable accesses thread safe [via Adrian Danieli]

0
@@ -83,10 +83,16 @@ module Capistrano
0
             @tmpdir ||= configuration[:copy_dir] || Dir.tmpdir
0
           end
0
 
0
+          # The directory on the remote server to which the archive should be
0
+          # copied
0
+          def remote_dir
0
+            @remote_dir ||= configuration[:copy_remote_dir] || "/tmp"
0
+          end
0
+
0
           # The location on the remote server where the file should be
0
           # temporarily stored.
0
           def remote_filename
0
-            @remote_filename ||= "/tmp/#{File.basename(filename)}"
0
+            @remote_filename ||= File.join(remote_dir, File.basename(filename))
0
           end
0
 
0
           # The compression method to use, defaults to :gzip.

0
@@ -121,4 +121,26 @@ class DeployStrategyCopyTest < Test::Unit::TestCase
0
 
0
     @strategy.deploy!
0
   end
0
+
0
+  def test_deploy_with_copy_remote_dir_should_copy_to_that_dir
0
+    @config[:copy_remote_dir] = "/somewhere/else"
0
+    Dir.expects(:tmpdir).returns("/temp/dir")
0
+    Dir.expects(:chdir).yields
0
+    @source.expects(:checkout).returns(:local_checkout)
0
+
0
+    @strategy.expects(:system).with(:local_checkout)
0
+    @strategy.expects(:system).with("tar czf 1234567890.tar.gz 1234567890")
0
+    @strategy.expects(:put).with(:mock_file_contents, "/somewhere/else/1234567890.tar.gz")
0
+    @strategy.expects(:run).with("cd /u/apps/test/releases && tar xzf /somewhere/else/1234567890.tar.gz && rm /somewhere/else/1234567890.tar.gz")
0
+
0
+    mock_file = mock("file")
0
+    mock_file.expects(:puts).with("154")
0
+    File.expects(:open).with("/temp/dir/1234567890/REVISION", "w").yields(mock_file)
0
+    File.expects(:read).with("/temp/dir/1234567890.tar.gz").returns(:mock_file_contents)
0
+
0
+    FileUtils.expects(:rm).with("/temp/dir/1234567890.tar.gz")
0
+    FileUtils.expects(:rm_rf).with("/temp/dir/1234567890")
0
+
0
+    @strategy.deploy!
0
+  end
0
 end