net-ssh 2.0.18 → 2.0.19

data/CHANGELOG.rdoc

@@ -1,7 +1,14 @@
+
+=== 2.0.19 / 16 Jan 2010
+
+* Support plus sign in sshconfig hostname [Jason Weathered]
+
+
 === 2.0.18 / 15 Jan 2010
 
 * Fix related to #recv(1) to #readpartial change in 2.0.16 [Hans de Graaff, Delano Mandelbaum]
 
+
 === 2.0.17 / 14 Dec 2009
 
 * Don't load net/ssh/authentication/pageant on Windows with Ruby 1.9 [Travis Reeder, Delano Mandelbaum]

data/Manifest

@@ -28,6 +28,7 @@ lib/net/ssh/known_hosts.rb
 lib/net/ssh/loggable.rb
 lib/net/ssh/packet.rb
 lib/net/ssh/prompt.rb
+lib/net/ssh/proxy/command.rb
 lib/net/ssh/proxy/errors.rb
 lib/net/ssh/proxy/http.rb
 lib/net/ssh/proxy/socks4.rb
@@ -69,6 +70,7 @@ lib/net/ssh/version.rb
 net-ssh.gemspec
 setup.rb
 support/arcfour_check.rb
+support/ssh_tunnel_bug.rb
 test/authentication/methods/common.rb
 test/authentication/methods/test_abstract.rb
 test/authentication/methods/test_hostbased.rb
@@ -81,6 +83,7 @@ test/authentication/test_session.rb
 test/common.rb
 test/configs/eqsign
 test/configs/exact_match
+test/configs/host_plus
 test/configs/multihost
 test/configs/wild_cards
 test/connection/test_channel.rb

data/lib/net/ssh/config.rb

@@ -170,6 +170,7 @@ module Net; module SSH
         def pattern2regex(pattern)
           pattern = "^" + pattern.to_s.gsub(/\./, "\\.").
             gsub(/\?/, '.').
+            gsub(/([+\/])/, '\\\\\\0').
             gsub(/\*/, '.*') + "$"
           Regexp.new(pattern, true)
         end

data/lib/net/ssh/version.rb

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

data/net-ssh.gemspec

@@ -1,7 +1,7 @@
 @spec = Gem::Specification.new do |s|
 	s.name = "net-ssh"
         s.rubyforge_project = 'net-ssh'
-	s.version = "2.0.18"
+	s.version = "2.0.19"
 	s.summary = "Net::SSH: a pure-Ruby implementation of the SSH2 client protocol."
 	s.description = s.summary
 	s.authors = ["Jamis Buck", "Delano Mandelbaum"]
@@ -103,6 +103,7 @@
   test/common.rb
   test/configs/eqsign
   test/configs/exact_match
+  test/configs/host_plus
   test/configs/multihost
   test/configs/wild_cards
   test/connection/test_channel.rb

data/test/configs/host_plus

@@ -0,0 +1,10 @@
+# Jump through hosts with one SSH call
+# via <http://glandium.org/blog/?p=308>
+Host *+*
+	ProxyCommand ssh $(echo %h | sed 's/+[^+]*$//;s/\([^+%%]*\)%%\([^+]*\)$/\2 -l \1/;s/:/ -p /') PATH=.:\$PATH nc -w1 $(echo %h | sed 's/^.*+//;/:/!s/$/ %p/;s/:/ /')
+
+Host office-offsite
+	HostName work-gateway+office-workstation
+
+Host test.host
+	Compression yes

data/test/test_config.rb

@@ -90,7 +90,12 @@ class TestConfig < Test::Unit::TestCase
     assert_equal 1234,      net_ssh[:port]
     assert_equal 1024,      net_ssh[:rekey_limit]
   end
-
+  
+  def test_load_with_plus_sign_hosts
+    config = Net::SSH::Config.load(config(:host_plus), "test.host")
+    assert config['compression']
+  end
+  
   private
 
     def config(name)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: net-ssh
 version: !ruby/object:Gem::Version 
-  version: 2.0.18
+  version: 2.0.19
 platform: ruby
 authors: 
 - Jamis Buck
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-15 00:00:00 -05:00
+date: 2010-01-16 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -112,6 +112,7 @@ files:
 - test/common.rb
 - test/configs/eqsign
 - test/configs/exact_match
+- test/configs/host_plus
 - test/configs/multihost
 - test/configs/wild_cards
 - test/connection/test_channel.rb