net-ftp 0.2.0 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf9d2560e8bb495195915b83e2fa701ff039c328b06934515ac50f1309025769
-  data.tar.gz: 2231a3b5311f57b6fee02282e8cb41fd717b79cc1f2186d76483db8fd873ff47
+  metadata.gz: 97ccaa6df703f39961e8a7274b19cc9468f04ed72dc5fc7d6152c0509ff7c989
+  data.tar.gz: aacca7dfd79d87e581fa01f13a1dabec628185bf1ba7bff43c28463f077cc290
 SHA512:
-  metadata.gz: 52f5676aecc77cc97286bbbe6c6649ff9a966e7e161674643593db4cdb1aacdd6080fa25d8f8e3e379b9649125a5dd1167b3292401268141f0924bf618e4e0ad
-  data.tar.gz: 19212687975c12da4fee59c30e620ead52ad0e5a8beccf178de4c74809e43fc662c6cf5a5e084d3b222c19d5bacc4c352bdebb7b2d18939f9762600f9c43b60d
+  metadata.gz: 3ebf50723f5c16057db6dc1b98fc313259a48436b894126754290e5c9d236f7e89e27a67584dba5c4205563e98569c8a65218bf71d4f9d3caf7b0d26340a33b5
+  data.tar.gz: a2ea30881abbfa4e75903c1daaa12913267c1cd221ed4c1efa3aecc84f5100b03572056766c677358323766866fbd64c547b878b372a72143098978bfd860a49

data/.github/workflows/test.yml

@@ -11,7 +11,7 @@ jobs:
         os: [ ubuntu-latest, macos-latest ]
     runs-on: ${{ matrix.os }}
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:

data/lib/net/ftp.rb

@@ -85,7 +85,7 @@ module Net
     end
 
     # :stopdoc:
-    VERSION = "0.2.0"
+    VERSION = "0.3.3"
     FTP_PORT = 21
     CRLF = "\r\n"
     DEFAULT_BLOCKSIZE = BufferedIO::BUFSIZE
@@ -356,19 +356,14 @@ module Net
     # SOCKS_SERVER, then a SOCKSSocket is returned, else a Socket is
     # returned.
     def open_socket(host, port) # :nodoc:
-      if defined? SOCKSSocket and ENV["SOCKS_SERVER"]
-        @passive = true
-        Timeout.timeout(@open_timeout, OpenTimeout) do
+      return Timeout.timeout(@open_timeout, OpenTimeout) {
+        if defined? SOCKSSocket and ENV["SOCKS_SERVER"]
+          @passive = true
           SOCKSSocket.open(host, port)
+        else
+          Socket.tcp(host, port)
         end
-      else
-        begin
-          Socket.tcp host, port, nil, nil, connect_timeout: @open_timeout
-        rescue Errno::ETIMEDOUT #raise Net:OpenTimeout instead for compatibility with previous versions
-          raise Net::OpenTimeout, "Timeout to open TCP connection to "\
-          "#{host}:#{port} (exceeds #{@open_timeout} seconds)"
-        end
-      end
+      }
     end
     private :open_socket
 
@@ -568,6 +563,7 @@ module Net
     def transfercmd(cmd, rest_offset = nil) # :nodoc:
       if @passive
         host, port = makepasv
+        succeeded = false
         begin
           conn = open_socket(host, port)
           if @resume and rest_offset
@@ -582,8 +578,9 @@ module Net
           if !resp.start_with?("1")
             raise FTPReplyError, resp
           end
+          succeeded = true
         ensure
-          conn.close if conn && $!
+          conn&.close if !succeeded
         end
       else
         sock = makeport
@@ -1401,7 +1398,7 @@ module Net
       if !resp.start_with?("227")
         raise FTPReplyError, resp
       end
-      if m = /\((?<host>\d+(?:,\d+){3}),(?<port>\d+,\d+)\)/.match(resp)
+      if m = /(?<host>\d+(?:,\d+){3}),(?<port>\d+,\d+)/.match(resp)
         if @use_pasv_ip
           host = parse_pasv_ipv4_host(m["host"])
         else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: net-ftp
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.3
 platform: ruby
 authors:
 - Shugo Maeda
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-07 00:00:00.000000000 Z
+date: 2023-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-protocol
@@ -61,7 +61,7 @@ licenses:
 metadata:
   homepage_uri: https://github.com/ruby/net-ftp
   source_code_uri: https://github.com/ruby/net-ftp
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -76,8 +76,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.0.dev
-signing_key:
+rubygems_version: 3.4.12
+signing_key: 
 specification_version: 4
 summary: Support for the File Transfer Protocol.
 test_files: []