celluloid-io 0.16.1 → 0.16.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a14112c061df1e593c0c40f73f6bbafbb937419
-  data.tar.gz: 2fc0714e1b2064a425105db7779ce83bbdb85508
+  metadata.gz: 478d600640a4868162a199bc7db4ac8926be40f2
+  data.tar.gz: d0cc206f1aeb05290be388ba6fc0e66375bd179f
 SHA512:
-  metadata.gz: 0853eb2f8d75efb7287a95ae81d74a2c619d7a7f79cce162110faafda75f4e41049bbf1134615b6abba5c14361a3e9dff69847ae199a9fa3f1898cd024033661
-  data.tar.gz: a195890888ace5714d9781c4683a6b23c4a6f3208cedaf9619c92520cf34a0ef1ee57c9bd2457a36d018ae3f433c83b23e69e5105579208570906d9167edf081
+  metadata.gz: 244c3a718d4e0237682640dd2e4005fbf254893f0c12441efc7cab19de65585ac4e14a8b99e7e11cf796c4c8cf1e18dc60cab259787b0fabffaa306fa73d240c
+  data.tar.gz: 09a0bbc5a409bde43ada45ac692467a9702d98d79f45e27d63ddcc6586e682cb3ff0d067e1e764e1b06a839de37d849d35efb05db9b0c6304a18aee63c02c994

data/CHANGES.md

@@ -1,3 +1,9 @@
+0.16.2 (2014-01-30)
+-------------------
+* More TCPSocket compatibility fixes
+* Ensure monitors are closed when tasks resume
+* Fix Errno::EAGAIN handling in Stream#syswrite
+
 0.16.1 (2014-10-08)
 -------------------
 * Revert read/write interest patch as it caused file descriptor leaks

data/celluloid-io.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   gem.add_dependency 'celluloid', '>= 0.16.0'
-  gem.add_dependency 'nio4r',     '>= 1.0.0'
+  gem.add_dependency 'nio4r',     '>= 1.1.0'
 
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rspec', '~> 2.14.0'

data/lib/celluloid/io/reactor.rb

@@ -41,14 +41,22 @@ module Celluloid
 
         monitor = @selector.register(io, set)
         monitor.value = Task.current
-        Task.suspend :iowait
+        
+        begin
+          Task.suspend :iowait
+        ensure
+          # In all cases we want to ensure that the monitor is closed once we 
+          # have woken up. However, in some cases, the monitor is already 
+          # invalid, e.g. in the case that we are terminating. We catch this
+          # case explicitly.
+          monitor.close
+        end
       end
 
       # Run the reactor, waiting for events or wakeup signal
       def run_once(timeout = nil)
         @selector.select(timeout) do |monitor|
           task = monitor.value
-          monitor.close
 
           if task.running?
             task.resume

data/lib/celluloid/io/stream.rb

@@ -64,6 +64,9 @@ module Celluloid
               retry
             rescue EOFError
               return total_written
+            rescue Errno::EAGAIN
+              wait_writable
+              retry
             end
 
             total_written += written

data/lib/celluloid/io/tcp_socket.rb

@@ -14,16 +14,13 @@ module Celluloid
       # automatically when done (if a block is given)
       def self.open(*args, &block)
         sock = new(*args)
+        return sock unless block_given?
 
-        if block_given?
-          begin
-            yield sock
-          ensure
-            sock.close
-          end
+        begin
+          yield(sock)
+        ensure
+          sock.close
         end
-
-        sock
       end
 
       # Convert a Ruby TCPSocket into a Celluloid::IO::TCPSocket

data/lib/celluloid/io/version.rb

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

data/spec/celluloid/io/reactor_spec.rb

@@ -0,0 +1,38 @@
+require 'spec_helper'
+
+describe Celluloid::IO::Reactor do
+  let(:payload) { "balls" }
+  
+  it "shouldn't crash" do
+    server = ::TCPServer.new example_addr, example_port
+    
+    thread = Thread.new { server.accept }
+    
+    socket = within_io_actor { Celluloid::IO::TCPSocket.new example_addr, example_port }
+    peer = thread.value
+    peer_thread = Thread.new { loop { peer << payload } }
+    handle = false
+    
+    # Main server body:
+    within_io_actor do
+      begin
+        timeout(2) do
+          loop do
+            socket.readpartial(2046)
+          end
+        end
+      # rescuing timeout, ok. rescuing terminated error, is it ok? TODO: investigate
+      rescue Celluloid::Task::TerminatedError, Timeout::Error
+      ensure
+        socket.readpartial(2046)
+        handle = true
+      end
+    end
+    
+    expect(handle).to be_true
+    
+    server.close
+    peer.close
+    socket.close
+  end
+end

data/spec/celluloid/io/tcp_socket_spec.rb

@@ -4,6 +4,33 @@ describe Celluloid::IO::TCPSocket do
   let(:payload) { 'ohai' }
 
   context "inside Celluloid::IO" do
+
+    describe ".open" do
+      it "returns the open socket" do
+        server = ::TCPServer.new example_addr, example_port
+        thread = Thread.new { server.accept }
+
+        socket = within_io_actor { Celluloid::IO::TCPSocket.open(example_addr, example_port) }
+        socket.should be_a(Celluloid::IO::TCPSocket)
+
+        server.close
+        thread.terminate
+        socket.close
+      end
+      context "when passed a block" do
+        it "returns the block evaluation" do
+          server = ::TCPServer.new example_addr, example_port
+          thread = Thread.new { server.accept }
+  
+          value = within_io_actor { Celluloid::IO::TCPSocket.open(example_addr, example_port) { true } }
+          value.should be_true
+  
+          server.close
+          thread.terminate
+        end
+      end
+    end
+
     it "connects to TCP servers" do
       server = ::TCPServer.new example_addr, example_port
       thread = Thread.new { server.accept }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: celluloid-io
 version: !ruby/object:Gem::Version
-  version: 0.16.1
+  version: 0.16.2
 platform: ruby
 authors:
 - Tony Arcieri
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-08 00:00:00.000000000 Z
+date: 2015-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -146,10 +146,10 @@ 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
+- spec/celluloid/io/reactor_spec.rb
 - spec/celluloid/io/ssl_server_spec.rb
 - spec/celluloid/io/ssl_socket_spec.rb
 - spec/celluloid/io/tcp_server_spec.rb
@@ -185,16 +185,16 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 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
+- spec/celluloid/io/reactor_spec.rb
 - spec/celluloid/io/ssl_server_spec.rb
 - spec/celluloid/io/ssl_socket_spec.rb
 - spec/celluloid/io/tcp_server_spec.rb