Respect the new interface defined by Net::SSH 3.1

Author: byroot

lib/sshkit/backends/netssh.rb

@@ -38,9 +38,9 @@ def keys_for(hostlist)
             key_list = keys[host]
             return key_list if key_list
 
-            hashes.each do |(hmac, salt), key|
+            hashes.each do |(hmac, salt), hash_keys|
               if OpenSSL::HMAC.digest(sha1, salt, host) == hmac
-                return key
+                return hash_keys
               end
             end
           end
@@ -132,9 +132,10 @@ def initialize
         end
 
         def search_for(host, options = {})
-          ::Net::SSH::KnownHosts.hostfiles(options).map do |path|
+          keys = ::Net::SSH::KnownHosts.hostfiles(options).map do |path|
             known_hosts_file(path).keys_for(host)
           end.flatten
+          ::Net::SSH::HostKeys.new(keys, host, self, options)
         end
 
         def add(*args)
@@ -154,7 +155,7 @@ class Configuration
         attr_writer :ssh_options
 
         def ssh_options
-          @ssh_options ||= {known_hosts: KnownHosts.new}
+          @ssh_options ||= {}
         end
       end
 

test/unit/backends/test_netssh.rb

@@ -54,12 +54,14 @@ def test_transfer_summarizer
         end
       end
 
-      def test_known_hosts_for_when_all_hosts_are_recognized
-        perform_known_hosts_test("github")
-      end
+      if Net::SSH::Version::CURRENT >= Net::SSH::Version[3, 1, 0]
+        def test_known_hosts_for_when_all_hosts_are_recognized
+          perform_known_hosts_test("github")
+        end
 
-      def test_known_hosts_for_when_an_host_hash_is_recognized
-        perform_known_hosts_test("github_hash")
+        def test_known_hosts_for_when_an_host_hash_is_recognized
+          perform_known_hosts_test("github_hash")
+        end
       end
 
       private
@@ -68,8 +70,12 @@ def perform_known_hosts_test(hostfile)
         source = File.join(File.dirname(__FILE__), '../../known_hosts', hostfile)
         kh = Netssh::KnownHosts.new
         keys = kh.search_for('github.com', user_known_hosts_file: source, global_known_hosts_file: Tempfile.new('sshkit-test').path)
+
+        assert_instance_of ::Net::SSH::HostKeys, keys
         assert_equal(1, keys.count)
-        assert_equal("ssh-rsa", keys[0].ssh_type)
+        keys.each do |key|
+          assert_equal("ssh-rsa", key.ssh_type)
+        end
       end
     end
   end