ftpd 0.17.0 → 1.0.0

data/features/step_definitions/server_title.rb

@@ -4,9 +4,9 @@ Then /^the server returns its title$/ do
 end
 
 Then /^the server returns its name$/ do
-  @response.should include @server.server_name
+  expect(@response).to include @server.server_name
 end
 
 Then /^the server returns its version$/ do
-  @response.should =~ /\b\d+\.\d+\.\d+\b/
+  expect(@response).to match /\b\d+\.\d+\.\d+\b/
 end

data/features/step_definitions/size.rb

@@ -16,5 +16,5 @@ When /^the client gets size with no path$/ do
 end
 
 Then(/^the reported size should be "(.*?)"$/) do |size|
-  @size.should eq size.to_i
+  expect(@size).to eq size.to_i
 end

data/features/step_definitions/success_replies.rb

@@ -1,5 +1,5 @@
 Then /^the server returns a "(.*?)" reply$/ do |reply|
-  @reply.should == reply + "\n"
+  expect(@reply).to eq reply + "\n"
 end
 
 Then /^the server returns a not necessary reply$/ do

data/features/step_definitions/timing.rb

@@ -9,11 +9,11 @@ end
 Then /^it should take at least (\S+) seconds$/ do |s|
   min_elapsed_time = s.to_f
   elapsed_time = Time.now - @start_time
-  elapsed_time.should >= min_elapsed_time
+  expect(elapsed_time).to be >= min_elapsed_time
 end
 
 Then /^it should take less than (\S+) seconds$/ do |s|
   max_elapsed_time = s.to_f
   elapsed_time = Time.now - @start_time
-  elapsed_time.should < max_elapsed_time
+  expect(elapsed_time).to be < max_elapsed_time
 end

data/ftpd.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: ftpd 0.17.0 ruby lib
+# stub: ftpd 1.0.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "ftpd"
-  s.version = "0.17.0"
+  s.version = "1.0.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Wayne Conrad"]
-  s.date = "2014-06-29"
+  s.date = "2014-09-05"
   s.description = "ftpd is a pure Ruby FTP server library.  It supports implicit and explicit TLS, IPV6, passive and active mode, and is unconditionally compliant per RFC-1123.  It can be used as part of a test fixture or embedded in a program."
   s.email = "wconrad@yagni.com"
   s.extra_rdoc_files = [
@@ -245,35 +245,38 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<memoizer>, ["~> 1.0"])
-      s.add_development_dependency(%q<cucumber>, [">= 0"])
-      s.add_development_dependency(%q<double-bag-ftps>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, [">= 0"])
-      s.add_development_dependency(%q<rake>, [">= 0"])
-      s.add_development_dependency(%q<redcarpet>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, [">= 0"])
-      s.add_development_dependency(%q<timecop>, [">= 0"])
-      s.add_development_dependency(%q<yard>, [">= 0"])
+      s.add_development_dependency(%q<cucumber>, ["~> 1.3.16"])
+      s.add_development_dependency(%q<double-bag-ftps>, ["~> 0.1.2"])
+      s.add_development_dependency(%q<jeweler>, ["~> 2.0.1"])
+      s.add_development_dependency(%q<rake>, ["~> 10.3.2"])
+      s.add_development_dependency(%q<redcarpet>, ["~> 3.1.2"])
+      s.add_development_dependency(%q<rspec>, ["~> 3.1.0"])
+      s.add_development_dependency(%q<rspec-its>, ["~> 1.0.1"])
+      s.add_development_dependency(%q<timecop>, ["~> 0.7.1"])
+      s.add_development_dependency(%q<yard>, ["~> 0.8.7.4"])
     else
       s.add_dependency(%q<memoizer>, ["~> 1.0"])
-      s.add_dependency(%q<cucumber>, [">= 0"])
-      s.add_dependency(%q<double-bag-ftps>, [">= 0"])
-      s.add_dependency(%q<jeweler>, [">= 0"])
-      s.add_dependency(%q<rake>, [">= 0"])
-      s.add_dependency(%q<redcarpet>, [">= 0"])
-      s.add_dependency(%q<rspec>, [">= 0"])
-      s.add_dependency(%q<timecop>, [">= 0"])
-      s.add_dependency(%q<yard>, [">= 0"])
+      s.add_dependency(%q<cucumber>, ["~> 1.3.16"])
+      s.add_dependency(%q<double-bag-ftps>, ["~> 0.1.2"])
+      s.add_dependency(%q<jeweler>, ["~> 2.0.1"])
+      s.add_dependency(%q<rake>, ["~> 10.3.2"])
+      s.add_dependency(%q<redcarpet>, ["~> 3.1.2"])
+      s.add_dependency(%q<rspec>, ["~> 3.1.0"])
+      s.add_dependency(%q<rspec-its>, ["~> 1.0.1"])
+      s.add_dependency(%q<timecop>, ["~> 0.7.1"])
+      s.add_dependency(%q<yard>, ["~> 0.8.7.4"])
     end
   else
     s.add_dependency(%q<memoizer>, ["~> 1.0"])
-    s.add_dependency(%q<cucumber>, [">= 0"])
-    s.add_dependency(%q<double-bag-ftps>, [">= 0"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
-    s.add_dependency(%q<rake>, [">= 0"])
-    s.add_dependency(%q<redcarpet>, [">= 0"])
-    s.add_dependency(%q<rspec>, [">= 0"])
-    s.add_dependency(%q<timecop>, [">= 0"])
-    s.add_dependency(%q<yard>, [">= 0"])
+    s.add_dependency(%q<cucumber>, ["~> 1.3.16"])
+    s.add_dependency(%q<double-bag-ftps>, ["~> 0.1.2"])
+    s.add_dependency(%q<jeweler>, ["~> 2.0.1"])
+    s.add_dependency(%q<rake>, ["~> 10.3.2"])
+    s.add_dependency(%q<redcarpet>, ["~> 3.1.2"])
+    s.add_dependency(%q<rspec>, ["~> 3.1.0"])
+    s.add_dependency(%q<rspec-its>, ["~> 1.0.1"])
+    s.add_dependency(%q<timecop>, ["~> 0.7.1"])
+    s.add_dependency(%q<yard>, ["~> 0.8.7.4"])
   end
 end
 

data/spec/connection_throttle_spec.rb

@@ -15,13 +15,16 @@ module Ftpd
     end
 
     before(:each) do
-      connection_tracker.stub(:connections => connections)
-      connection_tracker.stub(:connections_for).with(socket).and_return(connections_for_socket)
+      allow(connection_tracker).to receive(:connections)
+      .and_return(connections)
+      allow(connection_tracker).to receive(:connections_for)
+      .with(socket)
+      .and_return(connections_for_socket)
     end
 
     it 'should have defaults' do
-      connection_throttle.max_connections.should be_nil
-      connection_throttle.max_connections_per_ip.should be_nil
+      expect(connection_throttle.max_connections).to be_nil
+      expect(connection_throttle.max_connections_per_ip).to be_nil
     end
 
     describe '#allow?' do
@@ -37,17 +40,17 @@ module Ftpd
 
         context 'almost at maximum connections' do
           let(:connections) {max_connections - 1}
-          specify {connection_throttle.allow?(socket).should be_true}
+          specify {expect(connection_throttle.allow?(socket)).to be_truthy}
         end
 
         context 'at maximum connections' do
           let(:connections) {max_connections}
-          specify {connection_throttle.allow?(socket).should be_false}
+          specify {expect(connection_throttle.allow?(socket)).to be_falsey}
         end
 
         context 'above maximum connections' do
           let(:connections) {max_connections + 1}
-          specify {connection_throttle.allow?(socket).should be_false}
+          specify {expect(connection_throttle.allow?(socket)).to be_falsey}
         end
 
       end
@@ -63,17 +66,17 @@ module Ftpd
 
         context 'almost at maximum connections for ip' do
           let(:connections_for_socket) {max_connections_per_ip - 1}
-          specify {connection_throttle.allow?(socket).should be_true}
+          specify {expect(connection_throttle.allow?(socket)).to be_truthy}
         end
 
         context 'at maximum connections for ip' do
           let(:connections_for_socket) {max_connections_per_ip}
-          specify {connection_throttle.allow?(socket).should be_false}
+          specify {expect(connection_throttle.allow?(socket)).to be_falsey}
         end
 
         context 'above maximum connections for ip' do
           let(:connections_for_socket) {max_connections_per_ip + 1}
-          specify {connection_throttle.allow?(socket).should be_false}
+          specify {expect(connection_throttle.allow?(socket)).to be_falsey}
         end
 
       end
@@ -86,7 +89,7 @@ module Ftpd
 
       it 'should send a "too many connections" message' do
         connection_throttle.deny socket
-        socket.string.should == "421 Too many connections\r\n"
+        expect(socket.string).to eq "421 Too many connections\r\n"
       end
 
     end

data/spec/connection_tracker_spec.rb

@@ -13,7 +13,7 @@ module Ftpd
     def socket_bound_to(source_ip)
       socket = double TCPSocket
       peeraddr = Socket.pack_sockaddr_in(0, source_ip)
-      socket.stub :getpeername => peeraddr
+      allow(socket).to receive(:getpeername) {peeraddr}
       socket
     end
 
@@ -23,6 +23,11 @@ module Ftpd
 
     class Connector
 
+      # Enable the rspec expect syntax in this class.
+      # This uses an internal API of rspec-mock.
+      # See: http://stackoverflow.com/q/25692786/238886
+      RSpec::Mocks::Syntax.enable_expect self
+
       def initialize(connection_tracker)
         @connection_tracker = connection_tracker
         @tracked = Queue.new
@@ -39,7 +44,8 @@ module Ftpd
             @tracked.enq :go
             command = @end_session.deq
             if command == :close
-              socket.stub(:getpeername).and_raise(RuntimeError, "Socket closed")
+              allow(socket).to receive(:getpeername)
+              .and_raise(RuntimeError, "Socket closed")
             end
           end
           @session_ended.enq :go
@@ -67,11 +73,11 @@ module Ftpd
       context '(session ends normally)' do
 
         it 'should track the total number of connection' do
-          connection_tracker.connections.should == 0
+          expect(connection_tracker.connections).to eq 0
           connector.start_session socket
-          connection_tracker.connections.should == 1
+          expect(connection_tracker.connections).to eq 1
           connector.end_session
-          connection_tracker.connections.should == 0
+          expect(connection_tracker.connections).to eq 0
         end
 
       end
@@ -79,11 +85,11 @@ module Ftpd
       context '(socket disconnected during session)' do
 
         it 'should track the total number of connection' do
-          connection_tracker.connections.should == 0
+          expect(connection_tracker.connections).to eq 0
           connector.start_session socket
-          connection_tracker.connections.should == 1
+          expect(connection_tracker.connections).to eq 1
           connector.end_session :close
-          connection_tracker.connections.should == 0
+          expect(connection_tracker.connections).to eq 0
         end
 
       end
@@ -95,14 +101,14 @@ module Ftpd
       it 'should track the number of connections for an ip' do
         socket1 = socket_bound_to('127.0.0.1')
         socket2 = socket_bound_to('127.0.0.2')
-        connection_tracker.connections_for(socket1).should == 0
-        connection_tracker.connections_for(socket2).should == 0
+        expect(connection_tracker.connections_for(socket1)).to eq 0
+        expect(connection_tracker.connections_for(socket2)).to eq 0
         connector.start_session socket1
-        connection_tracker.connections_for(socket1).should == 1
-        connection_tracker.connections_for(socket2).should == 0
+        expect(connection_tracker.connections_for(socket1)).to eq 1
+        expect(connection_tracker.connections_for(socket2)).to eq 0
         connector.end_session
-        connection_tracker.connections_for(socket1).should == 0
-        connection_tracker.connections_for(socket2).should == 0
+        expect(connection_tracker.connections_for(socket1)).to eq 0
+        expect(connection_tracker.connections_for(socket2)).to eq 0
       end
 
     end
@@ -112,11 +118,11 @@ module Ftpd
       let(:socket) {socket_bound_to('127.0.0.1')}
 
       it 'should forget about an IP that has no connection' do
-        connection_tracker.known_ip_count.should == 0
+        expect(connection_tracker.known_ip_count).to eq 0
         connector.start_session socket
-        connection_tracker.known_ip_count.should == 1
+        expect(connection_tracker.known_ip_count).to eq 1
         connector.end_session
-        connection_tracker.known_ip_count.should == 0
+        expect(connection_tracker.known_ip_count).to eq 0
       end
 
     end

data/spec/disk_file_system_spec.rb

@@ -60,13 +60,13 @@ module Ftpd
 
       context '(within tree)' do
         specify do
-          disk_file_system.accessible?('file').should be_true
+          expect(disk_file_system.accessible?('file')).to be_truthy
         end
       end
 
       context '(outside tree)' do
         specify do
-          disk_file_system.accessible?('../outside').should be_false
+          expect(disk_file_system.accessible?('../outside')).to be_falsey
         end
       end
 
@@ -76,13 +76,13 @@ module Ftpd
 
       context '(exists)' do
         specify do
-          disk_file_system.exists?('file').should be_true
+          expect(disk_file_system.exists?('file')).to be_truthy
         end
       end
 
       context '(does not exist)' do
         specify do
-          disk_file_system.exists?('missing').should be_false
+          expect(disk_file_system.exists?('missing')).to be_falsey
         end
       end
 
@@ -92,13 +92,13 @@ module Ftpd
 
       context '(directory)' do
         specify do
-          disk_file_system.directory?('file').should be_false
+          expect(disk_file_system.directory?('file')).to be_falsey
         end
       end
 
       context '(file)' do
         specify do
-          disk_file_system.directory?('dir').should be_true
+          expect(disk_file_system.directory?('dir')).to be_truthy
         end
       end
 
@@ -109,7 +109,7 @@ module Ftpd
       context '(success)' do
         specify do
           disk_file_system.delete('file')
-          exists?('file').should be_false
+          expect(exists?('file')).to be_falsey
         end
       end
 
@@ -129,8 +129,8 @@ module Ftpd
         let(:path) {'file'}
         specify do
           disk_file_system.read(path) do |file|
-            file.should be_a(IO)
-            file.read.should == canned_contents(path)
+            expect(file).to be_a(IO)
+            expect(file.read).to eq canned_contents(path)
           end
         end
       end
@@ -154,7 +154,7 @@ module Ftpd
         let(:path) {'file_path'}
         specify do
           disk_file_system.write(path, stream)
-          read_file(path).should == contents
+          expect(read_file(path)).to eq contents
         end
       end
 
@@ -177,7 +177,7 @@ module Ftpd
         let(:path) {'file_path'}
         specify do
           disk_file_system.append(path, stream)
-          read_file(path).should == contents
+          expect(read_file(path)).to eq contents
         end
       end
 
@@ -185,7 +185,7 @@ module Ftpd
         let(:path) {'file'}
         specify do
           disk_file_system.append(path, stream)
-          read_file(path).should == canned_contents(path) + contents
+          expect(read_file(path)).to eq canned_contents(path) + contents
         end
       end
 
@@ -205,7 +205,7 @@ module Ftpd
         let(:path) {'another_subdir'}
         specify do
           disk_file_system.mkdir(path)
-          directory?(path).should be_true
+          expect(directory?(path)).to be_truthy
         end
       end
 
@@ -227,8 +227,8 @@ module Ftpd
       context '(success)' do
         specify do
           disk_file_system.rename(from_path, to_path)
-          exists?(from_path).should be_false
-          exists?(to_path).should be_true
+          expect(exists?(from_path)).to be_falsey
+          expect(exists?(to_path)).to be_truthy
         end
       end
 

data/spec/exception_translator_spec.rb

@@ -4,6 +4,7 @@ module Ftpd
   describe ExceptionTranslator do
 
     class FooError < StandardError ; end
+    class BarError < StandardError ; end
 
     subject(:translator) {ExceptionTranslator.new}
     let(:message) {'An error happened'}

data/spec/file_info_spec.rb

@@ -29,12 +29,12 @@ module Ftpd
 
       context '(file)' do
         let(:ftype) {'file'}
-        its(:file?) {should be_true}
+        its(:file?) {should be_truthy}
       end
 
       context '(directory)' do
         let(:ftype) {'directory'}
-        its(:file?) {should be_false}
+        its(:file?) {should be_falsey}
       end
 
     end
@@ -45,12 +45,12 @@ module Ftpd
 
       context '(file)' do
         let(:ftype) {'file'}
-        its(:directory?) {should be_false}
+        its(:directory?) {should be_falsey}
       end
 
       context '(directory)' do
         let(:ftype) {'directory'}
-        its(:directory?) {should be_true}
+        its(:directory?) {should be_truthy}
       end
 
     end

data/spec/list_format/eplf_spec.rb

@@ -16,7 +16,7 @@ module Ftpd
         subject(:formatter) {Eplf.new(file_info)}
 
         it 'should produce EPLF format' do
-          formatter.to_s.should == "+r,s1234,m1362299880\tfoo"
+          expect(formatter.to_s).to eq "+r,s1234,m1362299880\tfoo"
         end
 
       end
@@ -33,7 +33,7 @@ module Ftpd
         subject(:formatter) {Eplf.new(file_info)}
 
         it 'should produce EPLF format' do
-          formatter.to_s.should == "+/,m1362299880\tfoo"
+          expect(formatter.to_s).to eq "+/,m1362299880\tfoo"
         end
 
       end
@@ -51,8 +51,7 @@ module Ftpd
         subject(:formatter) {Eplf.new(file_info)}
 
         it 'should produce EPLF format' do
-          formatter.to_s.should ==
-            "+r,s1234,m1362299880,i1234.5678\tfoo"
+          expect(formatter.to_s).to eq "+r,s1234,m1362299880,i1234.5678\tfoo"
         end
 
       end