net-ssh 2.6.7 → 2.6.8

data/CHANGES.txt

@@ -1,4 +1,11 @@
 
+=== 2.6.8 / 6 Jul 2013
+
+* Added support for host wildcard substitution [GabKlein]
+* Added a wait to the loop in close to help fix possible blocks [Josh Kalderimis]
+* Fixed test file encoding issues with Ruby 2.0 (#87) [voxik]
+
+
 === 2.6.7 / 11 Apr 2013
 
 * Decreased default packet size to 32768 as described in RFC 4253 [Olipro]

data/README.rdoc

@@ -1,5 +1,8 @@
 = Net::SSH 2.x
 
+<em><b>Please note: this project is in maintenance mode. It is not under active development but pull requests are very much welcome. Just be sure to include tests! -- delano</b></em>
+
+
 * Docs: http://net-ssh.github.com/net-ssh
 * Issues: https://github.com/net-ssh/net-ssh/issues
 * Codes: https://github.com/net-ssh/net-ssh
@@ -94,7 +97,7 @@ Lastly, if you want to run the tests or use any of the Rake tasks, you'll need:
 
 NOTE: If you are running on jruby you need to install jruby-pageant manually (gemspec doesn't allow for platform specific dependencies).
 
-However, in order to be sure the code you're installing hasn't been tampered with, it's recommended that you verify the signiture[http://docs.rubygems.org/read/chapter/21]. To do this, you need to add my public key as a trusted certificate (you only need to do this once):
+However, in order to be sure the code you're installing hasn't been tampered with, it's recommended that you verify the signature[http://docs.rubygems.org/read/chapter/21]. To do this, you need to add my public key as a trusted certificate (you only need to do this once):
 
     # Add the public key as a trusted certificate
     # (You only need to do this once)
@@ -153,7 +156,7 @@ which should produce the following:
 
 Run the test suite from the net-ssh directory with the following command:
 
-     ruby -Ilib -Itest -rrubygems test/test_all.rb
+     bash -c 'unset HOME && ruby -Ilib -Itest -rrubygems test/test_all.rb'
 
 Run a single test file like this:
 

data/Rakefile

@@ -34,8 +34,8 @@ begin
 
     s.license = "MIT"
 
-    s.signing_key = File.join('/mnt/gem/', 'gem-private_key.pem')
-    s.cert_chain  = ['gem-public_cert.pem']
+    #s.signing_key = File.join('/mnt/gem/', 'gem-private_key.pem')
+    #s.cert_chain  = ['gem-public_cert.pem']
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/lib/net/ssh.rb

@@ -1,6 +1,6 @@
 # Make sure HOME is set, regardless of OS, so that File.expand_path works
 # as expected with tilde characters.
-ENV['HOME'] ||= ENV['HOMEPATH'] ? "#{ENV['HOMEDRIVE']}#{ENV['HOMEPATH']}" : "."
+ENV['HOME'] ||= ENV['HOMEPATH'] ? "#{ENV['HOMEDRIVE']}#{ENV['HOMEPATH']}" : Dir.pwd
 
 require 'logger'
 

data/lib/net/ssh/config.rb

@@ -92,6 +92,7 @@ module Net; module SSH
             multi_host = value.to_s.split(/\s+/)
             matched_host = multi_host.select { |h| host =~ pattern2regex(h) }.first
             seen_host = true
+            settings[key] = host
           elsif !seen_host
             if key == 'identityfile'
               (globals[key] ||= []) << value
@@ -145,7 +146,7 @@ module Net; module SSH
           when 'hostkeyalias' then
             hash[:host_key_alias] = value
           when 'hostname' then
-            hash[:host_name] = value
+            hash[:host_name] = value.gsub(/%h/, settings['host'])
           when 'identityfile' then
             hash[:keys] = value
           when 'macs' then

data/lib/net/ssh/connection/session.rb

@@ -110,7 +110,7 @@ module Net; module SSH; module Connection
     def close
       info { "closing remaining channels (#{channels.length} open)" }
       channels.each { |id, channel| channel.close }
-      loop { channels.any? }
+      loop(0.1) { channels.any? }
       transport.close
     end
 

data/lib/net/ssh/version.rb

@@ -51,7 +51,7 @@ module Net; module SSH
     MINOR = 6
 
     # The tiny component of this version of the Net::SSH library
-    TINY  = 7
+    TINY  = 8
 
     # The current version of the Net::SSH library as a Version instance
     CURRENT = new(MAJOR, MINOR, TINY)

data/net-ssh.gemspec

@@ -5,12 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "net-ssh"
-  s.version = "2.6.7"
+  s.version = "2.6.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jamis Buck", "Delano Mandelbaum"]
-  s.cert_chain = ["gem-public_cert.pem"]
-  s.date = "2013-04-11"
+  s.date = "2013-07-06"
   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 = [
@@ -127,6 +126,7 @@ Gem::Specification.new do |s|
     "test/configs/multihost",
     "test/configs/nohost",
     "test/configs/numeric_host",
+    "test/configs/substitutes",
     "test/configs/wild_cards",
     "test/connection/test_channel.rb",
     "test/connection/test_session.rb",
@@ -170,7 +170,6 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.rubyforge_project = "net-ssh"
   s.rubygems_version = "1.8.25"
-  s.signing_key = "/mnt/gem/gem-private_key.pem"
   s.summary = "Net::SSH: a pure-Ruby implementation of the SSH2 client protocol."
 
   if s.respond_to? :specification_version then

data/test/configs/substitutes

@@ -0,0 +1,8 @@
+Host test
+  HostName %h.sufix
+
+Host 1234
+  HostName prefix.%h.sufix
+
+Host *
+  HostName %h

data/test/test_buffer.rb

@@ -1,3 +1,5 @@
+# encoding: ASCII-8BIT
+
 require 'common'
 require 'net/ssh/buffer'
 

data/test/test_config.rb

@@ -1,7 +1,12 @@
 require 'common'
 require 'net/ssh/config'
+require 'pathname'
 
 class TestConfig < Test::Unit::TestCase
+  def test_home_should_be_absolute_path
+    assert Pathname.new(ENV['HOME']).absolute?
+  end
+
   def test_load_for_non_existant_file_should_return_empty_hash
     bogus_file = File.expand_path("/bogus/file")
     File.expects(:readable?).with(bogus_file).returns(false)
@@ -111,6 +116,24 @@ class TestConfig < Test::Unit::TestCase
     assert_equal '2G', config['rekeylimit']
     assert_equal 1980, config['port']
   end
+
+  def test_load_wildcar_with_substitutes
+    config = Net::SSH::Config.load(config(:substitutes), "toto")
+    net_ssh = Net::SSH::Config.translate(config)
+    assert_equal 'toto', net_ssh[:host_name]
+  end
+
+  def test_load_sufix_with_substitutes
+    config = Net::SSH::Config.load(config(:substitutes), "test")
+    net_ssh = Net::SSH::Config.translate(config)
+    assert_equal 'test.sufix', net_ssh[:host_name]
+  end
+
+  def test_load_prefix_and_sufix_with_substitutes
+    config = Net::SSH::Config.load(config(:substitutes), "1234")
+    net_ssh = Net::SSH::Config.translate(config)
+    assert_equal 'prefix.1234.sufix', net_ssh[:host_name]
+  end
   
   private
 

data/test/transport/hmac/test_md5.rb

@@ -1,3 +1,5 @@
+# encoding: ASCII-8BIT
+
 require 'common'
 require 'net/ssh/transport/hmac/md5'
 

data/test/transport/hmac/test_md5_96.rb

@@ -1,3 +1,5 @@
+# encoding: ASCII-8BIT
+
 require 'common'
 require 'transport/hmac/test_md5'
 require 'net/ssh/transport/hmac/md5_96'

data/test/transport/hmac/test_ripemd160.rb

@@ -1,3 +1,5 @@
+# encoding: ASCII-8BIT
+
 require 'common'
 require 'net/ssh/transport/hmac/ripemd160'
 

data/test/transport/hmac/test_sha1.rb

@@ -1,3 +1,5 @@
+# encoding: ASCII-8BIT
+
 require 'common'
 require 'net/ssh/transport/hmac/sha1'
 

data/test/transport/hmac/test_sha1_96.rb

@@ -1,3 +1,5 @@
+# encoding: ASCII-8BIT
+
 require 'common'
 require 'transport/hmac/test_sha1'
 require 'net/ssh/transport/hmac/sha1_96'

data/test/transport/hmac/test_sha2_256.rb

@@ -1,3 +1,5 @@
+# encoding: ASCII-8BIT
+
 require 'common'
 require 'net/ssh/transport/hmac/sha2_256'
 

data/test/transport/hmac/test_sha2_256_96.rb

@@ -1,3 +1,5 @@
+# encoding: ASCII-8BIT
+
 require 'common'
 require 'transport/hmac/test_sha2_256'
 require 'net/ssh/transport/hmac/sha2_256_96'

data/test/transport/hmac/test_sha2_512.rb

@@ -1,3 +1,5 @@
+# encoding: ASCII-8BIT
+
 require 'common'
 require 'net/ssh/transport/hmac/sha2_512'
 

data/test/transport/hmac/test_sha2_512_96.rb

@@ -1,3 +1,5 @@
+# encoding: ASCII-8BIT
+
 require 'common'
 require 'transport/hmac/test_sha2_512'
 require 'net/ssh/transport/hmac/sha2_512_96'

data/test/transport/test_cipher_factory.rb

@@ -1,3 +1,5 @@
+# encoding: ASCII-8BIT
+
 require 'common'
 require 'net/ssh/transport/cipher_factory'
 

data/test/transport/test_packet_stream.rb

@@ -1,3 +1,5 @@
+# encoding: ASCII-8BIT
+
 require 'common'
 require 'net/ssh/transport/packet_stream'
 

data/test/transport/test_state.rb

@@ -1,3 +1,5 @@
+# encoding: ASCII-8BIT
+
 require 'common'
 require 'net/ssh/transport/state'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: net-ssh
 version: !ruby/object:Gem::Version
-  version: 2.6.7
+  version: 2.6.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,36 +9,8 @@ authors:
 - Delano Mandelbaum
 autorequire: 
 bindir: bin
-cert_chain:
-- !binary |-
-  LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUROakNDQWg2Z0F3SUJB
-  Z0lCQURBTkJna3Foa2lHOXcwQkFRVUZBREJCTVE4d0RRWURWUVFEREFaa1pX
-  eGgKYm04eEdUQVhCZ29Ka2lhSmsvSXNaQUVaRmdsemIyeDFkR2x2ZFhNeEV6
-  QVJCZ29Ka2lhSmsvSXNaQUVaRmdOagpiMjB3SGhjTk1UTXdNakEyTVRFMU56
-  UTFXaGNOTVRRd01qQTJNVEUxTnpRMVdqQkJNUTh3RFFZRFZRUUREQVprClpX
-  eGhibTh4R1RBWEJnb0praWFKay9Jc1pBRVpGZ2x6YjJ4MWRHbHZkWE14RXpB
-  UkJnb0praWFKay9Jc1pBRVoKRmdOamIyMHdnZ0VpTUEwR0NTcUdTSWIzRFFF
-  QkFRVUFBNElCRHdBd2dnRUtBb0lCQVFEZzFoTXRsMFhzTXVVSwpBS1RnWVd2
-  M2dqajd2dUVzRTJFalQrdnlCZzgvTHBxVlZ3WnppaWFlYkpUOUlaaVErc0NG
-  cWJpYWtqMGI1M3BJCmhnMXlPYUJFbUg2L1cwTDdyd3pxYVJWOXNXMWVKczlK
-  eEZZUUNuZDY3elVuemo4bm5SbE9qRytoaElHK1ZzaWoKbnBzR2J0MjhwZWZ1
-  TlpKak81cTJjbEFsZlNuaUlJSGZJc1U3L1N0RVl1NkZVR09qbndyeVowcjV5
-  SmxyOVJyRQpHcytxMERXOFFuWjlVcEFmdURGUVp1SXFlS1FGRkxFN25NbUNH
-  YUErMEJOMW5MbDNmVkhOYkxIcTdBdms4K1orClp1dXZrZHNjYkhsTy9sKzN4
-  Q05RNW5Vbkh3cTBBREFiTUxPbG1pWVl6cVhvV0xqbWVJNm1lL2Nsa3RKQ2ZO
-  MlIKb1pHM1VRdnZBZ01CQUFHak9UQTNNQWtHQTFVZEV3UUNNQUF3SFFZRFZS
-  ME9CQllFRk1TSk9FdEh6RTRsMGF6dgpNMEpLMGtLTlRvSzFNQXNHQTFVZER3
-  UUVBd0lFc0RBTkJna3Foa2lHOXcwQkFRVUZBQU9DQVFFQXRPZEU3M3F4Ck9I
-  MnlkaTlvVDJoUzVmOUcweTFaNzBUbHdoK1ZHRXh5Znh6VkU5WHdDK2lQcEp4
-  TnJhaUhZZ0YvOS9va3k3WloKUjlxMC90Sm5ldWhBZW5aZGlRa1g3b2k0TzN2
-  OXdSUzZZSG9XQnhNUEZLVlJMTlR6dlZKc2JtZnBDQWxwNS81ZwpwczR3UUZ5
-  NW1pYkVsR1ZsT29iZi9naHFaMjVIUzlKNmtkMC9DL3J5MEFVdFRvZ3NMN1R4
-  R3dUNGtiQ3g2M3ViCjN2eXdFRWhzSlV6ZmQ5N0dDQUJtdFFmUlRsZFgvajdG
-  MXovNXdkOHAraGZkb3gxaWliZHM5WnRmYVpBM0t6S24Ka2NoV045QjZ6Zzly
-  MVhNUThCTTJKejBYb1BhblBlMzU0K2xXd2pwa1JLYkZvdy9aYlFIY0NMQ3Ey
-  NCtONmI2ZwpkZ0tmTkR6d2lEcHFDQT09Ci0tLS0tRU5EIENFUlRJRklDQVRF
-  LS0tLS0K
-date: 2013-04-11 00:00:00.000000000 Z
+cert_chain: []
+date: 2013-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
@@ -191,6 +163,7 @@ files:
 - test/configs/multihost
 - test/configs/nohost
 - test/configs/numeric_host
+- test/configs/substitutes
 - test/configs/wild_cards
 - test/connection/test_channel.rb
 - test/connection/test_session.rb

metadata.gz.sig

@@ -1,4 +0,0 @@
-��Iϑrq�}g�)jr8��!�Ǧ3oO��������dϙO��Jv�Γ,�ɉ��3���j���eL*�p	�L}���)���K�c�������
-�o)5��b��\Y:+j�߄?��Mu'��

��+�zZCHR-3Bs|��-�{�If6������E���Y!ZR��\C�<�Z)S@��+���
-V
-�:8ɦ�N��ڴ��^�J�1'H<��i!Nh�p��ޡ5G�tL,�X{QgXGi�9�z���QU�K