net-scp 1.0.1 → 1.0.2

data/CHANGELOG.rdoc

@@ -1,3 +1,8 @@
+=== 1.0.2 / 4 Feb 2009
+
+* 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]

data/lib/net/scp.rb

@@ -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
+end

data/lib/net/scp/upload.rb

@@ -10,7 +10,7 @@ module Net; class SCP
 
     # The default read chunk size, if an explicit chunk-size is not specified
     # by the client.
-    DEFAULT_CHUNK_SIZE = 2048
+    DEFAULT_CHUNK_SIZE = 16384
 
     # The start state for uploads. Simply sets up the upload scaffolding,
     # sets the current item to upload, and jumps to #upload_current_state.

data/lib/net/scp/version.rb

@@ -6,7 +6,7 @@ module Net; class SCP
   class Version < Net::SSH::Version
     MAJOR = 1
     MINOR = 0
-    TINY  = 1
+    TINY  = 2
 
     # The current version, as a Version instance
     CURRENT = new(MAJOR, MINOR, TINY)

data/net-scp.gemspec

@@ -1,62 +1,34 @@
-
-# Gem::Specification for Net-scp-1.0.1
-# Originally generated by Echoe
+# -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{net-scp}
-  s.version = "1.0.1"
-
-  s.specification_version = 2 if s.respond_to? :specification_version=
+  s.version = "1.0.2"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jamis Buck"]
-  s.date = %q{2008-05-29}
+  s.date = %q{2009-11-23}
   s.description = %q{A pure Ruby implementation of the SCP client protocol}
   s.email = %q{jamis@jamisbuck.org}
   s.extra_rdoc_files = ["CHANGELOG.rdoc", "lib/net/scp/download.rb", "lib/net/scp/errors.rb", "lib/net/scp/upload.rb", "lib/net/scp/version.rb", "lib/net/scp.rb", "lib/uri/open-scp.rb", "lib/uri/scp.rb", "README.rdoc"]
   s.files = ["CHANGELOG.rdoc", "lib/net/scp/download.rb", "lib/net/scp/errors.rb", "lib/net/scp/upload.rb", "lib/net/scp/version.rb", "lib/net/scp.rb", "lib/uri/open-scp.rb", "lib/uri/scp.rb", "Rakefile", "README.rdoc", "setup.rb", "test/common.rb", "test/test_all.rb", "test/test_download.rb", "test/test_scp.rb", "test/test_upload.rb", "Manifest", "net-scp.gemspec"]
-  s.has_rdoc = true
   s.homepage = %q{http://net-ssh.rubyforge.org/scp}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Net-scp", "--main", "README.rdoc"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{net-ssh}
-  s.rubygems_version = %q{1.1.1}
+  s.rubygems_version = %q{1.3.5}
   s.summary = %q{A pure Ruby implementation of the SCP client protocol}
   s.test_files = ["test/test_all.rb"]
 
-  s.add_dependency(%q<net-ssh>, [">= 1.99.1"])
-end
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
 
-
-# # Original Rakefile source (requires the Echoe gem):
-# 
-# $LOAD_PATH.unshift "../net-ssh/lib"
-# require './lib/net/scp/version'
-# 
-# begin
-#   require 'echoe'
-# rescue LoadError
-#   abort "You'll need to have `echoe' installed to use Net::SCP's Rakefile"
-# end
-# 
-# version = Net::SCP::Version::STRING.dup
-# if ENV['SNAPSHOT'].to_i == 1
-#   version << "." << Time.now.utc.strftime("%Y%m%d%H%M%S")
-# end
-# 
-# Echoe.new('net-scp', version) do |p|
-#   p.project          = "net-ssh"
-#   p.changelog        = "CHANGELOG.rdoc"
-# 
-#   p.author           = "Jamis Buck"
-#   p.email            = "jamis@jamisbuck.org"
-#   p.summary          = "A pure Ruby implementation of the SCP client protocol"
-#   p.url              = "http://net-ssh.rubyforge.org/scp"
-# 
-#   p.dependencies     = ["net-ssh >=1.99.1"]
-# 
-#   p.need_zip         = true
-#   p.include_rakefile = true
-# 
-#   p.rdoc_pattern     = /^(lib|README.rdoc|CHANGELOG.rdoc)/
-# end
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<net-ssh>, [">= 1.99.1"])
+    else
+      s.add_dependency(%q<net-ssh>, [">= 1.99.1"])
+    end
+  else
+    s.add_dependency(%q<net-ssh>, [">= 1.99.1"])
+  end
+end

data/test/test_download.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))
 

data/test/test_upload.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))
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: net-scp
 version: !ruby/object:Gem::Version 
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors: 
 - Jamis Buck
@@ -9,11 +9,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-05-29 00:00:00 -06:00
+date: 2009-11-23 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: net-ssh
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -58,6 +59,8 @@ files:
 - net-scp.gemspec
 has_rdoc: true
 homepage: http://net-ssh.rubyforge.org/scp
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --line-numbers
@@ -78,14 +81,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      version: "0"
+      version: "1.2"
   version: 
 requirements: []
 
 rubyforge_project: net-ssh
-rubygems_version: 1.1.1
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: A pure Ruby implementation of the SCP client protocol
 test_files: 
 - test/test_all.rb