cool.io 1.1.1 → 1.2.0

data/lib/cool.io.rb

@@ -4,10 +4,10 @@
 # See file LICENSE for details
 #++
 
-require 'iobuffer'
-
 require "cool.io/version"
-require "cool.io_ext"
+require "cool.io/custom_require"
+cool_require "iobuffer_ext"
+cool_require "cool.io_ext"
 
 require "cool.io/loop"
 require "cool.io/meta"
@@ -29,4 +29,4 @@ end
 module Cool
   # Allow Coolio module to be referenced as Cool.io
   def self.io; Coolio; end
-end
+end

data/lib/cool.io/custom_require.rb

@@ -0,0 +1,9 @@
+def cool_require(gem)
+  begin
+    m = /(\d+.\d+)/.match(RUBY_VERSION)
+    ver = m[1]
+    require "#{ver}/#{gem}.so"
+  rescue LoadError
+    require gem
+  end
+end

data/lib/cool.io/dns_resolver.rb

@@ -32,15 +32,17 @@ module Coolio
   class DNSResolver < IOWatcher
     #--
     # TODO check if it's caching right
-    RESOLV_CONF = '/etc/resolv.conf'
-    HOSTS = '/etc/hosts'
+    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
     RETRIES = 4 # Number of retries to attempt
     # 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)
       hosts = {}
@@ -61,8 +63,9 @@ module Coolio
     # use nameservers listed in /etc/resolv.conf
     def initialize(hostname, *nameservers)
       if nameservers.empty?
-        nameservers = File.read(RESOLV_CONF).scan(/^\s*nameserver\s+([0-9.:]+)/).flatten # TODO could optimize this to just read once
-        raise RuntimeError, "no nameservers found in #{RESOLV_CONF}" if nameservers.empty? # TODO just call resolve_failed, not raise [also handle Errno::ENOENT)]
+        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
 
       @nameservers = nameservers

data/lib/cool.io/http_client.rb

@@ -5,7 +5,8 @@
 # See file LICENSE for details
 #++
 
-require 'http11_client'
+require "cool.io/custom_require"
+cool_require 'http11_client'
 
 module Coolio
   # A simple hash is returned for each request made by HttpClient with
@@ -118,8 +119,8 @@ module Coolio
   # == Example
   #
   #   loop = Coolio::Loop.default
-  #   client = Coolio::HttpClient.connect("www.google.com").attach
-  #   client.get('/search', query: {q: 'foobar'})
+  #   client = Coolio::HttpClient.connect("www.google.com").attach(loop)
+  #   client.request('GET', '/search', query: {q: 'foobar'})
   #   loop.run
   #
   class HttpClient < TCPSocket

data/lib/cool.io/listener.rb

@@ -21,10 +21,6 @@ module Coolio
       @listen_socket.fileno
     end
 
-    def listen(backlog)
-      @listen_socket.listen(backlog)
-    end
-
     # Close the listener
     def close
       detach if attached?
@@ -57,9 +53,9 @@ module Coolio
     end
   end
 
-  DEFAULT_BACKLOG = 1024
-
   class TCPListener < Listener
+    DEFAULT_BACKLOG = 1024
+
     # Create a new Coolio::TCPListener on the specified address and port.
     # Accepts the following options:
     #
@@ -91,9 +87,7 @@ module Coolio
     # Optionally, it can also take anyn existing UNIXServer object
     # and create a Coolio::UNIXListener out of it.
     def initialize(*args)
-      s = ::UNIXServer === args.first ? args.first : ::UNIXServer.new(*args)
-      s.instance_eval { listen(DEFAULT_BACKLOG) }
-      super(s)
+      super(::UNIXServer === args.first ? args.first : ::UNIXServer.new(*args))
     end
   end
 end

data/lib/cool.io/server.rb

@@ -56,7 +56,7 @@ module Coolio
         raise ArgumentError, "port must be an integer" if nil == port
         ::TCPServer.new(host, port)
       end
-      listen_socket.instance_eval { listen(DEFAULT_BACKLOG) } # Change listen backlog to 1024
+      listen_socket.instance_eval { listen(1024) } # Change listen backlog to 1024
       super(listen_socket, klass, *args, &block)
     end
   end
@@ -68,7 +68,6 @@ module Coolio
   class UNIXServer < Server
     def initialize(path, klass = UNIXSocket, *args, &block)
       s = ::UNIXServer === path ? path : ::UNIXServer.new(path)
-      s.instance_eval { listen(DEFAULT_BACKLOG) }
       super(s, klass, *args, &block)
     end
   end

data/lib/cool.io/version.rb

@@ -1,5 +1,5 @@
 module Coolio
-  VERSION = "1.1.1"
+  VERSION = "1.2.0"
   
   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 do
+describe Cool.io::AsyncWatcher, :env => :win do
 
   it "does not signal on spurious wakeups" do
     aw = Cool.io::AsyncWatcher.new

data/spec/spec_helper.rb

@@ -2,4 +2,11 @@ $LOAD_PATH.unshift File.dirname(__FILE__)
 $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 
 require 'rspec'
-require 'cool.io'
+require 'cool.io'
+
+RSpec.configure do |c|
+  if RUBY_PLATFORM =~ /mingw|win32/
+    $stderr.puts "Skip some specs on Windows"
+    c.filter_run_excluding :env => :win
+  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 do
+describe Cool.io::UNIXListener, :env => :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 do
+describe Cool.io::UNIXServer, :env => :win do
 
   before :each do
     @tmp = Tempfile.new('coolio_unix_server_spec')
@@ -11,15 +11,13 @@ describe Cool.io::UNIXServer do
 
   it "creates a new Cool.io::UNIXServer" do
     listener = Cool.io::UNIXListener.new(@tmp.path)
-    listener.listen(24)
     File.socket?(@tmp.path).should == true
   end
 
   it "builds off an existing ::UNIXServer" do
     unix_server = ::UNIXServer.new(@tmp.path)
     File.socket?(@tmp.path).should == true
-    listener = Cool.io::UNIXServer.new(unix_server, Coolio::UNIXSocket)
-    listener.listen(24)
+    listener = Cool.io::UNIXServer.new(unix_server)
     File.socket?(@tmp.path).should == true
     listener.fileno.should == unix_server.fileno
   end

metadata

@@ -1,79 +1,75 @@
 --- !ruby/object:Gem::Specification
 name: cool.io
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
+  prerelease: 
 platform: ruby
 authors:
 - Tony Arcieri
+- Masahiro Nakagawa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-30 00:00:00.000000000 Z
+date: 2013-05-27 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: iobuffer
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.9
+        version: 0.8.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.9
+        version: 0.8.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: 2.13.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        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
   the libev C library
 email:
 - tony.arcieri@gmail.com
+- repeatedly@gmail.com
 executables: []
 extensions:
 - ext/cool.io/extconf.rb
 - ext/http11_client/extconf.rb
+- ext/iobuffer/extconf.rb
 extra_rdoc_files: []
 files:
 - .gitignore
@@ -112,6 +108,8 @@ files:
 - ext/http11_client/http11_parser.c
 - ext/http11_client/http11_parser.h
 - ext/http11_client/http11_parser.rl
+- ext/iobuffer/extconf.rb
+- ext/iobuffer/iobuffer.c
 - ext/libev/Changes
 - ext/libev/LICENSE
 - ext/libev/README
@@ -130,6 +128,7 @@ files:
 - lib/.gitignore
 - lib/cool.io.rb
 - lib/cool.io/async_watcher.rb
+- lib/cool.io/custom_require.rb
 - lib/cool.io/dns_resolver.rb
 - lib/cool.io/dsl.rb
 - lib/cool.io/eventmachine.rb
@@ -153,26 +152,33 @@ files:
 - 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: 3111666693494633054
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3111666693494633054
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: A cool framework for doing high performance I/O in Ruby
 test_files:
 - spec/async_watcher_spec.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 574129faba4be1f5f42244622d7c1ecc94349bd9
-  data.tar.gz: cf189c4d87b89133afd04a29c4a5e078244d648b
-SHA512:
-  metadata.gz: 037beb60fd9b659e1986885947cc74a77e57004d788dcfd6ac07df4a6196dcd9f784c9a2031759f2bd9b23a667a9f56e4f564b1572b52a9a0549973ecc7df778
-  data.tar.gz: a07fd3da19d0c7fddad53c93c8f4942e5562f1562c5a8a0c323c078dc493004db7bb38f131fe9ca0d70c6d1eee7dd873111088eeaa4e41bbe3701fde780f2090