net-sftp 2.0.1 → 2.0.2

data/CHANGELOG.rdoc

@@ -1,3 +1,8 @@
+=== 2.0.2 / 1 Feb 2009
+
+* 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]

data/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

data/lib/net/sftp.rb

@@ -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 Object => anything
+      begin
+        session.shutdown!
+      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
+end

data/lib/net/sftp/version.rb

@@ -6,7 +6,7 @@ module Net; module SFTP
   class Version < Net::SSH::Version
     MAJOR = 2
     MINOR = 0
-    TINY  = 1
+    TINY  = 2
 
     # The current version, as a Version instance
     CURRENT = new(MAJOR, MINOR, TINY)

data/net-sftp.gemspec

@@ -1,16 +1,10 @@
-
-# Gem::Specification for Net-sftp-2.0.1
-# Originally generated by Echoe
-
 Gem::Specification.new do |s|
   s.name = %q{net-sftp}
-  s.version = "2.0.1"
-
-  s.specification_version = 2 if s.respond_to? :specification_version=
+  s.version = "2.0.2"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jamis Buck"]
-  s.date = %q{2008-05-29}
+  s.date = %q{2009-02-01}
   s.description = %q{A pure Ruby implementation of the SFTP client protocol}
   s.email = %q{jamis@jamisbuck.org}
   s.extra_rdoc_files = ["CHANGELOG.rdoc", "lib/net/sftp/constants.rb", "lib/net/sftp/errors.rb", "lib/net/sftp/operations/dir.rb", "lib/net/sftp/operations/download.rb", "lib/net/sftp/operations/file.rb", "lib/net/sftp/operations/file_factory.rb", "lib/net/sftp/operations/upload.rb", "lib/net/sftp/packet.rb", "lib/net/sftp/protocol/01/attributes.rb", "lib/net/sftp/protocol/01/base.rb", "lib/net/sftp/protocol/01/name.rb", "lib/net/sftp/protocol/02/base.rb", "lib/net/sftp/protocol/03/base.rb", "lib/net/sftp/protocol/04/attributes.rb", "lib/net/sftp/protocol/04/base.rb", "lib/net/sftp/protocol/04/name.rb", "lib/net/sftp/protocol/05/base.rb", "lib/net/sftp/protocol/06/attributes.rb", "lib/net/sftp/protocol/06/base.rb", "lib/net/sftp/protocol/base.rb", "lib/net/sftp/protocol.rb", "lib/net/sftp/request.rb", "lib/net/sftp/response.rb", "lib/net/sftp/session.rb", "lib/net/sftp/version.rb", "lib/net/sftp.rb", "README.rdoc"]
@@ -20,43 +14,23 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Net-sftp", "--main", "README.rdoc"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{net-ssh}
-  s.rubygems_version = %q{1.1.1}
+  s.rubygems_version = %q{1.2.0}
   s.summary = %q{A pure Ruby implementation of the SFTP client protocol}
   s.test_files = ["test/test_all.rb"]
 
-  s.add_dependency(%q<net-ssh>, [">= 1.99.1"])
-end
-
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 2
 
-# # Original Rakefile source (requires the Echoe gem):
-# 
-# $LOAD_PATH.unshift "../net-ssh/lib"
-# require './lib/net/sftp/version'
-# 
-# begin
-#   require 'echoe'
-# rescue LoadError
-#   abort "You'll need to have `echoe' installed to use Net::SFTP's Rakefile"
-# end
-# 
-# version = Net::SFTP::Version::STRING.dup
-# if ENV['SNAPSHOT'].to_i == 1
-#   version << "." << Time.now.utc.strftime("%Y%m%d%H%M%S")
-# end
-# 
-# Echoe.new('net-sftp', version) do |p|
-#   p.project          = "net-ssh"
-#   p.changelog        = "CHANGELOG.rdoc"
-# 
-#   p.author           = "Jamis Buck"
-#   p.email            = "jamis@jamisbuck.org"
-#   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.need_zip         = true
-#   p.include_rakefile = true
-# 
-#   p.rdoc_pattern     = /^(lib|README.rdoc|CHANGELOG.rdoc)/
-# end
+    if current_version >= 3 then
+      s.add_runtime_dependency(%q<net-ssh>, [">= 2.0.9"])
+      s.add_development_dependency(%q<echoe>, [">= 0"])
+    else
+      s.add_dependency(%q<net-ssh>, [">= 2.0.9"])
+      s.add_dependency(%q<echoe>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<net-ssh>, [">= 2.0.9"])
+    s.add_dependency(%q<echoe>, [">= 0"])
+  end
+end

data/test/common.rb

@@ -2,15 +2,13 @@ require 'test/unit'
 require 'mocha'
 
 begin
-  gem 'net-ssh', ">= 2.0.0"
   require 'net/ssh'
+  require 'net/ssh/version'
+  raise LoadError, "wrong version" unless Net::SSH::Version::STRING >= '1.99.0'
 rescue LoadError
-  $LOAD_PATH.unshift "#{File.dirname(__FILE__)}/../../net-ssh/lib"
-
   begin
+    gem 'net-ssh', ">= 2.0.0"
     require 'net/ssh'
-    require 'net/ssh/version'
-    raise LoadError, "wrong version" unless Net::SSH::Version::STRING >= '1.99.0'
   rescue LoadError => e
     abort "could not load net/ssh v2 (#{e.inspect})"
   end
@@ -170,4 +168,4 @@ module Protocol
   module V04; end
   module V05; end
   module V06; end
-end
+end

data/test/protocol/04/test_name.rb

@@ -11,7 +11,11 @@ class Protocol::V04::TestName < Net::SFTP::TestCase
   end
 
   def teardown
-    ENV['TZ'] = @save_tz
+    if @save_tz
+      ENV['TZ'] = @save_tz
+    else
+      ENV.delete('TZ')
+    end
   end
 
   def test_directory?
@@ -46,4 +50,4 @@ class Protocol::V04::TestName < Net::SFTP::TestCase
     assert_equal "-rwxr-xr-x jamis    users       10240 Mar 12 03:40 test",
       @file.longname
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: net-sftp
 version: !ruby/object:Gem::Version 
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors: 
 - Jamis Buck
@@ -9,17 +9,28 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-05-29 00:00:00 -06:00
+date: 2009-02-01 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: net-ssh
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.99.1
+        version: 2.0.9
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: echoe
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
     version: 
 description: A pure Ruby implementation of the SFTP client protocol
 email: jamis@jamisbuck.org
@@ -135,12 +146,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      version: "0"
+      version: "1.2"
   version: 
 requirements: []
 
 rubyforge_project: net-ssh
-rubygems_version: 1.1.1
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: A pure Ruby implementation of the SFTP client protocol