ftpd 0.11.0 → 0.12.0

data/lib/ftpd/tls_server.rb

@@ -1,3 +1,5 @@
+require_relative 'server'
+
 module Ftpd
   class TlsServer < Server
 

data/spec/server_spec.rb

@@ -0,0 +1,66 @@
+require File.expand_path('spec_helper', File.dirname(__FILE__))
+
+module Ftpd
+
+  describe Server do
+
+    describe 'reuse explicit port (github #23)' do
+
+      # The bug being tested involves a race condition.  Monkey patch
+      # the server so that start does not return until "accept" has
+      # been called on the server socket.  This causes the test to
+      # reliably expose the bug.
+
+      def monkey_patch_server(server)
+
+        class << server
+
+          def start
+            @accepting = Queue.new
+            super
+            wait_for_accept
+          end
+
+          def accept
+            @accepting.enq true
+            super
+          end
+
+          private
+
+          def wait_for_accept
+            @accepting.deq
+            # There's a potential race condition in _this_ code:
+            # @accepting is triggered just before the accept is done
+            # on the socket, but it's possible that the server thread
+            # has been preempted and accept has not yet been called.
+            # A little sleep gives the server thread another shot at
+            # actually getting the accept done before we continue.
+            sleep 0.01
+          end
+
+        end
+
+      end
+
+      it do
+        port = find_open_port
+        2.times do
+          server = Server.new
+          monkey_patch_server server
+          server.port = port
+          server.start
+          server.stop
+        end
+      end
+
+      def find_open_port
+        socket = TCPServer.new('localhost', 0)
+        socket.addr[1].tap {socket.close}
+      end
+
+    end
+
+  end
+
+end

metadata

@@ -1,144 +1,147 @@
 --- !ruby/object:Gem::Specification
 name: ftpd
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Wayne Conrad
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-16 00:00:00.000000000 Z
+date: 2014-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: memoizer
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: cucumber
   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: double-bag-ftps
   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: jeweler
   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: rake
   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: redcarpet
   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'
 - !ruby/object:Gem::Dependency
   name: timecop
   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: yard
   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: ftpd is a pure Ruby FTP server library.  It supports implicit and explicit
-  TLS, IPV6, passive and active mode, and is unconditionally compliant per [RFC-1123][1].  It
-  can be used as part of a test fixture or embedded in a program.
+description: '[![Code Climate](https://codeclimate.com/github/wconrad/ftpd.png)](https://codeclimate.com/github/wconrad/ftpd)
+  [![Build Status](https://travis-ci.org/wconrad/ftpd.png)](https://travis-ci.org/wconrad/ftpd)
+  [![Gem Version](https://badge.fury.io/rb/ftpd.png)](http://badge.fury.io/rb/ftpd)  ftpd
+  is a pure Ruby FTP server library.  It supports implicit and explicit TLS, IPV6,
+  passive and active mode, and is unconditionally compliant per [RFC-1123][1].  It
+  can be used as part of a test fixture or embedded in a program.'
 email: wconrad@yagni.com
 executables: []
 extensions: []
@@ -146,8 +149,8 @@ extra_rdoc_files:
 - LICENSE.md
 - README.md
 files:
-- ".travis.yml"
-- ".yardopts"
+- .travis.yml
+- .yardopts
 - Changelog.md
 - Gemfile
 - Gemfile.lock
@@ -160,6 +163,7 @@ files:
 - doc/rfc-compliance.md
 - examples/example.rb
 - examples/example_spec.rb
+- examples/foo.rb
 - examples/hello_world.rb
 - features/example/eplf.feature
 - features/example/example.feature
@@ -268,17 +272,63 @@ files:
 - ftpd.gemspec
 - insecure-test-cert.pem
 - lib/ftpd.rb
+- lib/ftpd/ascii_helper.rb
 - lib/ftpd/auth_levels.rb
+- lib/ftpd/cmd_abor.rb
+- lib/ftpd/cmd_allo.rb
+- lib/ftpd/cmd_appe.rb
+- lib/ftpd/cmd_auth.rb
+- lib/ftpd/cmd_cdup.rb
+- lib/ftpd/cmd_cwd.rb
+- lib/ftpd/cmd_dele.rb
+- lib/ftpd/cmd_eprt.rb
+- lib/ftpd/cmd_epsv.rb
+- lib/ftpd/cmd_feat.rb
+- lib/ftpd/cmd_help.rb
+- lib/ftpd/cmd_list.rb
+- lib/ftpd/cmd_login.rb
+- lib/ftpd/cmd_mdtm.rb
+- lib/ftpd/cmd_mkd.rb
+- lib/ftpd/cmd_mode.rb
+- lib/ftpd/cmd_nlst.rb
+- lib/ftpd/cmd_noop.rb
+- lib/ftpd/cmd_opts.rb
+- lib/ftpd/cmd_pasv.rb
+- lib/ftpd/cmd_pbsz.rb
+- lib/ftpd/cmd_port.rb
+- lib/ftpd/cmd_prot.rb
+- lib/ftpd/cmd_pwd.rb
+- lib/ftpd/cmd_quit.rb
+- lib/ftpd/cmd_rein.rb
+- lib/ftpd/cmd_rename.rb
+- lib/ftpd/cmd_rest.rb
+- lib/ftpd/cmd_retr.rb
+- lib/ftpd/cmd_rmd.rb
+- lib/ftpd/cmd_site.rb
+- lib/ftpd/cmd_size.rb
+- lib/ftpd/cmd_smnt.rb
+- lib/ftpd/cmd_stat.rb
+- lib/ftpd/cmd_stor.rb
+- lib/ftpd/cmd_stou.rb
+- lib/ftpd/cmd_stru.rb
+- lib/ftpd/cmd_syst.rb
+- lib/ftpd/cmd_type.rb
+- lib/ftpd/command_handler.rb
+- lib/ftpd/command_handler_factory.rb
+- lib/ftpd/command_handlers.rb
+- lib/ftpd/command_loop.rb
 - lib/ftpd/command_sequence_checker.rb
 - lib/ftpd/config.rb
 - lib/ftpd/connection_throttle.rb
 - lib/ftpd/connection_tracker.rb
+- lib/ftpd/data_connection_helper.rb
 - lib/ftpd/disk_file_system.rb
 - lib/ftpd/error.rb
 - lib/ftpd/exception_translator.rb
 - lib/ftpd/exceptions.rb
 - lib/ftpd/file_info.rb
 - lib/ftpd/file_system_error_translator.rb
+- lib/ftpd/file_system_helper.rb
 - lib/ftpd/ftp_server.rb
 - lib/ftpd/insecure_certificate.rb
 - lib/ftpd/list_format/eplf.rb
@@ -312,6 +362,7 @@ files:
 - spec/list_path_spec.rb
 - spec/null_logger_spec.rb
 - spec/protocols_spec.rb
+- spec/server_spec.rb
 - spec/spec_helper.rb
 - spec/telnet_spec.rb
 - spec/translate_exceptions_spec.rb
@@ -325,17 +376,17 @@ 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.2.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Pure Ruby FTP server library