avoid using ensure in Net::SFTP.start to prevent hangs when exceptions are raised

Author: jamis

CHANGELOG.rdoc

@@ -1,3 +1,8 @@
+=== (unreleased)
+
+* Avoid using 'ensure' in Net::SFTP.start since it causes unfriendly behavior when exceptions are raised [Jamis Buck]
+
+
 === 2.0.1 / 29 May 2008
 
 * Open files in binary mode to appease Windows [Jamis Buck]

Rakefile

@@ -21,10 +21,10 @@ Echoe.new('net-sftp', version) do |p|
   p.summary          = "A pure Ruby implementation of the SFTP client protocol"
   p.url              = "http://net-ssh.rubyforge.org/sftp"
 
-  p.dependencies     = ["net-ssh >=1.99.1"]
+  p.dependencies     = ["net-ssh >=2.0.9"]
 
   p.need_zip         = true
   p.include_rakefile = true
 
   p.rdoc_pattern     = /^(lib|README.rdoc|CHANGELOG.rdoc)/
-end
+end

lib/net/sftp.rb

@@ -31,11 +31,21 @@ def self.start(host, user, options={}, &block)
       session = Net::SSH.start(host, user, options)
       sftp = Net::SFTP::Session.new(session, &block).connect!
 
-      sftp.loop if block_given?
+      if block_given?
+        sftp.loop
+        session.close
+        return nil
+      end
 
       sftp
-    ensure
-      session.close if session && block_given?
+    rescue Exception => anything
+      begin
+        session.terminate!
+      rescue Exception
+        # swallow exceptions that occur while trying to shutdown
+      end
+
+      raise anything
     end
   end
 
@@ -57,4 +67,4 @@ def sftp(wait=true)
       sftp
     end
   end
-end
+end