testftpd 0.1.4 → 0.1.5

data/lib/testftpd.rb

@@ -1,5 +1,6 @@
 require_relative 'testftpd/file_system_provider'
 require_relative 'testftpd/server'
+require_relative 'testftpd/server_builder'
 
 module TestFtpd
 

data/lib/testftpd/server_builder.rb

@@ -0,0 +1,32 @@
+require_relative 'server'
+
+module TestFtpd
+
+  class ServerBuilder
+
+    DEFAULT_PORT_RANGE = (21212..21232).to_a
+
+    def self.build(config, ports)
+      new.build(config, ports)
+    end
+
+    def build(config, ports = DEFAULT_PORT_RANGE)
+      @server = nil
+      ports.each do |port|
+        attempt_to_build config.merge(port: port)
+        break if @server
+      end
+      @server
+    end
+
+    private
+
+    def attempt_to_build(options)
+      @server = Server.new(options)
+    rescue Errno::EADDRINUSE
+      nil
+    end
+
+  end
+
+end

data/lib/testftpd/version.rb

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

data/spec/integration/test_ftp_spec.rb

@@ -17,7 +17,6 @@ describe TestFtpd do
 
   before do
     subject.start
-    copy_ftproot(ftp_root)
   end
 
   after do
@@ -27,6 +26,7 @@ describe TestFtpd do
 
   context 'before authenticating' do
     before :each do
+      copy_ftproot(ftp_root)
       @ftp = Net::FTP.new
       @ftp.connect('127.0.0.1', ftp_port)
     end
@@ -42,6 +42,7 @@ describe TestFtpd do
 
   context 'after authenticating' do
     before :each do
+      copy_ftproot(ftp_root)
       @ftp = Net::FTP.new
       @ftp.connect('127.0.0.1', ftp_port)
       @ftp.login('username', 'password')

data/spec/unit/testftpd/server_builder_spec.rb

@@ -0,0 +1,30 @@
+require 'spec_helper'
+
+require 'testftpd'
+
+describe TestFtpd::ServerBuilder do
+
+  let(:ftp_ports) { (21212..21232).to_a }
+  let(:ftp_options) { { root_dir: APP_PATH } }
+
+  subject { TestFtpd::ServerBuilder }
+
+  describe '#build' do
+    context 'when a port is in use' do
+      before(:each) do
+        @dummy_server = TCPServer.new('', ftp_ports.first)
+      end
+      after(:each) do
+        @dummy_server.close
+        @server.shutdown
+      end
+
+      it 'builds a server on the next available port' do
+        @server = subject.build(ftp_options, ftp_ports)
+        expect( @server ).to be_an_instance_of TestFtpd::Server
+        expect( @server.config[:port] ).to eq ftp_ports[1]
+      end
+    end
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: testftpd
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-15 00:00:00.000000000 Z
+date: 2013-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -86,6 +86,7 @@ extra_rdoc_files: []
 files:
 - lib/testftpd/file_system_provider.rb
 - lib/testftpd/server.rb
+- lib/testftpd/server_builder.rb
 - lib/testftpd/version.rb
 - lib/testftpd.rb
 - vendor/dyn-ftp-serv/CHANGELOG
@@ -101,6 +102,7 @@ files:
 - spec/fixtures/test_file_to_upload
 - spec/integration/test_ftp_spec.rb
 - spec/spec_helper.rb
+- spec/unit/testftpd/server_builder_spec.rb
 - spec/unit/testftpd/server_spec.rb
 homepage: https://github.com/christian-schulze/testftpd
 licenses: []
@@ -135,4 +137,5 @@ test_files:
 - spec/fixtures/test_file_to_upload
 - spec/integration/test_ftp_spec.rb
 - spec/spec_helper.rb
+- spec/unit/testftpd/server_builder_spec.rb
 - spec/unit/testftpd/server_spec.rb