Fix warnings

wconrad · wconrad · commit 786fa22e55b5 · 2017-07-23T22:46:28.000-07:00
diff --git a/examples/example.rb b/examples/example.rb
@@ -52,7 +52,7 @@ def initialize(argv)
     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
diff --git a/features/support/test_file_templates.rb b/features/support/test_file_templates.rb
@@ -13,7 +13,7 @@ def [](filename)
   private
 
   def have_template?(filename)
-    File.exists?(template_path(filename))
+    File.exist?(template_path(filename))
   end
 
   def read_template(filename)
diff --git a/features/support/test_server_files.rb b/features/support/test_server_files.rb
@@ -22,7 +22,7 @@ def add_directory(path)
 
   def has_file?(path)
     full_path = temp_path(path)
-    File.exists?(full_path)
+    File.exist?(full_path)
   end
 
   def has_file_with_contents_of?(path)
diff --git a/lib/ftpd.rb b/lib/ftpd.rb
@@ -77,7 +77,6 @@
 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'
diff --git a/lib/ftpd/cmd_help.rb b/lib/ftpd/cmd_help.rb
@@ -8,11 +8,11 @@ class CmdHelp < CommandHandler
 
     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:'
diff --git a/lib/ftpd/cmd_nlst.rb b/lib/ftpd/cmd_nlst.rb
@@ -18,8 +18,8 @@ def cmd_nlst(argument)
 
     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
diff --git a/lib/ftpd/cmd_type.rb b/lib/ftpd/cmd_type.rb
@@ -8,9 +8,7 @@ class CmdType < CommandHandler
 
     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
diff --git a/lib/ftpd/data_connection_helper.rb b/lib/ftpd/data_connection_helper.rb
@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative 'command_handler'
-
 module Ftpd
 
   module DataConnectionHelper
diff --git a/lib/ftpd/disk_file_system.rb b/lib/ftpd/disk_file_system.rb
@@ -57,7 +57,7 @@ def accessible?(ftp_path)
       # @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.
diff --git a/lib/ftpd/file_system_helper.rb b/lib/ftpd/file_system_helper.rb
@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative 'command_handler'
-
 module Ftpd
 
   module FileSystemHelper
diff --git a/lib/ftpd/gets_peer_address.rb b/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 @@ def peer_ip(socket)
       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
diff --git a/lib/ftpd/read_only_disk_file_system.rb b/lib/ftpd/read_only_disk_file_system.rb
diff --git a/lib/ftpd/server.rb b/lib/ftpd/server.rb
@@ -28,6 +28,7 @@ def initialize
       @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 @@ def start_session_thread(socket)
       Thread.new do
         begin
           session socket
-        rescue OpenSSL::SSL::SSLError => e
+        rescue OpenSSL::SSL::SSLError
         ensure
           close_socket socket
         end
diff --git a/lib/ftpd/temp_dir.rb b/lib/ftpd/temp_dir.rb
@@ -14,7 +14,7 @@ def make
       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
diff --git a/lib/ftpd/tls_server.rb b/lib/ftpd/tls_server.rb
@@ -85,7 +85,6 @@ def socket.local_address
     # make life a little easier.
 
     def add_tls_methods_to_socket(socket)
-      context = @ssl_context
       class << socket
 
         def ssl_context
diff --git a/lib/ftpd/translate_exceptions.rb b/lib/ftpd/translate_exceptions.rb
@@ -42,9 +42,10 @@ module ClassMethods
 
       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
diff --git a/spec/disk_file_system_spec.rb b/spec/disk_file_system_spec.rb
@@ -36,7 +36,7 @@ def directory?(path)
     end
 
     def exists?(path)
-      File.exists?(data_path(path))
+      File.exist?(data_path(path))
     end
 
     def canned_contents(path)
@@ -117,7 +117,7 @@ def add_symlink(target_path, symlink_path)
         specify do
           expect {
             disk_file_system.delete(missing_path)
-          }.to raise_error *missing_file_error
+          }.to raise_error(*missing_file_error)
         end
       end
 
@@ -139,7 +139,7 @@ def add_symlink(target_path, symlink_path)
         specify do
           expect {
             disk_file_system.read(missing_path) {}
-          }.to raise_error *missing_file_error
+          }.to raise_error(*missing_file_error)
         end
       end
 
@@ -162,7 +162,7 @@ def add_symlink(target_path, symlink_path)
         specify do
           expect {
             disk_file_system.write('dir', stream)
-          }.to raise_error *is_a_directory_error
+          }.to raise_error(*is_a_directory_error)
         end
       end
 
@@ -193,7 +193,7 @@ def add_symlink(target_path, symlink_path)
         specify do
           expect {
             disk_file_system.append('dir', stream)
-          }.to raise_error *is_a_directory_error
+          }.to raise_error(*is_a_directory_error)
         end
       end
 
@@ -236,7 +236,7 @@ def add_symlink(target_path, symlink_path)
         specify do
           expect {
             disk_file_system.rename(missing_path, to_path)
-          }.to raise_error *missing_file_error
+          }.to raise_error(*missing_file_error)
         end
       end
 
diff --git a/spec/protocols_spec.rb b/spec/protocols_spec.rb
@@ -41,7 +41,7 @@ def initialize(bind_address, connect_address)
         Thread.new do
           queue.enq @listening_socket.accept
         end
-        client_socket = TCPSocket.new(connect_address, port)
+        _client_socket = TCPSocket.new(connect_address, port)
         @connected_socket = queue.deq
       end
 
