ftpd 0.11.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 131edbd4d2cff04d60c36f8fb0ae07adea821823
-  data.tar.gz: 9b43256518b4844af2a76306ce48943999ddde08
+  metadata.gz: fa02f983b7e202a26dbadeeb27d69e3c4448291a
+  data.tar.gz: b55917ec573258184c199001142318131a10aab6
 SHA512:
-  metadata.gz: becd885798f77294b84ef32815c018b2ac0dc15f467a72ae338b06e507f0dc91a464e56f405c5612897e3ec8bd24322ab98220d4c60815be70b5db75f8626274
-  data.tar.gz: 30b34af9047acf54b926e9f55803004003ba95bd269a120749a55cbfd329682eb42d579be6823634abd34679fc837641181ac0d65d629a6888c5775b73693d3e
+  metadata.gz: 7ca68334c5a362e25ce0b31cca42022a26a79e7050b1a5c3bc478316ef43996a75b7449503217c0436a64f2386e777b2b8b496814b53393dcacc49fc31ad93a6
+  data.tar.gz: cc25d35c1ac3b9514e478012417d8ba43edc954027a9b3e43782a1ef6caecf0640f8f307f9ff427cfc0ce1d19e231d7860dbd63639771df4774a32bdccaf0376

data/Changelog.md

@@ -2,6 +2,12 @@ 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.
 
+### 0.12.0
+
+Bug fixes
+
+* Fix Errno::EADDRINUSE when reusing port (issue #23)	
+
 ### 0.11.0
 
 Bug fixes
@@ -9,7 +15,7 @@ Bug fixes
 * Fix Bad file descriptor exception on stop (issue #20)
 * CWD returns 250, not 257 (issue #18)
 
-#Enhancements
+Enhancements
 
 * MDTM command (issue #19)
 * SIZE command (issue #19)

data/Gemfile

@@ -1,6 +1,6 @@
 source 'http://rubygems.org'
 
-gem 'memoizer', '~> 1.0.1'
+gem 'memoizer', '~> 1.0'
 
 group :development do
   gem 'cucumber'

data/Gemfile.lock

@@ -74,7 +74,7 @@ DEPENDENCIES
   cucumber
   double-bag-ftps
   jeweler
-  memoizer (~> 1.0.1)
+  memoizer (~> 1.0)
   rake
   redcarpet
   rspec

data/README.md

@@ -1,4 +1,7 @@
-# Ftpd [![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)
+# Ftpd
+[![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
@@ -255,14 +258,35 @@ See [RFC Compliance](doc/rfc-compliance.md) for details
 
 The tests pass with these Rubies:
 
-* ruby-1.8.7-p371
-* ruby-1.9.3-p448
-* ruby-2.0.0-p247
+* ruby-1.9.3
+* ruby-2.0
+* ruby-2.1
 
 For Ruby 1.8, use an ftpd version before 0.8.  In your Gemfile:
 
     gem 'ftpd', '<0.8'
 
+## OS compatability
+
+## *nix
+
+Ftpd runs on:
+
+* Linux
+* OSX
+
+## Windows
+
+The master branch of ftpd does not currently run on Windows.  There is
+an experimental branch for Windows which contains several changes that
+ought to make ftpd work on Windows, but they need testing.  To try
+that branch, use this line in your Gemfile:
+
+    gem 'ftpd', github: 'wconrad/ftpd', branch: 'windows'
+
+Does it work for you?  Is it busted?  Please report your experience
+[here](https://github.com/wconrad/ftpd/issues/3).
+
 ## Development
 
 ### Tests

data/VERSION

@@ -1 +1 @@
-0.11.0
+0.12.0

data/examples/foo.rb

@@ -0,0 +1,114 @@
+#!/usr/bin/env ruby
+
+unless $:.include?(File.dirname(__FILE__) + '/../lib')
+  $:.unshift(File.dirname(__FILE__) + '/../lib')
+end
+
+require 'socket'
+require 'thread'
+require 'tmpdir'
+
+def show(s)
+  return
+  print s + "\n"
+end
+
+class Server
+
+  attr_accessor :port
+
+  def initialize
+    @interface = '127.0.0.1'
+    @port = 0
+    @stopping = false
+    @start_queue = Queue.new
+    @stop_queue = Queue.new
+  end
+
+  def start
+    show 's #start'
+    @server_socket = make_server_socket
+    @server_thread = make_server_thread
+    show 's waiting for start'
+    show "s #{@start_queue.deq}"
+  end
+
+  def stop
+    show 's #stop'
+    @stopping = true
+    @server_socket.shutdown
+#    @server_socket.close
+    show 's joining on thread'
+#    @thread.join
+    # show 's waiting for stop'
+    # show "s #{@stop_queue.deq}"
+  end
+
+  private
+
+  def make_server_socket
+    return TCPServer.new(@interface, @port)
+  end
+
+  def make_server_thread
+    @thread = Thread.new do
+      show 't started'
+      Thread.abort_on_exception = false
+      begin
+        @start_queue.enq 'started'
+        server_thread
+      rescue Exception
+        show 't exception'
+        @stop_queue.enq 'stopping'
+        raise
+      else
+        show 't no exception'
+        @stop_queue.enq 'stopping'
+      end
+    end
+  end
+
+  def server_thread
+    loop do
+      begin
+        begin
+          show 't waiting for bind'
+          @server_socket.accept
+          show 't bound'
+        rescue Errno::EBADF, Errno::EINVAL => e
+          show "t #{e}"
+          raise unless @stopping
+          break
+        end
+      rescue IOError
+        show 't IOError'
+        break
+      end
+    end
+    show 't done'
+  end
+
+  def accept
+  end
+
+end
+
+Dir.mktmpdir do |temp_dir|
+  i = 0
+  loop do
+    i += 1
+    begin
+      if i % 1000 == 0
+        print '.'
+        $stdout.flush
+      end
+      server = Server.new
+      server.port = 10000
+      server.start
+      server.stop
+    rescue Errno::EADDRINUSE
+      puts i
+      raise
+    end
+  end
+end

data/ftpd.gemspec

@@ -2,17 +2,17 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: ftpd 0.11.0 ruby lib
+# stub: ftpd 0.12.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "ftpd"
-  s.version = "0.11.0"
+  s.version = "0.12.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Wayne Conrad"]
-  s.date = "2014-03-16"
-  s.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."
+  s.date = "2014-05-11"
+  s.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."
   s.email = "wconrad@yagni.com"
   s.extra_rdoc_files = [
     "LICENSE.md",
@@ -33,6 +33,7 @@ Gem::Specification.new do |s|
     "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",
@@ -141,17 +142,63 @@ Gem::Specification.new do |s|
     "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",
@@ -185,20 +232,21 @@ Gem::Specification.new do |s|
     "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"
   ]
   s.homepage = "http://github.com/wconrad/ftpd"
   s.licenses = ["MIT"]
-  s.rubygems_version = "2.2.1"
+  s.rubygems_version = "2.2.2"
   s.summary = "Pure Ruby FTP server library"
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<memoizer>, ["~> 1.0.1"])
+      s.add_runtime_dependency(%q<memoizer>, ["~> 1.0"])
       s.add_development_dependency(%q<cucumber>, [">= 0"])
       s.add_development_dependency(%q<double-bag-ftps>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
@@ -208,7 +256,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<timecop>, [">= 0"])
       s.add_development_dependency(%q<yard>, [">= 0"])
     else
-      s.add_dependency(%q<memoizer>, ["~> 1.0.1"])
+      s.add_dependency(%q<memoizer>, ["~> 1.0"])
       s.add_dependency(%q<cucumber>, [">= 0"])
       s.add_dependency(%q<double-bag-ftps>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
@@ -219,7 +267,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<yard>, [">= 0"])
     end
   else
-    s.add_dependency(%q<memoizer>, ["~> 1.0.1"])
+    s.add_dependency(%q<memoizer>, ["~> 1.0"])
     s.add_dependency(%q<cucumber>, [">= 0"])
     s.add_dependency(%q<double-bag-ftps>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])

data/lib/ftpd.rb

@@ -1,7 +1,7 @@
+# Standard libraries
 require 'fileutils'
 require 'forwardable'
 require 'logger'
-require 'memoizer'
 require 'openssl'
 require 'pathname'
 require 'shellwords'
@@ -10,34 +10,80 @@ require 'strscan'
 require 'thread'
 require 'tmpdir'
 
-module Ftpd
-  module ListFormat
-    autoload :Eplf,                    'ftpd/list_format/eplf'
-    autoload :Ls,                      'ftpd/list_format/ls'
-  end
-  autoload :CommandSequenceChecker,    'ftpd/command_sequence_checker'
-  autoload :ConnectionThrottle,        'ftpd/connection_throttle'
-  autoload :ConnectionTracker,         'ftpd/connection_tracker'
-  autoload :DiskFileSystem,            'ftpd/disk_file_system'
-  autoload :Error,                     'ftpd/error'
-  autoload :ExceptionTranslator,       'ftpd/exception_translator'
-  autoload :FileInfo,                  'ftpd/file_info'
-  autoload :FileSystemErrorTranslator, 'ftpd/file_system_error_translator'
-  autoload :FileSystemMethodMissing,   'ftpd/file_system_method_missing'
-  autoload :FtpServer,                 'ftpd/ftp_server'
-  autoload :InsecureCertificate,       'ftpd/insecure_certificate'
-  autoload :ListPath,                  'ftpd/list_path'
-  autoload :NullLogger,                'ftpd/null_logger'
-  autoload :Protocols,                 'ftpd/protocols'
-  autoload :ReadOnlyDiskFileSystem,    'ftpd/read_only_disk_file_system'
-  autoload :Server,                    'ftpd/server'
-  autoload :Session,                   'ftpd/session'
-  autoload :SessionConfig,             'ftpd/session_config'
-  autoload :Telnet,                    'ftpd/telnet'
-  autoload :TempDir,                   'ftpd/temp_dir'
-  autoload :TlsServer,                 'ftpd/tls_server'
-  autoload :TranslateExceptions,       'ftpd/translate_exceptions'
-end
+# Gems
+require 'memoizer'
+
+
+# Ftpd
 
-require 'ftpd/auth_levels'
-require 'ftpd/exceptions'
+require_relative 'ftpd/ascii_helper'
+require_relative 'ftpd/auth_levels'
+require_relative 'ftpd/cmd_abor'
+require_relative 'ftpd/cmd_allo'
+require_relative 'ftpd/cmd_appe'
+require_relative 'ftpd/cmd_auth'
+require_relative 'ftpd/cmd_cdup'
+require_relative 'ftpd/cmd_cwd'
+require_relative 'ftpd/cmd_dele'
+require_relative 'ftpd/cmd_eprt'
+require_relative 'ftpd/cmd_epsv'
+require_relative 'ftpd/cmd_feat'
+require_relative 'ftpd/cmd_help'
+require_relative 'ftpd/cmd_list'
+require_relative 'ftpd/cmd_login'
+require_relative 'ftpd/cmd_mdtm'
+require_relative 'ftpd/cmd_mkd'
+require_relative 'ftpd/cmd_mode'
+require_relative 'ftpd/cmd_nlst'
+require_relative 'ftpd/cmd_noop'
+require_relative 'ftpd/cmd_opts'
+require_relative 'ftpd/cmd_pasv'
+require_relative 'ftpd/cmd_pbsz'
+require_relative 'ftpd/cmd_port'
+require_relative 'ftpd/cmd_prot'
+require_relative 'ftpd/cmd_pwd'
+require_relative 'ftpd/cmd_quit'
+require_relative 'ftpd/cmd_rein'
+require_relative 'ftpd/cmd_rename'
+require_relative 'ftpd/cmd_rest'
+require_relative 'ftpd/cmd_retr'
+require_relative 'ftpd/cmd_rmd'
+require_relative 'ftpd/cmd_site'
+require_relative 'ftpd/cmd_size'
+require_relative 'ftpd/cmd_smnt'
+require_relative 'ftpd/cmd_stat'
+require_relative 'ftpd/cmd_stor'
+require_relative 'ftpd/cmd_stou'
+require_relative 'ftpd/cmd_stru'
+require_relative 'ftpd/cmd_syst'
+require_relative 'ftpd/cmd_type'
+require_relative 'ftpd/command_handler'
+require_relative 'ftpd/command_handler_factory'
+require_relative 'ftpd/command_handlers'
+require_relative 'ftpd/command_loop'
+require_relative 'ftpd/command_sequence_checker'
+require_relative 'ftpd/connection_throttle'
+require_relative 'ftpd/connection_tracker'
+require_relative 'ftpd/data_connection_helper'
+require_relative 'ftpd/disk_file_system'
+require_relative 'ftpd/error'
+require_relative 'ftpd/exception_translator'
+require_relative 'ftpd/exceptions'
+require_relative 'ftpd/file_info'
+require_relative 'ftpd/file_system_error_translator'
+require_relative 'ftpd/file_system_helper'
+require_relative 'ftpd/ftp_server'
+require_relative 'ftpd/insecure_certificate'
+require_relative 'ftpd/list_format/eplf'
+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/server'
+require_relative 'ftpd/session'
+require_relative 'ftpd/session_config'
+require_relative 'ftpd/telnet'
+require_relative 'ftpd/temp_dir'
+require_relative 'ftpd/tls_server'
+require_relative 'ftpd/translate_exceptions'