ftpd 0.0.0.pre2 → 0.0.1.pre

data/VERSION

@@ -1 +1 @@
-0.0.0.pre2
+0.0.1.pre

data/examples/example.rb

@@ -9,9 +9,9 @@ require 'ftpd'
 class Example
 
   def initialize
-    @data_dir = Ftpd::TempDir.new
+    @data_dir = TempDir.make
     create_files
-    @server = Ftpd::FtpServer.new(@data_dir.path)
+    @server = Ftpd::FtpServer.new(@data_dir)
     set_credentials
     display_connection_info
     create_connection_script
@@ -31,7 +31,7 @@ class Example
   end
 
   def create_file(path, contents)
-    full_path = File.expand_path(path, @data_dir.path)
+    full_path = File.expand_path(path, @data_dir)
     FileUtils.mkdir_p File.dirname(full_path)
     File.open(full_path, 'w') do |file|
       file.write contents
@@ -48,7 +48,7 @@ class Example
     puts "Port: #{@server.port}"
     puts "User: #{@server.user}"
     puts "Pass: #{@server.password}"
-    puts "Directory: #{@data_dir.path}"
+    puts "Directory: #{@data_dir}"
     puts "URI: ftp://#{HOST}:#{@server.port}"
   end
 

data/features/concurrent_sessions.feature

@@ -0,0 +1,11 @@
+Feature: Mode
+
+  As a client
+  I want to start a session when there is another session
+  So that my session doesn't have to wait on the other
+
+Scenario: Stream
+  Given a successful login
+  And the server has file "ascii_unix"
+  And the second client connects and logs in
+  Then the second client successfully does nothing

data/features/delete.feature

@@ -9,8 +9,6 @@ Feature: Delete
     And the server has file "foo"
     When the client successfully deletes "foo"
     Then the server should not have file "foo"
-    And the client lists the directory
-    And the file list should not contain "foo"
 
   Scenario: Missing path
     Given a successful login

data/features/step_definitions/client.rb

@@ -0,0 +1,14 @@
+def client_variable_name(client_name)
+  var = '@' + [
+    client_name,
+    'client',
+  ].compact.map(&:strip).join('_')
+end
+
+def set_client(client_name, client)
+  instance_variable_set client_variable_name(client_name), client
+end
+
+def client(client_name = nil)
+  instance_variable_get(client_variable_name(client_name))
+end

data/features/step_definitions/connect.rb

@@ -1,19 +1,13 @@
 require 'double_bag_ftps'
 require 'net/ftp'
 
-When /^the client connects( with TLS)?$/ do |with_tls|
-  @client = TestClient.new(:tls => with_tls)
-  @client.connect(@server.host, @server.port)
+When /^the( \w+)? client connects( with TLS)?$/ do
+|client_name, with_tls|
+  client = TestClient.new(:tls => with_tls)
+  client.connect(@server.host, @server.port)
+  set_client client_name, client
 end
 
 After do
   @client.close if @client
 end
-
-Then /^the connection is closed$/ do
-  @client.should be_closed
-end
-
-Then /^the connection is open$/ do
-  @client.should be_open
-end

data/features/step_definitions/login.rb

@@ -3,9 +3,9 @@ def logged_in?
   @error.nil?
 end
 
-def login(user, password)
+def login(user, password, client_name = nil)
   capture_error do
-    @client.login user, password
+    client.login user, password
   end
 end
 
@@ -19,14 +19,19 @@ Given /^a successful login( with TLS)?$/ do |with_tls|
   step 'the client logs in'
 end
 
+Given /^the( \w+)? client connects and logs in$/ do |client_name|
+  step "the#{client_name} client connects"
+  step "the#{client_name} client logs in"
+end
+
 Given /^a failed login$/ do
   step 'the server is started'
   step 'the client connects'
   step 'the client logs in with a bad password'
 end
 
-When /^the client logs in$/ do
-  login @server.user, @server.password
+When /^the( \w+)? client logs in$/ do |client_name|
+  login @server.user, @server.password, client_name
 end
 
 When /^the client logs in with a bad password$/ do

data/features/step_definitions/noop.rb

@@ -1,13 +1,15 @@
-When /^the client successfully does nothing( with a parameter)?$/ do |with_param|
+When /^the( \w+)? client successfully does nothing( with a parameter)?$/ do
+|client_name, with_param|
   if with_param
-    @client.raw 'NOOP', 'foo'
+    client(client_name).raw 'NOOP', 'foo'
   else
-    @client.noop
+    client(client_name).noop
   end
 end
 
-When /^the client does nothing( with a parameter)?$/ do |with_param|
+When /^the( \w+)? client does nothing( with a parameter)?$/ do
+|client_name, with_param|
   capture_error do
-    step "the client successfully does nothing#{with_param}"
+    step "the#{client_name} client successfully does nothing#{with_param}"
   end
 end

data/features/support/test_client.rb

@@ -7,14 +7,13 @@ class TestClient
   include FileUtils
 
   def initialize(opts = {})
-    @temp_dir = Ftpd::TempDir.new
+    @temp_dir = TempDir.make
     @ftp = make_ftp(opts)
     @templates = TestFileTemplates.new
   end
 
   def close
     @ftp.close
-    @temp_dir.rm
   end
 
   def_delegators :@ftp,
@@ -32,7 +31,7 @@ class TestClient
   :quit
 
   def raw(*command)
-    @ftp.sendcmd *command.compact.join(' ')
+    @ftp.sendcmd command.compact.join(' ')
   end
 
   def get(mode, remote_path)
@@ -66,7 +65,7 @@ class TestClient
   end
 
   def temp_path(path)
-    File.expand_path(path, @temp_dir.path)
+    File.expand_path(path, @temp_dir)
   end
 
   def make_ftp(opts)

data/features/support/test_server.rb

@@ -7,14 +7,13 @@ class TestServer
   include FileUtils
 
   def initialize
-    @temp_dir = Ftpd::TempDir.new
-    @server = Ftpd::FtpServer.new(@temp_dir.path)
+    @temp_dir = TempDir.make
+    @server = Ftpd::FtpServer.new(@temp_dir)
     @templates = TestFileTemplates.new
   end
 
   def close
     @server.close
-    @temp_dir.rm
   end
 
   def host
@@ -46,7 +45,7 @@ class TestServer
   private
 
   def temp_path(path)
-    File.expand_path(path, @temp_dir.path)
+    File.expand_path(path, @temp_dir)
   end
 
 end

data/features/syntax_errors.feature

@@ -1,4 +1,4 @@
-Feature: Miscellaneous Errors
+Feature: Syntax Errors
 
   As a client
   I want good error messages

data/ftpd.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "ftpd"
-  s.version = "0.0.0.pre2"
+  s.version = "0.0.1.pre"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wayne Conrad"]
-  s.date = "2013-02-10"
+  s.date = "2013-02-11"
   s.description = "ftpd is a pure Ruby FTP server library.  It supports implicit and explicit TLS, suitlble for use by a program such as a test fixture or FTP daemon."
   s.email = "wconrad@yagni.com"
   s.extra_rdoc_files = [
@@ -25,6 +25,7 @@ Gem::Specification.new do |s|
     "VERSION",
     "examples/example.rb",
     "features/command_errors.feature",
+    "features/concurrent_sessions.feature",
     "features/delete.feature",
     "features/directory_navigation.feature",
     "features/file_structure.feature",
@@ -37,6 +38,7 @@ Gem::Specification.new do |s|
     "features/port.feature",
     "features/put.feature",
     "features/quit.feature",
+    "features/step_definitions/client.rb",
     "features/step_definitions/client_and_server_files.rb",
     "features/step_definitions/client_files.rb",
     "features/step_definitions/command.rb",

data/lib/ftpd/ftp_server.rb

@@ -3,8 +3,8 @@
 require 'fileutils'
 require 'openssl'
 require 'pathname'
-require File.expand_path('tls_server', File.dirname(__FILE__))
-require File.expand_path('temp_dir', File.dirname(__FILE__))
+require 'ftpd/tls_server'
+require 'ftpd/temp_dir'
 
 module Ftpd
   class FtpServer < TlsServer

data/lib/ftpd/server.rb

@@ -39,11 +39,7 @@ module Ftpd
               sleep(0.2)
               retry
             end
-            begin
-              session(socket)
-            ensure
-              socket.close
-            end
+            start_session_thread socket
           rescue IOError
             break
           end
@@ -51,6 +47,16 @@ module Ftpd
       end
     end
 
+    def start_session_thread(socket)
+      Thread.new do
+        begin
+          session(socket)
+        ensure
+          socket.close
+        end
+      end
+    end
+
     def accept
       @server_socket.accept
     end

data/lib/ftpd/temp_dir.rb

@@ -1,56 +1,16 @@
-require 'tempfile'
+require 'fileutils'
+require 'tmpdir'
 
-module Ftpd
-  class TempDir
+module TempDir
 
-    attr_reader :path
-
-    class << self
-
-      def make(basename = nil)
-        temp_dir = TempDir.new(basename)
-        begin
-          yield(temp_dir)
-        ensure
-          temp_dir.rm unless temp_dir.kept
-        end
+  def make
+    Dir.mktmpdir.tap do |path|
+      at_exit do
+        FileUtils.rm_rf path
+        Dir.rmdir path if File.exists?(path)
       end
-
     end
-
-    attr_reader :kept
-
-    def initialize(basename = nil)
-      @path = unique_path(basename)
-      @kept = false
-      ObjectSpace.define_finalizer(self, TempDir.cleanup(path))
-      Dir.mkdir(@path)
-    end
-
-    def keep
-      @kept = true
-      ObjectSpace.undefine_finalizer(self)
-    end
-
-    def rm
-      keep
-      system("rm -rf #{path.inspect}")
-    end
-
-    private
-
-    def unique_path(basename)
-      tempfile = Tempfile.new(File.basename(basename || $0 || ''))
-      path = tempfile.path
-      tempfile.close!
-      path
-    end
-
-    def TempDir.cleanup(path)
-      proc { |id|
-        system("/bin/rm -rf #{path.inspect}")
-      }
-    end
-
   end
+  module_function :make
+
 end

data/lib/ftpd/tls_server.rb

@@ -1,5 +1,5 @@
 require 'openssl'
-require File.expand_path('server', File.dirname(__FILE__))
+require 'ftpd/server'
 
 module Ftpd
   class TlsServer < Server

metadata

@@ -1,80 +1,113 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: ftpd
-version: !ruby/object:Gem::Version
-  version: 0.0.0.pre2
+version: !ruby/object:Gem::Version 
+  hash: -468842399
   prerelease: 6
+  segments: 
+  - 0
+  - 0
+  - 1
+  - pre
+  version: 0.0.1.pre
 platform: ruby
-authors:
+authors: 
 - Wayne Conrad
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-10 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2013-02-11 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: cucumber
-  requirement: &70369190 !ruby/object:Gem::Requirement
+  prerelease: false
+  type: :development
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 29
+        segments: 
+        - 1
+        - 2
+        - 1
         version: 1.2.1
-  type: :development
-  prerelease: false
-  version_requirements: *70369190
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: double-bag-ftps
-  requirement: &70366630 !ruby/object:Gem::Requirement
+  prerelease: false
+  type: :development
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 0
+        - 1
+        - 0
         version: 0.1.0
-  type: :development
-  prerelease: false
-  version_requirements: *70366630
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: jeweler
-  requirement: &70397920 !ruby/object:Gem::Requirement
+  prerelease: false
+  type: :development
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 63
+        segments: 
+        - 1
+        - 8
+        - 4
         version: 1.8.4
-  type: :development
-  prerelease: false
-  version_requirements: *70397920
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: rake
-  requirement: &70395740 !ruby/object:Gem::Requirement
+  prerelease: false
+  type: :development
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 73
+        segments: 
+        - 10
+        - 0
+        - 3
         version: 10.0.3
-  type: :development
-  prerelease: false
-  version_requirements: *70395740
-- !ruby/object:Gem::Dependency
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: &70395170 !ruby/object:Gem::Requirement
+  prerelease: false
+  type: :development
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 2
+        - 0
+        - 1
         version: 2.0.1
-  type: :development
-  prerelease: false
-  version_requirements: *70395170
-description: ftpd is a pure Ruby FTP server library.  It supports implicit and explicit
-  TLS, suitlble for use by a program such as a test fixture or FTP daemon.
+  version_requirements: *id005
+description: ftpd is a pure Ruby FTP server library.  It supports implicit and explicit TLS, suitlble for use by a program such as a test fixture or FTP daemon.
 email: wconrad@yagni.com
 executables: []
+
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - LICENSE.md
 - README.md
-files:
+files: 
 - Gemfile
 - Gemfile.lock
 - LICENSE.md
@@ -83,6 +116,7 @@ files:
 - VERSION
 - examples/example.rb
 - features/command_errors.feature
+- features/concurrent_sessions.feature
 - features/delete.feature
 - features/directory_navigation.feature
 - features/file_structure.feature
@@ -95,6 +129,7 @@ files:
 - features/port.feature
 - features/put.feature
 - features/quit.feature
+- features/step_definitions/client.rb
 - features/step_definitions/client_and_server_files.rb
 - features/step_definitions/client_files.rb
 - features/step_definitions/command.rb
@@ -136,28 +171,39 @@ files:
 - rake_tasks/cucumber.rake
 - rake_tasks/jeweler.rake
 homepage: http://github.com/wconrad/ftpd
-licenses:
+licenses: 
 - MIT
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>'
-    - !ruby/object:Gem::Version
+  requirements: 
+  - - ">"
+    - !ruby/object:Gem::Version 
+      hash: 25
+      segments: 
+      - 1
+      - 3
+      - 1
       version: 1.3.1
 requirements: []
+
 rubyforge_project: 
 rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: Pure Ruby FTP server library
 test_files: []
+