net-scp 4.0.1.rc3 → 4.1.1.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 85938ca32f11557ce4671954e90804b552ff17c08f70b048e6dacf3f1fa19e14
-  data.tar.gz: c868ed5839f461ccde85599b8b8eb359f4a33206f671dd15a6ab935fa8dc2f5b
+  metadata.gz: 140aba7e5a90f61684d2a1acf0dedd19834b903c6e0a1d09f8e396cea0fd002c
+  data.tar.gz: 10ba5b3c7cc0172b435b44efbfc115be88caf60d804bfb11cb08b7e60bfbe00a
 SHA512:
-  metadata.gz: fc18c52990e428fb8f4dc2132d016d8817b5e47a916462f72bc4d4fe6092909abda1ba5b99c0a49cc370913c8fe7e77dc0823f322cad5ded384865b16a479749
-  data.tar.gz: fdef41a58bd49186406b01e4d5829c263c599a704a30023711314ecac03fa6b5112f381777941a24602074de94a532b7f6f03a120c026b59f93da95d444aa6d5
+  metadata.gz: eca631adb3b5cc64bca4fcf5ca05ae62e5043631f004dac7edc2341c86165da3546f3aeb249b7618c454046c1d8897ed98a1a453f927815c2c10395bc11bcbd5
+  data.tar.gz: ee708ab42fa3b6d92cb79d695fe5a1f4b408cc4b4095cb74a8985c98f15af0002428d8f2c56c5f328a1fe0f7d709e33c49d0a60e8fb1db1d456ff9a016db17e7

data/.github/workflows/ci.yml

@@ -10,7 +10,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby-version: ['2.3', '2.4', '2.5', '2.6', '2.7', '3.0', '3.1', '3.2', '3.3', 'ruby-head']
+        ruby-version: ['2.6', '2.7', '3.0', '3.1', '3.2', '3.3', '3.4', 'ruby-head']
     continue-on-error: ${{ matrix.ruby-version == 'ruby-head' }}
     steps:
       - uses: actions/checkout@v3
@@ -21,3 +21,5 @@ jobs:
           bundler-cache: true # runs 'bundle install' and caches installed gems automatically
       - name: Run Tests
         run: bundle exec rake test
+        env:
+          RUBYOPT: "--enable=frozen_string_literal"

data/CHANGES.txt

@@ -1,3 +1,12 @@
+=== 4.1.1
+
+* Fix frozen string literal compatibility [npezza93, mfazekas]
+  - Use mutable string for scp command construction
+  - Use mutable string for error_string initialization
+* Add Ruby 3.4 and ruby-head to CI matrix
+* Add Ruby 4.0+ compatibility (logger, rdoc gems)
+* Drop EOL Ruby 2.3-2.5 from CI
+
 === 3.0.0
 
 * NetSHH 6.* support

data/Gemfile

@@ -3,9 +3,13 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in mygem.gemspec
 gemspec
 
+gem "net-ssh", ">= 7.3.1"
+gem "logger" # no longer a default gem in Ruby 4.0+
+
 # TODO: add to gemspec
 gem "bundler", ">= 1.11"
 gem "rake", ">= 12.0"
+gem "rdoc"
 
 gem 'byebug', group: %i[development test] if !Gem.win_platform? && RUBY_ENGINE == "ruby"
 

data/Rakefile

@@ -1,7 +1,10 @@
 require "rubygems"
 require "rake"
 require "rake/clean"
-require "rdoc/task"
+begin
+  require "rdoc/task"
+rescue LoadError
+end
 require "bundler/gem_tasks"
 
 desc "When releasing make sure NET_SSH_BUILDGEM_SIGNED is set"
@@ -67,17 +70,19 @@ Rake::TestTask.new do |t|
 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.md'
-  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.exist?(file)
-  }
+if defined?(RDoc::Task)
+  RDoc::Task.new do |rdoc|
+    rdoc.rdoc_dir = "rdoc"
+    rdoc.title = "#{name} #{version}"
+    rdoc.generator = 'hanna' # gem install hanna-nouveau
+    rdoc.main = 'README.md'
+    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.exist?(file)
+    }
+  end
 end
 
 def change_version(&block)

data/lib/net/scp/version.rb

@@ -49,7 +49,7 @@ module Net
       MAJOR = 4
 
       # The minor component of this version of the Net::SSH library
-      MINOR = 0
+      MINOR = 1
 
       # The tiny component of this version of the Net::SSH library
       TINY  = 1

data/lib/net/scp.rb

@@ -329,7 +329,7 @@ module Net
       # (:verbose, :recursive, :preserve). Returns the command-line as a
       # string, ready to execute.
       def scp_command(mode, options)
-        command = "scp "
+        command = +"scp "
         command << (mode == :upload ? "-t" : "-f")
         command << " -v" if options[:verbose]
         command << " -r" if options[:recursive]
@@ -360,7 +360,7 @@ module Net
               channel[:buffer  ] = Net::SSH::Buffer.new
               channel[:state   ] = "#{mode}_start"
               channel[:stack   ] = []
-              channel[:error_string] = ''
+              channel[:error_string] = +''
 
               channel.on_close do
                 # If we got an exit-status and it is not 0, something went wrong

data/net-scp-public_cert.pem

@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
 MIIDeDCCAmCgAwIBAgIBATANBgkqhkiG9w0BAQsFADBBMQ8wDQYDVQQDDAZuZXRz
 c2gxGTAXBgoJkiaJk/IsZAEZFglzb2x1dGlvdXMxEzARBgoJkiaJk/IsZAEZFgNj
-b20wHhcNMjQxMjI1MTEzNDQ3WhcNMjUxMjI1MTEzNDQ3WjBBMQ8wDQYDVQQDDAZu
+b20wHhcNMjYwNTE2MTYyMDUzWhcNMjcwNTE2MTYyMDUzWjBBMQ8wDQYDVQQDDAZu
 ZXRzc2gxGTAXBgoJkiaJk/IsZAEZFglzb2x1dGlvdXMxEzARBgoJkiaJk/IsZAEZ
 FgNjb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDGJ4TbZ9H+qZ08
 pQfJhPJTHaDCyQvCsKTFrL5O9z3tllQ7B/zksMMM+qFBpNYu9HCcg4yBATacE/PB
@@ -12,10 +12,10 @@ KP4yMn+TzaXijyjRg7gECfJr3TGASaA4bQsILFGG5dAWcwO4OMrZedR7SHj/o0Kf
 3gL7P0axAgMBAAGjezB5MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQW
 BBQF8qLA7Z4zg0SJGtUbv3eoQ8tjIzAfBgNVHREEGDAWgRRuZXRzc2hAc29sdXRp
 b3VzLmNvbTAfBgNVHRIEGDAWgRRuZXRzc2hAc29sdXRpb3VzLmNvbTANBgkqhkiG
-9w0BAQsFAAOCAQEAOEVGPubOS9dBQmiJYIZHOXe2Q50iQgxKa7hyEJcyA7q69Q5h
-Ha5r4WpZyW0Dkr0+jIkT8GS7hO0XnUZdOiuNFQrx30jfRSVT7680dF6wAHEQZJqC
-ZmYFthhR/mtzi7bA+Ubd0PyBNivqt3WhWP+Z19j1bVWIwzczUcFFao+FBjXptI0m
-VGRPnRIzATA2qQUuKGkwrNFSHD9tDIHXSvwJ62U9ahoMKfMoDP0WHdPIpFCB8bPg
-wxMvGTA/RH93o6dL09sq7rVtsS9NNFmBGJWLZWWPfcspNBUXS0HTWXsWS9XTm2bm
-bbXS+I4xE1yFIPs39ej57LGJDMgMhWTyJF2zVg==
+9w0BAQsFAAOCAQEAVx/yCCX0ZPQ8TFeZe1T+OBEn3Co/AfjAmCdhstf1TF+Jziyx
+dFJ8m8mF4596gru87Mi8mvu+WbPsLlFMOf5LDUkAsgnlvJ+zqNL7jPjGmsh0KOHJ
+0dzPYnTeGcfyrp1AXNN3Z2jWlEInrnqvo376vOmejjTtmDVVlhPjITHQqLSXzRaQ
+e3M8fbJ+nupobti6jpXCYvH86KtpaxF66mwaynfdjzxQAVycV/ilKtL+sHH8zxlg
+vNiMFH5yLu/tlav4xh+HlYscWVdFQIvd7f/Uxa+Vip1Pi16wmhnrE15z/vDX921v
+hukBRIoCEAuUgNVBh+L/C8aETzbf/77WU3Si/w==
 -----END CERTIFICATE-----

metadata

@@ -1,20 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: net-scp
 version: !ruby/object:Gem::Version
-  version: 4.0.1.rc3
+  version: 4.1.1.rc3
 platform: ruby
 authors:
 - Jamis Buck
 - Delano Mandelbaum
 - Miklós Fazekas
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
   MIIDeDCCAmCgAwIBAgIBATANBgkqhkiG9w0BAQsFADBBMQ8wDQYDVQQDDAZuZXRz
   c2gxGTAXBgoJkiaJk/IsZAEZFglzb2x1dGlvdXMxEzARBgoJkiaJk/IsZAEZFgNj
-  b20wHhcNMjQxMjI1MTEzNDQ3WhcNMjUxMjI1MTEzNDQ3WjBBMQ8wDQYDVQQDDAZu
+  b20wHhcNMjYwNTE2MTYyMDUzWhcNMjcwNTE2MTYyMDUzWjBBMQ8wDQYDVQQDDAZu
   ZXRzc2gxGTAXBgoJkiaJk/IsZAEZFglzb2x1dGlvdXMxEzARBgoJkiaJk/IsZAEZ
   FgNjb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDGJ4TbZ9H+qZ08
   pQfJhPJTHaDCyQvCsKTFrL5O9z3tllQ7B/zksMMM+qFBpNYu9HCcg4yBATacE/PB
@@ -25,14 +25,14 @@ cert_chain:
   3gL7P0axAgMBAAGjezB5MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQW
   BBQF8qLA7Z4zg0SJGtUbv3eoQ8tjIzAfBgNVHREEGDAWgRRuZXRzc2hAc29sdXRp
   b3VzLmNvbTAfBgNVHRIEGDAWgRRuZXRzc2hAc29sdXRpb3VzLmNvbTANBgkqhkiG
-  9w0BAQsFAAOCAQEAOEVGPubOS9dBQmiJYIZHOXe2Q50iQgxKa7hyEJcyA7q69Q5h
-  Ha5r4WpZyW0Dkr0+jIkT8GS7hO0XnUZdOiuNFQrx30jfRSVT7680dF6wAHEQZJqC
-  ZmYFthhR/mtzi7bA+Ubd0PyBNivqt3WhWP+Z19j1bVWIwzczUcFFao+FBjXptI0m
-  VGRPnRIzATA2qQUuKGkwrNFSHD9tDIHXSvwJ62U9ahoMKfMoDP0WHdPIpFCB8bPg
-  wxMvGTA/RH93o6dL09sq7rVtsS9NNFmBGJWLZWWPfcspNBUXS0HTWXsWS9XTm2bm
-  bbXS+I4xE1yFIPs39ej57LGJDMgMhWTyJF2zVg==
+  9w0BAQsFAAOCAQEAVx/yCCX0ZPQ8TFeZe1T+OBEn3Co/AfjAmCdhstf1TF+Jziyx
+  dFJ8m8mF4596gru87Mi8mvu+WbPsLlFMOf5LDUkAsgnlvJ+zqNL7jPjGmsh0KOHJ
+  0dzPYnTeGcfyrp1AXNN3Z2jWlEInrnqvo376vOmejjTtmDVVlhPjITHQqLSXzRaQ
+  e3M8fbJ+nupobti6jpXCYvH86KtpaxF66mwaynfdjzxQAVycV/ilKtL+sHH8zxlg
+  vNiMFH5yLu/tlav4xh+HlYscWVdFQIvd7f/Uxa+Vip1Pi16wmhnrE15z/vDX921v
+  hukBRIoCEAuUgNVBh+L/C8aETzbf/77WU3Si/w==
   -----END CERTIFICATE-----
-date: 2024-12-25 00:00:00.000000000 Z
+date: 2026-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -105,7 +105,6 @@ files:
 - lib/net/scp/errors.rb
 - lib/net/scp/upload.rb
 - lib/net/scp/version.rb
-- lib/net/scp/version.rb.old
 - lib/uri/open-scp.rb
 - lib/uri/scp.rb
 - net-scp-public_cert.pem
@@ -116,7 +115,7 @@ licenses:
 - MIT
 metadata:
   changelog_uri: https://github.com/net-ssh/net-scp/blob/master/CHANGES.txt
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -132,7 +131,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.3.3
-signing_key: 
+signing_key:
 specification_version: 3
 summary: A pure Ruby implementation of the SCP client protocol.
 test_files: []

data/lib/net/scp/version.rb.old

@@ -1,68 +0,0 @@
-module Net
-  class SCP
-    # A class for describing the current version of a library. The version
-    # consists of three parts: the +major+ number, the +minor+ number, and the
-    # +tiny+ (or +patch+) number.
-    #
-    # Two Version instances may be compared, so that you can test that a version
-    # of a library is what you require:
-    #
-    #   require 'net/scp/version'
-    #
-    #   if Net::SCP::Version::CURRENT < Net::SCP::Version[2,1,0]
-    #     abort "your software is too old!"
-    #   end
-    class Version
-      include Comparable
-
-      # A convenience method for instantiating a new Version instance with the
-      # given +major+, +minor+, and +tiny+ components.
-      def self.[](major, minor, tiny, pre = nil)
-        new(major, minor, tiny, pre)
-      end
-
-      attr_reader :major, :minor, :tiny
-
-      # Create a new Version object with the given components.
-      def initialize(major, minor, tiny, pre = nil)
-        @major, @minor, @tiny, @pre = major, minor, tiny, pre
-      end
-
-      # Compare this version to the given +version+ object.
-      def <=>(version)
-        to_i <=> version.to_i
-      end
-
-      # Converts this version object to a string, where each of the three
-      # version components are joined by the '.' character. E.g., 2.0.0.
-      def to_s
-        @to_s ||= [@major, @minor, @tiny, @pre].compact.join(".")
-      end
-
-      # Converts this version to a canonical integer that may be compared
-      # against other version objects.
-      def to_i
-        @to_i ||= @major * 1_000_000 + @minor * 1_000 + @tiny
-      end
-
-      # The major component of this version of the Net::SSH library
-      MAJOR = 4
-
-      # The minor component of this version of the Net::SSH library
-      MINOR = 0
-
-      # The tiny component of this version of the Net::SSH library
-      TINY  = 1
-
-      # The prerelease component of this version of the Net::SSH library
-      # nil allowed
-      PRE   = "rc2"
-
-      # The current version of the Net::SSH library as a Version instance
-      CURRENT = new(*[MAJOR, MINOR, TINY, PRE].compact)
-
-      # The current version of the Net::SSH library as a String
-      STRING = CURRENT.to_s
-    end
-  end
-end