ftpd 0.6.0 → 0.7.0

data/Changelog.md

@@ -1,3 +1,10 @@
+### 0.7.0
+
+Bug fixes
+
+* Gracefully handle Errno::ENOTCONN during socket shutdown (fixes
+  gh-1)
+
 ### 0.6.0
 
 Enhancements

data/Gemfile.lock

@@ -1,6 +1,6 @@
 GIT
   remote: git@github.com:wconrad/double-bag-ftps.git
-  revision: 043ba70309ed622302d3aa5c6f3169872d1211ca
+  revision: c546429689618e1757bb2dfe1fa35a386e7aebb2
   specs:
     double-bag-ftps (0.1.0)
 

data/VERSION

@@ -1 +1 @@
-0.6.0
+0.7.0

data/features/ftp_server/get_tls.feature

@@ -8,10 +8,14 @@ Feature: Get TLS
     Given the test server has TLS mode "explicit"
     And the test server is started
 
-  Scenario: TLS
-    pending "TLS not supported in active mode (see README)"
+  Scenario: Active
+    Given a successful login with explicit TLS
+    And the server has file "ascii_unix"
+    And the client is in active mode
+    When the client successfully gets text "ascii_unix"
+    Then the local file "ascii_unix" should match the remote file
 
-  Scenario: TLS, Passive
+  Scenario: Passive
     Given a successful login with explicit TLS
     And the server has file "ascii_unix"
     And the client is in passive mode

data/features/ftp_server/implicit_tls.feature

@@ -1,4 +1,4 @@
-Feature: Put TLS
+Feature: Implicit TLS
 
   As a server
   I want to use implicit TLS
@@ -8,10 +8,14 @@ Feature: Put TLS
     Given the test server has TLS mode "implicit"
     And the test server is started
 
-  Scenario: Get
-    pending "TLS not supported in active mode (see README)"
+  Scenario: Active
+    Given a successful login with implicit TLS
+    And the client has file "ascii_unix"
+    And the client is in active mode
+    When the client successfully puts text "ascii_unix"
+    Then the remote file "ascii_unix" should match the local file
 
-  Scenario: Get (passive)
+  Scenario: Passive
     Given a successful login with implicit TLS
     And the client has file "ascii_unix"
     And the client is in passive mode

data/features/ftp_server/list_tls.feature

@@ -8,10 +8,17 @@ Feature: List TLS
     Given the test server has TLS mode "explicit"
     And the test server is started
 
-  Scenario: TLS
-    pending "TLS not supported in active mode (see README)"
+  Scenario: Active
+    Given a successful login with explicit TLS
+    And the server has file "foo"
+    And the server has file "bar"
+    And the client is in active mode
+    When the client successfully lists the directory
+    Then the file list should be in long form
+    And the file list should contain "foo"
+    And the file list should contain "bar"
 
-  Scenario: TLS, Passive
+  Scenario: Passive
     Given a successful login with explicit TLS
     And the server has file "foo"
     And the server has file "bar"

data/features/ftp_server/name_list_tls.feature

@@ -9,10 +9,17 @@ Feature: Name List TLS
     Given the test server has TLS mode "explicit"
     And the test server is started
 
-  Scenario: TLS
-    pending "TLS not supported in active mode (see README)"
+  Scenario: Active
+    Given a successful login with explicit TLS
+    And the server has file "foo"
+    And the server has file "bar"
+    And the client is in active 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"
 
-  Scenario: TLS, Passive
+  Scenario: Passive
     Given a successful login with explicit TLS
     And the server has file "foo"
     And the server has file "bar"

data/features/ftp_server/put_tls.feature

@@ -8,10 +8,14 @@ Feature: Put TLS
     Given the test server has TLS mode "explicit"
     And the test server is started
 
-  Scenario: TLS, Active
-    pending "TLS not supported in active mode (see README)"
+  Scenario: Active
+    Given a successful login with explicit TLS
+    And the client has file "ascii_unix"
+    And the client is in active mode
+    When the client successfully puts text "ascii_unix"
+    Then the remote file "ascii_unix" should match the local file
 
-  Scenario: TLS, Passive
+  Scenario: Passive
     Given a successful login with explicit TLS
     And the client has file "ascii_unix"
     And the client is in passive mode

data/ftpd.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "ftpd"
-  s.version = "0.6.0"
+  s.version = "0.7.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wayne Conrad"]
-  s.date = "2013-03-19"
+  s.date = "2013-04-10"
   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.email = "wconrad@yagni.com"
   s.extra_rdoc_files = [

data/lib/ftpd/server.rb

@@ -109,8 +109,8 @@ module Ftpd
 
     def close_socket(socket)
       if socket.respond_to?(:shutdown)
-        socket.shutdown
-        socket.read
+        socket.shutdown rescue nil
+        socket.read rescue nil
       end
     ensure
       socket.close

data/spec/list_format/eplf_spec.rb

@@ -9,14 +9,14 @@ module Ftpd
         let(:file_info) do
           FileInfo.new(:ftype => 'file',
                        :mode => 0100644,
-                       :mtime => Time.mktime(2013, 3, 3, 8, 38, 0),
+                       :mtime => Time.utc(2013, 3, 3, 8, 38, 0),
                        :path => 'foo',
                        :size => 1234)
         end
         subject(:formatter) {Eplf.new(file_info)}
 
         it 'should produce EPLF format' do
-          formatter.to_s.should == "+r,s1234,m1362325080\tfoo"
+          formatter.to_s.should == "+r,s1234,m1362299880\tfoo"
         end
 
       end
@@ -26,14 +26,14 @@ module Ftpd
         let(:file_info) do
           FileInfo.new(:ftype => 'directory',
                        :mode => 0100644,
-                       :mtime => Time.mktime(2013, 3, 3, 8, 38, 0),
+                       :mtime => Time.utc(2013, 3, 3, 8, 38, 0),
                        :path => 'foo',
                        :size => 1024)
         end
         subject(:formatter) {Eplf.new(file_info)}
 
         it 'should produce EPLF format' do
-          formatter.to_s.should == "+/,m1362325080\tfoo"
+          formatter.to_s.should == "+/,m1362299880\tfoo"
         end
 
       end
@@ -43,7 +43,7 @@ module Ftpd
         let(:file_info) do
           FileInfo.new(:ftype => 'file',
                        :mode => 0100644,
-                       :mtime => Time.mktime(2013, 3, 3, 8, 38, 0),
+                       :mtime => Time.utc(2013, 3, 3, 8, 38, 0),
                        :path => 'foo',
                        :identifier => '1234.5678',
                        :size => 1234)
@@ -52,7 +52,7 @@ module Ftpd
 
         it 'should produce EPLF format' do
           formatter.to_s.should ==
-            "+r,s1234,m1362325080,i1234.5678\tfoo"
+            "+r,s1234,m1362299880,i1234.5678\tfoo"
         end
 
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ftpd
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-19 00:00:00.000000000 Z
+date: 2013-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: memoizer
@@ -334,7 +334,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 371312525
+      hash: -1044639
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: