ftpd 0.16.0 → 0.17.0

data/lib/ftpd/translate_exceptions.rb

@@ -1,6 +1,6 @@
 module Ftpd
 
-  # This module tranlates exceptions to FileSystemError exceptions.
+  # This module translates exceptions to FileSystemError exceptions.
   #
   # A disk file system (such as Ftpd::DiskFileSystem) is expected to
   # raise only FileSystemError exceptions, but many common operations
@@ -40,9 +40,9 @@ module Ftpd
 
       def translate_exceptions(method_name)
         original_method = instance_method(method_name)
-        define_method method_name do |*args|
+        define_method method_name do |*args, &block|
           exception_translator.translate_exceptions do
-            original_method.bind(self).call *args
+            original_method.bind(self).call *args, &block
           end
         end
       end

data/spec/command_sequence_checker_spec.rb

@@ -3,7 +3,9 @@ require File.expand_path('spec_helper', File.dirname(__FILE__))
 module Ftpd
   describe CommandSequenceChecker do
 
-    let(:sequence_error) {[CommandError, '503 Bad sequence of commands']}
+    let(:sequence_error_verification) do
+      lambda {|e| e.code == 503 && e.message == "Bad sequence of commands"}
+    end
     subject(:checker) {CommandSequenceChecker.new}
 
     context 'initial' do
@@ -25,7 +27,7 @@ module Ftpd
       it 'rejects any other command' do
         expect {
           checker.check 'NOOP'
-        }.to raise_error *sequence_error
+        }.to raise_error(FtpServerError, &sequence_error_verification)
       end
 
     end
@@ -49,7 +51,7 @@ module Ftpd
         checker.expect 'PASS'
         expect {
           checker.check 'NOOP'
-        }.to raise_error *sequence_error
+        }.to raise_error(FtpServerError, &sequence_error_verification)
       end
 
       it 'accepts any other command' do
@@ -67,7 +69,7 @@ module Ftpd
       it 'rejects that command if not expected' do
         expect {
           checker.check 'PASS'
-        }.to raise_error *sequence_error
+        }.to raise_error(FtpServerError, &sequence_error_verification)
       end
 
       it 'accepts that command when it is accepted' do

data/spec/disk_file_system_spec.rb

@@ -128,14 +128,17 @@ module Ftpd
       context '(success)' do
         let(:path) {'file'}
         specify do
-          disk_file_system.read(path).should == canned_contents(path)
+          disk_file_system.read(path) do |file|
+            file.should be_a(IO)
+            file.read.should == canned_contents(path)
+          end
         end
       end
 
       context '(error)' do
         specify do
           expect {
-            disk_file_system.read(missing_path)
+            disk_file_system.read(missing_path) {}
           }.to raise_error *missing_file_error
         end
       end
@@ -145,11 +148,12 @@ module Ftpd
     describe '#write' do
 
       let(:contents) {'file contents'}
+      let(:stream)   {Ftpd::Stream.new(StringIO.new(contents), nil)}
 
       context '(success)' do
         let(:path) {'file_path'}
         specify do
-          disk_file_system.write(path, contents)
+          disk_file_system.write(path, stream)
           read_file(path).should == contents
         end
       end
@@ -157,7 +161,7 @@ module Ftpd
       context '(error)' do
         specify do
           expect {
-            disk_file_system.write('dir', contents)
+            disk_file_system.write('dir', stream)
           }.to raise_error *is_a_directory_error
         end
       end
@@ -167,11 +171,12 @@ module Ftpd
     describe '#append' do
 
       let(:contents) {'file contents'}
+      let(:stream)   {Ftpd::Stream.new(StringIO.new(contents), nil)}
 
       context '(destination missing)' do
         let(:path) {'file_path'}
         specify do
-          disk_file_system.append(path, contents)
+          disk_file_system.append(path, stream)
           read_file(path).should == contents
         end
       end
@@ -179,7 +184,7 @@ module Ftpd
       context '(destination exists)' do
         let(:path) {'file'}
         specify do
-          disk_file_system.append(path, contents)
+          disk_file_system.append(path, stream)
           read_file(path).should == canned_contents(path) + contents
         end
       end
@@ -187,7 +192,7 @@ module Ftpd
       context '(error)' do
         specify do
           expect {
-            disk_file_system.append('dir', contents)
+            disk_file_system.append('dir', stream)
           }.to raise_error *is_a_directory_error
         end
       end

data/spec/ftp_server_error_spec.rb

@@ -0,0 +1,13 @@
+require File.expand_path('spec_helper', File.dirname(__FILE__))
+
+module Ftpd
+  describe FtpServerError do
+
+    it "won't instantiate with an invalid error code" do
+      expect { described_class.new("Nooooooooo", 665) }.to(
+        raise_error(ArgumentError, "Invalid response code")
+      )
+    end
+
+  end
+end

metadata

@@ -1,139 +1,139 @@
 --- !ruby/object:Gem::Specification
 name: ftpd
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.17.0
 platform: ruby
 authors:
 - Wayne Conrad
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-19 00:00:00.000000000 Z
+date: 2014-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: memoizer
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: double-bag-ftps
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: ftpd is a pure Ruby FTP server library.  It supports implicit and explicit
@@ -146,8 +146,8 @@ extra_rdoc_files:
 - LICENSE.md
 - README.md
 files:
-- .travis.yml
-- .yardopts
+- ".travis.yml"
+- ".yardopts"
 - Changelog.md
 - Gemfile
 - Gemfile.lock
@@ -268,7 +268,6 @@ files:
 - ftpd.gemspec
 - insecure-test-cert.pem
 - lib/ftpd.rb
-- lib/ftpd/ascii_helper.rb
 - lib/ftpd/auth_levels.rb
 - lib/ftpd/cmd_abor.rb
 - lib/ftpd/cmd_allo.rb
@@ -323,7 +322,6 @@ files:
 - lib/ftpd/exception_translator.rb
 - lib/ftpd/exceptions.rb
 - lib/ftpd/file_info.rb
-- lib/ftpd/file_system_error_translator.rb
 - lib/ftpd/file_system_helper.rb
 - lib/ftpd/ftp_server.rb
 - lib/ftpd/insecure_certificate.rb
@@ -336,6 +334,7 @@ files:
 - lib/ftpd/server.rb
 - lib/ftpd/session.rb
 - lib/ftpd/session_config.rb
+- lib/ftpd/stream.rb
 - lib/ftpd/telnet.rb
 - lib/ftpd/temp_dir.rb
 - lib/ftpd/tls_server.rb
@@ -352,7 +351,7 @@ files:
 - spec/disk_file_system_spec.rb
 - spec/exception_translator_spec.rb
 - spec/file_info_spec.rb
-- spec/file_system_error_translator_spec.rb
+- spec/ftp_server_error_spec.rb
 - spec/list_format/eplf_spec.rb
 - spec/list_format/ls_spec.rb
 - spec/list_path_spec.rb
@@ -372,17 +371,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Pure Ruby FTP server library

data/lib/ftpd/ascii_helper.rb

@@ -1,16 +0,0 @@
-module Ftpd
-
-  module AsciiHelper
-
-    def unix_to_nvt_ascii(s)
-      return s if s =~ /\r\n/
-      s.gsub(/\n/, "\r\n")
-    end
-
-    def nvt_ascii_to_unix(s)
-      s.gsub(/\r\n/, "\n")
-    end
-
-  end
-
-end

data/lib/ftpd/file_system_error_translator.rb

@@ -1,29 +0,0 @@
-module Ftpd
-
-  # A proxy file system driver that sends a "450" or "550" error
-  # reply in response to FileSystemError exceptions.
-
-  class FileSystemErrorTranslator
-
-    include Error
-
-    def initialize(file_system)
-      @file_system = file_system
-    end
-
-    def respond_to?(method)
-      @file_system.respond_to?(method) || super
-    end
-
-    def method_missing(method, *args)
-      @file_system.send(method, *args)
-    rescue PermanentFileSystemError => e
-      permanent_error e
-    rescue TransientFileSystemError => e
-      transient_error e
-    rescue FileSystemError => e
-      permanent_error e
-    end
-
-  end
-end

data/spec/file_system_error_translator_spec.rb

@@ -1,59 +0,0 @@
-require File.expand_path('spec_helper', File.dirname(__FILE__))
-
-module Ftpd
-  describe FileSystemErrorTranslator do
-
-    class MockFileSystem
-
-      def with_error(klass)
-        raise klass, 'An error occurred'
-      end
-
-      def without_error
-        123
-      end
-
-    end
-
-    subject(:translator) do
-      FileSystemErrorTranslator.new(MockFileSystem.new)
-    end
-
-    context 'missing method' do
-      specify do
-        expect {
-          translator.no_such_method
-        }.to raise_error NoMethodError, /no_such_method/
-      end
-    end
-
-    context 'no exception' do
-      its(:without_error) {should == 123}
-    end
-
-    context 'FileSystemError' do
-      specify do
-        expect {
-          translator.with_error(FileSystemError)
-        }.to raise_error CommandError, '550 An error occurred'
-      end
-    end
-
-    context 'PermanentFileSystemError' do
-      specify do
-        expect {
-          translator.with_error(PermanentFileSystemError)
-        }.to raise_error CommandError, '550 An error occurred'
-      end
-    end
-
-    context 'TransientFileSystemError' do
-      specify do
-        expect {
-          translator.with_error(TransientFileSystemError)
-        }.to raise_error CommandError, '450 An error occurred'
-      end
-    end
-
-  end
-end