train 0.27.0 → 0.28.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 802cb7956050b4a8db80e8260bcafab0802ba46f
-  data.tar.gz: 372b756cae6c8b8fc34e57eee61521545098e312
+  metadata.gz: eca87a39cc3d6258174e753e4533c05f9508ac24
+  data.tar.gz: 82689ec956034e7e19b96d0f749bced3964c7fa7
 SHA512:
-  metadata.gz: a831de36739909f5803dfce9bccd3a1de0061af38087d3b7d1af37e42b87ef8f7465c1b776b47cda5add839a2d807b7254ff9cfc9d44ad15a688a635952c183a
-  data.tar.gz: c71f0bcb8eb7908076ad5d282975e8dfe10ee99a9bd1faebba374c43173543c4f35488eefe63a1a0f29957ed8e56abd7c01d67f0e89622d880b0c7cd6f2c2f14
+  metadata.gz: e984b1624f89dee67e5dbf0014db3b3d7f40b3a24a7a68bc1e5bfdb212c080940427ca167df8799f3fa1b54ae7c801791661e8d000e497de853703e5fcb4b01d
+  data.tar.gz: 67639d931b4d15c01ef5feafdc80c2bba5b02b3f78d6ec90d04124cb7e2d195475c17d14d52e3070bf07720b8a3d433b25effa88a3dba03ec5ef901952696301

data/CHANGELOG.md

@@ -1,10 +1,18 @@
 # Change Log
 
-## [0.27.0](https://github.com/chef/train/tree/0.27.0) (2017-09-25)
-[Full Changelog](https://github.com/chef/train/compare/v0.26.2...0.27.0)
+## [0.28.0](https://github.com/chef/train/tree/0.28.0) (2017-09-25)
+[Full Changelog](https://github.com/chef/train/compare/v0.27.0...0.28.0)
 
 **Merged pull requests:**
 
+- Continue to support older net-ssh while fixing 4.2 deprecation [\#199](https://github.com/chef/train/pull/199) ([adamleff](https://github.com/adamleff))
+
+## [v0.27.0](https://github.com/chef/train/tree/v0.27.0) (2017-09-25)
+[Full Changelog](https://github.com/chef/train/compare/v0.26.2...v0.27.0)
+
+**Merged pull requests:**
+
+- Release v0.27.0 [\#198](https://github.com/chef/train/pull/198) ([adamleff](https://github.com/adamleff))
 - Bump to net-ssh 4.2, fix bad net-ssh deprecation [\#197](https://github.com/chef/train/pull/197) ([adamleff](https://github.com/adamleff))
 
 ## [v0.26.2](https://github.com/chef/train/tree/v0.26.2) (2017-09-05)

data/lib/train/transports/ssh.rb

@@ -33,7 +33,7 @@ module Train::Transports
   # files.
   #
   # @author Fletcher Nichol <fnichol@nichol.ca>
-  class SSH < Train.plugin(1)
+  class SSH < Train.plugin(1) # rubocop:disable Metrics/ClassLength
     name 'ssh'
 
     require 'train/transports/ssh_connection'
@@ -131,10 +131,9 @@ module Train::Transports
     # @return [Hash] hash of connection options
     # @api private
     def connection_options(opts)
-      {
+      connection_options = {
         logger:                 logger,
         user_known_hosts_file:  '/dev/null',
-        verify_host_key:        false,
         hostname:               opts[:host],
         port:                   opts[:port],
         username:               opts[:user],
@@ -153,6 +152,31 @@ module Train::Transports
         forward_agent:          opts[:forward_agent],
         transport_options:      opts,
       }
+
+      # disable host key verification. The hash key to use
+      # depends on the version of net-ssh in use.
+      connection_options[verify_host_key_option] = false
+
+      connection_options
+    end
+
+    #
+    # Returns the correct host-key-verification option key to use depending
+    # on what version of net-ssh is in use. In net-ssh <= 4.1, the supported
+    # parameter is `paranoid` but in 4.2, it became `verify_host_key`
+    #
+    # `verify_host_key` does not work in <= 4.1, and `paranoid` throws
+    # deprecation warnings in >= 4.2.
+    #
+    # While the "right thing" to do would be to pin train's dependency on
+    # net-ssh to ~> 4.2, this will prevent InSpec from being used in
+    # Chef v12 because of it pinning to a v3 of net-ssh.
+    #
+    def verify_host_key_option
+      current_net_ssh = Net::SSH::Version::CURRENT
+      new_option_version = Net::SSH::Version[4, 2, 0]
+
+      current_net_ssh >= new_option_version ? :verify_host_key : :paranoid
     end
 
     # Creates a new SSH Connection instance and save it for potential future

data/lib/train/version.rb

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

data/train.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'mixlib-shellout', '~> 2.0'
   # net-ssh 3.x drops Ruby 1.9 support, so this constraint could be raised when
   # 1.9 support is no longer needed here or for Inspec
-  spec.add_dependency 'net-ssh', '~> 4.2'
+  spec.add_dependency 'net-ssh', '>= 2.9', '< 5.0'
   spec.add_dependency 'net-scp', '~> 1.2'
   spec.add_dependency 'winrm', '~> 2.0'
   spec.add_dependency 'winrm-fs', '~> 1.0'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: train
 version: !ruby/object:Gem::Version
-  version: 0.27.0
+  version: 0.28.0
 platform: ruby
 authors:
 - Dominik Richter
@@ -48,16 +48,22 @@ dependencies:
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.9'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.9'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: net-scp
   requirement: !ruby/object:Gem::Requirement