net-ssh 3.1.0.rc1 → 3.1.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1186f0f901ff1e9fcfa25d956c044ee53a54bee8
-  data.tar.gz: edac339140a2f3d294dd1cd2035c53a205178634
+  metadata.gz: 78a803f1874f561b9d207f4be53484bb84e2f5a8
+  data.tar.gz: 27ac3df6351aa4c23a2f25dfdac85300d59da4a1
 SHA512:
-  metadata.gz: ab441807f815f8e6a6ef089643dcb90e2cbcf288aedb63b28f4892ec7daf20f8a2da962e797b7ff7e7454c51f83437dd2a9f61922a982d06caa7fc2692f32fcf
-  data.tar.gz: a393728bbe3395b1a118d43864c414f421cff17061500ad59143c25fafd1c704f7e42b137fb1ad05dde4ec43f78b1c22fe7b4d1675f2f0f639bb6d8f91774542
+  metadata.gz: 2282ad0af5f98206969aaa9b441cd1c653e275ffbbb2066ac3bb4cd7becc280d663812169d8d79b51da31ecb07273b93f5149f84bbc9ba30bc1346d81b7a6b65
+  data.tar.gz: f7ab245b518a969d6fe1634a32538daa504b930803d93b31607a343256a807547118856a6173946ae9c7b1935ea8727275d71063b66ba6cff11f816a73d6ffc0

data/.travis.yml

@@ -1,7 +1,6 @@
 language: ruby
 sudo: false
 rvm:
-  - 1.9.3
   - 2.0.0
   - 2.1.0
   - 2.2.0

data/lib/net/ssh/known_hosts.rb

@@ -5,29 +5,22 @@ require 'net/ssh/buffer'
 
 module Net; module SSH
 
-  class HostKeys
-    include Enumerable
+  # Represents the result of a search in known hosts
+  # see search_for
+  class HostKeys < Array
     attr_reader :host
 
     def initialize(host_keys, host, known_hosts, options = {})
-       @host_keys = host_keys
+       super(host_keys)
        @host = host
        @known_hosts = known_hosts
        @options = options
     end
 
     def add_host_key(key)
-       @known_hosts.add(@host, key, options)
+       @known_hosts.add(@host, key, @options)
        push(key)
     end
-
-    def each(&block)
-       @host_keys.each(&block)
-    end
-
-    def empty?
-      @host_keys.empty?
-    end
   end
 
   # Searches an OpenSSH-style known-host file for a given host, and returns all

data/lib/net/ssh/version.rb

@@ -55,7 +55,7 @@ module Net; module SSH
 
     # The prerelease component of this version of the Net::SSH library 
     # nil allowed
-    PRE   = "rc1"
+    PRE   = "rc2"
 
     # The current version of the Net::SSH library as a Version instance
     CURRENT = new(*[MAJOR, MINOR, TINY, PRE].compact)

data/net-ssh.gemspec

@@ -2,17 +2,17 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: net-ssh 3.1.0.rc1 ruby lib
+# stub: net-ssh 3.1.0.rc2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "net-ssh"
-  s.version = "3.1.0.rc1"
+  s.version = "3.1.0.rc2"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Jamis Buck", "Delano Mandelbaum", "Mikl\u{f3}s Fazekas"]
   s.cert_chain = ["net-ssh-public_cert.pem"]
-  s.date = "2016-03-12"
+  s.date = "2016-03-15"
   s.description = "Net::SSH: a pure-Ruby implementation of the SSH2 client protocol. It allows you to write programs that invoke and interact with processes on remote servers, via SSH2."
   s.email = "net-ssh@solutious.com"
   s.extra_rdoc_files = [

data/test/test_known_hosts.rb

@@ -2,8 +2,7 @@ require 'common'
 
 class TestKnownHosts < Test::Unit::TestCase
 
-  def perform_test(hostfile)
-    source = File.join(File.dirname(__FILE__), hostfile)
+  def perform_test(source)
     kh = Net::SSH::KnownHosts.new(source)
     keys = kh.keys_for("github.com")
     assert_equal(1, keys.count)
@@ -11,11 +10,57 @@ class TestKnownHosts < Test::Unit::TestCase
   end
 
   def test_key_for_when_all_hosts_are_recognized
-    perform_test("known_hosts/github")
+    perform_test(path("known_hosts/github"))
   end
 
   def test_key_for_when_an_host_hash_is_recognized
-    perform_test("known_hosts/github_hash")
+    perform_test(path("known_hosts/github_hash"))
   end
 
+  def test_missing_then_add
+    Tempfile.open('github') do |f|
+      f.write(File.read(path("known_hosts/github")))
+      kh = Net::SSH::KnownHosts.new(f.path)
+      keys = kh.keys_for("github2.com")
+      assert_equal(0, keys.count)
+      assert_equal([], keys.to_a)
+
+      kh.add('github2.com',rsa_key)
+      keys2 = kh.keys_for("github2.com")
+      assert_equal([rsa_key.to_blob], keys2.to_a.map(&:to_blob))
+    end
+  end
+
+  def test_search_for
+    options = {user_known_hosts_file: path("known_hosts/github")}
+    keys = Net::SSH::KnownHosts.search_for('github.com',options)
+    assert_equal(["ssh-rsa"], keys.map(&:ssh_type))
+  end
+
+  def test_search_for_then_add
+    Tempfile.open('github') do |f|
+      f.write(File.read(path("known_hosts/github")))
+      options = {user_known_hosts_file: f.path}
+      keys = Net::SSH::KnownHosts.search_for('github2.com',options)
+      assert_equal(0, keys.count)
+
+      keys.add_host_key(rsa_key)
+
+      assert_equal([rsa_key.to_blob], keys.map(&:to_blob))
+      keys = Net::SSH::KnownHosts.search_for('github2.com',options)
+      assert_equal([rsa_key.to_blob], keys.map(&:to_blob))
+    end
+  end
+
+
+  def path(relative_path)
+    File.join(File.dirname(__FILE__), "known_hosts/github")
+  end
+
+  def rsa_key
+    key = OpenSSL::PKey::RSA.new
+    key.e = 0xffeeddccbbaa9988
+    key.n = 0x7766554433221100
+    key
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: net-ssh
 version: !ruby/object:Gem::Version
-  version: 3.1.0.rc1
+  version: 3.1.0.rc2
 platform: ruby
 authors:
 - Jamis Buck
@@ -31,7 +31,7 @@ cert_chain:
   s/ZUKye79ELwFYKJOhjW5g725OL3hy+llhEleytwKRwgXFQBPTC4f5UkdxZVVWGH
   e2C9M1m/2odPZo8h
   -----END CERTIFICATE-----
-date: 2016-03-12 00:00:00.000000000 Z
+date: 2016-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit