cool.io 1.2.3 → 1.2.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: edacf8d3fa674b299e42ade38405b993f5e89de3
+  data.tar.gz: d4d3745f78319c94a7a8780408bc636036315b67
+SHA512:
+  metadata.gz: 1d870e50cec23dbcd03d8216b42c0b5cebfa4176d2d14b84d8b852478ad632d06464c87c3859c0e5838eeee7a44bceb03f4b79ee151a897b96d49fdbb8b680fc
+  data.tar.gz: 3f4bd75c9720813861d33fec20e26bee7adb421667de536b8d3aa5333372c35cf5c4afa94abb3a0740d412040f0a8dcb2b94d29ad7f81b73a07d4bb503f738e1

data/.travis.yml

@@ -3,8 +3,7 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.0
-  - 2.1.1
+  - 2.1
   - ruby-head
   - rbx
 

data/CHANGES.md

@@ -1,3 +1,10 @@
+1.2.4
+-----
+
+* Fix a bug that #close for unconnected Socket doesn't detach all watchers (#33)
+* Remove 1.8 support code
+* Use standard library instead of own hosts list (#34)
+
 1.2.3
 -----
 

data/README.md

@@ -86,9 +86,6 @@ core socket classes are also provided.  Among these are:
   Cool.io::TCPSocket (or any subclass you wish to provide) whenever an incoming
   connection is received.
 
-* Cool.io::HttpClient - An HTTP/1.1 client with support for chunked encoding
-  and streaming response processing through asynchronous callbacks.
-
 Example Program
 ---------------
 

data/lib/cool.io.rb

@@ -23,10 +23,14 @@ require "cool.io/http_client"
 require "cool.io/dsl"
 
 module Coolio
-  def self.inspect; "Cool.io"; end
+  def self.inspect
+    "Cool.io"
+  end
 end
 
 module Cool
   # Allow Coolio module to be referenced as Cool.io
-  def self.io; Coolio; end
+  def self.io
+    Coolio
+  end
 end

data/lib/cool.io/dns_resolver.rb

@@ -17,6 +17,8 @@
 #
 #++
 
+require 'resolv'
+
 module Coolio
   # A non-blocking DNS resolver.  It provides interfaces for querying both
   # /etc/hosts and nameserves listed in /etc/resolv.conf, or nameservers of
@@ -31,12 +33,6 @@ module Coolio
   # again.
   class DNSResolver < IOWatcher
     #--
-    # TODO check if it's caching right
-    if RUBY_PLATFORM =~ /mingw|win32/
-      HOSTS = 'c:\WINDOWS\system32\drivers\etc\hosts'
-    else
-      HOSTS = '/etc/hosts'
-    end
     DNS_PORT = 53
     DATAGRAM_SIZE = 512
     TIMEOUT = 3 # Retry timeout for each datagram sent
@@ -44,7 +40,7 @@ module Coolio
     # so currently total is 12s before it will err due to timeouts
     # if it errs due to inability to reach the DNS server [Errno::EHOSTUNREACH], same
     # Query /etc/hosts (or the specified hostfile) for the given host
-    def self.hosts(host, hostfile = HOSTS)
+    def self.hosts(host, hostfile = Resolv::Hosts::DefaultFileName)
       hosts = {}
       File.open(hostfile) do |f|
         f.each_line do |host_entry|
@@ -63,7 +59,6 @@ module Coolio
     # use nameservers listed in /etc/resolv.conf
     def initialize(hostname, *nameservers)
       if nameservers.empty?
-        require 'resolv'
         nameservers = Resolv::DNS::Config.default_config_hash[:nameserver]
         raise RuntimeError, "no nameservers found" if nameservers.empty? # TODO just call resolve_failed, not raise [also handle Errno::ENOENT)]
       end

data/lib/cool.io/dsl.rb

@@ -124,11 +124,15 @@ end
 # The Cool module containing all our coolness
 module Cool
   module Coolness
-    def cool; Cool::IOThunk; end
+    def cool
+      Cool::IOThunk
+    end
   end
 
   module IOThunk
-    def self.io; Coolio::DSL; end
+    def self.io
+      Coolio::DSL
+    end
   end
 end
 

data/lib/cool.io/http_client.rb

@@ -111,6 +111,9 @@ module Coolio
     end
   end
 
+  # HttpClient is tested on only CRuby.  AFAIK, there is no HttpClient users.
+  # So HttpClient will not be maintained in the future.
+
   # HTTP client class implemented as a subclass of Coolio::TCPSocket.  Encodes
   # requests and allows streaming consumption of the response.  Response is
   # parsed with a Ragel-generated whitelist parser which supports chunked

data/lib/cool.io/io.rb

@@ -31,25 +31,45 @@ module Coolio
     #
 
     # Attach to the event loop
-    def attach(loop); @_read_watcher.attach loop; schedule_write if !@_write_buffer.empty?; self; end
+    def attach(loop)
+      @_read_watcher.attach(loop)
+      schedule_write if !@_write_buffer.empty?
+      self
+    end
 
     # Detach from the event loop
-    def detach; @_read_watcher.detach; self; end # TODO should these detect write buffers, as well?
+    def detach
+      # TODO should these detect write buffers, as well?
+      @_read_watcher.detach
+      self
+    end
 
     # Enable the watcher
-    def enable; @_read_watcher.enable; self; end
+    def enable
+      @_read_watcher.enable
+      self
+    end
 
     # Disable the watcher
-    def disable; @_read_watcher.disable; self; end
+    def disable
+      @_read_watcher.disable
+      self
+    end
 
     # Is the watcher attached?
-    def attached?; @_read_watcher.attached?; end
+    def attached?
+      @_read_watcher.attached?
+    end
 
     # Is the watcher enabled?
-    def enabled?; @_read_watcher.enabled?; end
+    def enabled?
+      @_read_watcher.enabled?
+    end
 
     # Obtain the event loop associated with this object
-    def evloop; @_read_watcher.evloop; end
+    def evloop
+      @_read_watcher.evloop
+    end
 
     #
     # Callbacks for asynchronous events
@@ -136,7 +156,7 @@ module Coolio
     # Schedule a write to be performed when the IO object becomes writable
     def schedule_write
       return unless @_io # this would mean 'we are still pre DNS here'
-      return unless attached? # this would mean 'currently unattached' -- ie still pre DNS, or just plain not attached, which is ok
+      return unless @_read_watcher.attached? # this would mean 'currently unattached' -- ie still pre DNS, or just plain not attached, which is ok
       begin
         enable_write_watcher
       rescue IOError
@@ -167,8 +187,13 @@ module Coolio
       end
 
       # Configure IOWatcher event callbacks to call the method passed to #initialize
-      def on_readable; @coolio_io.__send__(:on_readable); end
-      def on_writable; @coolio_io.__send__(:on_writable); end
+      def on_readable
+        @coolio_io.__send__(:on_readable)
+      end
+
+      def on_writable
+        @coolio_io.__send__(:on_writable)
+      end
     end
   end
 end

data/lib/cool.io/loop.rb

@@ -15,17 +15,9 @@ end
 
 module Coolio
   class Loop
-    # In Ruby 1.9 we want a Coolio::Loop per thread, but Ruby 1.8 is unithreaded
-    if RUBY_VERSION >= "1.9.0"
-      # Retrieve the default event loop for the current thread
-      def self.default
-        Thread.current._coolio_loop
-      end
-    else
-      # Retrieve the default event loop
-      def self.default
-        @@_coolio_loop ||= Coolio::Loop.new
-      end
+    # Retrieve the default event loop for the current thread
+    def self.default
+      Thread.current._coolio_loop
     end
 
     # Create a new Coolio::Loop

data/lib/cool.io/meta.rb

@@ -11,7 +11,7 @@ module Coolio
     # an event to occur before the current watcher can be used in earnest,
     # such as making an outgoing TCP connection.
     def watcher_delegate(proxy_var)
-      %w{attach detach enable disable}.each do |method|
+      %w{attach attached? detach enable disable}.each do |method|
         module_eval <<-EOD
           def #{method}(*args)
             if defined? #{proxy_var} and #{proxy_var}

data/lib/cool.io/version.rb

@@ -1,5 +1,7 @@
 module Coolio
-  VERSION = "1.2.3"
+  VERSION = "1.2.4"
   
-  def self.version; VERSION; end
+  def self.version
+    VERSION
+  end
 end

data/spec/async_watcher_spec.rb

@@ -2,7 +2,7 @@ require File.expand_path('../spec_helper', __FILE__)
 require 'tempfile'
 require 'fcntl'
 
-describe Cool.io::AsyncWatcher, :env => :win do
+describe Cool.io::AsyncWatcher, :env => :exclude_win do
 
   it "does not signal on spurious wakeups" do
     aw = Cool.io::AsyncWatcher.new

data/spec/spec_helper.rb

@@ -14,6 +14,6 @@ end
 RSpec.configure do |c|
   if RUBY_PLATFORM =~ /mingw|win32/
     $stderr.puts "Skip some specs on Windows"
-    c.filter_run_excluding :env => :win
+    c.filter_run_excluding :env => :exclude_win
   end
 end

data/spec/tcp_server_spec.rb

@@ -106,7 +106,7 @@ ensure
 end
 
 # This test should work on Windows
-describe Coolio::TCPServer, :env => :win do
+describe Coolio::TCPServer do
 
   it '#run' do
     test_run("hello").should == "hello"

data/spec/tcp_socket_spec.rb

@@ -0,0 +1,27 @@
+require File.expand_path('../spec_helper', __FILE__)
+
+describe Coolio::TCPSocket do
+
+  before :each do
+    @server = TCPServer.new('127.0.0.1', 0)
+    @host = @server.addr[3]
+    @port = @server.addr[1]
+  end
+
+  after :each do
+    @server.close
+  end
+
+  describe '#close' do
+
+    it 'detaches all watchers on #close before loop#run' do
+      reactor = Coolio::Loop.new
+      client = Coolio::TCPSocket.connect(@host, @port)
+      reactor.attach(client)
+      client.close
+      reactor.watchers.size.should == 0
+    end
+  end
+
+end
+

data/spec/unix_listener_spec.rb

@@ -1,7 +1,7 @@
 require File.expand_path('../spec_helper', __FILE__)
 require 'tempfile'
 
-describe Cool.io::UNIXListener, :env => :win do
+describe Cool.io::UNIXListener, :env => :exclude_win do
 
   before :each do
     @tmp = Tempfile.new('coolio_unix_listener_spec')

data/spec/unix_server_spec.rb

@@ -1,7 +1,7 @@
 require File.expand_path('../spec_helper', __FILE__)
 require 'tempfile'
 
-describe Cool.io::UNIXServer, :env => :win do
+describe Cool.io::UNIXServer, :env => :exclude_win do
 
   before :each do
     @tmp = Tempfile.new('coolio_unix_server_spec')

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cool.io
 version: !ruby/object:Gem::Version
-  version: 1.2.3
-  prerelease: 
+  version: 1.2.4
 platform: ruby
 authors:
 - Tony Arcieri
@@ -10,54 +9,48 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-25 00:00:00.000000000 Z
+date: 2014-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.13.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.13.0
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.6.0
 description: Cool.io provides a high performance event framework for Ruby which uses
@@ -72,9 +65,9 @@ extensions:
 - ext/iobuffer/extconf.rb
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - CHANGES.md
 - Gemfile
 - LICENSE
@@ -149,38 +142,32 @@ files:
 - spec/spec_helper.rb
 - spec/stat_watcher_spec.rb
 - spec/tcp_server_spec.rb
+- spec/tcp_socket_spec.rb
 - spec/timer_watcher_spec.rb
 - spec/unix_listener_spec.rb
 - spec/unix_server_spec.rb
 homepage: http://coolio.github.com
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2054079521512211321
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2054079521512211321
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A cool framework for doing high performance I/O in Ruby
 test_files:
 - spec/async_watcher_spec.rb
@@ -188,6 +175,7 @@ test_files:
 - spec/spec_helper.rb
 - spec/stat_watcher_spec.rb
 - spec/tcp_server_spec.rb
+- spec/tcp_socket_spec.rb
 - spec/timer_watcher_spec.rb
 - spec/unix_listener_spec.rb
 - spec/unix_server_spec.rb