train-core 3.3.1 → 3.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0245d5647c9a636cff344b8976bc6983d0f375f4e66b2baa4d2b8dccfcc98f24
-  data.tar.gz: c8a74114fd330ffeff3063fd9d452b7142287a0502033e1f91ae9e867c9c0966
+  metadata.gz: 0d1528d472a38847644b9b12d7e7ebfd304e696bdfc50f7562b4b5bf387f5059
+  data.tar.gz: 4913341d6670668289ccc69ab4d67335d4529da28fb449a0f9fcb1dc191b571b
 SHA512:
-  metadata.gz: 4d622422a8d022e6e8c6770d7baf5ae00afd8466029bed65ce86fc08af51308818170744edbae6cfa7242e19ced2e30f202bdf98f16aa02a43547df171c47e05
-  data.tar.gz: dda8b333a8a2b9716e992630d65a37599a0a8a7099d52ffd3183a1cb82a2f2aeccdbca1fd5287f285b59ff931fba7a9eaa5ca3a42b65a19fa18ba9019632d355
+  metadata.gz: 2ab551ae2ab9e8ef40628edb76cf77f5ce0391483a2ae3aaf9ade688244817286d48bf4d92f0f3ca78e488dcf71c6783808e98a56a226df0a09867b0a281fff9
+  data.tar.gz: df2cc712d56b9e91239e6e10dd537b9233b0d97cfb8cb29771bb3539915f81df61523b222875791dd5dc8a9d0edbfa9f71f789cf7be74ee0164e0f504eba9c27

data/lib/train/platforms/detect/specifications/os.rb

@@ -369,6 +369,7 @@ module Train::Platforms::Detect::Specifications
       declare_bsd("freebsd", "Freebsd", "bsd", /freebsd/i)
       declare_bsd("openbsd", "Openbsd", "bsd", /openbsd/i)
       declare_bsd("netbsd", "Netbsd", "bsd", /netbsd/i)
+      declare_bsd("dragonflybsd", "Dragonflybsd", "bsd", /dragonfly/i)
     end
 
     def self.load_other

data/lib/train/transports/ssh.rb

@@ -65,6 +65,9 @@ module Train::Transports
     option :non_interactive, default: false
     option :verify_host_key, default: false
 
+    # Allow connecting with older algorithms
+    option :append_all_supported_algorithms, default: true
+
     option :compression_level do |opts|
       # on nil or false: set compression level to 0
       opts[:compression] ? 6 : 0
@@ -76,7 +79,7 @@ module Train::Transports
       validate_options(opts)
       conn_opts = connection_options(opts)
 
-      if defined?(@connection) && @connection_options == conn_opts
+      if defined?(@connection) && reusable_connection?(conn_opts)
         reuse_connection(&block)
       else
         create_new_connection(conn_opts, &block)
@@ -85,6 +88,13 @@ module Train::Transports
 
     private
 
+    def reusable_connection?(conn_opts)
+      return false unless @connection_options
+
+      # Do requested options match their current settings
+      @connection_options.all? { |k, v| conn_opts[k] == v }
+    end
+
     def validate_options(options)
       super(options)
 
@@ -167,6 +177,7 @@ module Train::Transports
         bastion_user: opts[:bastion_user],
         bastion_port: opts[:bastion_port],
         non_interactive: opts[:non_interactive],
+        append_all_supported_algorithms: opts[:append_all_supported_algorithms],
         transport_options: opts,
       }
       # disable host key verification. The hash key and value to use

data/lib/train/transports/ssh_connection.rb

@@ -202,8 +202,6 @@ class Train::Transports::SSH
         require "net/ssh/proxy/command"
         @options[:proxy] = Net::SSH::Proxy::Command.new(generate_proxy_command)
       end
-      # Allow older algorithms
-      @options[:append_all_supported_algorithms] = true
       Net::SSH.start(@hostname, @username, @options.clone.delete_if { |_key, value| value.nil? })
     rescue *RESCUE_EXCEPTIONS_ON_ESTABLISH => e
       if (opts[:retries] -= 1) <= 0

data/lib/train/version.rb

@@ -3,5 +3,5 @@
 # Author:: Dominik Richter (<dominik.richter@gmail.com>)
 
 module Train
-  VERSION = "3.3.1".freeze
+  VERSION = "3.3.4".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: train-core
 version: !ruby/object:Gem::Version
-  version: 3.3.1
+  version: 3.3.4
 platform: ruby
 authors:
 - Chef InSpec Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-10 00:00:00.000000000 Z
+date: 2020-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable