net-ssh 2.6.1 → 2.6.2

data/README.rdoc

@@ -90,6 +90,20 @@ 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).
 
+== RUBY 1.8 SUPPORT
+
+net-ssh supports Ruby 1.8.x up until the 2.5.1 release. Later releases will work but the test suite is no longer guaranteed to pass all tests.
+
+== JRUBY 1.6 
+
+There is an issue with jruby-openssl that produces the following error in jruby 1.6:
+
+    <ArgumentError> wrong number of arguments (2 for 1)
+    /home/offers/tracking/shared/bundle/jruby/1.8/gems/net-ssh-2.6.0/lib/net/ssh/key_factory.rb:77:in `load_data_private_key'
+
+You can downgrade jruby-openssl to version 0.7.4 (before they added the PKey.read method) to resolve it or upgrade jruby to 1.7. See issue #61 for more info: https://github.com/net-ssh/net-ssh/issues/61.
+
+
 == ARCFOUR SUPPORT:
 
 from Karl Varga:

data/lib/net/ssh.rb

@@ -190,8 +190,9 @@ module Net
       if auth.authenticate("ssh-connection", user, options[:password])
         connection = Connection::Session.new(transport, options)
         if block_given?
-          yield connection
+          retval = yield connection
           connection.close
+          retval
         else
           return connection
         end

data/lib/net/ssh/test/channel.rb

@@ -10,6 +10,7 @@ module Net; module SSH; module Test
   #     channel = session.opens_channel
   #     channel.sends_exec "ls"
   #     channel.gets_data "result of ls"
+  #     channel.gets_extended_data "some error coming from ls"
   #     channel.gets_close
   #     channel.sends_close
   #   end
@@ -104,6 +105,14 @@ module Net; module SSH; module Test
       script.gets_channel_data(self, data)
     end
 
+    # Scripts the reception of a channel extended data packet from the remote
+    # end.
+    #
+    #   channel.gets_extended_data "whoops"
+    def gets_extended_data(data)
+      script.gets_channel_extended_data(self, data)
+    end
+
     # Scripts the reception of an "exit-status" channel request packet.
     #
     #   channel.gets_exit_status(127)

data/lib/net/ssh/test/kex.rb

@@ -32,7 +32,7 @@ module Net; module SSH; module Test
       raise Net::SSH::Exception, "expected NEWKEYS" unless buffer.type == NEWKEYS
 
       { :session_id        => "abc-xyz",
-        :server_key        => OpenSSL::PKey::RSA.new(32),
+        :server_key        => OpenSSL::PKey::RSA.new(512),
         :shared_secret     => OpenSSL::BN.new("1234567890", 10),
         :hashing_algorithm => OpenSSL::Digest::SHA1 }
     end

data/lib/net/ssh/test/packet.rb

@@ -65,6 +65,7 @@ module Net; module SSH; module Test
         when CHANNEL_OPEN then [:string, :long, :long, :long]
         when CHANNEL_OPEN_CONFIRMATION then [:long, :long, :long, :long]
         when CHANNEL_DATA then [:long, :string]
+        when CHANNEL_EXTENDED_DATA then [:long, :long, :string]
         when CHANNEL_EOF, CHANNEL_CLOSE, CHANNEL_SUCCESS, CHANNEL_FAILURE then [:long]
         when CHANNEL_REQUEST
           parts = [:long, :string, :bool]

data/lib/net/ssh/test/script.rb

@@ -111,6 +111,15 @@ module Net; module SSH; module Test
       events << RemotePacket.new(:channel_data, channel.local_id, data)
     end
 
+    # Scripts the reception of a channel extended data packet from the remote
+    # host by the given Net::SSH::Test::Channel +channel+. This will typically
+    # be called via Net::SSH::Test::Channel#gets_extended_data.
+    #
+    # Currently the only extended data type is stderr == 1.
+    def gets_channel_extended_data(channel, data)
+      events << RemotePacket.new(:channel_extended_data, channel.local_id, 1, data)
+    end
+
     # Scripts the reception of a channel request packet from the remote host by
     # the given Net::SSH::Test::Channel +channel+. This will typically be
     # called via Net::SSH::Test::Channel#gets_exit_status.

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  = 1 
+    TINY  = 2
 
     # 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.6.1"
+  s.version = "2.6.2"
   s.summary = "Net::SSH: a pure-Ruby implementation of the SSH2 client protocol."
   s.description = s.summary + " It allows you to write programs that invoke and interact with processes on remote servers, via SSH2."
   s.authors = ["Jamis Buck", "Delano Mandelbaum"]

data/test/README.txt

@@ -13,11 +13,15 @@ Run a single test file like this:
 
 EXPECTED RESULTS
 
-* Ruby 1.8: all tests pass
-
 * Ruby 1.9: all tests pass
 
-* JRuby 1.5: 99% tests pass (448 tests, 1846 assertions, 1 failures)
+* Ruby 1.8: all tests pass (up until version 2.5)
+
+* JRuby 1.7: 98% test pass (510 tests, 1914 assertions, 2 failures, 9 errors)
+
+* JRuby 1.6: 98% test pass (510 tests, 1914 assertions, 4 failures, 5 errors)
+
+* JRuby 1.5: 98% tests pass (510 tests, 1914 assertions, 5 failures, 5 errors)
 
 
 PORT FORWARDING TESTS

data/test/test_all.rb

@@ -1,3 +1,5 @@
+$: << '.'
+
 #     $ ruby -Ilib -Itest -rrubygems test/test_all.rb
 #     $ ruby -Ilib -Itest -rrubygems test/transport/test_server_version.rb
 Dir.chdir(File.dirname(__FILE__)) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: net-ssh
 version: !ruby/object:Gem::Version
-  version: 2.6.1
+  version: 2.6.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-18 00:00:00.000000000 Z
+date: 2012-11-22 00:00:00.000000000 Z
 dependencies: []
 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