celluloid-io 0.16.0 → 0.16.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06e019423155a4f894648df359c6d544cf68e6e0
-  data.tar.gz: a44dd7a23826a73dcbe7a6fa04c7fad10a104126
+  metadata.gz: 2a14112c061df1e593c0c40f73f6bbafbb937419
+  data.tar.gz: 2fc0714e1b2064a425105db7779ce83bbdb85508
 SHA512:
-  metadata.gz: c2b6218e998263dc990af5195682cc1aebc930a31e9413f214b9e4afca30ec6a532532b6d70966408dbb5fb260c5b6a6f8d9a3190141d06d73af292c8715cef0
-  data.tar.gz: 937e511d635e0d426791c5ba214e77319be2223bf058e2ac76e0fd8ab81e8d8c46504b42ac7594bfa52123b5ab13d55b4e4ab8ee603e9c9deca7a8a1a2b0b5e9
+  metadata.gz: 0853eb2f8d75efb7287a95ae81d74a2c619d7a7f79cce162110faafda75f4e41049bbf1134615b6abba5c14361a3e9dff69847ae199a9fa3f1898cd024033661
+  data.tar.gz: a195890888ace5714d9781c4683a6b23c4a6f3208cedaf9619c92520cf34a0ef1ee57c9bd2457a36d018ae3f433c83b23e69e5105579208570906d9167edf081

data/CHANGES.md

@@ -1,3 +1,7 @@
+0.16.1 (2014-10-08)
+-------------------
+* Revert read/write interest patch as it caused file descriptor leaks
+
 0.16.0 (2014-09-04)
 -------------------
 * Fix bug handling simultaneous read/write interests

data/celluloid-io.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'nio4r',     '>= 1.0.0'
 
   gem.add_development_dependency 'rake'
-  gem.add_development_dependency 'rspec'
+  gem.add_development_dependency 'rspec', '~> 2.14.0'
   gem.add_development_dependency 'benchmark_suite'
   gem.add_development_dependency 'guard-rspec'
   gem.add_development_dependency 'rb-fsevent', '~> 0.9.1' if RUBY_PLATFORM =~ /darwin/

data/lib/celluloid/io/dns_resolver.rb

@@ -21,7 +21,9 @@ module Celluloid
       end
 
       def initialize
-        @nameservers = self.class.nameservers
+        # early return for edge case when there are no nameservers configured
+        # but we still want to be able to static lookups using #resolve_hostname
+        @nameservers = self.class.nameservers or return
 
         @server = IPAddr.new(@nameservers.sample)
 

data/lib/celluloid/io/reactor.rb

@@ -14,25 +14,20 @@ module Celluloid
 
       def initialize
         @selector = NIO::Selector.new
-        @monitors = {}
       end
 
       # Wait for the given IO object to become readable
       def wait_readable(io)
-        wait io do |monitor|
-          monitor.wait_readable
-        end
+        wait io, :r
       end
 
       # Wait for the given IO object to become writable
       def wait_writable(io)
-        wait io do |monitor|
-          monitor.wait_writable
-        end
+        wait io, :w
       end
 
       # Wait for the given IO operation to complete
-      def wait(io)
+      def wait(io, set)
         # zomg ugly type conversion :(
         unless io.is_a?(::IO) or io.is_a?(OpenSSL::SSL::SSLSocket)
           if io.respond_to? :to_io
@@ -44,89 +39,21 @@ module Celluloid
           raise TypeError, "can't convert #{io.class} into IO" unless io.is_a?(::IO)
         end
 
-        unless monitor = @monitors[io]
-          monitor = Monitor.new(@selector, io)
-          @monitors[io] = monitor
-        end
-
-        yield monitor
+        monitor = @selector.register(io, set)
+        monitor.value = Task.current
+        Task.suspend :iowait
       end
 
       # Run the reactor, waiting for events or wakeup signal
       def run_once(timeout = nil)
         @selector.select(timeout) do |monitor|
-          monitor.value.resume
-        end
-      end
-
-      class Monitor
-        def initialize(selector, io)
-          @selector = selector
-          @io = io
-          @interests = {}
-        end
-
-        def wait_readable
-          wait :r
-        end
-
-        def wait_writable
-          wait :w
-        end
-
-        def wait(interest)
-          raise "Already waiting for #{interest.inspect}" if @interests.include?(interest)
-          @interests[interest] = Task.current
-          reregister
-          Task.suspend :iowait
-        end
-
-        def reregister
-          if @monitor
-            @monitor.close
-            @monitor = nil
-          end
-
-          if interests_symbol
-            @monitor = @selector.register(@io, interests_symbol)
-            @monitor.value = self
-          end
-        end
-
-        def interests_symbol
-          case @interests.keys
-          when [:r]
-            :r
-          when [:w]
-            :w
-          when [:r, :w]
-            :rw
-          end
-        end
-
-        def resume
-          raise "No monitor" unless @monitor
-
-          if @monitor.readable?
-            resume_for :r
-          end
-
-          if @monitor.writable?
-            resume_for :w
-          end
-
-          reregister
-        end
-
-        def resume_for(interest)
-          task = @interests.delete(interest)
+          task = monitor.value
+          monitor.close
 
-          if task
-            if task.running?
-              task.resume
-            else
-              raise "reactor attempted to resume a dead task"
-            end
+          if task.running?
+            task.resume
+          else
+            Logger.warn("reactor attempted to resume a dead task")
           end
         end
       end

data/lib/celluloid/io/ssl_socket.rb

@@ -17,6 +17,7 @@ module Celluloid
 
       def connect
         @socket.connect_nonblock
+        self
       rescue ::IO::WaitReadable
         wait_readable
         retry

data/lib/celluloid/io/tcp_server.rb

@@ -8,7 +8,11 @@ module Celluloid
       def_delegators :@server, :listen, :sysaccept, :close, :closed?, :addr, :setsockopt
 
       def initialize(hostname_or_port, port = nil)
-        @server = ::TCPServer.new(hostname_or_port, port)
+        if port.nil?
+          @server = ::TCPServer.new(hostname_or_port)
+        else
+          @server = ::TCPServer.new(hostname_or_port, port)
+        end
       end
 
       def accept

data/lib/celluloid/io/udp_socket.rb

@@ -3,7 +3,7 @@ module Celluloid
     # UDPSockets with combined blocking and evented support
     class UDPSocket
       extend Forwardable
-      def_delegators :@socket, :bind, :connect, :send, :recvfrom_nonblock, :close, :closed?
+      def_delegators :@socket, :addr, :bind, :connect, :send, :recvfrom_nonblock, :close, :closed?
 
       def initialize(address_family = ::Socket::AF_INET)
         @socket = ::UDPSocket.new(address_family)

data/lib/celluloid/io/version.rb

@@ -1,5 +1,5 @@
 module Celluloid
   module IO
-    VERSION = "0.16.0"
+    VERSION = "0.16.1"
   end
 end

data/spec/celluloid/io/dns_resolver_spec.rb

@@ -2,14 +2,24 @@ require 'spec_helper'
 
 describe Celluloid::IO::DNSResolver do
   describe '#resolve' do
+    it 'resolves hostnames statically from hosts file without nameservers' do
+      # /etc/resolv.conf doesn't exist on Mac OSX when no networking is
+      # disabled, thus .nameservers would return nil
+      Celluloid::IO::DNSResolver.should_receive(:nameservers).at_most(:once) { nil }
+      resolver = Celluloid::IO::DNSResolver.new
+      resolver.resolve('localhost').should eq Resolv::IPv4.create("127.0.0.1")
+    end
+
     it 'resolves hostnames' do
       resolver = Celluloid::IO::DNSResolver.new
       resolver.resolve('localhost').should eq Resolv::IPv4.create("127.0.0.1")
     end
 
     it "resolves domain names" do
-      resolver = Celluloid::IO::DNSResolver.new
-      resolver.resolve("celluloid.io").should == Resolv::IPv4.create("207.97.227.245")
+      resolver    = Celluloid::IO::DNSResolver.new
+      nameservers = resolver.resolve("celluloid.io")
+      expect(nameservers).to include Resolv::IPv4.create("104.28.21.100")
+      expect(nameservers).to include Resolv::IPv4.create("104.28.20.100")
     end
 
     it "resolves CNAME responses" do

data/spec/celluloid/io/tcp_server_spec.rb

@@ -5,7 +5,7 @@ describe Celluloid::IO::TCPServer do
     let(:payload) { 'ohai' }
 
     it "can be initialized without a host" do
-      expect{ server = Celluloid::IO::TCPServer.new(2000); server.close }.to_not raise_error
+      expect { Celluloid::IO::TCPServer.new(2000).close }.to_not raise_error
     end
 
     context "inside Celluloid::IO" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: celluloid-io
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.16.1
 platform: ruby
 authors:
 - Tony Arcieri
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-05 00:00:00.000000000 Z
+date: 2014-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid
@@ -56,16 +56,16 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.14.0
 - !ruby/object:Gem::Dependency
   name: benchmark_suite
   requirement: !ruby/object:Gem::Requirement
@@ -146,6 +146,7 @@ files:
 - lib/celluloid/io/version.rb
 - log/.gitignore
 - logo.png
+- spec/celluloid/io/.dns_resolver_spec.rb.swp
 - spec/celluloid/io/actor_spec.rb
 - spec/celluloid/io/dns_resolver_spec.rb
 - spec/celluloid/io/mailbox_spec.rb
@@ -190,6 +191,7 @@ specification_version: 4
 summary: Celluloid::IO allows you to monitor multiple IO objects within a Celluloid
   actor
 test_files:
+- spec/celluloid/io/.dns_resolver_spec.rb.swp
 - spec/celluloid/io/actor_spec.rb
 - spec/celluloid/io/dns_resolver_spec.rb
 - spec/celluloid/io/mailbox_spec.rb
@@ -206,4 +208,3 @@ test_files:
 - spec/fixtures/server.crt
 - spec/fixtures/server.key
 - spec/spec_helper.rb
-has_rdoc: