testftpd 0.1.5 → 0.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 0e253a0ac759c449b1ec10031c41ee07c6b60f08
+  data.tar.gz: b6b319117d53aa64722c75b390859385657ff90e
+SHA512:
+  metadata.gz: 0020a1cd619e2ae2bcbec0ddbf82f614cb16e6b9c3fcecb8fbd725258318d128874817114174d7f60d71ce32660f7f8d365af4978a4c410221d72a2296721132
+  data.tar.gz: ad8dae905f645a4ce70f69b2c562579f0b765d79a6fe0c87ca8f29872208d06ad03e143476fc0e3ed9ff328877005084439ecaa87d3c150849ef880afabefba2

data/lib/testftpd/server.rb

@@ -30,11 +30,12 @@ module TestFtpd
 
     def shutdown(timeout = 2)
       Timeout.timeout(timeout) do
+        if running?
+          @ftp_thread.kill
+          sleep 0.1 while running?
+          @ftp_thread = nil
+        end
         @server.close unless @server.closed?
-        return if @ftp_thread.nil?
-        @ftp_thread.kill
-        sleep 0.1 while running?
-        @ftp_thread = nil
       end
     rescue TimeoutError
       raise TimeoutError.new('TestFtpd::Server timeout before shutdown succeeded.')

data/lib/testftpd/version.rb

@@ -1,3 +1,3 @@
 module TestFtpd
-  VERSION = '0.1.5'
+  VERSION = '0.2.0'
 end

data/spec/unit/testftpd/server_spec.rb

@@ -23,6 +23,13 @@ describe TestFtpd::Server do
   describe '.start(timeout = 2)' do
     it 'raises exception if ftp process does not shutdown within timeout' do
       subject.start
+
+      original_method = subject.method(:running?)
+      subject.stub(:running?) do |*args, &block|
+        sleep 0.1
+        original_method.call
+      end
+
       expect { subject.shutdown(0.01) }.to raise_error(TimeoutError)
     end
   end

data/vendor/dyn-ftp-serv/dynftp_server.rb

@@ -85,8 +85,11 @@ class DynFTPServer
         thread[:socket] = s
         client_loop
       end
+      sleep 0.01
     end
     threads.each {|t| t.join }
+  ensure
+    @server.close unless @server.closed?
   end
   
   private

metadata

@@ -1,52 +1,46 @@
 --- !ruby/object:Gem::Specification
 name: testftpd
 version: !ruby/object:Gem::Version
-  version: 0.1.5
-  prerelease: 
+  version: 0.2.0
 platform: ruby
 authors:
 - Christian Schulze
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-02 00:00:00.000000000 Z
+date: 2013-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 10.0.3
+        version: 10.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 10.0.3
+        version: 10.1.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '2.12'
+        version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '2.12'
+        version: '2.14'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov-rcov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -106,27 +97,26 @@ files:
 - spec/unit/testftpd/server_spec.rb
 homepage: https://github.com/christian-schulze/testftpd
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ~>
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.8.24
 requirements: []
 rubyforge_project: testftpd
-rubygems_version: 1.8.25
+rubygems_version: 2.0.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Simple FTP server written in pure Ruby
 test_files:
 - spec/fixtures/ftproot/subfolder/test_file1