ftpd 2.0.5 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c3fc097615e27f601d22ca3e2eafae1799e7ec6
-  data.tar.gz: 7a0f7056bcc776576466baf64e7c957e0b751cdf
+  metadata.gz: fa6a9a475474687ea612712f4830113e899f673a
+  data.tar.gz: 586a68fd022bda0a95da5cf94da05982b25dcd4f
 SHA512:
-  metadata.gz: 34bf396a9a6fa14971f9a63e6c29238f5b56dcfd40cbcb4cd1832025871186e7ecfc67ade325163039b998a24543b5a2ad5774538292ea787df5c3193de31332
-  data.tar.gz: d8530f13d4da99b95836d5109aff4564c45ab0232af9447bd36b28d6d72af5bda4aa601e029440ac5a895593453b3f2d3a32f3391fd5b84a49b81cbe34fa3073
+  metadata.gz: 8ec864ec9526fa5f567fbfac0e248b8eaa491e49a7fb612d71f4511b9a6eeda7330e3f13d9e6aaf03bc76141b9757fbb51abec9491db8bf6c125f8077296082e
+  data.tar.gz: 30352a8101f4e74c61aad1eb4405116af35a72091b3e24f45f1c21e9e14f78b6ef9c62352bbc908b06ff5ba0b85fc451fe8d6967cf9e6de62605be2845976763

data/Changelog.md

@@ -2,6 +2,11 @@ This is the change log for the main branch of ftpd, which supports
 Ruby 1.9 and greater.  For ruby 1.8.7, please use the latest version
 before 0.8.0.
 
+### 2.1.0 2017-07-23
+
+* Introduced Release::VERSION and Release::DATE constants
+* Fixed all known warnings in tests and example
+
 ### 2.0.5 2017-07-23
 
 * Fix DOS caused by fast socket disconnects (thanks iblue)

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ftpd (2.0.4)
+    ftpd (2.1.0)
       memoizer (~> 1.0)
 
 GEM
@@ -61,4 +61,4 @@ DEPENDENCIES
   yard (~> 0.8.7)
 
 BUNDLED WITH
-   1.15.2
+   1.15.3

data/examples/example.rb

@@ -52,7 +52,7 @@ module Example
     private
 
     def option_parser
-      op = OptionParser.new do |op|
+      OptionParser.new do |op|
         op.on('-p', '--port N', Integer, 'Bind to a specific port') do |t|
           @port = t
         end

data/ftpd.gemspec

@@ -1,4 +1,7 @@
 # -*- encoding: utf-8 -*-
+# frozen_string_literal: true
+
+require File.join(File.dirname(__FILE__), "lib/ftpd/release")
 
 class Readme
 
@@ -42,26 +45,13 @@ class Readme
 
 end
 
-class Version
-
-  def to_s
-    File.read(VERSION_PATH).strip
-  end
-
-  private
-
-  VERSION_PATH = File.expand_path("VERSION", File.dirname(__FILE__))
-  private_constant :VERSION_PATH
-  
-end
-
 Gem::Specification.new do |s|
   s.name = "ftpd"
-  s.version = Version.new.to_s
+  s.version = Ftpd::Release::VERSION
   s.required_rubygems_version = Gem::Requirement.new(">= 0")
   s.require_paths = ["lib"]
   s.authors = ["Wayne Conrad"]
-  s.date = "2017-07-17"
+  s.date = Ftpd::Release::DATE
   s.description = Readme.new.description
   s.email = "kf7qga@gmail.com"
   s.executables = ["ftpdrb"]
@@ -77,7 +67,6 @@ Gem::Specification.new do |s|
     "LICENSE.md",
     "README.md",
     "Rakefile",
-    "VERSION",
     "bin/ftpdrb",
     "ftpd.gemspec",
     "insecure-test-cert.pem",

data/lib/ftpd.rb

@@ -77,7 +77,7 @@ require_relative 'ftpd/list_format/ls'
 require_relative 'ftpd/list_path'
 require_relative 'ftpd/null_logger'
 require_relative 'ftpd/protocols'
-require_relative 'ftpd/read_only_disk_file_system'
+require_relative 'ftpd/release'
 require_relative 'ftpd/server'
 require_relative 'ftpd/session'
 require_relative 'ftpd/session_config'

data/lib/ftpd/cmd_help.rb

@@ -8,11 +8,11 @@ module Ftpd
 
     def cmd_help(argument)
       if argument
-        command = argument.upcase
-        if supported_commands.include?(command)
-          reply "214 Command #{command} is recognized"
+        target_command = argument.upcase
+        if supported_commands.include?(target_command)
+          reply "214 Command #{target_command} is recognized"
         else
-          reply "214 Command #{command} is not recognized"
+          reply "214 Command #{target_command} is not recognized"
         end
       else
         reply '214-The following commands are recognized:'

data/lib/ftpd/cmd_nlst.rb

@@ -18,8 +18,8 @@ module Ftpd
 
     private
 
-    def name_list(path)
-      path_list(path).map do |path|
+    def name_list(target_path)
+      path_list(target_path).map do |path|
         File.basename(path) + "\n"
       end.join
     end

data/lib/ftpd/cmd_type.rb

@@ -8,9 +8,7 @@ module Ftpd
 
     def cmd_type(argument)
       ensure_logged_in
-      syntax_error unless argument =~ /^(\S)(?: (\S+))?$/
-      type_code = $1
-      format_code = $2
+      syntax_error unless argument =~ /^\S(?: \S+)?$/
       unless argument =~ /^([AEI]( [NTC])?|L .*)$/
         error 'Invalid type code', 504
       end

data/lib/ftpd/data_connection_helper.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative 'command_handler'
-
 module Ftpd
 
   module DataConnectionHelper

data/lib/ftpd/disk_file_system.rb

@@ -57,7 +57,7 @@ module Ftpd
       # @return [Boolean]
 
       def exists?(ftp_path)
-        File.exists?(expand_ftp_path(ftp_path))
+        File.exist?(expand_ftp_path(ftp_path))
       end
 
       # Return true if the path exists and is a directory.

data/lib/ftpd/file_system_helper.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative 'command_handler'
-
 module Ftpd
 
   module FileSystemHelper

data/lib/ftpd/ftp_server.rb

@@ -130,8 +130,8 @@ module Ftpd
 
     attr_accessor :server_name
 
-    # The server's version, sent in a STAT reply.  Defaults to the
-    # contents of the VERSION file.
+    # The server's version, sent in a STAT reply.  Defaults to
+    # Release::VERSION.
     #
     # Set this before calling #start.
     #
@@ -184,7 +184,7 @@ module Ftpd
       @auth_level = AUTH_PASSWORD
       @session_timeout = 300
       @server_name = DEFAULT_SERVER_NAME
-      @server_version = read_version_file
+      @server_version = Release::VERSION
       @allow_low_data_ports = false
       @failed_login_delay = 0
       @nat_ip = nil
@@ -231,13 +231,5 @@ module Ftpd
       session.run
     end
 
-    def read_version_file
-      File.open(version_file_path, 'r', &:read).strip
-    end
-
-    def version_file_path
-      File.expand_path('../../VERSION', File.dirname(__FILE__))
-    end
-
   end
 end

data/lib/ftpd/gets_peer_address.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "gets_peer_address"
-
 module Ftpd
 
   module GetsPeerAddress
@@ -29,7 +27,7 @@ module Ftpd
       if socket.respond_to?(:getpeername)
         # Non SSL
         sockaddr = socket.getpeername
-        port, host = Socket.unpack_sockaddr_in(sockaddr)
+        _port, host = Socket.unpack_sockaddr_in(sockaddr)
         host
       else
         # SSL

data/lib/ftpd/release.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Ftpd
+
+  # Release information.  This is used both by the library and by the
+  # gemspec.
+  module Release
+
+    VERSION = "2.1.0"
+    DATE = "2017-07-23"
+
+  end
+end

data/lib/ftpd/server.rb

@@ -28,6 +28,7 @@ module Ftpd
       @interface = '127.0.0.1'
       @port = 0
       @stopping = false
+      @server_thread = nil
     end
 
     # The port the server is bound to.  Must not be called until after
@@ -117,7 +118,7 @@ module Ftpd
       Thread.new do
         begin
           session socket
-        rescue OpenSSL::SSL::SSLError => e
+        rescue OpenSSL::SSL::SSLError
         ensure
           close_socket socket
         end

data/lib/ftpd/temp_dir.rb

@@ -14,7 +14,7 @@ module Ftpd
       Dir.mktmpdir.tap do |path|
         at_exit do
           FileUtils.rm_rf path
-          Dir.rmdir path if File.exists?(path)
+          Dir.rmdir(path) if File.exist?(path)
         end
       end
     end

data/lib/ftpd/tls_server.rb

@@ -42,7 +42,7 @@ module Ftpd
     def make_server_socket
       socket = super
       if tls_enabled?
-        socket = OpenSSL::SSL::SSLServer.new(socket, ssl_context);
+        socket = OpenSSL::SSL::SSLServer.new(socket, ssl_context)
         socket.start_immediately = false
       end
       socket
@@ -85,7 +85,6 @@ module Ftpd
     # make life a little easier.
 
     def add_tls_methods_to_socket(socket)
-      context = @ssl_context
       class << socket
 
         def ssl_context

data/lib/ftpd/translate_exceptions.rb

@@ -42,9 +42,10 @@ module Ftpd
 
       def translate_exceptions(method_name)
         original_method = instance_method(method_name)
-        define_method method_name do |*args, &block|
+        remove_method(method_name)
+        define_method(method_name) do |*args, &block|
           exception_translator.translate_exceptions do
-            original_method.bind(self).call *args, &block
+            original_method.bind(self).call(*args, &block)
           end
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ftpd
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.1.0
 platform: ruby
 authors:
 - Wayne Conrad
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-17 00:00:00.000000000 Z
+date: 2017-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: memoizer
@@ -160,7 +160,6 @@ files:
 - LICENSE.md
 - README.md
 - Rakefile
-- VERSION
 - bin/ftpdrb
 - doc/benchmarks.md
 - doc/references.md
@@ -238,7 +237,7 @@ files:
 - lib/ftpd/list_path.rb
 - lib/ftpd/null_logger.rb
 - lib/ftpd/protocols.rb
-- lib/ftpd/read_only_disk_file_system.rb
+- lib/ftpd/release.rb
 - lib/ftpd/server.rb
 - lib/ftpd/session.rb
 - lib/ftpd/session_config.rb

data/VERSION

@@ -1 +0,0 @@
-2.0.5

data/lib/ftpd/read_only_disk_file_system.rb

@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-
-module Ftpd
-
-  # A disk file system that does not allow any modification (writes,
-  # deletes, etc.)
-
-  class ReadOnlyDiskFileSystem
-
-    include DiskFileSystem::Base
-    include DiskFileSystem::List
-    include DiskFileSystem::Read
-
-    # Make a new instance to serve a directory.  data_dir should be an
-    # absolute path.
-
-    def initialize(data_dir)
-      set_data_dir data_dir
-      translate_exception SystemCallError
-    end
-
-  end
-
-end