ftpd 0.14.0 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2602b3cd4cd61682d02f3467f93a720ad7bbcd88
-  data.tar.gz: 4f321e26b94a6929432c1824ecd9330f189b4c19
+  metadata.gz: aa59afb98dd26875b646c6f8a3550d337505ab80
+  data.tar.gz: d29d3bc6c44189ee226694d613621c5e2febbd63
 SHA512:
-  metadata.gz: 0ff32a1f439d0b14d159a99dd10b79763c34912f4e9ff1b531851c205dbaf54f4bcea18893ae04b0016adc7ca23ce61211612f4d061e1fc246fe4e8cda6e5b36
-  data.tar.gz: b615abaef9b4d803e0378331c1d3a24332157da882256f3c19cb6ea5fb98145b312667f2ed8e98564de751ec931a3f30ef7fc822602ae26e4e6079aa71b5a0a3
+  metadata.gz: 344986d4b6cee9e0f6880f3a101c6ff56029e3a165ac70bfc302ac7eedfc5068a32f23055d960f42a4ca8504b9dec3014697fb668fc1233abcbb888a53c5e398
+  data.tar.gz: d9e739f8960d52383b39351b3f72f510dc05e85b14504f8aaccb45732b6d9683dab7cb5c3c06f7e76e99d6842099d2ede7fc7c6fade379f9270dd8cc4f81da94

data/Changelog.md

@@ -2,6 +2,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.
 
+Bug fixes
+
+* Ignore Errno::ENOTCONN on socket shutdown (issue #24)	
+
+Administration
+
+* Remove examples/foo.rb (accidental commit)
+
 ### 0.14.0
 
 Administration

data/VERSION

@@ -1 +1 @@
-0.14.0
+0.15.0

data/ftpd.gemspec

@@ -2,16 +2,15 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: ftpd 0.14.0 ruby lib
+# stub: ftpd 0.15.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "ftpd"
-  s.version = "0.14.0"
+  s.version = "0.15.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-05-11"
+  s.date = "2014-05-14"
   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 = [
@@ -33,7 +32,6 @@ Gem::Specification.new do |s|
     "doc/rfc-compliance.md",
     "examples/example.rb",
     "examples/example_spec.rb",
-    "examples/foo.rb",
     "examples/hello_world.rb",
     "features/example/eplf.feature",
     "features/example/example.feature",
@@ -239,7 +237,8 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/wconrad/ftpd"
   s.licenses = ["MIT"]
-  s.rubygems_version = "2.2.2"
+  s.require_paths = ["lib"]
+  s.rubygems_version = "2.1.11"
   s.summary = "Pure Ruby FTP server library"
 
   if s.respond_to? :specification_version then

data/lib/ftpd/server.rb

@@ -50,7 +50,10 @@ module Ftpd
 
     def stop
       @stopping = true
-      @server_socket.shutdown
+      begin
+        @server_socket.shutdown
+      rescue Errno::ENOTCONN
+      end
       @server_socket.close
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ftpd
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.15.0
 platform: ruby
 authors:
 - Wayne Conrad
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-11 00:00:00.000000000 Z
+date: 2014-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: memoizer
@@ -160,7 +160,6 @@ files:
 - doc/rfc-compliance.md
 - examples/example.rb
 - examples/example_spec.rb
-- examples/foo.rb
 - examples/hello_world.rb
 - features/example/eplf.feature
 - features/example/example.feature
@@ -383,7 +382,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Pure Ruby FTP server library

data/examples/foo.rb

@@ -1,114 +0,0 @@
-#!/usr/bin/env ruby
-
-unless $:.include?(File.dirname(__FILE__) + '/../lib')
-  $:.unshift(File.dirname(__FILE__) + '/../lib')
-end
-
-require 'socket'
-require 'thread'
-require 'tmpdir'
-
-def show(s)
-  return
-  print s + "\n"
-end
-
-class Server
-
-  attr_accessor :port
-
-  def initialize
-    @interface = '127.0.0.1'
-    @port = 0
-    @stopping = false
-    @start_queue = Queue.new
-    @stop_queue = Queue.new
-  end
-
-  def start
-    show 's #start'
-    @server_socket = make_server_socket
-    @server_thread = make_server_thread
-    show 's waiting for start'
-    show "s #{@start_queue.deq}"
-  end
-
-  def stop
-    show 's #stop'
-    @stopping = true
-    @server_socket.shutdown
-#    @server_socket.close
-    show 's joining on thread'
-#    @thread.join
-    # show 's waiting for stop'
-    # show "s #{@stop_queue.deq}"
-  end
-
-  private
-
-  def make_server_socket
-    return TCPServer.new(@interface, @port)
-  end
-
-  def make_server_thread
-    @thread = Thread.new do
-      show 't started'
-      Thread.abort_on_exception = false
-      begin
-        @start_queue.enq 'started'
-        server_thread
-      rescue Exception
-        show 't exception'
-        @stop_queue.enq 'stopping'
-        raise
-      else
-        show 't no exception'
-        @stop_queue.enq 'stopping'
-      end
-    end
-  end
-
-  def server_thread
-    loop do
-      begin
-        begin
-          show 't waiting for bind'
-          @server_socket.accept
-          show 't bound'
-        rescue Errno::EBADF, Errno::EINVAL => e
-          show "t #{e}"
-          raise unless @stopping
-          break
-        end
-      rescue IOError
-        show 't IOError'
-        break
-      end
-    end
-    show 't done'
-  end
-
-  def accept
-  end
-
-end
-
-Dir.mktmpdir do |temp_dir|
-  i = 0
-  loop do
-    i += 1
-    begin
-      if i % 1000 == 0
-        print '.'
-        $stdout.flush
-      end
-      server = Server.new
-      server.port = 10000
-      server.start
-      server.stop
-    rescue Errno::EADDRINUSE
-      puts i
-      raise
-    end
-  end
-end