double-bag-ftps 0.1.0 → 0.1.1

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NGY4OTNkYzcyNmI3NWFlMzdlOGFiM2JjZjI4NDhiOTM4ZjcwOWU1MA==
+  data.tar.gz: !binary |-
+    ZDI0YzlmNTMwMmU1YTM3ZmNlNjNmNDI2NDFkZGQxMjZmM2ZmODRlNQ==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    YzhjZGUyMmJiNjg3OWFhYWE5ZjNiNWMwNDYyMjE0N2U5OTQwNDBjNzZiNjY0
+    M2U3MGU1NDU2YTE5MzcwZjZlMmNlNWFiYWMyZWViMmNiZjAxZjA2YjE2Y2Vl
+    ODRjYjZiOTJmMmU0ODNlMjRlOWRlMzUzNzFiOWM2ZDg2YTUwOGE=
+  data.tar.gz: !binary |-
+    ZTNiOGRhNWNiYzM5NTZkNzM5YjZkNzYyOTA1NjI1OGEyYWM1OWYyYzEyODEz
+    ZjdiNTUzYzMxY2NiOGQ2ZDI0MzIwNDQwNThkMmFlZmYyN2Y0MmNjNTkzNWY1
+    ZGM0ZTJjMWJmZDcxMThhOThmMTgxZTM1ZjI0NWUxNTVlY2E1NDE=

data/.gitignore

@@ -2,3 +2,4 @@
 .bundle
 Gemfile.lock
 pkg/*
+*~

data/CHANGELOG.md

@@ -0,0 +1,9 @@
+## 0.1.1
+
+Features:
+
+  - Ruby 2.0-p0 compatibility
+
+Bugfixes:
+
+  - Active mode data transfers properly establish a connection

data/double_bag_ftps.gemspec

@@ -3,7 +3,8 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "double-bag-ftps"
-  s.version     = "0.1.0"
+  s.version     = "0.1.1"
+  s.license     = "MIT"
   s.author      = "Bryan Nix"
   s.homepage    = "https://github.com/bnix/double-bag-ftps"
   s.summary     = "Provides a child class of Net::FTP to support implicit and explicit FTPS."

data/lib/double_bag_ftps.rb

@@ -121,10 +121,9 @@ class DoubleBagFTPS < Net::FTP
       if resp[0] != ?1
         raise FTPReplyError, resp
       end
-
-      temp_ssl_sock = ssl_socket(sock)
-      conn = temp_ssl_sock.accept
-      temp_ssl_sock.close
+      conn = sock.accept
+      conn = ssl_socket(conn)
+      sock.close
     end
     return conn
   end
@@ -150,15 +149,43 @@ class DoubleBagFTPS < Net::FTP
     unless @ssl_context.verify_mode == OpenSSL::SSL::VERIFY_NONE
       sock.post_connection_check(@hostname)
     end
+    decorate_socket sock
     return sock
   end
   private :ssl_socket
 
+  # Ruby 2.0's Ftp class closes sockets by first doing a shutdown,
+  # setting the read timeout, and doing a read.  OpenSSL doesn't
+  # have those methods, so fake it.
+  #
+  # Ftp calls #close in an ensure block, so the socket will still get
+  # closed.
+
+  def decorate_socket(sock)
+
+    def sock.shutdown(how)
+      @shutdown = true
+    end
+
+    def sock.read_timeout=(seconds)
+    end
+
+    # Skip read after shutdown.  Prevents 2.0 from hanging in
+    # Ftp#close
+
+    def sock.read(*args)
+      return if @shutdown
+      super(*args)
+    end
+
+  end
+  private :decorate_socket
+
   def DoubleBagFTPS.create_ssl_context(params = {})
     raise 'SSL extension not installed' unless defined?(OpenSSL)
     context = OpenSSL::SSL::SSLContext.new
     context.set_params(params)
     return context
   end
-  
+
 end

data/spec/double_bag_ftps_spec.rb

@@ -6,23 +6,35 @@ shared_examples_for "DoubleBagFTPS" do
   end
 
   it "logs in with a user name and password" do
-  	@ftp.connect(HOST)
+    @ftp.connect(HOST)
     lambda {@ftp.login(USR, PASSWD)}.should_not raise_error
   end
 
   it "can open a secure data channel" do
-  	@ftp.connect(HOST)
+    @ftp.connect(HOST)
     @ftp.login(USR, PASSWD)
     @ftp.send(:transfercmd, 'nlst').should be_an_instance_of OpenSSL::SSL::SSLSocket
   end
 
+  it "can retrieve a file" do
+    Dir.mktmpdir do |temp_dir|
+      @ftp.connect HOST
+      @ftp.login USR, PASSWD
+      filename = @ftp.nlst.first
+      filename.should_not be_nil
+      local_path = File.join(temp_dir, filename)
+      @ftp.get(filename, local_path)
+      File.exists?(local_path).should be_true
+    end
+  end
+
   it "prevents setting the FTPS mode while connected" do
     @ftp.connect(HOST)
-    lambda {@ftp.ftps_mode = 'dummy value'}.should raise_error
+    lambda {@ftp.ftps_mode = DoubleBagFTPS::IMPLICIT}.should raise_error RuntimeError
   end
 
   it "prevents setting the FTPS mode to an unrecognized value" do
-    lambda {@ftp.ftps_mode = 'dummy value'}.should raise_error
+    lambda {@ftp.ftps_mode = 'dummy value'}.should raise_error ArgumentError
   end
 
 end
@@ -51,14 +63,14 @@ describe DoubleBagFTPS do
 
   context "explicit" do
     before(:each) do
-    	@ftp = DoubleBagFTPS.new
-    	@ftp.ftps_mode = DoubleBagFTPS::EXPLICIT
+      @ftp = DoubleBagFTPS.new
+      @ftp.ftps_mode = DoubleBagFTPS::EXPLICIT
       @ftp.passive = true
-    	@ftp.ssl_context = DoubleBagFTPS.create_ssl_context(:verify_mode => OpenSSL::SSL::VERIFY_NONE)
+      @ftp.ssl_context = DoubleBagFTPS.create_ssl_context(:verify_mode => OpenSSL::SSL::VERIFY_NONE)
     end
 
     after(:each) do
-    	@ftp.close unless @ftp.welcome.nil?
+      @ftp.close unless @ftp.welcome.nil?
     end
 
     it "does not use an SSLSocket when first connected" do
@@ -69,4 +81,4 @@ describe DoubleBagFTPS do
 
     it_should_behave_like "DoubleBagFTPS"
   end
-end
+end

data/spec/spec_helper.rb

@@ -1,6 +1,8 @@
 $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'double_bag_ftps'
 
+require 'tmpdir'
+
 HOST   = 'ftp.secureftp-test.com'
 USR    = 'test'
-PASSWD = 'test'
+PASSWD = 'test'

metadata

@@ -1,38 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: double-bag-ftps
 version: !ruby/object:Gem::Version
-  version: 0.1.0
-  prerelease: 
+  version: 0.1.1
 platform: ruby
 authors:
 - Bryan Nix
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-03 00:00:00.000000000Z
+date: 2013-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &75184820 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *75184820
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &75184600 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *75184600
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email: 
 executables: []
@@ -40,6 +45,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- CHANGELOG.md
 - LICENSE
 - README.md
 - Rakefile
@@ -48,27 +54,29 @@ files:
 - spec/double_bag_ftps_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/bnix/double-bag-ftps
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Provides a child class of Net::FTP to support implicit and explicit FTPS.
-test_files: []
+test_files:
+- spec/double_bag_ftps_spec.rb
+- spec/spec_helper.rb