net-sftp 2.1.3.rc3 → 3.0.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4089bb0442c65560beabbd81c7dd5312f54091db
-  data.tar.gz: '091ca6fe9e56584d72a8fd302ac6ddb439659103'
+  metadata.gz: dfaa82448aebfb3c2a205a2ee3a4a00cb79880de
+  data.tar.gz: 80dd6481dd160bf3a25ba724c13cd1d86f2faa96
 SHA512:
-  metadata.gz: 5672fe2bbb93376a0e81573b1a96d0dc2d99bc7ef216269c19ea76deb313aacf0f177e5cb8fff5005f6dc49862660c68ed4898948f3413d34ce8d1b92fdb4405
-  data.tar.gz: 7d01db8e73f61a9a2cddcfe967de03678e2fca9f7c7aefdd4d777d2258217b315e40bf58547f2ac4d9101e62a7d1fd019393de663c297fff45bff7f5e27b0843
+  metadata.gz: 1b420fd11f558578edd054c8413c3de74515791d05d982bad5d07ac0c5e0a540bc8af13cf23e347091431e43611b3f3116de6917754bf87a9b37e0f692ad42d8
+  data.tar.gz: df1d630648a90a715148837346d3be01d9462a70c3831822d4a4d803fa320b1544fda4b2faab3f7f45256ad79a160e0f1d00b347f18750cbb66081fa3b6ae4fd

data/.travis.yml

@@ -1,14 +1,14 @@
 language: ruby
 sudo: false
 rvm:
-  - 2.0.0
-  - 2.1.0
-  - 2.2.0
-  - 2.3.0
-  - 2.4.0
+  - 2.2.10
+  - 2.3.7
+  - 2.4.5
+  - 2.5.3
+  - 2.6.0-rc2
   - ruby-head
   - jruby-head
-  - rbx-2
+  - rbx-3.107
 
 install: gem install net-ssh test-unit mocha
 
@@ -17,4 +17,4 @@ script: rake test
 matrix:
   allow_failures:
     - rvm: jruby-head
-    - rvm: rbx-2
+    - rvm: rbx-3.107

data/README.rdoc

@@ -26,7 +26,7 @@ Net::SFTP is a pure-Ruby implementation of the SFTP protocol (specifically, vers
 
 In a nutshell:
 
-  require 'net/sftp'
+  require 'net-sftp'
 
   Net::SFTP.start('host', 'username', :password => 'password') do |sftp|
     # upload a file or directory to the remote host

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

@@ -57,10 +57,10 @@ module Net; module SFTP; module Operations
     # it should be able to handle modest numbers of files in each directory.
     def glob(path, pattern, flags=0)
       flags |= ::File::FNM_PATHNAME
-      path = path.chop if path[-1,1] == "/"
+      path = path.chop if path.end_with?('/') && path != '/'
 
       results = [] unless block_given?
-      queue = entries(path).reject { |e| e.name == "." || e.name == ".." }
+      queue = entries(path).reject { |e| %w(. ..).include?(e.name) }
       while queue.any?
         entry = queue.shift
 
@@ -90,4 +90,4 @@ module Net; module SFTP; module Operations
     end
   end
 
-end; end; end
+end; end; end

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

@@ -256,7 +256,7 @@ module Net; module SFTP; module Operations
       # operation was successful.
       def on_opendir(response)
         entry = response.request[:entry]
-        raise "opendir #{entry.remote}: #{response}" unless response.ok?
+        raise  StatusException.new(response, "opendir #{entry.remote}") unless response.ok?
         entry.handle = response[:handle]
         request = sftp.readdir(response[:handle], &method(:on_readdir))
         request[:parent] = entry
@@ -271,7 +271,7 @@ module Net; module SFTP; module Operations
           request = sftp.close(entry.handle, &method(:on_closedir))
           request[:parent] = entry
         elsif !response.ok?
-          raise "readdir #{entry.remote}: #{response}"
+          raise StatusException.new(response, "readdir #{entry.remote}")
         else
           response[:names].each do |item|
             next if item.name == "." || item.name == ".."
@@ -297,7 +297,7 @@ module Net; module SFTP; module Operations
       def on_closedir(response)
         @active -= 1
         entry = response.request[:parent]
-        raise "close #{entry.remote}: #{response}" unless response.ok?
+        raise StatusException.new(response, "close #{entry.remote}") unless response.ok?
         process_next_entry
       end
 
@@ -305,7 +305,7 @@ module Net; module SFTP; module Operations
       # to initiate the data transfer.
       def on_open(response)
         entry = response.request[:entry]
-        raise "open #{entry.remote}: #{response}" unless response.ok?
+        raise StatusException.new(response, "open #{entry.remote}") unless response.ok?
 
         entry.handle = response[:handle]
         entry.sink = entry.local.respond_to?(:write) ? entry.local : ::File.open(entry.local, "wb")
@@ -333,7 +333,7 @@ module Net; module SFTP; module Operations
           request = sftp.close(entry.handle, &method(:on_close))
           request[:entry] = entry
         elsif !response.ok?
-          raise "read #{entry.remote}: #{response}"
+          raise StatusException.new(response, "read #{entry.remote}")
         else
           entry.offset += response[:data].bytesize
           update_progress(:get, entry, response.request[:offset], response[:data])
@@ -346,7 +346,7 @@ module Net; module SFTP; module Operations
       def on_close(response)
         @active -= 1
         entry = response.request[:entry]
-        raise "close #{entry.remote}: #{response}" unless response.ok?
+        raise StatusException.new(response, "close #{entry.remote}") unless response.ok?
         process_next_entry
       end
 

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

@@ -81,21 +81,35 @@ module Net; module SFTP; module Operations
     # Reads up to the next instance of +sep_string+ in the stream, and
     # returns the bytes read (including +sep_string+). If +sep_string+ is
     # omitted, it defaults to +$/+. If EOF is encountered before any data
-    # could be read, #gets will return +nil+.
-    def gets(sep_string=$/)
-      delim = if sep_string.length == 0
+    # could be read, #gets will return +nil+. If the first argument is an
+    # integer, or optional second argument is given, the returning string
+    # would not be longer than the given value in bytes.
+    def gets(sep_or_limit=$/, limit=Float::INFINITY)
+      if sep_or_limit.is_a? Integer
+        sep_string = $/
+        lim = sep_or_limit
+      else
+        sep_string = sep_or_limit
+        lim = limit
+      end
+
+      delim = if sep_string && sep_string.length == 0
         "#{$/}#{$/}"
       else
         sep_string
       end
 
       loop do
-        at = @buffer.index(delim)
+        at = @buffer.index(delim) if delim
         if at
-          offset = at + delim.length
+          offset = [at + delim.length, lim].min
           @pos += offset
           line, @buffer = @buffer[0,offset], @buffer[offset..-1]
           return line
+        elsif lim < @buffer.length
+          @pos += lim
+          line, @buffer = @buffer[0,lim], @buffer[lim..-1]
+          return line
         elsif !fill
           return nil if @buffer.empty?
           @pos += @buffer.length
@@ -107,8 +121,8 @@ module Net; module SFTP; module Operations
 
     # Same as #gets, but raises EOFError if EOF is encountered before any
     # data could be read.
-    def readline(sep_string=$/)
-      line = gets(sep_string)
+    def readline(sep_or_limit=$/, limit=Float::INFINITY)
+      line = gets(sep_or_limit, limit)
       raise EOFError if line.nil?
       return line
     end
@@ -131,6 +145,15 @@ module Net; module SFTP; module Operations
       nil
     end
 
+    def size
+      stat.size
+    end
+
+    # Resets position to beginning of file
+    def rewind
+      self.pos = 0
+    end
+
     # Writes each argument to the stream, appending a newline to any item
     # that does not already end in a newline. Array arguments are flattened.
     def puts(*items)

data/lib/net/sftp/version.rb

@@ -46,17 +46,17 @@ module Net
       end
 
       # The major component of this version of the Net::SFTP library
-      MAJOR = 2
+      MAJOR = 3
 
       # The minor component of this version of the Net::SFTP library
-      MINOR = 1
+      MINOR = 0
 
       # The tiny component of this version of the Net::SFTP library
-      TINY  = 3
+      TINY  = 0
 
       # The prerelease component of this version of the Net::SFTP library
       # nil allowed
-      PRE   = "rc3"
+      PRE   = "beta1"
 
       # The current version of the Net::SFTP library as a Version instance
       CURRENT = new(*[MAJOR, MINOR, TINY, PRE].compact)

data/net-sftp.gemspec

@@ -31,16 +31,16 @@ Gem::Specification.new do |spec|
     spec.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      spec.add_runtime_dependency(%q<net-ssh>, [">= 2.6.5", "< 6.0.0"])
+      spec.add_runtime_dependency(%q<net-ssh>, [">= 5.0.0", "< 6.0.0"])
       spec.add_development_dependency(%q<test-unit>, [">= 0"])
       spec.add_development_dependency(%q<mocha>, [">= 0"])
     else
-      spec.add_dependency(%q<net-ssh>, [">= 2.6.5", "< 6.0.0"])
+      spec.add_dependency(%q<net-ssh>, [">= 5.0.0", "< 6.0.0"])
       spec.add_dependency(%q<test-unit>, [">= 0"])
       spec.add_dependency(%q<mocha>, [">= 0"])
     end
   else
-    spec.add_dependency(%q<net-ssh>, [">= 2.6.5", "< 6.0.0"])
+    spec.add_dependency(%q<net-ssh>, [">= 5.0.0", "< 6.0.0"])
     spec.add_dependency(%q<test-unit>, [">= 0"])
     spec.add_dependency(%q<mocha>, [">= 0"])
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: net-sftp
 version: !ruby/object:Gem::Version
-  version: 2.1.3.rc3
+  version: 3.0.0.beta1
 platform: ruby
 authors:
 - Jamis Buck
@@ -32,7 +32,7 @@ cert_chain:
   YBtB7WnyXXwkUAo0FUibVzXXSxU+wXhrfpOCo2ZOlQOspdOcGZjirOZoxUKSvMtn
   URWm7gw7y0UkzFg4iZOFuC84+4GZ08U3/gr9sg==
   -----END CERTIFICATE-----
-date: 2018-12-13 00:00:00.000000000 Z
+date: 2018-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -40,7 +40,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.6.5
+        version: 5.0.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 6.0.0
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.6.5
+        version: 5.0.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 6.0.0