net-ssh 2.0.13 → 2.0.14

data/CHANGELOG.rdoc

@@ -1,5 +1,12 @@
 
 
+=== 2.0.14 / 28 Aug 2009
+
+* Fix for IO#select threading bug in Ruby 1.8 (LH-1) [Daniel Azuma]
+
+* Fix for "uninitialized constant OpenSSL::Digest::MD5" exception in Net::SFTP [DL Redden]
+
+
 === 2.0.13 / 17 Aug 2009
 
 * Added fix for hanging in ServerVersion#negotiate! when using SOCKS5 proxy (GH-9) [Gerald Talton]

data/lib/net/ssh/buffered_io.rb

@@ -1,5 +1,6 @@
 require 'net/ssh/buffer'
 require 'net/ssh/loggable'
+require 'net/ssh/ruby_compat'
 
 module Net; module SSH
 
@@ -109,7 +110,7 @@ module Net; module SSH
     def wait_for_pending_sends
       send_pending
       while output.length > 0
-        result = IO.select(nil, [self]) or next
+        result = Net::SSH::Compat.io_select(nil, [self]) or next
         next unless result[1].any?
         send_pending
       end
@@ -146,4 +147,4 @@ module Net; module SSH
       end
   end
 
-end; end
+end; end

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

@@ -1,4 +1,5 @@
 require 'net/ssh/loggable'
+require 'net/ssh/ruby_compat'
 require 'net/ssh/connection/channel'
 require 'net/ssh/connection/constants'
 require 'net/ssh/service/forward'
@@ -197,7 +198,7 @@ module Net; module SSH; module Connection
 
       r = listeners.keys
       w = r.select { |w2| w2.respond_to?(:pending_write?) && w2.pending_write? }
-      readers, writers, = IO.select(r, w, nil, wait)
+      readers, writers, = Net::SSH::Compat.io_select(r, w, nil, wait)
 
       postprocess(readers, writers)
     end

data/lib/net/ssh/ruby_compat.rb

@@ -1,7 +1,35 @@
+require 'thread'
+
 class String
   if RUBY_VERSION < "1.9"
     def getbyte(index)
       self[index]
     end
   end
-end
+end
+
+module Net; module SSH
+  
+  # This class contains miscellaneous patches and workarounds
+  # for different ruby implementations.
+  class Compat
+    
+    # A workaround for an IO#select threading bug in MRI 1.8.
+    # See: http://net-ssh.lighthouseapp.com/projects/36253/tickets/1-ioselect-threading-bug-in-ruby-18
+    # Also: http://redmine.ruby-lang.org/issues/show/1993
+    if RUBY_VERSION >= '1.9' || RUBY_PLATFORM == 'java'
+      def self.io_select(*params)
+        IO.select(*params)
+      end
+    else
+      SELECT_MUTEX = Mutex.new
+      def self.io_select(*params)
+        SELECT_MUTEX.synchronize do
+          IO.select(*params)
+        end
+      end
+    end
+    
+  end
+  
+end; end

data/lib/net/ssh/transport/hmac/abstract.rb

@@ -1,4 +1,5 @@
 require 'openssl'
+require 'openssl/digest'
 
 module Net; module SSH; module Transport; module HMAC
 

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

@@ -1,10 +1,12 @@
 require 'net/ssh/buffered_io'
 require 'net/ssh/errors'
 require 'net/ssh/packet'
+require 'net/ssh/ruby_compat'
 require 'net/ssh/transport/cipher_factory'
 require 'net/ssh/transport/hmac'
 require 'net/ssh/transport/state'
 
+
 module Net; module SSH; module Transport
 
   # A module that builds additional functionality onto the Net::SSH::BufferedIo
@@ -62,13 +64,13 @@ module Net; module SSH; module Transport
         Socket.getnameinfo(addr, Socket::NI_NUMERICHOST | Socket::NI_NUMERICSERV).first
       end
     end
-
+    
     # Returns true if the IO is available for reading, and false otherwise.
     def available_for_read?
-      result = IO.select([self], nil, nil, 0)
+      result = Net::SSH::Compat.io_select([self], nil, nil, 0)
       result && result.first.any?
     end
-
+    
     # Returns the next full packet. If the mode parameter is :nonblock (the
     # default), then this will return immediately, whether a packet is
     # available or not, and will return nil if there is no packet ready to be
@@ -86,7 +88,7 @@ module Net; module SSH; module Transport
           return packet if packet
 
           loop do
-            result = IO.select([self]) or next
+            result = Net::SSH::Compat.io_select([self]) or next
             break if result.first.any?
           end
 
@@ -227,4 +229,4 @@ module Net; module SSH; module Transport
       end
   end
 
-end; end; end
+end; end; 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  = 13
+    TINY  = 14
 
     # 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.13"
+	s.version = "2.0.14"
 	s.summary = "Net::SSH: a pure-Ruby implementation of the SSH2 client protocol."
 	s.description = s.summary
 	s.authors = ["Jamis Buck", "Delano Mandelbaum"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: net-ssh
 version: !ruby/object:Gem::Version 
-  version: 2.0.13
+  version: 2.0.14
 platform: ruby
 authors: 
 - Jamis Buck
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-17 00:00:00 -04:00
+date: 2009-08-28 00:00:00 -04:00
 default_executable: 
 dependencies: []