net-ftp 0.2.0 → 0.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf9d2560e8bb495195915b83e2fa701ff039c328b06934515ac50f1309025769
-  data.tar.gz: 2231a3b5311f57b6fee02282e8cb41fd717b79cc1f2186d76483db8fd873ff47
+  metadata.gz: e481d7fa04c36757bf0f4a60bc8821b56d37d20343f3ffee84f863a351bab45b
+  data.tar.gz: 27dfd640949af2161f80d5899a426fecd2a2d979ee08158cc5c4300cb3c98ae9
 SHA512:
-  metadata.gz: 52f5676aecc77cc97286bbbe6c6649ff9a966e7e161674643593db4cdb1aacdd6080fa25d8f8e3e379b9649125a5dd1167b3292401268141f0924bf618e4e0ad
-  data.tar.gz: 19212687975c12da4fee59c30e620ead52ad0e5a8beccf178de4c74809e43fc662c6cf5a5e084d3b222c19d5bacc4c352bdebb7b2d18939f9762600f9c43b60d
+  metadata.gz: 84a90b945499fce5fc21da0b67a8776c0a6aa814670d8d1cbcd40dd5eb3f5d788834991bf4b15c3db4f91e57bba5588c1d1d091ac0b885e40bb878426e1de336
+  data.tar.gz: 04454bccbb3088db4510b2805f8a4c38aac2feca903d5a25dd5e7eeb51bb25a89a9c66c336fe1e112ffe063094aac3c1e939fdf8a54add77dde3a3577ee2aa36

data/.github/workflows/push_gem.yml

@@ -0,0 +1,48 @@
+name: Publish gem to rubygems.org
+
+on:
+  push:
+    tags:
+      - 'v*'
+
+permissions:
+  contents: read
+
+jobs:
+  push:
+    if: github.repository == 'ruby/net-ftp'
+    runs-on: ubuntu-latest
+
+    environment:
+      name: rubygems.org
+      url: https://rubygems.org/gems/net-ftp
+
+    permissions:
+      contents: write
+      id-token: write
+
+    steps:
+      # Set up
+      - name: Harden Runner
+        uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
+        with:
+          egress-policy: audit
+
+      - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
+
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@cacc9f1c0b3f4eb8a16a6bb0ed10897b43b9de49 # v1.176.0
+        with:
+          bundler-cache: true
+          ruby-version: ruby
+
+      # Release
+      - name: Publish to RubyGems
+        uses: rubygems/release-gem@612653d273a73bdae1df8453e090060bb4db5f31 # v1
+
+      - name: Create GitHub release
+        run: |
+          tag_name="$(git describe --tags --abbrev=0)"
+          gh release create "${tag_name}" --verify-tag --draft --generate-notes
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

data/.github/workflows/test.yml

@@ -3,15 +3,22 @@ name: ubuntu
 on: [push, pull_request]
 
 jobs:
+  ruby-versions:
+    uses: ruby/actions/.github/workflows/ruby_versions.yml@master
+    with:
+      engine: cruby
+      min_version: 2.6
+
   build:
+    needs: ruby-versions
     name: build (${{ matrix.ruby }} / ${{ matrix.os }})
     strategy:
       matrix:
-        ruby: [ head, '3.1', '3.0', '2.7', '2.6' ]
-        os: [ ubuntu-latest, macos-latest ]
+        ruby: ${{ fromJson(needs.ruby-versions.outputs.versions) }}
+        os: [ ubuntu-latest, macos-latest, windows-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/BSDL

@@ -0,0 +1,22 @@
+Copyright (C) 1993-2013 Yukihiro Matsumoto. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.

data/COPYING

@@ -0,0 +1,56 @@
+Ruby is copyrighted free software by Yukihiro Matsumoto <matz@netlab.jp>.
+You can redistribute it and/or modify it under either the terms of the
+2-clause BSDL (see the file BSDL), or the conditions below:
+
+1. You may make and give away verbatim copies of the source form of the
+   software without restriction, provided that you duplicate all of the
+   original copyright notices and associated disclaimers.
+
+2. You may modify your copy of the software in any way, provided that
+   you do at least ONE of the following:
+
+   a. place your modifications in the Public Domain or otherwise
+      make them Freely Available, such as by posting said
+      modifications to Usenet or an equivalent medium, or by allowing
+      the author to include your modifications in the software.
+
+   b. use the modified software only within your corporation or
+      organization.
+
+   c. give non-standard binaries non-standard names, with
+      instructions on where to get the original software distribution.
+
+   d. make other distribution arrangements with the author.
+
+3. You may distribute the software in object code or binary form,
+   provided that you do at least ONE of the following:
+
+   a. distribute the binaries and library files of the software,
+      together with instructions (in the manual page or equivalent)
+      on where to get the original distribution.
+
+   b. accompany the distribution with the machine-readable source of
+      the software.
+
+   c. give non-standard binaries non-standard names, with
+      instructions on where to get the original software distribution.
+
+   d. make other distribution arrangements with the author.
+
+4. You may modify and include the part of the software into any other
+   software (possibly commercial).  But some files in the distribution
+   are not written by the author, so that they are not under these terms.
+
+   For the list of those files and their copying conditions, see the
+   file LEGAL.
+
+5. The scripts and library files supplied as input to or produced as
+   output from the software do not automatically fall under the
+   copyright of the software, but belong to whomever generated them,
+   and may be sold commercially, and may be aggregated with this
+   software.
+
+6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
+   IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+   WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+   PURPOSE.

data/LICENSE.txt

@@ -1,22 +1,2 @@
-Copyright (C) 1993-2013 Yukihiro Matsumoto. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-1. Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGE.
+All the files in this distribution are covered under either the Ruby license or
+the BSD-2-Clause license (see the file COPYING).

data/lib/net/ftp.rb

@@ -77,6 +77,10 @@ module Net
   # - #rename
   # - #delete
   #
+  # == Mainframe User Support
+  # - #literal
+  # - #quote
+  #
   class FTP < Protocol
     include MonitorMixin
     if defined?(OpenSSL::SSL)
@@ -85,7 +89,7 @@ module Net
     end
 
     # :stopdoc:
-    VERSION = "0.2.0"
+    VERSION = "0.3.8"
     FTP_PORT = 21
     CRLF = "\r\n"
     DEFAULT_BLOCKSIZE = BufferedIO::BUFSIZE
@@ -245,10 +249,15 @@ module Net
         if defined?(VerifyCallbackProc)
           @ssl_context.verify_callback = VerifyCallbackProc
         end
-        @ssl_context.session_cache_mode =
-          OpenSSL::SSL::SSLContext::SESSION_CACHE_CLIENT |
-          OpenSSL::SSL::SSLContext::SESSION_CACHE_NO_INTERNAL_STORE
-        @ssl_context.session_new_cb = proc {|sock, sess| @ssl_session = sess }
+
+        # jruby-openssl does not support session caching
+        unless RUBY_ENGINE == "jruby"
+          @ssl_context.session_cache_mode =
+            OpenSSL::SSL::SSLContext::SESSION_CACHE_CLIENT |
+            OpenSSL::SSL::SSLContext::SESSION_CACHE_NO_INTERNAL_STORE
+          @ssl_context.session_new_cb = proc {|sock, sess| @ssl_session = sess }
+        end
+
         @ssl_session = nil
         if options[:private_data_connection].nil?
           @private_data_connection = true
@@ -356,19 +365,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 +572,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 +587,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
@@ -761,7 +767,7 @@ module Net
           ensure
             conn.close if conn
           end
-          voidresp
+          getresp # The response might be important when connected to a mainframe
         end
       end
     rescue Errno::EPIPE
@@ -883,13 +889,18 @@ module Net
     # in +remotefile+. If callback or an associated block is supplied, calls it,
     # passing in the transmitted data one line at a time.
     #
+    # Returns the response which will contain a job number if the user was communicating with a mainframe in ASCII mode
+    # after issuing 'quote site filetype=jes'
+    #
     def puttextfile(localfile, remotefile = File.basename(localfile), &block) # :yield: line
       f = File.open(localfile)
+      response = ''
       begin
-        storlines("STOR #{remotefile}", f, &block)
+        response = storlines("STOR #{remotefile}", f, &block)
       ensure
         f.close
       end
+      response
     end
 
     #
@@ -1229,6 +1240,16 @@ module Net
       return parse257(resp)
     end
 
+    #
+    # The "quote" subcommand sends arguments verbatim to the remote ftp server.
+    # The "literal" subcommand is an alias for "quote".
+    # @param arguments Array[String] to be sent verbatim to the remote ftp server
+    #
+    def quote(arguments)
+      sendcmd(arguments)
+    end
+    alias literal quote
+
     #
     # Removes a remote directory.
     #
@@ -1346,7 +1367,7 @@ module Net
       end
 
       feats = []
-      resp.split("\n").each do |line|
+      resp.each_line do |line|
         next if !line.start_with?(' ') # skip status lines
 
         feats << line.strip
@@ -1401,7 +1422,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,13 @@
 --- !ruby/object:Gem::Specification
 name: net-ftp
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.8
 platform: ruby
 authors:
 - Shugo Maeda
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-07 00:00:00.000000000 Z
+date: 2024-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-protocol
@@ -46,8 +45,11 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".github/dependabot.yml"
+- ".github/workflows/push_gem.yml"
 - ".github/workflows/test.yml"
 - ".gitignore"
+- BSDL
+- COPYING
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -61,7 +63,6 @@ licenses:
 metadata:
   homepage_uri: https://github.com/ruby/net-ftp
   source_code_uri: https://github.com/ruby/net-ftp
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -76,8 +77,7 @@ 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.6.0.dev
 specification_version: 4
 summary: Support for the File Transfer Protocol.
 test_files: []