sshkit 1.21.4 → 1.25.0

data/test/unit/backends/test_netssh.rb

@@ -5,6 +5,12 @@ module SSHKit
   module Backend
     class TestNetssh < UnitTest
 
+      def teardown
+        super
+        # Reset config to defaults after each test
+        backend.instance_variable_set :@config, nil
+      end
+
       def backend
         @backend ||= Netssh
       end
@@ -13,6 +19,7 @@ module SSHKit
         backend.configure do |ssh|
           ssh.pty = true
           ssh.connection_timeout = 30
+          ssh.transfer_method = :sftp
           ssh.ssh_options = {
             keys: %w(/home/user/.ssh/id_rsa),
             forward_agent: false,
@@ -21,6 +28,7 @@ module SSHKit
         end
 
         assert_equal 30, backend.config.connection_timeout
+        assert_equal :sftp, backend.config.transfer_method
         assert_equal true, backend.config.pty
 
         assert_equal %w(/home/user/.ssh/id_rsa),  backend.config.ssh_options[:keys]
@@ -29,6 +37,46 @@ module SSHKit
         assert_instance_of backend::KnownHosts,   backend.config.ssh_options[:known_hosts]
       end
 
+      def test_transfer_method_prohibits_invalid_values
+        error = assert_raises ArgumentError do
+          backend.configure do |ssh|
+            ssh.transfer_method = :nope
+          end
+        end
+
+        assert_match ":nope is not a valid transfer method", error.message
+      end
+
+      def test_transfer_method_does_not_allow_nil
+        error = assert_raises ArgumentError do
+          backend.configure do |ssh|
+            ssh.transfer_method = nil
+          end
+        end
+
+        assert_match "nil is not a valid transfer method", error.message
+      end
+
+      def test_transfer_method_defaults_to_scp
+        assert_equal :scp, backend.config.transfer_method
+      end
+
+      def test_host_can_override_transfer_method
+        backend.configure do |ssh|
+          ssh.transfer_method = :scp
+        end
+
+        host = Host.new("fake")
+        host.transfer_method = :sftp
+
+        netssh = backend.new(host)
+        netssh.stubs(:with_ssh).yields(nil)
+
+        netssh.send(:with_transfer, nil) do |transfer|
+          assert_instance_of Netssh::SftpTransfer, transfer
+        end
+      end
+
       def test_netssh_ext
         assert_includes  Net::SSH::Config.default_files, "#{Dir.pwd}/.ssh/config"
       end

data/test/unit/test_command.rb

@@ -211,7 +211,8 @@ module SSHKit
     end
 
     def test_deprecated_stdtream_accessors
-      deprecation_out = ''
+      deprecation_out = +''
+
       SSHKit.config.deprecation_output = deprecation_out
 
       c = Command.new(:whoami)

data/test/unit/test_command_map.rb

@@ -27,26 +27,26 @@ module SSHKit
 
     def test_prefix
       map = CommandMap.new
-      map.prefix[:rake].push("/home/vagrant/.rbenv/bin/rbenv exec")
+      map.prefix[:rake].push("/home/deployer/.rbenv/bin/rbenv exec")
       map.prefix[:rake].push("bundle exec")
 
-      assert_equal map[:rake], "/home/vagrant/.rbenv/bin/rbenv exec bundle exec rake"
+      assert_equal map[:rake], "/home/deployer/.rbenv/bin/rbenv exec bundle exec rake"
     end
 
     def test_prefix_procs
       map = CommandMap.new
-      map.prefix[:rake].push("/home/vagrant/.rbenv/bin/rbenv exec")
+      map.prefix[:rake].push("/home/deployer/.rbenv/bin/rbenv exec")
       map.prefix[:rake].push(proc{ "bundle exec" })
 
-      assert_equal map[:rake], "/home/vagrant/.rbenv/bin/rbenv exec bundle exec rake"
+      assert_equal map[:rake], "/home/deployer/.rbenv/bin/rbenv exec bundle exec rake"
     end
 
     def test_prefix_unshift
       map = CommandMap.new
       map.prefix[:rake].push("bundle exec")
-      map.prefix[:rake].unshift("/home/vagrant/.rbenv/bin/rbenv exec")
+      map.prefix[:rake].unshift("/home/deployer/.rbenv/bin/rbenv exec")
 
-      assert_equal map[:rake], "/home/vagrant/.rbenv/bin/rbenv exec bundle exec rake"
+      assert_equal map[:rake], "/home/deployer/.rbenv/bin/rbenv exec bundle exec rake"
     end
 
     def test_indifferent_setter
@@ -59,10 +59,10 @@ module SSHKit
 
     def test_indifferent_prefix
       map = CommandMap.new
-      map.prefix[:rake].push("/home/vagrant/.rbenv/bin/rbenv exec")
+      map.prefix[:rake].push("/home/deployer/.rbenv/bin/rbenv exec")
       map.prefix["rake"].push("bundle exec")
 
-      assert_equal map[:rake], "/home/vagrant/.rbenv/bin/rbenv exec bundle exec rake"
+      assert_equal map[:rake], "/home/deployer/.rbenv/bin/rbenv exec bundle exec rake"
     end
 
     def test_prefix_initialization_is_thread_safe

data/test/unit/test_configuration.rb

@@ -11,7 +11,8 @@ module SSHKit
     end
 
     def test_deprecation_output
-      output = ''
+      output = +''
+
       SSHKit.config.deprecation_output = output
       SSHKit.config.deprecation_logger.log('Test')
       assert_equal "[Deprecated] Test\n", output.lines.first

data/test/unit/test_deprecation_logger.rb

@@ -20,7 +20,7 @@ module SSHKit
 
       assert_equal(2, actual_lines.size)
       assert_equal "[Deprecated] Some message\n", actual_lines[0]
-      assert_match %r{    \(Called from .*sshkit/test/unit/test_deprecation_logger.rb:#{line_number}:in `generate_warning'\)\n}, actual_lines[1]
+      assert_match %r{    \(Called from .*sshkit/test/unit/test_deprecation_logger.rb:#{line_number}:in .*generate_warning.\)\n}, actual_lines[1]
     end
 
     def test_handles_nil_output

data/test/unit/test_host.rb

@@ -28,6 +28,12 @@ module SSHKit
       assert_equal 'example.com', h.hostname
     end
 
+    def test_custom_host_with_port
+      h = Host.new 'db:22'
+      assert_equal 22,   h.port
+      assert_equal 'db', h.hostname
+    end
+
     def test_host_with_username
       h = Host.new 'root@example.com'
       assert_equal 'root',        h.username
@@ -50,6 +56,12 @@ module SSHKit
       assert_equal 'localhost',         h.hostname
     end
 
+    def test_ipv6_without_brackets
+      h = Host.new '1fff:0:a88:85a3::ac1f'
+      assert_nil h.port
+      assert_equal '1fff:0:a88:85a3::ac1f', h.hostname
+    end
+
     def test_does_not_confuse_ipv6_hosts_with_port_specification
       h = Host.new '[1fff:0:a88:85a3::ac1f]:8001'
       assert_equal 8001,                    h.port
@@ -142,6 +154,33 @@ module SSHKit
       end
     end
 
+    def test_transfer_method_defaults_to_nil
+      host = Host.new 'example.com'
+      assert_nil host.transfer_method
+    end
+
+    def test_transfer_method_can_be_configured
+      host = Host.new 'example.com'
+
+      host.transfer_method = :scp
+      assert_equal :scp, host.transfer_method
+
+      host.transfer_method = :sftp
+      assert_equal :sftp, host.transfer_method
+
+      host.transfer_method = nil
+      assert_nil host.transfer_method
+    end
+
+    def test_transfer_method_prohibits_invalid_values
+      host = Host.new 'example.com'
+
+      error = assert_raises ArgumentError do
+        host.transfer_method = :nope
+      end
+
+      assert_match ":nope is not a valid transfer method", error.message
+    end
   end
 
 end

metadata

@@ -1,16 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: sshkit
 version: !ruby/object:Gem::Version
-  version: 1.21.4
+  version: 1.25.0
 platform: ruby
 authors:
 - Lee Hambley
 - Tom Clements
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-20 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: base64
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: logger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
@@ -40,13 +67,27 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.1.2
 - !ruby/object:Gem::Dependency
-  name: danger
+  name: net-sftp
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.2
+- !ruby/object:Gem::Dependency
+  name: ostruct
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -54,47 +95,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: danger
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest-reporters
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
-  name: rainbow
+  name: minitest-reporters
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -115,14 +156,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.49.1
+        version: 0.52.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.49.1
+        version: 0.52.0
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
@@ -180,6 +221,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".docker/Dockerfile"
+- ".docker/ubuntu_setup.sh"
 - ".github/dependabot.yml"
 - ".github/release-drafter.yml"
 - ".github/workflows/ci.yml"
@@ -199,7 +242,7 @@ files:
 - README.md
 - RELEASING.md
 - Rakefile
-- Vagrantfile
+- docker-compose.yml
 - examples/images/example_output.png
 - examples/images/logo.png
 - examples/simple_connection.rb
@@ -214,6 +257,8 @@ files:
 - lib/sshkit/backends/local.rb
 - lib/sshkit/backends/netssh.rb
 - lib/sshkit/backends/netssh/known_hosts.rb
+- lib/sshkit/backends/netssh/scp_transfer.rb
+- lib/sshkit/backends/netssh/sftp_transfer.rb
 - lib/sshkit/backends/printer.rb
 - lib/sshkit/backends/skipper.rb
 - lib/sshkit/color.rb
@@ -240,15 +285,16 @@ files:
 - lib/sshkit/runners/sequential.rb
 - lib/sshkit/version.rb
 - sshkit.gemspec
-- test/boxes.json
+- test/functional/backends/netssh_transfer_tests.rb
 - test/functional/backends/test_local.rb
 - test/functional/backends/test_netssh.rb
-- test/functional/test_ssh_server_comes_up_for_functional_tests.rb
+- test/functional/backends/test_netssh_scp.rb
+- test/functional/backends/test_netssh_sftp.rb
 - test/helper.rb
 - test/known_hosts/github
 - test/known_hosts/github_hash
 - test/known_hosts/github_ip
-- test/support/vagrant_wrapper.rb
+- test/support/docker_wrapper.rb
 - test/unit/backends/test_abstract.rb
 - test/unit/backends/test_connection_pool.rb
 - test/unit/backends/test_local.rb
@@ -276,7 +322,6 @@ licenses:
 - MIT
 metadata:
   changelog_uri: https://github.com/capistrano/sshkit/releases
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -284,27 +329,27 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.7
-signing_key:
+rubygems_version: 3.7.2
 specification_version: 4
 summary: SSHKit makes it easy to write structured, testable SSH commands in Ruby
 test_files:
-- test/boxes.json
+- test/functional/backends/netssh_transfer_tests.rb
 - test/functional/backends/test_local.rb
 - test/functional/backends/test_netssh.rb
-- test/functional/test_ssh_server_comes_up_for_functional_tests.rb
+- test/functional/backends/test_netssh_scp.rb
+- test/functional/backends/test_netssh_sftp.rb
 - test/helper.rb
 - test/known_hosts/github
 - test/known_hosts/github_hash
 - test/known_hosts/github_ip
-- test/support/vagrant_wrapper.rb
+- test/support/docker_wrapper.rb
 - test/unit/backends/test_abstract.rb
 - test/unit/backends/test_connection_pool.rb
 - test/unit/backends/test_local.rb

data/Vagrantfile

@@ -1,20 +0,0 @@
-VAGRANTFILE_API_VERSION = "2"
-
-Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
-  config.vm.box = 'hashicorp/precise64'
-  config.vm.provision "shell", inline: <<-SHELL
-  echo 'ClientAliveInterval 3' >> /etc/ssh/sshd_config
-  echo 'ClientAliveCountMax 3' >> /etc/ssh/sshd_config
-  service ssh restart
-  SHELL
-
-  json_config_path = File.join("test", "boxes.json")
-  list = File.open(json_config_path).read
-  list = JSON.parse(list)
-
-  list.each do |vm|
-    config.vm.define vm["name"] do |web|
-      web.vm.network "forwarded_port", guest: 22, host: vm["port"]
-    end
-  end
-end

data/test/boxes.json

@@ -1,17 +0,0 @@
-[
-  {
-    "name": "one",
-    "port": 3001,
-    "user": "vagrant",
-    "password": "vagrant",
-    "hostname": "localhost"
-  },
-  {
-    "name": "two",
-    "port": 3002
-  },
-  {
-    "name": "three",
-    "port": 3003
-  }
-]

data/test/functional/test_ssh_server_comes_up_for_functional_tests.rb

@@ -1,24 +0,0 @@
-require 'helper'
-
-module SSHKit
-
-  class TestHost < FunctionalTest
-
-    def host
-      @_host ||= Host.new('')
-    end
-
-    def test_that_it_works
-      assert true
-    end
-
-    def test_creating_a_user_gives_us_back_his_private_key_as_a_string
-      skip 'It is not safe to create an user for non vagrant envs' unless VagrantWrapper.running?
-      keys = create_user_with_key(:peter)
-      assert_equal [:one, :two, :three], keys.keys
-      assert keys.values.all?
-    end
-
-  end
-
-end

data/test/support/vagrant_wrapper.rb

@@ -1,64 +0,0 @@
-class VagrantWrapper
-  class << self
-    def hosts
-      @vm_hosts ||= begin
-        result = {}
-
-        boxes = boxes_list
-
-        unless running?
-          boxes.map! do |box|
-            box['user'] = ENV['USER']
-            box['port'] = '22'
-            box
-          end
-        end
-
-        boxes.each do |vm|
-          result[vm['name']] = vm_host(vm)
-        end
-
-        result
-      end
-    end
-
-    def running?
-      @running ||= begin
-        status = `#{vagrant_binary} status`
-        status.include?('running')
-      end
-    end
-
-    def boxes_list
-      json_config_path = File.join('test', 'boxes.json')
-      boxes = File.open(json_config_path).read
-      JSON.parse(boxes)
-    end
-
-    def vagrant_binary
-      'vagrant'
-    end
-
-    private
-
-    def vm_host(vm)
-      host_options = {
-          user: vm['user'] || 'vagrant',
-          hostname: vm['hostname'] || 'localhost',
-          port: vm['port'] || '22',
-          password: vm['password'] || 'vagrant',
-          ssh_options: host_verify_options
-      }
-
-      SSHKit::Host.new(host_options)
-    end
-
-    def host_verify_options
-      if Net::SSH::Version::MAJOR >= 5
-        { verify_host_key: :never }
-      else
-        { paranoid: false }
-      end
-    end
-  end
-end