net-sftp 2.0.5 → 2.1.0

data/{CHANGELOG.rdoc → CHANGES.txt}

@@ -1,4 +1,14 @@
 
+=== 2.1.0 / 06 Feb 2013
+
+* Added public cert. All gem releases are now signed. See INSTALL in readme.
+* Remove self-require, it causes a warning in Ruby 1.9.2. [jbarnette]
+* Allow for upload to use the filename of the local file by default [czarneckid]
+* Properly handle receiving less data than requested. [thedarkone]
+* Added option to create directory on directory upload [Pablo Merino]
+* Remove a warnings in tests [kachick]
+
+
 === 2.0.5 / 19 Aug 2010
 
 * Fixed missing StringIO exception in download! [Toby Bryans, Delano Mandelbaum]

data/LICENSE.txt

@@ -0,0 +1,19 @@
+Copyright © 2008 Jamis Buck
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the ‘Software’), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED ‘AS IS’, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/README.rdoc

@@ -1,6 +1,12 @@
 = Net::SFTP
 
-* http://net-ssh.rubyforge.org/sftp
+* Docs: http://net-ssh.github.com/net-sftp
+* Issues: https://github.com/net-ssh/net-sftp/issues
+* Codes: https://github.com/net-ssh/net-sftp
+* Email: net-ssh@solutious.com
+
+<em>As of v2.1.0, all gem releases are signed. See INSTALL.</em>
+
 
 == DESCRIPTION:
 
@@ -63,6 +69,19 @@ If you wish to run the tests, you'll need:
 
 * gem install net-sftp (might need sudo privileges)
 
+However, in order to be sure the code you're installing hasn't been tampered with, it's recommended that you verify the signiture[http://docs.rubygems.org/read/chapter/21]. To do this, you need to add my public key as a trusted certificate (you only need to do this once):
+
+    # Add the public key as a trusted certificate
+    # (You only need to do this once)
+    $ curl -O https://raw.github.com/net-ssh/net-ssh/master/gem-public_cert.pem
+    $ gem cert --add gem-public_cert.pem
+
+Then, when install the gem, do so with high security:
+
+    $ gem install net-ssh -P HighSecurity
+
+If you don't add the public key, you'll see an error like "Couldn't verify data signature". If you're still having trouble let me know and I'll give you a hand.
+
 Or, if you prefer to do it the hard way (sans Rubygems):
 
 * tar xzf net-ssh-*.tgz

data/Rakefile

@@ -1,30 +1,54 @@
-$LOAD_PATH.unshift "../net-ssh/lib"
-require './lib/net/sftp/version'
+require "rubygems"
+require "rake"
+require "rake/clean"
+require "rdoc/task"
 
-begin
-  require 'echoe'
-rescue LoadError
-  abort "You'll need to have `echoe' installed to use Net::SFTP's Rakefile"
-end
+task :default => ["build"]
+CLEAN.include [ 'pkg', 'rdoc' ]
+name = "net-sftp"
 
+$:.unshift File.join(File.dirname(__FILE__), 'lib')
+require "net/sftp/version"
 version = Net::SFTP::Version::STRING.dup
-if ENV['SNAPSHOT'].to_i == 1
-  version << "." << Time.now.utc.strftime("%Y%m%d%H%M%S")
-end
 
-Echoe.new('net-sftp', version) do |p|
-  p.project          = "net-ssh"
-  p.changelog        = "CHANGELOG.rdoc"
+begin
+  require "jeweler"
+  Jeweler::Tasks.new do |s|
+    s.version = version
+    s.name = name
+    s.rubyforge_project = s.name
+    s.summary = "A pure Ruby implementation of the SFTP client protocol"
+    s.description = s.summary
+    s.email = "net-ssh@solutious.com"
+    s.homepage = "https://github.com/net-ssh/net-sftp"
+    s.authors = ["Jamis Buck", "Delano Mandelbaum"]
 
-  p.author           = "Jamis Buck"
-  p.email            = "netsftp@solutious.com"
-  p.summary          = "A pure Ruby implementation of the SFTP client protocol"
-  p.url              = "http://net-ssh.rubyforge.org/sftp"
+    s.add_dependency 'net-ssh', ">=2.6.4"
 
-  p.dependencies     = ["net-ssh >=2.0.9"]
+    s.add_development_dependency 'test-unit'
+    s.add_development_dependency 'mocha'
 
-  p.need_zip         = true
-  p.include_rakefile = true
+    s.license = "MIT"
 
-  p.rdoc_pattern     = /^(lib|README.rdoc|CHANGELOG.rdoc)/
+    s.signing_key = File.join('/mnt/gem/', 'gem-private_key.pem')
+    s.cert_chain  = ['gem-public_cert.pem']
+  end
+  Jeweler::GemcutterTasks.new
+rescue LoadError
+  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
+end
+
+extra_files = %w[LICENSE.txt THANKS.txt CHANGES.txt ]
+RDoc::Task.new do |rdoc|
+  rdoc.rdoc_dir = "rdoc"
+  rdoc.title = "#{name} #{version}"
+  rdoc.generator = 'hanna' # gem install hanna-nouveau
+  rdoc.main = 'README.rdoc'
+  rdoc.rdoc_files.include("README*")
+  rdoc.rdoc_files.include("bin/*.rb")
+  rdoc.rdoc_files.include("lib/**/*.rb")
+  extra_files.each { |file|
+    rdoc.rdoc_files.include(file) if File.exists?(file)
+  }
 end
+

data/gem-public_cert.pem

@@ -0,0 +1,20 @@
+-----BEGIN CERTIFICATE-----
+MIIDNjCCAh6gAwIBAgIBADANBgkqhkiG9w0BAQUFADBBMQ8wDQYDVQQDDAZkZWxh
+bm8xGTAXBgoJkiaJk/IsZAEZFglzb2x1dGlvdXMxEzARBgoJkiaJk/IsZAEZFgNj
+b20wHhcNMTMwMjA2MTE1NzQ1WhcNMTQwMjA2MTE1NzQ1WjBBMQ8wDQYDVQQDDAZk
+ZWxhbm8xGTAXBgoJkiaJk/IsZAEZFglzb2x1dGlvdXMxEzARBgoJkiaJk/IsZAEZ
+FgNjb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDg1hMtl0XsMuUK
+AKTgYWv3gjj7vuEsE2EjT+vyBg8/LpqVVwZziiaebJT9IZiQ+sCFqbiakj0b53pI
+hg1yOaBEmH6/W0L7rwzqaRV9sW1eJs9JxFYQCnd67zUnzj8nnRlOjG+hhIG+Vsij
+npsGbt28pefuNZJjO5q2clAlfSniIIHfIsU7/StEYu6FUGOjnwryZ0r5yJlr9RrE
+Gs+q0DW8QnZ9UpAfuDFQZuIqeKQFFLE7nMmCGaA+0BN1nLl3fVHNbLHq7Avk8+Z+
+ZuuvkdscbHlO/l+3xCNQ5nUnHwq0ADAbMLOlmiYYzqXoWLjmeI6me/clktJCfN2R
+oZG3UQvvAgMBAAGjOTA3MAkGA1UdEwQCMAAwHQYDVR0OBBYEFMSJOEtHzE4l0azv
+M0JK0kKNToK1MAsGA1UdDwQEAwIEsDANBgkqhkiG9w0BAQUFAAOCAQEAtOdE73qx
+OH2ydi9oT2hS5f9G0y1Z70Tlwh+VGExyfxzVE9XwC+iPpJxNraiHYgF/9/oky7ZZ
+R9q0/tJneuhAenZdiQkX7oi4O3v9wRS6YHoWBxMPFKVRLNTzvVJsbmfpCAlp5/5g
+ps4wQFy5mibElGVlOobf/ghqZ25HS9J6kd0/C/ry0AUtTogsL7TxGwT4kbCx63ub
+3vywEEhsJUzfd97GCABmtQfRTldX/j7F1z/5wd8p+hfdox1iibds9ZtfaZA3KzKn
+kchWN9B6zg9r1XMQ8BM2Jz0XoPanPe354+lWwjpkRKbFow/ZbQHcCLCq24+N6b6g
+dgKfNDzwiDpqCA==
+-----END CERTIFICATE-----

data/lib/net/sftp/operations/download.rb

@@ -318,7 +318,6 @@ module Net; module SFTP; module Operations
         request = sftp.read(entry.handle, entry.offset, read_size, &method(:on_read))
         request[:entry] = entry
         request[:offset] = entry.offset
-        entry.offset += read_size
       end
 
       # Called when a read from a file finishes. If the read was successful
@@ -335,6 +334,7 @@ module Net; module SFTP; module Operations
         elsif !response.ok?
           raise "read #{entry.remote}: #{response}"
         else
+          entry.offset += response[:data].bytesize
           update_progress(:get, entry, response.request[:offset], response[:data])
           entry.sink.write(response[:data])
           download_next_chunk(entry)

data/lib/net/sftp/operations/file.rb

@@ -1,5 +1,4 @@
 require 'net/ssh/loggable'
-require 'net/sftp/operations/file'
 
 module Net; module SFTP; module Operations
 

data/lib/net/sftp/operations/upload.rb

@@ -30,6 +30,9 @@ module Net; module SFTP; module Operations
   # This will upload "/path/to/directory", it's contents, it's subdirectories,
   # and their contents, recursively, to "/path/to/remote" on the remote server.
   #
+  # For uploading a directory without creating it, do
+  # sftp.upload!("/path/to/directory", "/path/to/remote", :mkdir => false)
+  #
   # If you want to send data to a file on the remote server, but the data is
   # in memory, you can pass an IO object and upload it's contents:
   #
@@ -157,12 +160,17 @@ module Net; module SFTP; module Operations
         @remote_cwd = remote
 
         @active += 1
-        sftp.mkdir(remote) do |response|
-          @active -= 1
-          raise StatusException.new(response, "mkdir `#{remote}'") unless response.ok?
-          (options[:requests] || RECURSIVE_READERS).to_i.times do
-            break unless process_next_entry
+        if @options[:mkdir]
+          sftp.mkdir(remote) do |response|
+            @active -= 1
+            raise StatusException.new(response, "mkdir `#{remote}'") unless response.ok?
+            (options[:requests] || RECURSIVE_READERS).to_i.times do
+              break unless process_next_entry
+            end
           end
+        else
+          @active -= 1
+          process_next_entry
         end
       else
         raise ArgumentError, "expected a file to upload" unless local.respond_to?(:read) || ::File.exists?(local)

data/lib/net/sftp/session.rb

@@ -94,12 +94,12 @@ module Net; module SFTP
       #
       #   uploader = sftp.upload("/local/path", "/remote/path")
       #   uploader.wait
-      def upload(local, remote, options={}, &block)
+      def upload(local, remote = File.basename(local), options={}, &block)
         Operations::Upload.new(self, local, remote, options, &block)
       end
 
       # Identical to #upload, but blocks until the upload is complete.
-      def upload!(local, remote, options={}, &block)
+      def upload!(local, remote = File.basename(local), options={}, &block)
         upload(local, remote, options, &block).wait
       end
 

data/lib/net/sftp/version.rb

@@ -5,8 +5,8 @@ module Net; module SFTP
   # Describes the current version of the Net::SFTP library.
   class Version < Net::SSH::Version
     MAJOR = 2
-    MINOR = 0
-    TINY  = 5
+    MINOR = 1
+    TINY  = 0
 
     # The current version, as a Version instance
     CURRENT = new(MAJOR, MINOR, TINY)

data/net-sftp.gemspec

@@ -1,34 +1,106 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{net-sftp}
-  s.version = "2.0.5"
+  s.name = "net-sftp"
+  s.version = "2.1.0"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Jamis Buck"]
-  s.date = %q{2010-08-19}
-  s.description = %q{A pure Ruby implementation of the SFTP client protocol}
-  s.email = %q{netsftp@solutious.com}
-  s.extra_rdoc_files = ["CHANGELOG.rdoc", "lib/net/sftp/constants.rb", "lib/net/sftp/errors.rb", "lib/net/sftp/operations/dir.rb", "lib/net/sftp/operations/download.rb", "lib/net/sftp/operations/file.rb", "lib/net/sftp/operations/file_factory.rb", "lib/net/sftp/operations/upload.rb", "lib/net/sftp/packet.rb", "lib/net/sftp/protocol/01/attributes.rb", "lib/net/sftp/protocol/01/base.rb", "lib/net/sftp/protocol/01/name.rb", "lib/net/sftp/protocol/02/base.rb", "lib/net/sftp/protocol/03/base.rb", "lib/net/sftp/protocol/04/attributes.rb", "lib/net/sftp/protocol/04/base.rb", "lib/net/sftp/protocol/04/name.rb", "lib/net/sftp/protocol/05/base.rb", "lib/net/sftp/protocol/06/attributes.rb", "lib/net/sftp/protocol/06/base.rb", "lib/net/sftp/protocol/base.rb", "lib/net/sftp/protocol.rb", "lib/net/sftp/request.rb", "lib/net/sftp/response.rb", "lib/net/sftp/session.rb", "lib/net/sftp/version.rb", "lib/net/sftp.rb", "README.rdoc"]
-  s.files = ["CHANGELOG.rdoc", "lib/net/sftp/constants.rb", "lib/net/sftp/errors.rb", "lib/net/sftp/operations/dir.rb", "lib/net/sftp/operations/download.rb", "lib/net/sftp/operations/file.rb", "lib/net/sftp/operations/file_factory.rb", "lib/net/sftp/operations/upload.rb", "lib/net/sftp/packet.rb", "lib/net/sftp/protocol/01/attributes.rb", "lib/net/sftp/protocol/01/base.rb", "lib/net/sftp/protocol/01/name.rb", "lib/net/sftp/protocol/02/base.rb", "lib/net/sftp/protocol/03/base.rb", "lib/net/sftp/protocol/04/attributes.rb", "lib/net/sftp/protocol/04/base.rb", "lib/net/sftp/protocol/04/name.rb", "lib/net/sftp/protocol/05/base.rb", "lib/net/sftp/protocol/06/attributes.rb", "lib/net/sftp/protocol/06/base.rb", "lib/net/sftp/protocol/base.rb", "lib/net/sftp/protocol.rb", "lib/net/sftp/request.rb", "lib/net/sftp/response.rb", "lib/net/sftp/session.rb", "lib/net/sftp/version.rb", "lib/net/sftp.rb", "Rakefile", "README.rdoc", "setup.rb", "test/common.rb", "test/protocol/01/test_attributes.rb", "test/protocol/01/test_base.rb", "test/protocol/01/test_name.rb", "test/protocol/02/test_base.rb", "test/protocol/03/test_base.rb", "test/protocol/04/test_attributes.rb", "test/protocol/04/test_base.rb", "test/protocol/04/test_name.rb", "test/protocol/05/test_base.rb", "test/protocol/06/test_attributes.rb", "test/protocol/06/test_base.rb", "test/protocol/test_base.rb", "test/test_all.rb", "test/test_dir.rb", "test/test_download.rb", "test/test_file.rb", "test/test_file_factory.rb", "test/test_packet.rb", "test/test_protocol.rb", "test/test_request.rb", "test/test_response.rb", "test/test_session.rb", "test/test_upload.rb", "Manifest", "net-sftp.gemspec"]
-  s.homepage = %q{http://net-ssh.rubyforge.org/sftp}
-  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Net-sftp", "--main", "README.rdoc"]
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Jamis Buck", "Delano Mandelbaum"]
+  s.cert_chain = ["gem-public_cert.pem"]
+  s.date = "2013-02-06"
+  s.description = "A pure Ruby implementation of the SFTP client protocol"
+  s.email = "net-ssh@solutious.com"
+  s.extra_rdoc_files = [
+    "LICENSE.txt",
+    "README.rdoc"
+  ]
+  s.files = [
+    "CHANGES.txt",
+    "LICENSE.txt",
+    "Manifest",
+    "README.rdoc",
+    "Rakefile",
+    "gem-public_cert.pem",
+    "lib/net/sftp.rb",
+    "lib/net/sftp/constants.rb",
+    "lib/net/sftp/errors.rb",
+    "lib/net/sftp/operations/dir.rb",
+    "lib/net/sftp/operations/download.rb",
+    "lib/net/sftp/operations/file.rb",
+    "lib/net/sftp/operations/file_factory.rb",
+    "lib/net/sftp/operations/upload.rb",
+    "lib/net/sftp/packet.rb",
+    "lib/net/sftp/protocol.rb",
+    "lib/net/sftp/protocol/01/attributes.rb",
+    "lib/net/sftp/protocol/01/base.rb",
+    "lib/net/sftp/protocol/01/name.rb",
+    "lib/net/sftp/protocol/02/base.rb",
+    "lib/net/sftp/protocol/03/base.rb",
+    "lib/net/sftp/protocol/04/attributes.rb",
+    "lib/net/sftp/protocol/04/base.rb",
+    "lib/net/sftp/protocol/04/name.rb",
+    "lib/net/sftp/protocol/05/base.rb",
+    "lib/net/sftp/protocol/06/attributes.rb",
+    "lib/net/sftp/protocol/06/base.rb",
+    "lib/net/sftp/protocol/base.rb",
+    "lib/net/sftp/request.rb",
+    "lib/net/sftp/response.rb",
+    "lib/net/sftp/session.rb",
+    "lib/net/sftp/version.rb",
+    "net-sftp.gemspec",
+    "setup.rb",
+    "test/common.rb",
+    "test/protocol/01/test_attributes.rb",
+    "test/protocol/01/test_base.rb",
+    "test/protocol/01/test_name.rb",
+    "test/protocol/02/test_base.rb",
+    "test/protocol/03/test_base.rb",
+    "test/protocol/04/test_attributes.rb",
+    "test/protocol/04/test_base.rb",
+    "test/protocol/04/test_name.rb",
+    "test/protocol/05/test_base.rb",
+    "test/protocol/06/test_attributes.rb",
+    "test/protocol/06/test_base.rb",
+    "test/protocol/test_base.rb",
+    "test/test_all.rb",
+    "test/test_dir.rb",
+    "test/test_download.rb",
+    "test/test_file.rb",
+    "test/test_file_factory.rb",
+    "test/test_packet.rb",
+    "test/test_protocol.rb",
+    "test/test_request.rb",
+    "test/test_response.rb",
+    "test/test_session.rb",
+    "test/test_upload.rb"
+  ]
+  s.homepage = "https://github.com/net-ssh/net-sftp"
+  s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubyforge_project = %q{net-ssh}
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{A pure Ruby implementation of the SFTP client protocol}
-  s.test_files = ["test/test_all.rb"]
+  s.rubyforge_project = "net-sftp"
+  s.rubygems_version = "1.8.25"
+  s.signing_key = "/mnt/gem/gem-private_key.pem"
+  s.summary = "A pure Ruby implementation of the SFTP client protocol"
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<net-ssh>, [">= 2.0.9"])
+      s.add_runtime_dependency(%q<net-ssh>, [">= 2.6.4"])
+      s.add_development_dependency(%q<test-unit>, [">= 0"])
+      s.add_development_dependency(%q<mocha>, [">= 0"])
     else
-      s.add_dependency(%q<net-ssh>, [">= 2.0.9"])
+      s.add_dependency(%q<net-ssh>, [">= 2.6.4"])
+      s.add_dependency(%q<test-unit>, [">= 0"])
+      s.add_dependency(%q<mocha>, [">= 0"])
     end
   else
-    s.add_dependency(%q<net-ssh>, [">= 2.0.9"])
+    s.add_dependency(%q<net-ssh>, [">= 2.6.4"])
+    s.add_dependency(%q<test-unit>, [">= 0"])
+    s.add_dependency(%q<mocha>, [">= 0"])
   end
 end
+

data/test/common.rb

@@ -1,5 +1,5 @@
 require 'test/unit'
-require 'mocha'
+require 'mocha/setup'
 require 'stringio'
 
 begin

data/test/test_all.rb

@@ -3,5 +3,5 @@
 #puts Net::SSH::Version::CURRENT
 require 'common'
 Dir.chdir(File.dirname(__FILE__)) do
-  Dir['**/test_*.rb'].each { |file| require(file) }
+  Dir['**/test_*.rb'].each { |file| require(file) unless file == File.basename(__FILE__) }
 end

data/test/test_download.rb

@@ -1,6 +1,8 @@
 require "common"
 
 class DownloadTest < Net::SFTP::TestCase
+  FXP_DATA_CHUNK_SIZE = 1024
+
   def setup
     prepare_progress!
   end
@@ -30,6 +32,19 @@ class DownloadTest < Net::SFTP::TestCase
     assert_equal text, file.string
   end
 
+  def test_download_large_file_should_handle_too_large_read_size
+    local = "/path/to/local"
+    remote = "/path/to/remote"
+    text = "0123456789" * 1024
+
+    # some servers put upper bound on the max read_size value and send less data than requested
+    too_large_read_size = FXP_DATA_CHUNK_SIZE + 1
+    file = prepare_large_file_download(local, remote, text, too_large_read_size)
+
+    assert_scripted_command { sftp.download(remote, local, :read_size => too_large_read_size) }
+    assert_equal text, file.string
+  end
+
   def test_download_large_file_with_progress_should_report_progress
     local = "/path/to/local"
     remote = "/path/to/remote"
@@ -121,25 +136,29 @@ class DownloadTest < Net::SFTP::TestCase
         channel.gets_packet(FXP_HANDLE, :long, 0, :string, "handle")
         channel.sends_packet(FXP_READ, :long, 1, :string, "handle", :int64, 0, :long, 32_000)
         channel.gets_packet(FXP_DATA, :long, 1, :string, text)
-        channel.sends_packet(FXP_READ, :long, 2, :string, "handle", :int64, 32_000, :long, 32_000)
+        channel.sends_packet(FXP_READ, :long, 2, :string, "handle", :int64, text.bytesize, :long, 32_000)
         channel.gets_packet(FXP_STATUS, :long, 2, :long, 1)
         channel.sends_packet(FXP_CLOSE, :long, 3, :string, "handle")
         channel.gets_packet(FXP_STATUS, :long, 3, :long, 0)
       end
     end
 
-    def prepare_large_file_download(local, remote, text)
+    def prepare_large_file_download(local, remote, text, requested_chunk_size = FXP_DATA_CHUNK_SIZE)
       expect_sftp_session :server_version => 3 do |channel|
         channel.sends_packet(FXP_OPEN, :long, 0, :string, remote, :long, 0x01, :long, 0)
         channel.gets_packet(FXP_HANDLE, :long, 0, :string, "handle")
-        10.times do |n|
-          channel.sends_packet(FXP_READ, :long, n+1, :string, "handle", :int64, n*1024, :long, 1024)
-          channel.gets_packet(FXP_DATA, :long, n+1, :string, text[n*1024,1024])
+        offset = 0
+        data_packet_count = (text.bytesize / FXP_DATA_CHUNK_SIZE.to_f).ceil
+        data_packet_count.times do |n|
+          payload = text[n*FXP_DATA_CHUNK_SIZE,FXP_DATA_CHUNK_SIZE]
+          channel.sends_packet(FXP_READ, :long, n+1, :string, "handle", :int64, offset, :long, requested_chunk_size)
+          offset += payload.bytesize
+          channel.gets_packet(FXP_DATA, :long, n+1, :string, payload)
         end
-        channel.sends_packet(FXP_READ, :long, 11, :string, "handle", :int64, 10240, :long, 1024)
-        channel.gets_packet(FXP_STATUS, :long, 11, :long, 1)
-        channel.sends_packet(FXP_CLOSE, :long, 12, :string, "handle")
-        channel.gets_packet(FXP_STATUS, :long, 12, :long, 0)
+        channel.sends_packet(FXP_READ, :long, data_packet_count + 1, :string, "handle", :int64, offset, :long, requested_chunk_size)
+        channel.gets_packet(FXP_STATUS, :long, data_packet_count + 1, :long, 1)
+        channel.sends_packet(FXP_CLOSE, :long, data_packet_count + 2, :string, "handle")
+        channel.gets_packet(FXP_STATUS, :long, data_packet_count + 2, :long, 0)
       end
       
       file = StringIO.new
@@ -182,6 +201,8 @@ class DownloadTest < Net::SFTP::TestCase
     # <- 15:STATUS(0)
 
     def prepare_directory_tree_download(local, remote)
+      file1_contents = "contents of file1"
+      file2_contents = "contents of file2"
       expect_sftp_session :server_version => 3 do |channel|
         channel.sends_packet(FXP_OPENDIR, :long, 0, :string, remote)
         channel.gets_packet(FXP_HANDLE, :long, 0, :string, "dir1")
@@ -214,8 +235,8 @@ class DownloadTest < Net::SFTP::TestCase
         channel.sends_packet(FXP_OPEN, :long, 8, :string, File.join(remote, "subdir1", "file2"), :long, 0x01, :long, 0)
         channel.sends_packet(FXP_READDIR, :long, 9, :string, "dir2")
 
-        channel.gets_packet(FXP_DATA, :long, 6, :string, "contents of file1")
-        channel.sends_packet(FXP_READ, :long, 10, :string, "file1", :int64, 32_000, :long, 32_000)
+        channel.gets_packet(FXP_DATA, :long, 6, :string, file1_contents)
+        channel.sends_packet(FXP_READ, :long, 10, :string, "file1", :int64, file1_contents.bytesize, :long, 32_000)
 
         channel.gets_packet(FXP_STATUS, :long, 7, :long, 0)
         channel.gets_packet(FXP_HANDLE, :long, 8, :string, "file2")
@@ -227,8 +248,8 @@ class DownloadTest < Net::SFTP::TestCase
         channel.gets_packet(FXP_STATUS, :long, 10, :long, 1)
         channel.sends_packet(FXP_CLOSE, :long, 13, :string, "file1")
 
-        channel.gets_packet(FXP_DATA, :long, 11, :string, "contents of file2")
-        channel.sends_packet(FXP_READ, :long, 14, :string, "file2", :int64, 32_000, :long, 32_000)
+        channel.gets_packet(FXP_DATA, :long, 11, :string, file2_contents)
+        channel.sends_packet(FXP_READ, :long, 14, :string, "file2", :int64, file2_contents.bytesize, :long, 32_000)
 
         channel.gets_packet(FXP_STATUS, :long, 12, :long, 0)
         channel.gets_packet(FXP_STATUS, :long, 13, :long, 0)

data/test/test_upload.rb

@@ -10,6 +10,20 @@ class UploadTest < Net::SFTP::TestCase
     assert_scripted_command { sftp.upload("/path/to/local", "/path/to/remote") }
   end
 
+  def test_upload_file_without_remote_uses_filename_of_local_file
+    expect_file_transfer("/path/to/local", "local", "here are the contents")
+
+    assert_scripted_command do
+      sftp.upload("/path/to/local") { |*args| record_progress(args) }
+    end
+
+    assert_progress_reported_open(:remote => "local")
+    assert_progress_reported_put(0, "here are the contents", :remote => "local")
+    assert_progress_reported_close(:remote => "local")
+    assert_progress_reported_finish
+    assert_no_more_reported_events
+  end
+
   def test_upload_file_with_progress_should_report_progress
     expect_file_transfer("/path/to/local", "/path/to/remote", "here are the contents")
 
@@ -96,7 +110,7 @@ class UploadTest < Net::SFTP::TestCase
     prepare_directory
 
     assert_scripted_command do
-      sftp.upload("/path/to/local", "/path/to/remote")
+      sftp.upload("/path/to/local", "/path/to/remote", :mkdir => true)
     end
   end
 
@@ -104,7 +118,7 @@ class UploadTest < Net::SFTP::TestCase
     prepare_directory
 
     assert_scripted_command do
-      sftp.upload("/path/to/local", "/path/to/remote") { |*args| record_progress(args) }
+      sftp.upload("/path/to/local", "/path/to/remote", :mkdir => true) { |*args| record_progress(args) }
     end
 
     assert_progress_reported_open(:remote => "/path/to/remote/file1")
@@ -216,4 +230,4 @@ class UploadTest < Net::SFTP::TestCase
 
       expect_file(local, data)
     end
-end
+end

metadata

@@ -1,76 +1,108 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: net-sftp
-version: !ruby/object:Gem::Version 
-  hash: 5
-  prerelease: false
-  segments: 
-  - 2
-  - 0
-  - 5
-  version: 2.0.5
+version: !ruby/object:Gem::Version
+  version: 2.1.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Jamis Buck
+- Delano Mandelbaum
 autorequire: 
 bindir: bin
-cert_chain: []
-
-date: 2010-08-19 00:00:00 -04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+cert_chain:
+- !binary |-
+  LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUROakNDQWg2Z0F3SUJB
+  Z0lCQURBTkJna3Foa2lHOXcwQkFRVUZBREJCTVE4d0RRWURWUVFEREFaa1pX
+  eGgKYm04eEdUQVhCZ29Ka2lhSmsvSXNaQUVaRmdsemIyeDFkR2x2ZFhNeEV6
+  QVJCZ29Ka2lhSmsvSXNaQUVaRmdOagpiMjB3SGhjTk1UTXdNakEyTVRFMU56
+  UTFXaGNOTVRRd01qQTJNVEUxTnpRMVdqQkJNUTh3RFFZRFZRUUREQVprClpX
+  eGhibTh4R1RBWEJnb0praWFKay9Jc1pBRVpGZ2x6YjJ4MWRHbHZkWE14RXpB
+  UkJnb0praWFKay9Jc1pBRVoKRmdOamIyMHdnZ0VpTUEwR0NTcUdTSWIzRFFF
+  QkFRVUFBNElCRHdBd2dnRUtBb0lCQVFEZzFoTXRsMFhzTXVVSwpBS1RnWVd2
+  M2dqajd2dUVzRTJFalQrdnlCZzgvTHBxVlZ3WnppaWFlYkpUOUlaaVErc0NG
+  cWJpYWtqMGI1M3BJCmhnMXlPYUJFbUg2L1cwTDdyd3pxYVJWOXNXMWVKczlK
+  eEZZUUNuZDY3elVuemo4bm5SbE9qRytoaElHK1ZzaWoKbnBzR2J0MjhwZWZ1
+  TlpKak81cTJjbEFsZlNuaUlJSGZJc1U3L1N0RVl1NkZVR09qbndyeVowcjV5
+  SmxyOVJyRQpHcytxMERXOFFuWjlVcEFmdURGUVp1SXFlS1FGRkxFN25NbUNH
+  YUErMEJOMW5MbDNmVkhOYkxIcTdBdms4K1orClp1dXZrZHNjYkhsTy9sKzN4
+  Q05RNW5Vbkh3cTBBREFiTUxPbG1pWVl6cVhvV0xqbWVJNm1lL2Nsa3RKQ2ZO
+  MlIKb1pHM1VRdnZBZ01CQUFHak9UQTNNQWtHQTFVZEV3UUNNQUF3SFFZRFZS
+  ME9CQllFRk1TSk9FdEh6RTRsMGF6dgpNMEpLMGtLTlRvSzFNQXNHQTFVZER3
+  UUVBd0lFc0RBTkJna3Foa2lHOXcwQkFRVUZBQU9DQVFFQXRPZEU3M3F4Ck9I
+  MnlkaTlvVDJoUzVmOUcweTFaNzBUbHdoK1ZHRXh5Znh6VkU5WHdDK2lQcEp4
+  TnJhaUhZZ0YvOS9va3k3WloKUjlxMC90Sm5ldWhBZW5aZGlRa1g3b2k0TzN2
+  OXdSUzZZSG9XQnhNUEZLVlJMTlR6dlZKc2JtZnBDQWxwNS81ZwpwczR3UUZ5
+  NW1pYkVsR1ZsT29iZi9naHFaMjVIUzlKNmtkMC9DL3J5MEFVdFRvZ3NMN1R4
+  R3dUNGtiQ3g2M3ViCjN2eXdFRWhzSlV6ZmQ5N0dDQUJtdFFmUlRsZFgvajdG
+  MXovNXdkOHAraGZkb3gxaWliZHM5WnRmYVpBM0t6S24Ka2NoV045QjZ6Zzly
+  MVhNUThCTTJKejBYb1BhblBlMzU0K2xXd2pwa1JLYkZvdy9aYlFIY0NMQ3Ey
+  NCtONmI2ZwpkZ0tmTkR6d2lEcHFDQT09Ci0tLS0tRU5EIENFUlRJRklDQVRF
+  LS0tLS0K
+date: 2013-02-06 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: net-ssh
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 29
-        segments: 
-        - 2
-        - 0
-        - 9
-        version: 2.0.9
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.6.4
   type: :runtime
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.6.4
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A pure Ruby implementation of the SFTP client protocol
-email: netsftp@solutious.com
+email: net-ssh@solutious.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
-- CHANGELOG.rdoc
-- lib/net/sftp/constants.rb
-- lib/net/sftp/errors.rb
-- lib/net/sftp/operations/dir.rb
-- lib/net/sftp/operations/download.rb
-- lib/net/sftp/operations/file.rb
-- lib/net/sftp/operations/file_factory.rb
-- lib/net/sftp/operations/upload.rb
-- lib/net/sftp/packet.rb
-- lib/net/sftp/protocol/01/attributes.rb
-- lib/net/sftp/protocol/01/base.rb
-- lib/net/sftp/protocol/01/name.rb
-- lib/net/sftp/protocol/02/base.rb
-- lib/net/sftp/protocol/03/base.rb
-- lib/net/sftp/protocol/04/attributes.rb
-- lib/net/sftp/protocol/04/base.rb
-- lib/net/sftp/protocol/04/name.rb
-- lib/net/sftp/protocol/05/base.rb
-- lib/net/sftp/protocol/06/attributes.rb
-- lib/net/sftp/protocol/06/base.rb
-- lib/net/sftp/protocol/base.rb
-- lib/net/sftp/protocol.rb
-- lib/net/sftp/request.rb
-- lib/net/sftp/response.rb
-- lib/net/sftp/session.rb
-- lib/net/sftp/version.rb
-- lib/net/sftp.rb
+extra_rdoc_files:
+- LICENSE.txt
+- README.rdoc
+files:
+- CHANGES.txt
+- LICENSE.txt
+- Manifest
 - README.rdoc
-files: 
-- CHANGELOG.rdoc
+- Rakefile
+- gem-public_cert.pem
+- lib/net/sftp.rb
 - lib/net/sftp/constants.rb
 - lib/net/sftp/errors.rb
 - lib/net/sftp/operations/dir.rb
@@ -79,6 +111,7 @@ files:
 - lib/net/sftp/operations/file_factory.rb
 - lib/net/sftp/operations/upload.rb
 - lib/net/sftp/packet.rb
+- lib/net/sftp/protocol.rb
 - lib/net/sftp/protocol/01/attributes.rb
 - lib/net/sftp/protocol/01/base.rb
 - lib/net/sftp/protocol/01/name.rb
@@ -91,14 +124,11 @@ files:
 - lib/net/sftp/protocol/06/attributes.rb
 - lib/net/sftp/protocol/06/base.rb
 - lib/net/sftp/protocol/base.rb
-- lib/net/sftp/protocol.rb
 - lib/net/sftp/request.rb
 - lib/net/sftp/response.rb
 - lib/net/sftp/session.rb
 - lib/net/sftp/version.rb
-- lib/net/sftp.rb
-- Rakefile
-- README.rdoc
+- net-sftp.gemspec
 - setup.rb
 - test/common.rb
 - test/protocol/01/test_attributes.rb
@@ -124,47 +154,29 @@ files:
 - test/test_response.rb
 - test/test_session.rb
 - test/test_upload.rb
-- Manifest
-- net-sftp.gemspec
-has_rdoc: true
-homepage: http://net-ssh.rubyforge.org/sftp
-licenses: []
-
+homepage: https://github.com/net-ssh/net-sftp
+licenses:
+- MIT
 post_install_message: 
-rdoc_options: 
-- --line-numbers
-- --inline-source
-- --title
-- Net-sftp
-- --main
-- README.rdoc
-require_paths: 
+rdoc_options: []
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 11
-      segments: 
-      - 1
-      - 2
-      version: "1.2"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
-rubyforge_project: net-ssh
-rubygems_version: 1.3.7
+rubyforge_project: net-sftp
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: A pure Ruby implementation of the SFTP client protocol
-test_files: 
-- test/test_all.rb
+test_files: []

metadata.gz.sig

@@ -0,0 +1,3 @@
+��!ˮ��alL
+��q�XNTw��-G�J�WǙY݄r��a�J3%�h�
�s(
+RNZ��%91�#�.�����[���?��jm�t,a����f����V���$7�rf�sQ/��"-i�!�y�҂8���YG}���Hj|��ayF�?��J\QN�b�:�ę�!E<�h��-0VT%�{U2�е���b����Kc۰̌cU�)>ci�L��e�,�í��D�.f۩{��zV��AV�����ތ��'���%�o