@@ -1,3 +1,8 @@ +=== (unreleased) + +* Escape spaces in file names on remote server [Jamis Buck] + + === 1.0.1 / 29 May 2008 * Make sure downloads open the file in binary mode to appease Windows [Jamis Buck] CHANGELOG.rdoc @@ -337,7 +337,7 @@ module Net # (See Net::SCP::Upload and Net::SCP::Download). def start_command(mode, local, remote, options={}, &callback) session.open_channel do |channel| - command = "#{scp_command(mode, options)} #{remote}" + command = "#{scp_command(mode, options)} #{sanitize_file_name(remote)}" channel.exec(command) do |ch, success| if success channel[:local ] = local @@ -398,6 +398,10 @@ module Net def progress_callback(channel, name, sent, total) channel[:callback].call(channel, name, sent, total) if channel[:callback] end + + def sanitize_file_name(file_name) + file_name.gsub(/[ ]/) { |m| "\\#{m}" } + end end end @@ -407,4 +411,4 @@ class Net::SSH::Connection::Session def scp @scp ||= Net::SCP.new(self) end -end \ No newline at end of file +end lib/net/scp.rb @@ -12,6 +12,20 @@ class TestDownload < Net::SCP::TestCase assert_equal "a" * 1234, file.io.string end + def test_download_file_with_spaces_in_name_should_escape_remote_file_name + file = prepare_file("/path/to/local file.txt", "") + + expect_scp_session "-f /path/to/remote\\ file.txt" do |channel| + channel.sends_ok + channel.gets_data "C0666 0 local file.txt\n" + channel.sends_ok + channel.gets_ok + channel.sends_ok + end + + assert_scripted { scp.download!("/path/to/remote file.txt", "/path/to/local file.txt") } + end + def test_download_with_preserve_should_send_times file = prepare_file("/path/to/local.txt", "a" * 1234, 0644, Time.at(1234567890, 123456), Time.at(12121212, 232323)) test/test_download.rb @@ -16,6 +16,20 @@ class TestUpload < Net::SCP::TestCase assert_scripted { scp.upload!("/path/to/local.txt", "/path/to/remote.txt") } end + def test_upload_file_with_spaces_in_name_should_escape_remote_file_name + prepare_file("/path/to/local file.txt", "") + + expect_scp_session "-t /path/to/remote\\ file.txt" do |channel| + channel.gets_ok + channel.sends_data "C0666 0 local file.txt\n" + channel.gets_ok + channel.sends_ok + channel.gets_ok + end + + assert_scripted { scp.upload!("/path/to/local file.txt", "/path/to/remote file.txt") } + end + def test_upload_file_with_preserve_should_send_times prepare_file("/path/to/local.txt", "a" * 1234, 0666, Time.at(1234567890, 123456), Time.at(1234543210, 345678)) test/test_upload.rb ab6644b2b0d2cdd29ea766f9432701bd8fcb10ec Jamis Buck jamis@37signals.com http://github.com/jamis/net-scp/commit/19c77f3b3fd7ffd4806272d193dca44d5d25318c 19c77f3b3fd7ffd4806272d193dca44d5d25318c 2009-02-02T20:17:51-08:00 2009-02-02T20:17:51-08:00 make sure spaces in remote file names are escaped 926788994cb2c605890db25f673ac3dfa004b7b4 Jamis Buck jamis@37signals.com