ftpd 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 402da43ab955cc1f7ec47d5080556ae09c85da9d
-  data.tar.gz: 6cde23e0be18f61b46e544809127337623ee55e9
+  metadata.gz: 1c547a0bf777999094a612c387fb63d40a2cbc7f
+  data.tar.gz: 021d0b2bdad238406fdc19d00c9b8036ec85a749
 SHA512:
-  metadata.gz: 2a434cd8438916a37900e2e6dc37a56c9b87d0628ed979f18e9ed8e1bba4f4a31252c012de9bfaa77b7078440212231ae1b073a848a5d80f5f43819277df0399
-  data.tar.gz: a9a3d3875c56cb3d8f5ba701291e9c2c22668b3d42534cdb34eb79fc81f781e49b00c42eb8cab8b5a13f67e47e2b846ddb93e7f8faf38086b4b14205a10118f1
+  metadata.gz: 5b7560963a406e9098cbbff5ba71741c642c93ce7f6296218eb28e69027c99837b07891abf922111e84601792871c3296211f66b8865711520b7a0bdc8ac3663
+  data.tar.gz: 5797b248427a0d497de07918094c35db4a921ae016e016ae63f48fef901c8ba4a38064b0314e62037c00dd695f879bf6b0e880441f9701d7ad884328838f5331

data/.travis.yml

@@ -0,0 +1,4 @@
+language: ruby
+rvm:
+- 1.9.3
+- 2.0.0

data/Changelog.md

@@ -2,6 +2,16 @@ 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.10.0
+
+Bug fixes
+
+* Do not die when implicit SSL connection disconnects (issue #13)	
+
+API Changes:
+
+* Change default interface from "localhost" to "127.0.0.1".
+
 ### 0.9.0
 
 Enhancements

data/Gemfile.lock

@@ -24,9 +24,9 @@ GEM
       nokogiri (~> 1.5.2)
       oauth2
     hashie (2.0.5)
-    highline (1.6.19)
+    highline (1.6.20)
     httpauth (0.2.0)
-    jeweler (1.8.7)
+    jeweler (1.8.8)
       builder
       bundler (~> 1.0)
       git (>= 1.2.5)
@@ -35,11 +35,11 @@ GEM
       nokogiri (= 1.5.10)
       rake
       rdoc
-    json (1.8.0)
+    json (1.8.1)
     jwt (0.1.8)
       multi_json (>= 1.5)
     memoizer (1.0.1)
-    multi_json (1.8.0)
+    multi_json (1.8.2)
     multi_test (0.0.2)
     multi_xml (0.5.5)
     multipart-post (1.2.0)

data/README.md

@@ -1,15 +1,15 @@
-# 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)
 
 ftpd is a pure Ruby FTP server library.  It supports implicit and
 explicit TLS, passive and active mode, and is unconditionally
-compliant per [RFC-1123][1].  It an be used as part of a test fixture or
-embedded in a program.
+compliant per [RFC-1123][1].  It can be used as part of a test fixture
+or embedded in a program.
 
 ## A note about this README
 
-This readme, and other files, contains Yardoc markup, especially for
-links to the API docs; those links don't display properly on github.
-You'll find a properly rendered version [on
+This readme contains [Yardoc](http://yardoc.org/) markup for links to
+the API docs; those links don't display properly on github.  You'll
+find a properly rendered version [on
 rubydoc.info](http://rubydoc.info/gems/ftpd)
 
 ## The state of this library
@@ -57,7 +57,6 @@ end
 Dir.mktmpdir do |temp_dir|
   driver = Driver.new(temp_dir)
   server = Ftpd::FtpServer.new(driver)
-  server.interface = '127.0.0.1'
   server.start
   puts "Server listening on port #{server.bound_port}"
   gets
@@ -172,7 +171,6 @@ example, to set the session timeout to 10 minutes:
 ```ruby
 server = Ftpd::FtpServer.new(driver)
 server.session_timeout = 10 * 60
-server.interface = '127.0.0.1'
 server.start
 ```
 
@@ -223,7 +221,8 @@ And register your class with the ftp_server before starting it:
 ### Logging
 
 Ftpd can write to an instance of
-{http://www.ruby-doc.org/stdlib-2.0.0/libdoc/logger/rdoc/Logger.html Logger} that you provide.  To log to standard out:
+{http://www.ruby-doc.org/stdlib-2.0.0/libdoc/logger/rdoc/Logger.html
+Logger} that you provide.  To log to standard out:
 
     server.log = Logger.new($stdout)
 

data/VERSION

@@ -1 +1 @@
-0.9.0
+0.10.0

data/examples/example.rb

@@ -165,6 +165,19 @@ module Example
       @driver = Driver.new(user, password, account,
                            @data_dir, @args.read_only)
       @server = Ftpd::FtpServer.new(@driver)
+      configure_server
+      @server.start
+      display_connection_info
+      create_connection_script
+    end
+
+    def run
+      wait_until_stopped
+    end
+
+    private
+
+    def configure_server
       @server.interface = @args.interface
       @server.port = @args.port
       @server.tls = @args.tls
@@ -175,17 +188,8 @@ module Example
       @server.auth_level = auth_level
       @server.session_timeout = @args.session_timeout
       @server.log = make_log
-      @server.start
-      display_connection_info
-      create_connection_script
     end
 
-    def run
-      wait_until_stopped
-    end
-
-    private
-
     def auth_level
       Ftpd.const_get("AUTH_#{@args.auth_level.upcase}")
     end
@@ -212,10 +216,14 @@ module Example
       puts "Account: #{account.inspect}" if auth_level >= Ftpd::AUTH_ACCOUNT
       puts "TLS: #{@args.tls}"
       puts "Directory: #{@data_dir}"
-      puts "URI: ftp://#{connection_host}:#{@server.bound_port}"
+      puts "URI: #{uri}"
       puts "PID: #{$$}"
     end
 
+    def uri
+      "ftp://#{connection_host}:#{@server.bound_port}"
+    end
+
     def create_connection_script
       command_path = '/tmp/connect-to-example-ftp-server.sh'
       File.open(command_path, 'w') do |file|

data/features/ftp_server/allo.feature

@@ -1,4 +1,4 @@
-Feature: Port
+Feature: ALLO
 
   As a client
   I want to reserve file system space

data/features/ftp_server/eprt.feature

@@ -5,6 +5,7 @@ Feature: EPRT
   So that I can correct problems
 
   Background:
+    Given the test server is bound to "::"
     Given the test server is started
 
   Scenario: Port 1024

data/ftpd.gemspec

@@ -2,21 +2,23 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+# stub: ftpd 0.10.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "ftpd"
-  s.version = "0.9.0"
+  s.version = "0.10.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wayne Conrad"]
-  s.date = "2013-10-01"
-  s.description = "ftpd is a pure Ruby FTP server library.  It supports implicit and explicit TLS, passive and active mode, and is unconditionally compliant per [RFC-1123][1].  It an be used as part of a test fixture or embedded in a program."
+  s.date = "2013-10-26"
+  s.description = "ftpd is a pure Ruby FTP server library.  It supports implicit and explicit TLS, 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",
     "README.md"
   ]
   s.files = [
+    ".travis.yml",
     ".yardopts",
     "Changelog.md",
     "Gemfile",
@@ -155,6 +157,7 @@ Gem::Specification.new do |s|
     "lib/ftpd/read_only_disk_file_system.rb",
     "lib/ftpd/server.rb",
     "lib/ftpd/session.rb",
+    "lib/ftpd/session_config.rb",
     "lib/ftpd/telnet.rb",
     "lib/ftpd/temp_dir.rb",
     "lib/ftpd/tls_server.rb",
@@ -184,7 +187,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/wconrad/ftpd"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "2.0.0"
+  s.rubygems_version = "2.1.3"
   s.summary = "Pure Ruby FTP server library"
 
   if s.respond_to? :specification_version then

data/lib/ftpd.rb

@@ -6,6 +6,7 @@ require 'openssl'
 require 'pathname'
 require 'shellwords'
 require 'socket'
+require 'strscan'
 require 'thread'
 require 'tmpdir'
 
@@ -31,6 +32,7 @@ module Ftpd
   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'

data/lib/ftpd/ftp_server.rb

@@ -49,7 +49,11 @@ module Ftpd
     #
     # @return [Logger]
 
-    attr_accessor :log
+    attr_reader :log
+
+    def log=(logger)
+      @log = logger || NullLogger.new
+    end
 
     # The maximum number of connections the server will allow.
     # Defaults to {ConnectionThrottle::DEFAULT_MAX_CONNECTIONS}.
@@ -62,27 +66,27 @@ module Ftpd
     def_delegator :@connection_throttle, :'max_connections'
     def_delegator :@connection_throttle, :'max_connections='
 
-    # The maximum number of connections the server will allow from a
-    # given IP.  Defaults to
-    # {ConnectionThrottle::DEFAULT_MAX_CONNECTIONS_PER_IP}.
+    # The maximum number of failed login attempts before disconnecting
+    # the user.  Defaults to nil (no maximum).  When set, this may
+    # makes brute-force password guessing attack less efficient.
     #
     # Set this before calling #start.
     #
-    # @!attribute max_connections_per_ip
     # @return [Integer]
 
-    def_delegator :@connection_throttle, :'max_connections_per_ip'
-    def_delegator :@connection_throttle, :'max_connections_per_ip='
+    attr_accessor :max_failed_logins
 
-    # The maximum number of failed login attempts before disconnecting
-    # the user.  Defaults to nil (no maximum).  When set, this may
-    # makes brute-force password guessing attack less efficient.
+    # The maximum number of connections the server will allow from a
+    # given IP.  Defaults to
+    # {ConnectionThrottle::DEFAULT_MAX_CONNECTIONS_PER_IP}.
     #
     # Set this before calling #start.
     #
+    # @!attribute max_connections_per_ip
     # @return [Integer]
 
-    attr_accessor :max_failed_logins
+    def_delegator :@connection_throttle, :'max_connections_per_ip'
+    def_delegator :@connection_throttle, :'max_connections_per_ip='
 
     # The number of seconds to delay before replying.  This is for
     # testing, when you need to test, for example, client timeouts.
@@ -144,7 +148,7 @@ module Ftpd
       @server_version = read_version_file
       @allow_low_data_ports = false
       @failed_login_delay = 0
-      @log = nil
+      self.log = nil
       @connection_tracker = ConnectionTracker.new
       @connection_throttle = ConnectionThrottle.new(@connection_tracker)
     end
@@ -166,19 +170,21 @@ module Ftpd
     end
 
     def run_session(socket)
-      Session.new(:allow_low_data_ports => allow_low_data_ports,
-                  :auth_level => @auth_level,
-                  :driver => @driver,
-                  :failed_login_delay => @failed_login_delay,
-                  :list_formatter => @list_formatter,
-                  :log => log,
-                  :max_failed_logins => @max_failed_logins,
-                  :response_delay => response_delay,
-                  :server_name => @server_name,
-                  :server_version => @server_version,
-                  :session_timeout => @session_timeout,
-                  :socket => socket,
-                  :tls => @tls).run
+      config = SessionConfig.new
+      config.allow_low_data_ports = @allow_low_data_ports
+      config.auth_level = @auth_level
+      config.driver = @driver
+      config.failed_login_delay = @failed_login_delay
+      config.list_formatter = @list_formatter
+      config.log = @log
+      config.max_failed_logins = @max_failed_logins
+      config.response_delay = response_delay
+      config.server_name = @server_name
+      config.server_version = @server_version
+      config.session_timeout = @session_timeout
+      config.tls = @tls
+      session = Session.new(config, socket)
+      session.run
     end
 
     def read_version_file

data/lib/ftpd/server.rb

@@ -4,7 +4,7 @@ module Ftpd
     include Memoizer
 
     # The interface to bind to (e.g. "127.0.0.1", "0.0.0.0",
-    # "10.0.0.12", etc.).  Defaults to "localhost"
+    # "10.0.0.12", "::1", "::", etc.).  Defaults to "127.0.0.1"
     #
     # Set this before calling #start.
     #
@@ -23,7 +23,7 @@ module Ftpd
     attr_accessor :port
 
     def initialize
-      @interface = 'localhost'
+      @interface = '127.0.0.1'
       @port = 0
     end
 
@@ -97,6 +97,7 @@ module Ftpd
       Thread.new do
         begin
           session socket
+        rescue OpenSSL::SSL::SSLError => e
         ensure
           close_socket socket
         end

data/lib/ftpd/session.rb

@@ -6,22 +6,13 @@ module Ftpd
     include Error
     include ListPath
 
-    def initialize(opts)
-      @failed_login_delay = opts[:failed_login_delay]
-      @connection_tracker = opts[:connection_tracker]
-      @max_failed_logins = opts[:max_failed_logins]
-      @log = opts[:log] || NullLogger.new
-      @allow_low_data_ports = opts[:allow_low_data_ports]
-      @server_name = opts[:server_name]
-      @server_version = opts[:server_version]
-      @driver = opts[:driver]
-      @auth_level = opts[:auth_level]
-      @socket = opts[:socket]
-      @tls = opts[:tls]
-      @list_formatter = opts[:list_formatter]
-      @response_delay = opts[:response_delay]
-      @session_timeout = opts[:session_timeout]
-      if @tls == :implicit
+    # @params session_config [SessionConfig] Session configuration
+    # @param socket [TCPSocket, OpenSSL::SSL::SSLSocket] The socket
+
+    def initialize(session_config, socket)
+      @config = session_config
+      @socket = socket
+      if @config.tls == :implicit
         @socket.encrypt
       end
       @command_sequence_checker = init_command_sequence_checker
@@ -72,7 +63,7 @@ module Ftpd
       syntax_error unless argument
       sequence_error if @logged_in
       @user = argument
-      if @auth_level > AUTH_USER
+      if @config.auth_level > AUTH_USER
         reply "331 Password required"
         expect 'pass'
       else
@@ -83,7 +74,7 @@ module Ftpd
     def cmd_pass(argument)
       syntax_error unless argument
       @password = argument
-      if @auth_level > AUTH_PASSWORD
+      if @config.auth_level > AUTH_PASSWORD
         reply "332 Account required"
         expect 'acct'
       else
@@ -365,7 +356,7 @@ module Ftpd
     end
 
     def tls_enabled?
-      @tls != :off
+      @config.tls != :off
     end
 
     def cmd_cdup(argument)
@@ -617,7 +608,7 @@ module Ftpd
         handle_data_disconnect do
           data_socket.write(contents)
         end
-        @log.debug "Sent #{contents.size} bytes"
+        @config.log.debug "Sent #{contents.size} bytes"
         reply "226 Transfer complete"
       end
     end
@@ -628,7 +619,7 @@ module Ftpd
           data_socket.read
         end
         contents = nvt_ascii_to_unix(contents) if @data_type == 'A'
-        @log.debug "Received #{contents.size} bytes"
+        @config.log.debug "Received #{contents.size} bytes"
         contents
       end
     end
@@ -749,12 +740,12 @@ module Ftpd
       s = gets_with_timeout(@socket)
       throw :done if s.nil?
       s = s.chomp
-      @log.debug s
+      @config.log.debug s
       s
     end
 
     def gets_with_timeout(socket)
-      ready = IO.select([@socket], nil, nil, @session_timeout)
+      ready = IO.select([@socket], nil, nil, @config.session_timeout)
       timeout if ready.nil?
       ready[0].first.gets
     end
@@ -765,11 +756,11 @@ module Ftpd
     end
 
     def reply(s)
-      if @response_delay.to_i != 0
-        @log.warn "#{@response_delay} second delay before replying"
-        sleep @response_delay
+      if @config.response_delay.to_i != 0
+        @config.log.warn "#{@config.response_delay} second delay before replying"
+        sleep @config.response_delay
       end
-      @log.debug s
+      @config.log.debug s
       @socket.write s + "\r\n"
     end
 
@@ -807,7 +798,7 @@ module Ftpd
     def format_list(paths)
       paths.map do |path|
         file_info = @file_system.file_info(path)
-        @list_formatter.new(file_info).to_s + "\n"
+        @config.list_formatter.new(file_info).to_s + "\n"
       end.join
     end
 
@@ -825,10 +816,10 @@ module Ftpd
     end
 
     def authenticate(*args)
-      while args.size < @driver.method(:authenticate).arity
+      while args.size < @config.driver.method(:authenticate).arity
         args << nil
       end
-      @driver.authenticate(*args)
+      @config.driver.authenticate(*args)
     end
 
     def login(*auth_tokens)
@@ -837,7 +828,7 @@ module Ftpd
         error "530 Login incorrect"
       end
       reply "230 Logged in"
-      set_file_system @driver.file_system(@user)
+      set_file_system @config.driver.file_system(@user)
       @logged_in = true
       reset_failed_auths
     end
@@ -869,8 +860,8 @@ module Ftpd
 
     def failed_auth
       @failed_auths += 1
-      sleep @failed_login_delay
-      if @max_failed_logins && @failed_auths >= @max_failed_logins
+      sleep @config.failed_login_delay
+      if @config.max_failed_logins && @failed_auths >= @config.max_failed_logins
         reply "421 server unavailable"
         throw :done
       end
@@ -881,7 +872,7 @@ module Ftpd
     end
 
     def set_active_mode_address(address, port)
-      if port > 0xffff || port < 1024 && !@allow_low_data_ports
+      if port > 0xffff || port < 1024 && !@config.allow_low_data_ports
         error "504 Command not implemented for that parameter"
       end
       @data_hostname = address
@@ -897,14 +888,14 @@ module Ftpd
       @data_channel_protection_level = :clear
       @data_hostname = nil
       @data_port = nil
-      @protection_buffer_size_set = 0
+      @protection_buffer_size_set = false
       @epsv_all = false
       close_data_server_socket
       reset_failed_auths
     end
 
     def server_name_and_version
-      "#{@server_name} #{@server_version}"
+      "#{@config.server_name} #{@config.server_version}"
     end
 
   end

data/lib/ftpd/session_config.rb

@@ -0,0 +1,103 @@
+module Ftpd
+
+  # All of the configuration needed by a session
+
+  class SessionConfig
+
+    # If true, allow the PORT command to specify privileged data ports
+    # (those below 1024).  Defaults to false.  Setting this to true
+    # makes it easier for an attacker to use the server to attack
+    # another server.  See RFC 2577 section 3.
+    #
+    # @return [Boolean]
+
+    attr_accessor :allow_low_data_ports
+
+    # The authentication level.  One of:
+    #
+    # * Ftpd::AUTH_USER
+    # * Ftpd::AUTH_PASSWORD (default)
+    # * Ftpd::AUTH_ACCOUNT
+    #
+    # @return [Integer] The authentication level
+
+    attr_accessor :auth_level
+
+    # @return driver A driver for the server's dynamic behavior such
+    #   as authentication and file system access.
+    #
+    # The driver should expose these public methods:
+    # * {Example::Driver#authenticate authenticate}
+    # * {Example::Driver#file_system file_system}
+
+    attr_accessor :driver
+
+    # The delay (in seconds) after a failed login.  Defaults to 0.
+    # Setting this makes brute force password guessing less efficient
+    # for the attacker.  RFC-2477 suggests a delay of 5 seconds.
+
+    attr_accessor :failed_login_delay
+
+    # The class for formatting for LIST output.
+    #
+    # @return [class that quacks like Ftpd::ListFormat::Ls]
+
+    attr_accessor :list_formatter
+
+    # The logger.
+    #
+    # @return [Logger]
+
+    attr_accessor :log
+
+    # The maximum number of failed login attempts before disconnecting
+    # the user.  Defaults to nil (no maximum).  When set, this may
+    # makes brute-force password guessing attack less efficient.
+    #
+    # @return [Integer]
+
+    attr_accessor :max_failed_logins
+
+    # The number of seconds to delay before replying.  This is for
+    # testing, when you need to test, for example, client timeouts.
+    # Defaults to 0 (no delay).
+    #
+    # @return [Numeric]
+
+    attr_accessor :response_delay
+
+    # The server's name, sent in a STAT reply.  Defaults to
+    # {Ftpd::FtpServer::DEFAULT_SERVER_NAME}.
+    #
+    # @return [String]
+
+    attr_accessor :server_name
+
+    # The server's version, sent in a STAT reply.
+    #
+    # @return [String]
+
+    attr_accessor :server_version
+
+    # The session timeout.  When a session is awaiting a command, if
+    # one is not received in this many seconds, the session is
+    # disconnected.  If nil, then timeout is disabled.
+    #
+    # @return [Numeric]
+
+    attr_accessor :session_timeout
+
+    # Whether or not to do TLS, and which flavor.
+    #
+    # One of:
+    # * :off
+    # * :explicit
+    # * :implicit
+    #
+    # @return [Symbol]
+
+    attr_accessor :tls
+
+  end
+
+end

data/lib/ftpd/telnet.rb

@@ -50,7 +50,7 @@ module Ftpd
     # @param command [String]
 
     def initialize(command)
-      telnet_state_machine command
+      parse_command command
     end
 
     private
@@ -66,51 +66,46 @@ module Ftpd
     end
     include Codes
 
-    def telnet_state_machine (command)
+    def accept(scanner)
+      @plain << scanner[1]
+    end
+
+    def reply_dont(scanner)
+      @reply << IAC + DONT + scanner[1]
+    end
+
+    def reply_wont(scanner)
+      @reply << IAC + WONT + scanner[1]
+    end
+
+    def ignore(scanner)
+    end
+
+    # Telnet sequences to handle, and how to handle them
+
+    SEQUENCES = [
+      [/#{IAC}(#{IAC})/, :accept],
+      [/#{IAC}#{WILL}(.)/m, :reply_dont],
+      [/#{IAC}#{WONT}(.)/m, :ignore],
+      [/#{IAC}#{DO}(.)/m, :reply_wont],
+      [/#{IAC}#{DONT}(.)/m, :ignore],
+      [/#{IAC}#{IP}/, :ignore],
+      [/#{IAC}#{DM}/, :ignore],
+      [/(.)/m, :accept],
+    ]
+
+    # Parse the the command.  Sets @plain and @reply
+
+    def parse_command(command)
       @plain = ''
       @reply = ''
-      state = :idle
-      command.each_char do |c|
-        case state
-        when :idle
-          if c == IAC
-            state = :iac
-          else
-            @plain << c
-          end
-        when :iac
-          case c
-          when IAC
-            @plain << c
-            state = :idle
-          when WILL
-            state = :will
-          when WONT
-            state = :wont
-          when DO
-            state = :do
-          when DONT
-            state = :dont
-          when IP
-            state = :idle
-          when DM
-            state = :idle
-          else
-            @plain << IAC + c
-            state = :idle
+      scanner = StringScanner.new(command)
+      while !scanner.eos?
+        SEQUENCES.each do |regexp, method|
+          if scanner.scan(regexp)
+            send method, scanner
+            break
           end
-        when :will
-          @reply << IAC + DONT + c
-          state = :idle
-        when :wont
-          state = :idle
-        when :do
-          @reply << IAC + WONT + c
-          state = :idle
-        when :dont
-          state = :idle
-        else
-          raise "Unknown state #{state.inspect}"
         end
       end
     end

data/rake_tasks/jeweler.rake

@@ -6,7 +6,10 @@ README_PATH = File.expand_path('../README.md', File.dirname(__FILE__))
 
 def extract_description_from_readme
   readme = File.open(README_PATH, 'r', &:read)
-  s = readme[/^# FTPD\n+((?:.*\n)+?)\n*##/i, 1]
+  s = readme[/^# FTPD.*\n+((?:.*\n)+?)\n*##/i, 1]
+  unless s
+    raise 'Unable to extract description from readme'
+  end     
   s.gsub(/\n/, ' ').strip
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ftpd
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Wayne Conrad
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-01 00:00:00.000000000 Z
+date: 2013-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: memoizer
@@ -138,7 +138,7 @@ dependencies:
         version: '0'
 description: ftpd is a pure Ruby FTP server library.  It supports implicit and explicit
   TLS, passive and active mode, and is unconditionally compliant per [RFC-1123][1].  It
-  an be used as part of a test fixture or embedded in a program.
+  can be used as part of a test fixture or embedded in a program.
 email: wconrad@yagni.com
 executables: []
 extensions: []
@@ -146,6 +146,7 @@ extra_rdoc_files:
 - LICENSE.md
 - README.md
 files:
+- .travis.yml
 - .yardopts
 - Changelog.md
 - Gemfile
@@ -284,6 +285,7 @@ files:
 - lib/ftpd/read_only_disk_file_system.rb
 - lib/ftpd/server.rb
 - lib/ftpd/session.rb
+- lib/ftpd/session_config.rb
 - lib/ftpd/telnet.rb
 - lib/ftpd/temp_dir.rb
 - lib/ftpd/tls_server.rb
@@ -329,7 +331,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.1.3
 signing_key: 
 specification_version: 4
 summary: Pure Ruby FTP server library