net-ssh 2.0.23 → 2.0.24

data/CHANGELOG.rdoc

@@ -1,4 +1,10 @@
 
+=== 2.0.24 / 14 Jan 2011
+
+* Fix for process code to correctly wait until remote_id is set before sending any output, including eof. [Daniel Pittman, Markus Roberts]
+* Fix circular require warning in Ruby 1.9.2 [Gavin Brock]
+
+
 === 2.0.23 / 03 Jun 2010
 
 * delay CHANNEL_EOF packet until output buffer is empty [Rich Lane]

data/README.rdoc

@@ -3,6 +3,7 @@
 * Docs: http://net-ssh.github.com/net-ssh
 * Issues: http://net-ssh.lighthouseapp.com/
 * Codes: http://github.com/net-ssh/net-ssh
+* Email: net-ssh@solutious.com
 
 == DESCRIPTION:
 
@@ -120,7 +121,7 @@ which should produce the following:
 
 (The MIT License)
 
-Copyright (c) 2008 Jamis Buck <jamis@37signals.com>
+Copyright (c) 2008 Jamis Buck
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -42,6 +42,7 @@ Rake::GemPackageTask.new(@spec) do |p|
   p.need_tar = true if RUBY_PLATFORM !~ /mswin/
 end
 
+task :build => [ :package ]
 task :release => [ :rdoc, :package ]
 task :install => [ :rdoc, :package ] do
 	sh %{sudo gem install pkg/#{name}-#{version}.gem}

data/THANKS.rdoc

@@ -5,7 +5,7 @@ contributions:
 GOTOU Yuuzou <gotoyuzo@notwork.org>
   * help and code related to OpenSSL
 
-Guillaume Mar�ais <guillaume.marcais@free.fr>
+Guillaume Marçais <guillaume.marcais@free.fr>
   * support for communicating with the the PuTTY "pageant" process
 
 Daniel Berger <djberg96@yahoo.com>
@@ -14,3 +14,6 @@ Daniel Berger <djberg96@yahoo.com>
 
 Chris Andrews <chris@nodnol.org> and Lee Jensen <lee@outerim.com>
   * support for ssh agent forwarding
+
+Hiroshi Nakamura
+  * fixed errors with JRuby tests

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

@@ -311,7 +311,7 @@ module Net; module SSH; module Connection
       @on_process.call(self) if @on_process
       enqueue_pending_output
 
-      if @eof and not @sent_eof and output.empty?
+      if @eof and not @sent_eof and output.empty? and remote_id
         connection.send_message(Buffer.from(:byte, CHANNEL_EOF, :long, remote_id))
         @sent_eof = true
       end

data/lib/net/ssh/key_factory.rb

@@ -11,7 +11,7 @@ module Net; module SSH
   #   klass = Net::SSH::KeyFactory.get("rsa")
   #   assert klass.is_a?(OpenSSL::PKey::RSA)
   #
-  #   key = Net::SSH::KeyFacory.load_public_key("~/.ssh/id_dsa.pub")
+  #   key = Net::SSH::KeyFactory.load_public_key("~/.ssh/id_dsa.pub")
   class KeyFactory
     # Specifies the mapping of SSH names to OpenSSL key classes.
     MAP = {

data/lib/net/ssh/transport/openssl.rb

@@ -1,5 +1,4 @@
 require 'openssl'
-require 'net/ssh/buffer'
 
 module OpenSSL
 

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  = 23
+    TINY  = 24
 
     # 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.23"
+	s.version = "2.0.24"
 	s.summary = "Net::SSH: a pure-Ruby implementation of the SSH2 client protocol."
 	s.description = s.summary
 	s.authors = ["Jamis Buck", "Delano Mandelbaum"]

data/test/README.txt

@@ -1,11 +1,11 @@
-2010-03-16 
+2010-03-16
 
 RUNNING TESTS
 
 Run the test suite from the net-ssh directory with the following command:
 
      ruby -Ilib -Itest -rrubygems test/test_all.rb
-     
+
 Run a single test file like this:
 
      ruby -Ilib -Itest -rrubygems test/transport/test_server_version.rb
@@ -25,18 +25,19 @@ PORT FORWARDING TESTS
      ruby -Ilib -Itest -rrubygems test/manual/test_forward.rb
 
 test_forward.rb must be run separately from the test suite because
-it requires authorizing your public SSH keys on you localhost. 
+it requires authorizing your public SSH keys on you localhost.
 
 If you already have keys you can do this:
 
      cat ~/.ssh/id_rsa.pub >> ~/.ssh/authorized_keys
 
 If you don't have keys see:
-     
+
      http://kimmo.suominen.com/docs/ssh/#ssh-keygen
-         
-You should now be able to login to your localhost with out 
+
+You should now be able to login to your localhost with out
 bring prompted for a password:
 
      ssh localhost
-     
+
+-Delano

data/test/authentication/methods/test_hostbased.rb

@@ -75,7 +75,7 @@ module Authentication; module Methods
 
       @@keys = nil
       def keys
-        @@keys ||= [OpenSSL::PKey::RSA.new(32), OpenSSL::PKey::DSA.new(32)]
+        @@keys ||= [OpenSSL::PKey::RSA.new(512), OpenSSL::PKey::DSA.new(512)]
       end
 
       def key_manager(options={})

data/test/authentication/methods/test_publickey.rb

@@ -106,7 +106,7 @@ module Authentication; module Methods
 
       @@keys = nil
       def keys
-        @@keys ||= [OpenSSL::PKey::RSA.new(32), OpenSSL::PKey::DSA.new(32)]
+        @@keys ||= [OpenSSL::PKey::RSA.new(512), OpenSSL::PKey::DSA.new(512)]
       end
 
       def key_manager(options={})

data/test/authentication/test_agent.rb

@@ -96,7 +96,7 @@ module Authentication
 
     def test_identities_should_augment_identities_with_comment_field
       key1 = key
-      key2 = OpenSSL::PKey::DSA.new(32)
+      key2 = OpenSSL::PKey::DSA.new(512)
 
       socket.expect do |s, type, buffer|
         assert_equal SSH2_AGENT_REQUEST_IDENTITIES, type
@@ -180,7 +180,7 @@ module Authentication
       end
 
       def key
-        @key ||= OpenSSL::PKey::RSA.new(32)
+        @key ||= OpenSSL::PKey::RSA.new(512)
       end
 
       def socket

data/test/authentication/test_key_manager.rb

@@ -84,12 +84,12 @@ module Authentication
         key.expects(:public_key).returns(key)
       end
 
-      def rsa(size=32)
+      def rsa(size=512)
         @rsa ||= OpenSSL::PKey::RSA.new(size)
       end
 
       def dsa
-        @dsa ||= OpenSSL::PKey::DSA.new(32)
+        @dsa ||= OpenSSL::PKey::DSA.new(512)
       end
 
       def agent

data/test/test_all.rb

@@ -1,7 +1,7 @@
 #     $ ruby -Ilib -Itest -rrubygems test/test_all.rb
 #     $ ruby -Ilib -Itest -rrubygems test/transport/test_server_version.rb
 Dir.chdir(File.dirname(__FILE__)) do
-  test_files = Dir['**/test_*.rb']
+  test_files = Dir['**/test_*.rb']-['test_all.rb'] # prevent circular require
   test_files = test_files.reject { |f| f =~ /^manual/ }
   test_files = test_files.select { |f| f =~ Regexp.new(ENV['ONLY']) } if ENV['ONLY']
   test_files = test_files.reject { |f| f =~ Regexp.new(ENV['EXCEPT']) } if ENV['EXCEPT']

data/test/test_key_factory.rb

@@ -48,10 +48,12 @@ class TestKeyFactory < Test::Unit::TestCase
   private
 
     def rsa_key
-      @rsa_key ||= OpenSSL::PKey::RSA.new("0@\002\001\000\002\t\000\300\030\317\2132\340 \267\002\003\001\000\001\002\t\000\236~\232\025\350Y=\341\002\005\000\352D\217\a\002\005\000\321\352\304\321\002\005\000\242\350\206%\002\005\000\270\021\217\361\002\004~\253\214j")
+      # 512 bits
+      @rsa_key ||= OpenSSL::PKey::RSA.new("0\202\001;\002\001\000\002A\000\235\236\374N\e@2E\321\3757\003\354c\276N\f\003\3479Ko\005\317\0027\a\255=\345!\306\220\340\211;\027u\331\260\362\2063x\332\301y4\353\v%\032\214v\312\304\212\271GJ\353\2701\031\002\003\001\000\001\002@\022Y\306*\031\306\031\224Cde\231QV3{\306\256U\2477\377\017\000\020\323\363R\332\027\351\034\224OU\020\227H|pUS\n\263+%\304\341\321\273/\271\e\004L\250\273\020&,\t\304By\002!\000\311c\246%a\002\305\277\262R\266\244\250\025V_\351]\264\016\265\341\355\305\223\347Z$8\205#\023\002!\000\310\\\367|\243I\363\350\020\307\246\302\365\ed\212L\273\2158M\223w\a\367 C\t\224A4\243\002!\000\262]+}\327\231\331\002\2331^\312\036\204'g\363\f&\271\020\245\365-\024}\306\374e\202\2459\002 }\231\341\276\3551\277\307{5\\\361\233\353G\024wS\237\fk}\004\302&\205\277\340rb\211\327\002!\000\223\307\025I:\215_\260\370\252\3757\256Y&X\364\354\342\215\350\203E8\227|\f\237M\375D|")
     end
 
     def dsa_key
+      # 512 bits
       @dsa_key ||= OpenSSL::PKey::DSA.new("0\201\367\002\001\000\002A\000\203\316/\037u\272&J\265\003l3\315d\324h\372{\t8\252#\331_\026\006\035\270\266\255\343\353Z\302\276\335\336\306\220\375\202L\244\244J\206>\346\b\315\211\302L\246x\247u\a\376\366\345\302\016#\002\025\000\244\274\302\221Og\275/\302+\356\346\360\024\373wI\2573\361\002@\027\215\270r*\f\213\350C\245\021:\350 \006\\\376\345\022`\210b\262\3643\023XLKS\320\370\002\276\347A\nU\204\276\324\256`=\026\240\330\306J\316V\213\024\e\030\215\355\006\037q\337\356ln\002@\017\257\034\f\260\333'S\271#\237\230E\321\312\027\021\226\331\251Vj\220\305\316\036\v\266+\000\230\270\177B\003?t\a\305]e\344\261\334\023\253\323\251\223M\2175)a(\004\"lI8\312\303\307\a\002\024_\aznW\345\343\203V\326\246ua\203\376\201o\350\302\002")
     end
 

data/test/transport/kex/test_diffie_hellman_group1_sha1.rb

@@ -95,9 +95,9 @@ module Transport; module Kex
         Net::SSH::Transport::Kex::DiffieHellmanGroup1SHA1
       end
 
-      # 368 bits is the smallest possible key that will work with this, so
+      # 512 bits is the smallest possible key that will work with this, so
       # we use it for speed reasons
-      def server_key(bits=368)
+      def server_key(bits=512)
         @server_key ||= OpenSSL::PKey::RSA.new(bits)
       end
 

data/test/transport/test_packet_stream.rb

@@ -378,6 +378,13 @@ module Transport
         next 
       end
       
+      # JRuby Zlib implementation (1.4 & 1.5) does not have byte-to-byte compatibility with MRI's.
+      # skip these 80 or more tests under JRuby.
+      if defined?(JRUBY_VERSION)
+        puts "Skipping zlib tests for JRuby"
+        next
+      end
+
       hmacs.each do |hmac_name|
         [false, :standard].each do |compress|
           cipher_method_name = cipher_name.gsub(/\W/, "_")

data/test/transport/test_state.rb

@@ -114,12 +114,18 @@ module Transport
     end
 
     def test_compress_when_compression_is_enabled_should_return_compressed_text
-      state.set :compression => :standard
+      state.set :compression => :standard     
+      # JRuby Zlib implementation (1.4 & 1.5) does not have byte-to-byte compatibility with MRI's.
+      # skip this test under JRuby.
+      return if defined?(JRUBY_VERSION)
       assert_equal "x\234\312H\315\311\311WH-K-\252L\312O\251\004\000\000\000\377\377", state.compress("hello everybody")
     end
 
     def test_decompress_when_compression_is_enabled_should_return_decompressed_text
-      state.set :compression => :standard
+      state.set :compression => :standard     
+      # JRuby Zlib implementation (1.4 & 1.5) does not have byte-to-byte compatibility with MRI's.
+      # skip this test under JRuby.
+      return if defined?(JRUBY_VERSION)
       assert_equal "hello everybody", state.decompress("x\234\312H\315\311\311WH-K-\252L\312O\251\004\000\000\000\377\377")
     end
 

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: net-ssh
 version: !ruby/object:Gem::Version 
-  version: 2.0.23
+  hash: 63
+  prerelease: false
+  segments: 
+  - 2
+  - 0
+  - 24
+  version: 2.0.24
 platform: ruby
 authors: 
 - Jamis Buck
@@ -10,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-03 00:00:00 -04:00
+date: 2011-01-14 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -154,21 +160,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: net-ssh
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: "Net::SSH: a pure-Ruby implementation of the SSH2 client protocol."