sshkit 1.11.0 → 1.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ea6531109db4fbc073107e4d01ac242f50a4f67
-  data.tar.gz: 70ae0a86727e7ba0659049b6b3abfb07e84f4f2b
+  metadata.gz: e19c67f924ef3a2dd33905c2ced117daa369d81d
+  data.tar.gz: e15d65a99e71fa5b1370cc338271751c99c2009f
 SHA512:
-  metadata.gz: 58a524ef9892ad8563de08e5f24eac198d22b78b5c193b72dbb8990712bf67cc0346b8a84e2281627a84c0bde28ed14a23d74059b5cb6f9a6ed14b31e69bb9df
-  data.tar.gz: ac0d03ae20ca9ef8b72727000d7cdbfb55f74a7806f2e9897d90eb1368b8c1f47ba281ef7e4b5e83deaf1b60d96006640f8eb5ed226aa695ebb45231b6b52c9f
+  metadata.gz: 3fb1764bbe94f71bd91ba99a7c4350f0e3623823f186389be3c053840cfe2b0ae7a144fd9d552c26da2e95fd69ce5c69879edc4696bd50c0e95dc5e6f1127ec8
+  data.tar.gz: aaf509fe9fcb25dbf545bccefd220f1e99241d23c72fa55241c721a127080b54db5427d771caf26a9f97598c3d70a835d9413b30514a4c3f900aa0a943baff73

data/CHANGELOG.md

@@ -8,6 +8,14 @@ appear at the top.
   * Add your entries below here, remember to credit yourself however you want
     to be credited!
 
+## [1.11.1][] (2016-06-17)
+
+### Bug fixes
+
+  * Fixed a regression in 1.11.0 that would cause
+    `ArgumentError: invalid option(s): known_hosts` in some older versions of
+    net-ssh. @byroot [#357](https://github.com/capistrano/sshkit/issues/357)
+
 ## [1.11.0][] (2016-06-14)
 
 ### Bug fixes
@@ -629,5 +637,6 @@ version `0.0.5`.
 
 First release.
 
-[Unreleased]: https://github.com/capistrano/sshkit/compare/v1.11.0...HEAD
+[Unreleased]: https://github.com/capistrano/sshkit/compare/v1.11.1...HEAD
+[1.11.1]: https://github.com/capistrano/sshkit/compare/v1.11.0...v1.11.1
 [1.11.0]: https://github.com/capistrano/sshkit/compare/v1.10.0...v1.11.0

data/README.md

@@ -259,7 +259,7 @@ desirable.
 first argument before attempting to find it in the *command map*.
 
 ## Interactive commands
-> (BETA) (Added in version #.##)
+> (Added in version 1.8.0)
 
 By default, commands against remote servers are run in a *non-login, non-interactive* ssh session.
 This is by design, to try and isolate the environment and make sure that things work as expected,
@@ -335,7 +335,7 @@ You can also pass a Proc object to map the output line from the server:
 execute(:passwd, interaction_handler: lambda { |server_data|
   case server_data
   when '(current) UNIX password: '
-    "old_pw\n",
+    "old_pw\n"
   when /(Enter|Retype) new UNIX password: /
     "new_pw\n"
   end
@@ -362,14 +362,14 @@ in response. This can be helpful if you don't know exactly what the server is se
 
 ```ruby
   # Start with this and run your script
-  execute(:unfamiliar_command, MappingInteractionHandler.new({}, :debug))
-  # DEBUG log => Unable to find interaction handler mapping for stdout:
-  #              "Please type your input:\r\n" so no response was sent"
-
-  # Update mapping:
-  execute(:unfamiliar_command, MappingInteractionHandler.new(
-    {"Please type your input:\r\n" => "Some input\n"}
-    :debug
+  execute(:unfamiliar_command, interaction_handler: MappingInteractionHandler.new({}, :info))
+  # INFO log => Unable to find interaction handler mapping for stdout:
+  #             "Please type your input:\r\n" so no response was sent"
+
+  # Add missing mapping:
+  execute(:unfamiliar_command, interaction_handler: MappingInteractionHandler.new(
+    {"Please type your input:\r\n" => "Some input\n"},
+    :info
   ))
 ```
 

data/lib/sshkit/backends/netssh.rb

@@ -33,8 +33,14 @@ module SSHKit
 
         private
 
-        def default_options
-          @default_options ||= {known_hosts: SSHKit::Backend::Netssh::KnownHosts.new}
+        if Net::SSH::VALID_OPTIONS.include?(:known_hosts)
+          def default_options
+            @default_options ||= {known_hosts: SSHKit::Backend::Netssh::KnownHosts.new}
+          end
+        else
+          def default_options
+            @default_options ||= {}
+          end
         end
       end
 

data/lib/sshkit/version.rb

@@ -1,3 +1,3 @@
 module SSHKit
-  VERSION = "1.11.0".freeze
+  VERSION = "1.11.1".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sshkit
 version: !ruby/object:Gem::Version
-  version: 1.11.0
+  version: 1.11.1
 platform: ruby
 authors:
 - Lee Hambley
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-14 00:00:00.000000000 Z
+date: 2016-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh