@@ -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] CHANGELOG.rdoc @@ -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 \ No newline at end of file +end Rakefile @@ -31,11 +31,21 @@ module Net 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 @@ class Net::SSH::Connection::Session sftp end end -end \ No newline at end of file +end lib/net/sftp.rb bc755d31fab2e071b362e0ae7996fab6d72d76c4 Jamis Buck jamis@37signals.com http://github.com/jamis/net-sftp/commit/e401c03a9bd4bd7f19ad213d2ac1a177da8727f5 e401c03a9bd4bd7f19ad213d2ac1a177da8727f5 2009-01-31T20:25:02-08:00 2009-01-31T20:25:02-08:00 avoid using ensure in Net::SFTP.start to prevent hangs when exceptions are raised fec44dacc3687d15e424d41b137f42c92629d2cd Jamis Buck jamis@37signals.com