double-bag-ftps 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af6b500341ec8519c6a00209062fe5c87795416f
-  data.tar.gz: 3d9d3ba31e952470ccb2cd31818913d69da9e3af
+  metadata.gz: '0805592b0f09a1cc49b11af0017ec1433450872e'
+  data.tar.gz: e0000c635ac5128da19631cc415542cd85352ecf
 SHA512:
-  metadata.gz: 5e58308523925e5de233a5e463e8099b26a302b8b1c1bbcd768a2337d981739c50faa74118bb6fab94a0623086bcc0c6b07bff1542e944b4d080056d6314fa20
-  data.tar.gz: b53b99bd2d481a38389c0168facae1a6184fb094358596e56f81b50b78c440fbd1bd084e35f02604b30185f640cedfdf7abd8b30dd1edc8cfd5e4e9942802405
+  metadata.gz: 587dd881f8a0c6a35ec5055732b179815cb5bf1e923811d55318fcfaa3000754822bea0c5dd6e066bbf3c5d12c8efc72a03485eee917ed5db729e09f9aa998d9
+  data.tar.gz: a104e89cf48ab9f795eb0fa1be785787a58802272c4e34992057f02b25a98774f216c7ffc66a5d1e1ad13e0855df00d04b6fd8c27cb2cf2a621c7e6fbe9bf903

data/CHANGELOG.md

@@ -1,4 +1,18 @@
+## 0.1.4
+
+Buffixes:
+
+- Fix active mode transfers hanging in some versions of Ruby 2.1
+
+## 0.1.3
+
+Bugfixes:
+
+- Fix active mode transfers hanging in some versions of Ruby 2.2 and
+  2.3
+
 ## 0.1.2
+
 Bugfixes:
 
   - Reuse SSL session when creating new sockets

data/double_bag_ftps.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "double-bag-ftps"
-  s.version     = "0.1.2"
+  s.version     = "0.1.4"
   s.license     = "MIT"
   s.author      = "Bryan Nix"
   s.homepage    = "https://github.com/bnix/double-bag-ftps"

data/lib/double_bag_ftps.rb

@@ -1,4 +1,5 @@
 require 'net/ftp'
+require 'rubygems'
 begin
   require 'openssl'
 rescue LoadError
@@ -109,6 +110,7 @@ class DoubleBagFTPS < Net::FTP
       conn = ssl_socket(conn) # SSL connection now possible after cmd sent
     else
       sock = makeport
+      sendport(sock.addr[3], sock.addr[1]) if sendport_needed?
       if @resume and rest_offset
         resp = sendcmd('REST ' + rest_offset.to_s)
         if resp[0] != ?3
@@ -129,6 +131,19 @@ class DoubleBagFTPS < Net::FTP
   end
   private :transfercmd
 
+  # Before ruby-2.2.3, makeport called sendport automatically.  After
+  # Ruby 2.3.0, makeport does not call sendport automatically, so do
+  # it ourselves.  This change to Ruby's FTP lib has been backported
+  # to Ruby 2.1 since version 2.1.7.
+  def sendport_needed?
+    @sendport_needed ||= begin
+      Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("2.2.3") ||
+      Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("2.1.7") &&
+      Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.2.0")
+    end
+  end
+  private :sendport_needed?
+
   def ftps_explicit?; @ftps_mode == EXPLICIT end
   def ftps_implicit?; @ftps_mode == IMPLICIT end
 

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: double-bag-ftps
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
 platform: ruby
 authors:
 - Bryan Nix
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-12 00:00:00.000000000 Z
+date: 2017-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: 
@@ -44,7 +44,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - CHANGELOG.md
 - LICENSE
 - README.md
@@ -63,20 +63,19 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Provides a child class of Net::FTP to support implicit and explicit FTPS.
-test_files:
-- spec/double_bag_ftps_spec.rb
-- spec/spec_helper.rb
+test_files: []
+has_rdoc: