ftpd 0.0.1.pre → 0.1.0

data/features/{name_list.feature → ftp_server/name_list.feature}

@@ -4,74 +4,68 @@ Feature: Name List
   I want to list file names
   So that I can see what file to transfer
 
-  Scenario: List implicit
+  Background:
+    Given the test server is started
+
+  Scenario: Implicit
     Given a successful login
     And the server has file "foo"
     And the server has file "bar"
-    When the client name lists the directory
+    When the client successfully name-lists the directory
     Then the file list should be in short form
     And the file list should contain "foo"
     And the file list should contain "bar"
 
-  Scenario: List root
+  Scenario: Root
     Given a successful login
     And the server has file "foo"
     And the server has file "bar"
-    When the client name lists the directory "/"
+    When the client successfully name-lists the directory "/"
     Then the file list should be in short form
     And the file list should contain "foo"
     And the file list should contain "bar"
 
-  Scenario: List subdir
+  Scenario: Parent of root
     Given a successful login
-    And the server has file "subdir/foo"
-    When the client name lists the directory "subdir"
+    And the server has file "foo"
+    And the server has file "bar"
+    When the client successfully name-lists the directory "/.."
     Then the file list should be in short form
     And the file list should contain "foo"
+    And the file list should contain "bar"
 
-  Scenario: List glob
+  Scenario: Subdir
     Given a successful login
-    And the server has file "foo"
-    And the server has file "bar"
-    When the client name lists the directory "f*"
+    And the server has file "subdir/foo"
+    When the client successfully name-lists the directory "subdir"
     Then the file list should be in short form
     And the file list should contain "foo"
-    And the file list should not contain "bar"
 
-  Scenario: Passive
+  Scenario: Glob
     Given a successful login
     And the server has file "foo"
     And the server has file "bar"
-    And the client is in passive mode
-    When the client name lists the directory
+    When the client successfully name-lists the directory "f*"
     Then the file list should be in short form
     And the file list should contain "foo"
-    And the file list should contain "bar"
-
-  Scenario: TLS
-    pending "TLS not supported in active mode (see README)"
+    And the file list should not contain "bar"
 
-  Scenario: TLS, Passive
-    Given a successful login with TLS
+  Scenario: Passive
+    Given a successful login
     And the server has file "foo"
     And the server has file "bar"
     And the client is in passive mode
-    When the client name lists the directory
+    When the client successfully name-lists the directory
     Then the file list should be in short form
     And the file list should contain "foo"
     And the file list should contain "bar"
 
-  Scenario: Path outside tree
-    Given a successful login
-    When the client name lists the directory ".."
-    Then the server returns an access denied error
-
-  Scenario: Missing file
+  Scenario: Missing directory
     Given a successful login
-    When the client name lists the directory "missing/file"
-    Then the server returns a no such file error
+    When the client successfully name-lists the directory "missing/file"
+    Then the file list should be empty
 
   Scenario: Not logged in
     Given a successful connection
-    When the client name lists the directory
+    When the client name-lists the directory
     Then the server returns a not logged in error

data/features/ftp_server/name_list_tls.feature

@@ -0,0 +1,22 @@
+Feature: Name List TLS
+
+  As a client
+  I want to securely list file names
+  So that I can see what file to transfer
+  And nobody else can
+
+  Background:
+    Given the test server is started with TLS
+
+  Scenario: TLS
+    pending "TLS not supported in active mode (see README)"
+
+  Scenario: TLS, Passive
+    Given a successful login with TLS
+    And the server has file "foo"
+    And the server has file "bar"
+    And the client is in passive mode
+    When the client successfully name-lists the directory
+    Then the file list should be in short form
+    And the file list should contain "foo"
+    And the file list should contain "bar"

data/features/{noop.feature → ftp_server/noop.feature}

@@ -4,6 +4,9 @@ Feature: No Operation
   I want to keep the connection alive
   So that I don't have to log in so often
 
+  Background:
+    Given the test server is started
+
   Scenario: NOP
     Given a successful connection
     Then the client successfully does nothing

data/features/{port.feature → ftp_server/port.feature}

@@ -4,6 +4,9 @@ Feature: Port
   I want good error messages
   So that I can correct problems
 
+  Background:
+    Given the test server is started
+
   Scenario: Not logged in
     Given a successful connection
     When the client sends PORT "1,2,3,4,5,6"

data/features/{put.feature → ftp_server/put.feature}

@@ -1,8 +1,12 @@
 Feature: Put
 
   As a client
-  I want to put a file
+  I want to securely put a file
   So that someone else can have it
+  But nobody else can
+
+  Background:
+    Given the test server is started
 
   Scenario: ASCII file with *nix line endings
     Given a successful login
@@ -31,20 +35,18 @@ Feature: Put
     When the client successfully puts text "ascii_unix"
     Then the remote file "ascii_unix" should match the local file
 
-  Scenario: TLS
-    pending "TLS not supported in active mode (see README)"
-
-  Scenario: TLS, Passive
-    Given a successful login with TLS
+  Scenario: Non-root working directory
+    Given a successful login
     And the client has file "ascii_unix"
-    And the client is in passive mode
+    And the server has directory "foo"
+    And the client successfully cd's to "foo"
     When the client successfully puts text "ascii_unix"
-    Then the remote file "ascii_unix" should match the local file
+    Then the remote file "foo/ascii_unix" should match the local file
 
-  Scenario: Path outside tree
+  Scenario: Access denied
     Given a successful login
-    And the client has file "foo"
-    When the client puts text "../foo"
+    And the client has file "forbidden"
+    When the client puts text "forbidden"
     Then the server returns an access denied error
 
   Scenario: Missing directory
@@ -63,3 +65,9 @@ Feature: Put
     Given a successful login
     When the client puts with no path
     Then the server returns a syntax error
+
+  Scenario: File system error
+    Given a successful login
+    And the client has file "unable"
+    When the client puts text "unable"
+    Then the server returns an action not taken error

data/features/ftp_server/put_tls.feature

@@ -0,0 +1,18 @@
+Feature: Put TLS
+
+  As a client
+  I want to put a file
+  So that someone else can have it
+
+  Background:
+    Given the test server is started with TLS
+
+  Scenario: TLS
+    pending "TLS not supported in active mode (see README)"
+
+  Scenario: TLS, Passive
+    Given a successful login with TLS
+    And the client has file "ascii_unix"
+    And the client is in passive mode
+    When the client successfully puts text "ascii_unix"
+    Then the remote file "ascii_unix" should match the local file

data/features/{quit.feature → ftp_server/quit.feature}

@@ -4,6 +4,9 @@ Feature: Quit
   In order to free up resources
   I want to close the connection
 
+  Background:
+    Given the test server is started
+
   Scenario: Logged in
     Given a successful login
     When the client successfully quits

data/features/ftp_server/step_definitions/debug.rb

@@ -0,0 +1,8 @@
+Then /^the server should have written( no)? debug output$/ do |neg|
+  matcher = if neg
+              be_false
+            else
+              be_true
+            end
+  @server.wrote_debug_output?.should matcher
+end

data/features/ftp_server/step_definitions/test_server.rb

@@ -0,0 +1,12 @@
+Given /^the test server is started$/ do
+  @server = TestServer.new(:tls => :off)
+end
+
+Given /^the test server is started with TLS$/ do
+  @server = TestServer.new(:tls => :explicit)
+end
+
+Given /^the test server is started with debug$/ do
+  @server = TestServer.new(:tls => :off,
+                           :debug => true)
+end

data/features/{syntax_errors.feature → ftp_server/syntax_errors.feature}

@@ -4,6 +4,9 @@ Feature: Syntax Errors
   I want good error messages
   So that I can figure out what went wrong
 
+  Background:
+    Given the test server is started
+
   Scenario: Empty command
     Given a successful connection
     When the client sends an empty command

data/features/ftp_server/type.feature

@@ -0,0 +1,56 @@
+Feature: Representation Type
+
+  As a client
+  I want to set the representation type
+  So that I can interoperate with foreign operating systems
+
+  Background:
+    Given the test server is started
+
+  Scenario: Type ASCII
+    Given a successful login
+    Then the client successfully sets type "A"
+
+  Scenario: Type IMAGE
+    Given a successful login
+    Then the client successfully sets type "I"
+
+  Scenario: Type EBCDIC
+    Given a successful login
+    When the client sets type "E"
+    Then the server returns a type not implemented error
+
+  Scenario: Type Local
+    Given a successful login
+    When the client sets type "L 7"
+    Then the server returns a type not implemented error
+
+  Scenario: Invalid Type
+    Given a successful login
+    When the client sets type "*"
+    Then the server returns an invalid type error
+
+  Scenario: Format Telnet
+    Given a successful login
+    When the client sets type "A T"
+    Then the server returns a format not implemented error
+
+  Scenario: Format Carriage Control
+    Given a successful login
+    When the client sets type "A C"
+    Then the server returns a format not implemented error
+
+  Scenario: Invalid Format
+    Given a successful login
+    When the client sets type "A *"
+    Then the server returns an invalid format error
+
+  Scenario: Not logged in
+    Given a successful connection
+    When the client sets type "S"
+    Then the server returns a not logged in error
+
+  Scenario: Missing parameter
+    Given a successful login
+    When the client sets type with no parameter
+    Then the server returns a syntax error

data/features/step_definitions/error.rb

@@ -10,16 +10,19 @@ Then /^the server returns no error$/ do
 end
 
 Then /^the server returns a "(.*?)" error$/ do |error_message|
-  @error.should include error_message
+  (@error || '').should include error_message
 end
 
 Then /^the server returns a no such file error$/ do
   step 'the server returns a "550 No such file or directory" error'
 end
 
+Then /^the server returns a not a directory error$/ do
+  step 'the server returns a "550 Not a directory" error'
+end
+
 Then /^the server returns a login incorrect error$/ do
   step 'the server returns a "530 Login incorrect" error'
-
 end
 
 Then /^the server returns a not logged in error$/ do
@@ -35,7 +38,7 @@ Then /^the server returns a path required error$/ do
 end
 
 Then /^the server returns a not found error$/ do
-  step 'the server returns a "450 No such file or directory" error'
+  step 'the server returns a "550 No such file or directory" error'
 end
 
 Then /^the server returns a syntax error$/ do
@@ -85,3 +88,7 @@ end
 Then /^the server returns an unimplemented command error$/ do
   step 'the server returns a "502 Command not implemented" error'
 end
+
+Then /^the server returns an action not taken error$/ do
+  step 'the server returns a "450 Unable to do it" error'
+end

data/features/step_definitions/list.rb

@@ -18,17 +18,30 @@ class FileList
     !long_form?
   end
 
+  def empty?
+    @lines.empty?
+  end
+
+end
+
+When /^the client successfully lists the directory(?: "(.*?)")?$/ do |directory|
+  @list = FileList.new(@client.ls(*[directory].compact))
 end
 
-When /^the client lists the directory(?: "(.*?)")?$/ do |directory|
+When /^the client lists the directory( "(?:.*?)")?$/ do |directory|
   capture_error do
-    @list = FileList.new(@client.ls(*[directory].compact))
+    step "the client successfully lists the directory#{directory}"
   end
 end
 
-When /^the client name lists the directory(?: "(.*?)")?$/ do |directory|
+When /^the client successfully name-lists the directory(?: "(.*?)")?$/ do
+|directory|
+  @list = FileList.new(@client.nlst(*[directory].compact))
+end
+
+When /^the client name-lists the directory( "(?:.*?)")?$/ do |directory|
   capture_error do
-    @list = FileList.new(@client.nlst(*[directory].compact))
+    step "the client successfully name-lists the directory#{directory}"
   end
 end
 
@@ -44,3 +57,7 @@ end
 Then /^the file list should be in (long|short) form$/ do |form|
   @list.should send("be_#{form}_form")
 end
+
+Then /^the file list should be empty$/ do
+  @list.should be_empty
+end

data/features/step_definitions/login.rb

@@ -10,7 +10,6 @@ def login(user, password, client_name = nil)
 end
 
 Given /^a successful connection( with TLS)?$/ do |with_tls|
-  step 'the server is started'
   step "the client connects#{with_tls}"
 end
 
@@ -25,7 +24,6 @@ Given /^the( \w+)? client connects and logs in$/ do |client_name|
 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

data/features/step_definitions/server_files.rb

@@ -1,3 +1,7 @@
+Given /^the server has directory "(.*?)"$/ do |remote_path|
+  @server.add_directory remote_path
+end
+
 Given /^the server has file "(.*?)"$/ do |remote_path|
   @server.add_file remote_path
 end

data/features/step_definitions/stop_server.rb

@@ -0,0 +1,3 @@
+After do
+  @server.stop if @server
+end

data/features/support/example_server.rb

@@ -0,0 +1,58 @@
+require 'fileutils'
+require 'forwardable'
+require File.expand_path('test_server_files',
+                         File.dirname(__FILE__))
+
+class ExampleServer
+
+  extend Forwardable
+  include FileUtils
+  include TestServerFiles
+
+  def initialize
+    command = [
+      File.expand_path('../../examples/example.rb',
+                       File.dirname(__FILE__))
+    ].join(' ')
+    @io = IO.popen(command, 'r+')
+    @output = read_output
+  end
+
+  def stop 
+    @io.close
+  end
+
+  def host
+    @output[/Host: (.*)$/, 1]
+  end
+
+  def port
+    @output[/Port: (.*)$/, 1].to_i
+  end
+
+  def user
+    @output[/User: (.*)$/, 1]
+  end
+
+  def password
+    @output[/Pass: (.*)$/, 1]
+  end
+
+  private
+
+  def read_output
+    output = ''
+    loop do
+      line = @io.gets
+      break if line.nil?
+      output << line
+      break if line =~ /FTP server started/
+    end
+    output
+  end
+
+  def temp_dir
+    @output[/Directory: (.*)$/, 1]
+  end
+
+end