ftpd 0.7.0 → 0.7.1

data/Changelog.md

@@ -1,3 +1,14 @@
+This is the change log for the main branch of ftpd, which supports
+Ruby 1.9 and greater.  For ruby 1.8.7, please use the latest version
+before 0.8.0.
+
+### 0.8.0
+
+Administration
+
+* Split Ruby 1.8 into separate branch
+* Upgraded gems
+
 ### 0.7.0
 
 Bug fixes

data/Gemfile

@@ -4,8 +4,8 @@ gem 'memoizer', '~> 1.0.1'
 
 group :development do
   gem 'cucumber'
-  gem 'double-bag-ftps', :git => 'git@github.com:wconrad/double-bag-ftps.git'
-  gem 'jeweler'
+  gem 'double-bag-ftps'
+  gem 'jeweler', '1.8.4'
   gem 'rake'
   gem 'redcarpet'
   gem 'rspec'

data/Gemfile.lock

@@ -1,51 +1,49 @@
-GIT
-  remote: git@github.com:wconrad/double-bag-ftps.git
-  revision: c546429689618e1757bb2dfe1fa35a386e7aebb2
-  specs:
-    double-bag-ftps (0.1.0)
-
 GEM
   remote: http://rubygems.org/
   specs:
-    builder (3.2.0)
-    cucumber (1.2.1)
+    builder (3.2.2)
+    cucumber (1.3.8)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.3)
-      gherkin (~> 2.11.0)
-      json (>= 1.4.6)
-    diff-lcs (1.2.1)
-    gherkin (2.11.6)
-      json (>= 1.7.6)
+      gherkin (~> 2.12.1)
+      multi_json (>= 1.7.5, < 2.0)
+      multi_test (>= 0.0.2)
+    diff-lcs (1.2.4)
+    double-bag-ftps (0.1.1)
+    gherkin (2.12.1)
+      multi_json (~> 1.3)
     git (1.2.5)
     jeweler (1.8.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
       rdoc
-    json (1.7.7)
+    json (1.8.0)
     memoizer (1.0.1)
-    rake (10.0.3)
+    multi_json (1.8.0)
+    multi_test (0.0.2)
+    rake (10.1.0)
     rdoc (4.0.0)
       json (~> 1.4)
-    redcarpet (2.2.2)
-    rspec (2.13.0)
-      rspec-core (~> 2.13.0)
-      rspec-expectations (~> 2.13.0)
-      rspec-mocks (~> 2.13.0)
-    rspec-core (2.13.0)
-    rspec-expectations (2.13.0)
+    redcarpet (3.0.0)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.5)
+    rspec-expectations (2.14.2)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.13.0)
-    timecop (0.5.9.2)
-    yard (0.8.5.2)
+    rspec-mocks (2.14.3)
+    timecop (0.6.3)
+    yard (0.8.7.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   cucumber
-  double-bag-ftps!
-  jeweler
+  double-bag-ftps
+  jeweler (= 1.8.4)
   memoizer (~> 1.0.1)
   rake
   redcarpet

data/README.md

@@ -212,8 +212,8 @@ And register your class with the ftp_server before starting it:
 
 ### Logging
 
-Ftpd can write to an instance of {Logger} that you provide.  To log to
-standard out:
+Ftpd can write to an instance of
+{http://www.ruby-doc.org/stdlib-2.0.0/libdoc/logger/rdoc/Logger.html Logger} that you provide.  To log to standard out:
 
     server.log = Logger.new($stdout)
 
@@ -247,6 +247,10 @@ The tests pass with these Rubies:
 * ruby-1.9.3-p392
 * ruby-2.0.0-p0
 
+For Ruby 1.8, use an ftpd version before 0.8.  In your Gemfile:
+
+    gem 'ftpd', '<0.8'
+
 ## Development
 
 ### Tests

data/VERSION

@@ -1 +1 @@
-0.7.0
+0.8.0

data/ftpd.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "ftpd"
-  s.version = "0.7.0"
+  s.version = "0.7.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wayne Conrad"]
-  s.date = "2013-04-10"
+  s.date = "2013-09-15"
   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 = [
@@ -185,32 +185,32 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<memoizer>, ["~> 1.0.1"])
       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<jeweler>, ["= 1.8.4"])
       s.add_development_dependency(%q<rake>, [">= 0"])
-      s.add_development_dependency(%q<redcarpet>, [">= 0"])
+      s.add_development_dependency(%q<redcarpet>, ["< 3"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
-      s.add_development_dependency(%q<timecop>, [">= 0"])
+      s.add_development_dependency(%q<timecop>, ["< 0.6.2.2"])
       s.add_development_dependency(%q<yard>, [">= 0"])
     else
       s.add_dependency(%q<memoizer>, ["~> 1.0.1"])
       s.add_dependency(%q<cucumber>, [">= 0"])
       s.add_dependency(%q<double-bag-ftps>, [">= 0"])
-      s.add_dependency(%q<jeweler>, [">= 0"])
+      s.add_dependency(%q<jeweler>, ["= 1.8.4"])
       s.add_dependency(%q<rake>, [">= 0"])
-      s.add_dependency(%q<redcarpet>, [">= 0"])
+      s.add_dependency(%q<redcarpet>, ["< 3"])
       s.add_dependency(%q<rspec>, [">= 0"])
-      s.add_dependency(%q<timecop>, [">= 0"])
+      s.add_dependency(%q<timecop>, ["< 0.6.2.2"])
       s.add_dependency(%q<yard>, [">= 0"])
     end
   else
     s.add_dependency(%q<memoizer>, ["~> 1.0.1"])
     s.add_dependency(%q<cucumber>, [">= 0"])
     s.add_dependency(%q<double-bag-ftps>, [">= 0"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
+    s.add_dependency(%q<jeweler>, ["= 1.8.4"])
     s.add_dependency(%q<rake>, [">= 0"])
-    s.add_dependency(%q<redcarpet>, [">= 0"])
+    s.add_dependency(%q<redcarpet>, ["< 3"])
     s.add_dependency(%q<rspec>, [">= 0"])
-    s.add_dependency(%q<timecop>, [">= 0"])
+    s.add_dependency(%q<timecop>, ["< 0.6.2.2"])
     s.add_dependency(%q<yard>, [">= 0"])
   end
 end

data/spec/connection_throttle_spec.rb

@@ -4,11 +4,11 @@ module Ftpd
 
   describe ConnectionThrottle do
 
-    let(:socket) {mock TCPSocket}
+    let(:socket) {double TCPSocket}
     let(:connections) {0}
     let(:connections_for_socket) {0}
     let(:connection_tracker) do
-      mock ConnectionTracker, :connections => connections
+      double ConnectionTracker, :connections => connections
     end
     subject(:connection_throttle) do
       ConnectionThrottle.new(connection_tracker)

data/spec/connection_tracker_spec.rb

@@ -11,7 +11,7 @@ module Ftpd
     # Create a mock socket with the given peer address
 
     def socket_bound_to(source_ip)
-      socket = mock TCPSocket
+      socket = double TCPSocket
       peeraddr = Socket.pack_sockaddr_in(0, source_ip)
       socket.stub :getpeername => peeraddr
       socket

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ftpd
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-10 00:00:00.000000000 Z
+date: 2013-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: memoizer
@@ -64,17 +64,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.8.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.8.4
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -96,17 +96,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - <
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - <
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -128,17 +128,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - <
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.6.2.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - <
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.6.2.2
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -334,7 +334,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1044639
+      hash: 590648335
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: