net-sftp 3.0.0.rc1 → 4.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 957073b004855dcca5c6535243c54f11eaf1db30a7c984d4910e08148415aec1
-  data.tar.gz: 97596162986c3be2939f8c97af3806d44250153886d285d13f85e6e95fb64a0f
+  metadata.gz: c208f351ce9e023de21fa61fffaf6cddf7368d089038c86903dfdfded4a22306
+  data.tar.gz: 2866977faf029bf8cbdd1427a995798147514f20ed83a6279179143cb0d71d5f
 SHA512:
-  metadata.gz: 212b6284e7835fcb60499b8fd030bdf9774ec5f05c9cc5a5d296d2db1ca0441743a74542ff740b501bb36e5c4c668044260dbbdb282a4bb7fd823aee964c7269
-  data.tar.gz: 68a3ba54c28b89b3abdb8ef96a53d0f0b1f8c77b17ac7094883c53609146ee3d2ea603f13a1fb429d06923545dc7d494f8111572c29366659922d6e062db75bf
+  metadata.gz: 12a498bebbe46993beb04fdea1989a57c26d7f48b69d3f34625ff063530221233220129f1e7c08cb7ee0f38b2ae7344de7da9d29ae2e638969efaa9b9c7e31c6
+  data.tar.gz: c8f73e75418e3153a4185ec18f407d6654d0c904b6de2bb9f79343062bac4bb653f6706346e40029822773bd7ed1845af401acb99ee69d2e99b8140531ae8df0

data/.github/workflows/ci.yml

@@ -0,0 +1,35 @@
+name: CI
+on: [push, pull_request]
+jobs:
+  test:
+    runs-on: ubuntu-18.04
+    continue-on-error: ${{ matrix.flaky }}
+    strategy:
+      matrix:
+        ruby-version: ["2.5", "2.6", "2.7", "3.0", "3.1", "truffleruby-22", "truffleruby-21"]
+        flaky: [false]
+        include:
+          - ruby-version: "ruby-head"
+            flaky: true
+          - ruby-version: "jruby-9.2"
+            flaky: true
+          - ruby-version: "jruby-9.3"
+            flaky: true
+          - ruby-version: "jruby-head"
+            flaky: true
+          - ruby-version: "truffleruby-head"
+            flaky: true
+    steps:
+      - uses: actions/checkout@v1
+
+      - name: Set up Ruby ${{ matrix.ruby-version }}
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+
+      - name: Bundle install
+        run: |
+          gem install bundler
+          bundle install
+      - name: Run Tests
+        run: bundle exec rake test

data/.gitignore

@@ -3,3 +3,4 @@ doc
 coverage
 ri
 *.swp
+Gemfile.lock

data/CHANGES.txt

@@ -1,3 +1,7 @@
+=== 3.0.0
+
+* Pass protocol version via Net::SFTP.start [#107]
+* Net-ssh 6.0 support [#106]
 
 === 2.1.2 / 07 May 2013
 

data/README.rdoc

@@ -3,7 +3,7 @@
 <em><b>Please note: this project is in maintenance mode. It is not under active development but pull requests are very much welcome. Just be sure to include tests! -- delano</b></em>
 
 
-* Docs: http://net-ssh.github.com/net-sftp
+* Docs: http://net-ssh.github.io/net-sftp
 * Issues: https://github.com/net-ssh/net-sftp/issues
 * Codes: https://github.com/net-ssh/net-sftp
 * Email: net-ssh@solutious.com
@@ -76,8 +76,8 @@ However, in order to be sure the code you're installing hasn't been tampered wit
 
     # 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
+    $ curl -O https://raw.githubusercontent.com/net-ssh/net-sftp/master/net-sftp-public_cert.pem
+    $ gem cert --add net-sftp-public_cert.pem
 
 Then, when install the gem, do so with high security:
 

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

@@ -27,7 +27,7 @@ module Net; module SFTP; module Operations
   #
   #   sftp.download!("/path/to/remotedir", "/path/to/local", :recursive => true)
   #
-  # This will download "/path/to/remotedir", it's contents, it's subdirectories,
+  # This will download "/path/to/remotedir", its contents, its subdirectories,
   # and their contents, recursively, to "/path/to/local" on the local host.
   # (If you specify :recursive => true and the source is not a directory,
   # you'll get an error!)

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

@@ -132,9 +132,9 @@ module Net; module SFTP; module Operations
     def write(data)
       data = data.to_s
       sftp.write!(handle, @real_pos, data)
-      @real_pos += data.length
+      @real_pos += data.bytes.length
       @pos = @real_pos
-      data.length
+      data.bytes.length
     end
 
     # Writes each argument to the stream. If +$\+ is set, it will be written

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

@@ -27,14 +27,14 @@ module Net; module SFTP; module Operations
   #
   #   sftp.upload!("/path/to/directory", "/path/to/remote")
   #
-  # This will upload "/path/to/directory", it's contents, it's subdirectories,
+  # This will upload "/path/to/directory", its contents, its 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:
+  # in memory, you can pass an IO object and upload its contents:
   #
   #   require 'stringio'
   #   io = StringIO.new(data)

data/lib/net/sftp/session.rb

@@ -419,7 +419,7 @@ module Net; module SFTP
 
       # :call-seq:
       #   readdir(handle) -> request
-      #   raeddir(handle) { |response| ... } -> request
+      #   readdir(handle) { |response| ... } -> request
       #
       # Reads a set of entries from the given directory handle (which must
       # have been obtained via #opendir). If the response is EOF, then there

data/lib/net/sftp/version.rb

@@ -46,7 +46,7 @@ module Net
       end
 
       # The major component of this version of the Net::SFTP library
-      MAJOR = 3
+      MAJOR = 4
 
       # The minor component of this version of the Net::SFTP library
       MINOR = 0

data/lib/net/sftp.rb

@@ -27,9 +27,17 @@ module Net
     #   Net::SFTP.start("localhost", "user") do |sftp|
     #     sftp.upload! "/local/file.tgz", "/remote/file.tgz"
     #   end
-    def self.start(host, user, options={}, &block)
-      session = Net::SSH.start(host, user, options)
-      sftp = Net::SFTP::Session.new(session, &block).connect!
+    #
+    # Extra parameters can be passed:
+    # - The Net::SSH connection options (see Net::SSH for more information)
+    # - The Net::SFTP connection options (only :version is supported, to let you 
+    #   set the SFTP protocol version to be used)
+    def self.start(host, user, ssh_options={}, sftp_options={}, &block)
+      session = Net::SSH.start(host, user, ssh_options)
+      # We only use a single option here, but this leaves room for more later
+      # without breaking the external API.
+      version = sftp_options.fetch(:version, nil)
+      sftp = Net::SFTP::Session.new(session, version, &block).connect!
 
       if block_given?
         sftp.loop

data/net-sftp-public_cert.pem

@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
 MIIDQDCCAiigAwIBAgIBATANBgkqhkiG9w0BAQsFADAlMSMwIQYDVQQDDBpuZXRz
-c2gvREM9c29sdXRpb3VzL0RDPWNvbTAeFw0yMDA0MjYwNjI0NTFaFw0yMTA0MjYw
-NjI0NTFaMCUxIzAhBgNVBAMMGm5ldHNzaC9EQz1zb2x1dGlvdXMvREM9Y29tMIIB
+c2gvREM9c29sdXRpb3VzL0RDPWNvbTAeFw0yMjA5MjIxMTUwMDJaFw0yMzA5MjIx
+MTUwMDJaMCUxIzAhBgNVBAMMGm5ldHNzaC9EQz1zb2x1dGlvdXMvREM9Y29tMIIB
 IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxieE22fR/qmdPKUHyYTyUx2g
 wskLwrCkxay+Tvc97ZZUOwf85LDDDPqhQaTWLvRwnIOMgQE2nBPzwalVclK6a+pW
 x/18KDeZY15vm3Qn5p42b0wi9hUxOqPm3J2hdCLCcgtENgdX21nVzejn39WVqFJO
@@ -11,10 +11,10 @@ fBbmDnsMLAtAtauMOxORrbx3EOY7sHku/kSrMg3FXFay7jc6BkbbUij+MjJ/k82l
 AQABo3sweTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUBfKiwO2e
 M4NEiRrVG793qEPLYyMwHwYDVR0RBBgwFoEUbmV0c3NoQHNvbHV0aW91cy5jb20w
 HwYDVR0SBBgwFoEUbmV0c3NoQHNvbHV0aW91cy5jb20wDQYJKoZIhvcNAQELBQAD
-ggEBAHZOpj9ZNefc4eoie/20zX4iOgk3i+Rmjo04sMYWEtj0+4zLHXqSjune7+hd
-ruP+u5xmEy9ueGQ/0kcLlDDM+8eQo6gjCY4GIQtwAzVLsUVeejE4291/GyfPf24v
-1dLWRtPwth0nyN5EOwOPqeiYiLAr5lO3wHTgfIgFhvdZpcXG8zB6JojuFJjDpKvO
-HBV0P82HXjocnjusBt1YykGCvK4cDnaRruZJh6w2XeYQJJjlbqbDfBSQVesg97yM
-bwwLGaqsVz0cC6q3EpU57oyyTu529o0HnDatc94Cz8t9p6ogkKtSM+jwsnnC6wmI
-MMzdZVhRg3QdHAGYfd+TfsS3Mps=
+ggEBABI2ORK5kzUL7uOF0EHI4ECMWxQMiN+pURyGp9u7DU0H8eSdZN52jbUGHzSB
+j7bB6GpqElEWjOe0IbH3vR52IVXq2bOF4P4vFchGAb4OuzJD8aJmrC/SPLHbWBuV
+2GpbRQRJyYPWN6Rt/4EHOxoFnhXOBEB6CGIy0dt7YezycVbzqtHoiI2Qf/bIFJQZ
+mpJAAUBkRiWksE7zrsE5DGK8kL2GVos7f8kdM71zT8p7VBwkMdY277T29TG2xD0D
+66Oev0C3/x89NXqCHkl1JElSzEFbOoxan16z7xNEf2MKcBKGhsYfzWVNyEtJm785
+g+97rn/AuO6dcxJnW2qBGYQa7pQ=
 -----END CERTIFICATE-----

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>, [">= 5.0.0", "< 7.0.0"])
+      spec.add_runtime_dependency(%q<net-ssh>, [">= 5.0.0", "< 8.0.0"])
       spec.add_development_dependency(%q<minitest>, [">= 5"])
       spec.add_development_dependency(%q<mocha>, [">= 0"])
     else
-      spec.add_dependency(%q<net-ssh>, [">= 5.0.0", "< 7.0.0"])
+      spec.add_dependency(%q<net-ssh>, [">= 5.0.0", "< 8.0.0"])
       spec.add_dependency(%q<minitest>, [">= 5"])
       spec.add_dependency(%q<mocha>, [">= 0"])
     end
   else
-    spec.add_dependency(%q<net-ssh>, [">= 5.0.0", "< 7.0.0"])
+    spec.add_dependency(%q<net-ssh>, [">= 5.0.0", "< 8.0.0"])
     spec.add_dependency(%q<minitest>, [">= 5"])
     spec.add_dependency(%q<test-unit>, [">= 0"])
     spec.add_dependency(%q<mocha>, [">= 0"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: net-sftp
 version: !ruby/object:Gem::Version
-  version: 3.0.0.rc1
+  version: 4.0.0.rc1
 platform: ruby
 authors:
 - Jamis Buck
@@ -13,8 +13,8 @@ cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
   MIIDQDCCAiigAwIBAgIBATANBgkqhkiG9w0BAQsFADAlMSMwIQYDVQQDDBpuZXRz
-  c2gvREM9c29sdXRpb3VzL0RDPWNvbTAeFw0yMDA0MjYwNjI0NTFaFw0yMTA0MjYw
-  NjI0NTFaMCUxIzAhBgNVBAMMGm5ldHNzaC9EQz1zb2x1dGlvdXMvREM9Y29tMIIB
+  c2gvREM9c29sdXRpb3VzL0RDPWNvbTAeFw0yMjA5MjIxMTUwMDJaFw0yMzA5MjIx
+  MTUwMDJaMCUxIzAhBgNVBAMMGm5ldHNzaC9EQz1zb2x1dGlvdXMvREM9Y29tMIIB
   IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxieE22fR/qmdPKUHyYTyUx2g
   wskLwrCkxay+Tvc97ZZUOwf85LDDDPqhQaTWLvRwnIOMgQE2nBPzwalVclK6a+pW
   x/18KDeZY15vm3Qn5p42b0wi9hUxOqPm3J2hdCLCcgtENgdX21nVzejn39WVqFJO
@@ -24,14 +24,14 @@ cert_chain:
   AQABo3sweTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUBfKiwO2e
   M4NEiRrVG793qEPLYyMwHwYDVR0RBBgwFoEUbmV0c3NoQHNvbHV0aW91cy5jb20w
   HwYDVR0SBBgwFoEUbmV0c3NoQHNvbHV0aW91cy5jb20wDQYJKoZIhvcNAQELBQAD
-  ggEBAHZOpj9ZNefc4eoie/20zX4iOgk3i+Rmjo04sMYWEtj0+4zLHXqSjune7+hd
-  ruP+u5xmEy9ueGQ/0kcLlDDM+8eQo6gjCY4GIQtwAzVLsUVeejE4291/GyfPf24v
-  1dLWRtPwth0nyN5EOwOPqeiYiLAr5lO3wHTgfIgFhvdZpcXG8zB6JojuFJjDpKvO
-  HBV0P82HXjocnjusBt1YykGCvK4cDnaRruZJh6w2XeYQJJjlbqbDfBSQVesg97yM
-  bwwLGaqsVz0cC6q3EpU57oyyTu529o0HnDatc94Cz8t9p6ogkKtSM+jwsnnC6wmI
-  MMzdZVhRg3QdHAGYfd+TfsS3Mps=
+  ggEBABI2ORK5kzUL7uOF0EHI4ECMWxQMiN+pURyGp9u7DU0H8eSdZN52jbUGHzSB
+  j7bB6GpqElEWjOe0IbH3vR52IVXq2bOF4P4vFchGAb4OuzJD8aJmrC/SPLHbWBuV
+  2GpbRQRJyYPWN6Rt/4EHOxoFnhXOBEB6CGIy0dt7YezycVbzqtHoiI2Qf/bIFJQZ
+  mpJAAUBkRiWksE7zrsE5DGK8kL2GVos7f8kdM71zT8p7VBwkMdY277T29TG2xD0D
+  66Oev0C3/x89NXqCHkl1JElSzEFbOoxan16z7xNEf2MKcBKGhsYfzWVNyEtJm785
+  g+97rn/AuO6dcxJnW2qBGYQa7pQ=
   -----END CERTIFICATE-----
-date: 2020-04-26 00:00:00.000000000 Z
+date: 2022-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -42,7 +42,7 @@ dependencies:
         version: 5.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 7.0.0
+        version: 8.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -52,7 +52,7 @@ dependencies:
         version: 5.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 7.0.0
+        version: 8.0.0
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -90,8 +90,8 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
-- ".travis.yml"
 - CHANGES.txt
 - Gemfile
 - LICENSE.txt
@@ -146,7 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 3
 summary: A pure Ruby implementation of the SFTP client protocol.

data/.travis.yml

@@ -1,20 +0,0 @@
-language: ruby
-sudo: false
-rvm:
-  - 2.3.7
-  - 2.4.5
-  - 2.5.3
-  - 2.6.5
-  - 2.7.1
-  - ruby-head
-  - jruby-head
-  - rbx-3.107
-
-install: gem install net-ssh test-unit mocha
-
-script: rake test
-
-matrix:
-  allow_failures:
-    - rvm: jruby-head
-    - rvm: rbx-3.107