celluloid-io 0.17.1 → 0.17.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 75a2412be5312afe0d2f8e6d8004a824998be990
-  data.tar.gz: 4b175006119bc9d8cfe474afedb6d40b1dabe4cf
+  metadata.gz: f22ca0d4783bd9c3d65491e35c23cb265f9f5921
+  data.tar.gz: 19eb07a8af91273aa9d02d0a13d8b8d7cc7fd42e
 SHA512:
-  metadata.gz: f9fa09d4e1d18673c8da2f5162606b87da69f74b985255de5445abd0490fe605fa7a451f50c28bf48931ba2a867c4347ec868ce03566bfe10e222c21a9eba21b
-  data.tar.gz: b25eff20154ab82f905cc801e79df481b07f9e205c545982528d6d5ad4102fb9f7d75abd4a1c2a3753e0e5926ab86bf7985383b9e75c1439802815e7f7b6f9ab
+  metadata.gz: 7461a398eda2e60590099d4794bb6bd7bc6d1854b1e69acfea49ef9ff898ba537d25025a89add4582aecb15b276b34bbdf0d84c2d4ba0100a3eefa23f3724476
+  data.tar.gz: 55426f5b1593876194494c4f193b824daddeaa3679493c84b36d5d8887e4c4f715aa710e4239fdb757065a0af0ebcf48585986af6d50cb06a1d612e5f76e5c7e

data/.rubocop.yml

@@ -0,0 +1,2 @@
+inherit_from:
+  - culture/rubocop/rubocop.yml

data/.travis.yml

@@ -1,34 +1,41 @@
 script: rake ci
 language: ruby
 rvm:
-  - 2.2.0
-  - 2.2.2
+  - rbx-2
   - jruby
+  - 2.2.2
+  - 2.2.0
+  - 2.1.4
+  - 2.0.0
+  - 1.9.3
   - ruby-head
   - jruby-head
-  - rbx-2
-
-# TODO: Put these back:
-# * CELLULOID_TASK_CLASS=Fibered
-# * CELLULOID_TASK_CLASS=Threaded
-# For right now the imporant thing is to test BACKPORTED mode:
 
 matrix:
   fast_finish: true
   allow_failures:
+    - rvm: 1.9.3
     - rvm: ruby-head
     - rvm: jruby-head
     - env: CELLULOID_BACKPORTED=true
+    - env: CELLULOID_BACKPORTED=false CELLULOID_TASK_CLASS=Threaded
+    - env: CELLULOID_BACKPORTED=true CELLULOID_TASK_CLASS=Threaded
 
 env:
+  global:
+    - NUMBER_OF_PROCESSORS=4 CELLULOID_CONFIG_FILE=.env-ci
   matrix:
     - CELLULOID_BACKPORTED=true
     - CELLULOID_BACKPORTED=false
-  global:
-    - NUMBER_OF_PROCESSORS=2 CELLULOID_CONFIG_FILE=.env-ci
+    - CELLULOID_BACKPORTED=false CELLULOID_TASK_CLASS=Threaded
+    - CELLULOID_BACKPORTED=true CELLULOID_TASK_CLASS=Threaded
 
 notifications:
   irc: "irc.freenode.org#celluloid"
 
+before_install:
+  # Only use 1 job until Travis fixes the rbx --jobs issue.
+  - if [ "$TRAVIS_RUBY_VERSION" == "rbx-2" ] ; then export BUNDLE_JOBS=1 ; else export BUNDLE_JOBS=4; fi
+
 sudo: false
 install: bundle install --without=development

data/CHANGES.md

@@ -1,5 +1,15 @@
-HEAD
+0.17.2 (2015-09-30)
 -----
+* Revamped test suite, using shared RSpec configuration layer provided by Celluloid itself.
+* Updated gem dependencies provided by Celluloid::Sync... extraneous gems removed, or marked as development dependencies.
+
+0.17.1 (2015-08-24)
+-----
+* Minor bug fixes. Synchronize gem dependencies.
+
+0.17.0 (2015-08-07)
+-----
+* Compatibility with Celluloid 0.17.0+
 * Adjust class name for Celluloid::Mailbox::Evented, per 0.17.0 of Celluloid.
 
 0.16.2 (2015-01-30)

data/Gemfile

@@ -1,4 +1,3 @@
 require File.expand_path("../culture/sync", __FILE__)
 
 Celluloid::Sync::Gemfile[self]
-

data/Guardfile

@@ -1,5 +1,5 @@
-guard 'rspec', :cli => '--format documentation' do
+guard "rspec", cli: "--format documentation" do
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^lib/(.+)\.rb$})     { |m| "spec/#{m[1]}_spec.rb" }
-  watch('spec/spec_helper.rb')  { "spec/" }
+  watch("spec/spec_helper.rb")  { "spec/" }
 end

data/Rakefile

@@ -1,6 +1,6 @@
 #!/usr/bin/env rake
-require 'bundler/gem_tasks'
+require "bundler/gem_tasks"
 Dir["tasks/**/*.task"].each { |task| load task }
 
-task :default => :spec
-task :ci      => %w(spec benchmark)
+task default: :spec
+task ci: %w(spec benchmark)

data/benchmarks/actor.rb

@@ -5,7 +5,8 @@ require 'bundler/setup'
 require 'celluloid/io'
 require 'benchmark/ips'
 
-class ExampleActor
+#de TODO: Consolidate with Celluloid benchmarking actor.
+class BenchmarkingActor
   include Celluloid::IO
 
   def initialize
@@ -23,7 +24,7 @@ class ExampleActor
   end
 end
 
-example_actor = ExampleActor.new
+example_actor = BenchmarkingActor.new
 mailbox = Celluloid::IO::Mailbox.new
 
 latch_in, latch_out = Queue.new, Queue.new
@@ -36,7 +37,7 @@ latch = Thread.new do
 end
 
 Benchmark.ips do |ips|
-  ips.report("spawn")       { ExampleActor.new.terminate }
+  ips.report("spawn")       { BenchmarkingActor.new.terminate }
 
   ips.report("calls")       { example_actor.example_method }
 

data/celluloid-io.gemspec

@@ -4,21 +4,21 @@ require File.expand_path("../culture/sync", __FILE__)
 Gem::Specification.new do |gem|
   gem.name          = "celluloid-io"
   gem.version       = Celluloid::IO::VERSION
-  gem.license       = 'MIT'
+  gem.license       = "MIT"
   gem.authors       = ["Tony Arcieri", "Donovan Keme"]
   gem.email         = ["tony.arcieri@gmail.com", "code@extremist.digital"]
   gem.description   = "Evented IO for Celluloid actors"
   gem.summary       = "Celluloid::IO allows you to monitor multiple IO objects within a Celluloid actor"
   gem.homepage      = "http://github.com/celluloid/celluloid-io"
 
-  gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  gem.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   gem.files         = `git ls-files`.split("\n")
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   gem.require_paths = ["lib"]
 
   Celluloid::Sync::Gemspec[gem]
-  
-  gem.add_dependency 'nio4r',     '>= 1.1'
 
-  gem.add_development_dependency 'rb-fsevent', '~> 0.9.1' if RUBY_PLATFORM =~ /darwin/
+  gem.add_dependency "nio4r", ">= 1.1"
+
+  gem.add_development_dependency "rb-fsevent", "~> 0.9.1" if RUBY_PLATFORM =~ /darwin/
 end

data/examples/echo_client.rb

@@ -1,8 +1,8 @@
 #!/usr/bin/env ruby
 
-require 'rubygems'
-require 'bundler/setup'
-require 'celluloid/io'
+require "rubygems"
+require "bundler/setup"
+require "celluloid/io"
 
 class EchoClient
   include Celluloid::IO
@@ -18,7 +18,6 @@ class EchoClient
     @socket.write(s)
     @socket.readpartial(4096)
   end
-
 end
 
 client = EchoClient.new("127.0.0.1", 1234)

data/examples/echo_server.rb

@@ -2,8 +2,8 @@
 #
 # Run this as: bundle exec examples/echo_server.rb
 
-require 'bundler/setup'
-require 'celluloid/io'
+require "bundler/setup"
+require "celluloid/io"
 
 class EchoServer
   include Celluloid::IO

data/examples/echo_unix_client.rb

@@ -1,5 +1,5 @@
-require 'bundler/setup'
-require 'celluloid/io'
+require "bundler/setup"
+require "celluloid/io"
 
 class EchoUNIXClient
   include Celluloid::IO
@@ -22,7 +22,6 @@ class EchoUNIXClient
   def finalize
     @socket.close if @socket
   end
-
 end
 
 c = EchoUNIXClient.new("/tmp/sock_test")

data/examples/echo_unix_server.rb

@@ -1,5 +1,5 @@
-require 'bundler/setup'
-require 'celluloid/io'
+require "bundler/setup"
+require "celluloid/io"
 
 class EchoUNIXServer
   include Celluloid::IO
@@ -38,7 +38,6 @@ class EchoUNIXServer
       File.delete(@socket_path)
     end
   end
-
 end
 
 supervisor = EchoUNIXServer.supervise("/tmp/sock_test")

data/lib/celluloid/io.rb

@@ -1,19 +1,19 @@
-require 'celluloid/io/version'
+require "celluloid/io/version"
 
-require 'celluloid'
-require 'celluloid/io/dns_resolver'
-require 'celluloid/io/mailbox'
-require 'celluloid/io/reactor'
-require 'celluloid/io/stream'
+require "celluloid"
+require "celluloid/io/dns_resolver"
+require "celluloid/io/mailbox"
+require "celluloid/io/reactor"
+require "celluloid/io/stream"
 
-require 'celluloid/io/tcp_server'
-require 'celluloid/io/tcp_socket'
-require 'celluloid/io/udp_socket'
-require 'celluloid/io/unix_server'
-require 'celluloid/io/unix_socket'
+require "celluloid/io/tcp_server"
+require "celluloid/io/tcp_socket"
+require "celluloid/io/udp_socket"
+require "celluloid/io/unix_server"
+require "celluloid/io/unix_socket"
 
-require 'celluloid/io/ssl_server'
-require 'celluloid/io/ssl_socket'
+require "celluloid/io/ssl_server"
+require "celluloid/io/ssl_socket"
 
 module Celluloid
   # Actors with evented IO support
@@ -30,13 +30,13 @@ module Celluloid
       actor = Thread.current[:celluloid_actor]
       actor && actor.mailbox.is_a?(Celluloid::IO::Mailbox)
     end
-  
+
     def self.try_convert(src)
       ::IO.try_convert(src)
     end
 
     def self.copy_stream(src, dst, copy_length = nil, src_offset = nil)
-      raise NotImplementedError, "length/offset not supported" if copy_length || src_offset
+      fail NotImplementedError, "length/offset not supported" if copy_length || src_offset
 
       src, dst = try_convert(src), try_convert(dst)
 

data/lib/celluloid/io/dns_resolver.rb

@@ -1,5 +1,5 @@
-require 'ipaddr'
-require 'resolv'
+require "ipaddr"
+require "resolv"
 
 module Celluloid
   module IO
@@ -35,7 +35,7 @@ module Celluloid
       def resolve(hostname)
         if host = resolve_hostname(hostname)
           unless ip_address = resolve_host(host)
-            raise Resolv::ResolvError, "invalid entry in hosts file: #{host}"
+            fail Resolv::ResolvError, "invalid entry in hosts file: #{host}"
           end
           return ip_address
         end
@@ -61,7 +61,8 @@ module Celluloid
         # Resolv::Hosts#getaddresses pushes onto a stack
         # so since we want the first occurance, simply
         # pop off the stack.
-        resolv.getaddresses(hostname).pop rescue nil
+        resolv.getaddresses(hostname).pop
+      rescue
       end
 
       def resolv
@@ -81,16 +82,14 @@ module Celluloid
       end
 
       def resolve_ip(klass, host)
-        begin
-          klass.create(host)
-        rescue ArgumentError
-        end
+        klass.create(host)
+      rescue ArgumentError
       end
 
       private
 
       def get_address(host)
-        Resolv::Hosts.new(host).get_address.
+        Resolv::Hosts.new(host).getaddress
       rescue
       end
     end

data/lib/celluloid/io/reactor.rb

@@ -1,4 +1,4 @@
-require 'nio'
+require "nio"
 
 module Celluloid
   module IO
@@ -29,24 +29,24 @@ module Celluloid
       # Wait for the given IO operation to complete
       def wait(io, set)
         # zomg ugly type conversion :(
-        unless io.is_a?(::IO) or io.is_a?(OpenSSL::SSL::SSLSocket)
+        unless io.is_a?(::IO) || io.is_a?(OpenSSL::SSL::SSLSocket)
           if io.respond_to? :to_io
             io = io.to_io
           elsif ::IO.respond_to? :try_convert
             io = ::IO.try_convert(io)
           end
 
-          raise TypeError, "can't convert #{io.class} into IO" unless io.is_a?(::IO)
+          fail TypeError, "can't convert #{io.class} into IO" unless io.is_a?(::IO)
         end
 
         monitor = @selector.register(io, set)
         monitor.value = Task.current
-        
+
         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 
+          # 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

data/lib/celluloid/io/ssl_server.rb

@@ -1,4 +1,4 @@
-require 'socket'
+require "socket"
 
 module Celluloid
   module IO
@@ -33,4 +33,3 @@ module Celluloid
     end
   end
 end
-

data/lib/celluloid/io/ssl_socket.rb

@@ -1,4 +1,4 @@
-require 'openssl'
+require "openssl"
 
 module Celluloid
   module IO
@@ -7,19 +7,19 @@ module Celluloid
       extend Forwardable
 
       def_delegators :@socket,
-        :read_nonblock,
-        :write_nonblock,
-        :close,
-        :closed?,
-        :cert,
-        :cipher,
-        :client_ca,
-        :peeraddr,
-        :peer_cert,
-        :peer_cert_chain,
-        :post_connection_check,
-        :verify_result,
-        :sync_close=
+                     :read_nonblock,
+                     :write_nonblock,
+                     :close,
+                     :closed?,
+                     :cert,
+                     :cipher,
+                     :client_ca,
+                     :peeraddr,
+                     :peer_cert,
+                     :peer_cert_chain,
+                     :post_connection_check,
+                     :verify_result,
+                     :sync_close=
 
       def initialize(io, ctx = OpenSSL::SSL::SSLContext.new)
         super()
@@ -47,7 +47,9 @@ module Celluloid
         retry
       end
 
-      def to_io; @socket; end
+      def to_io
+        @socket
+      end
     end
   end
 end

data/lib/celluloid/io/tcp_socket.rb

@@ -1,5 +1,5 @@
-require 'socket'
-require 'resolv'
+require "socket"
+require "resolv"
 
 module Celluloid
   module IO
@@ -12,7 +12,7 @@ module Celluloid
 
       # Open a TCP socket, yielding it to the given block and closing it
       # automatically when done (if a block is given)
-      def self.open(*args, &block)
+      def self.open(*args, &_block)
         sock = new(*args)
         return sock unless block_given?
 
@@ -41,7 +41,7 @@ module Celluloid
           @socket = remote_host
           return
         elsif remote_port.nil?
-          raise ArgumentError, "wrong number of arguments (1 for 2)"
+          fail ArgumentError, "wrong number of arguments (1 for 2)"
         end
 
         # Is it an IPv4 address?
@@ -61,7 +61,7 @@ module Celluloid
         # Guess it's not an IP address, so let's try DNS
         unless @addr
           addrs = Array(DNSResolver.new.resolve(remote_host))
-          raise Resolv::ResolvError, "DNS result has no information for #{remote_host}" if addrs.empty?
+          fail Resolv::ResolvError, "DNS result has no information for #{remote_host}" if addrs.empty?
 
           # Pseudorandom round-robin DNS support :/
           @addr = addrs[rand(addrs.size)]
@@ -72,7 +72,7 @@ module Celluloid
           family = Socket::AF_INET
         when Resolv::IPv6
           family = Socket::AF_INET6
-        else raise ArgumentError, "unsupported address class: #{@addr.class}"
+        else fail ArgumentError, "unsupported address class: #{@addr.class}"
         end
 
         @socket = Socket.new(family, Socket::SOCK_STREAM, 0)
@@ -88,7 +88,7 @@ module Celluloid
           # HAX: for some reason we need to finish_connect ourselves on JRuby
           # This logic is unnecessary but JRuby still throws Errno::EINPROGRESS
           # if we retry the non-blocking connect instead of just finishing it
-          retry unless RUBY_PLATFORM == 'java' && @socket.to_channel.finish_connect
+          retry unless RUBY_PLATFORM == "java" && @socket.to_channel.finish_connect
         rescue Errno::EISCONN
           # We're now connected! Yay exceptions for flow control
           # NOTE: This is the approach the Ruby stdlib docs suggest ;_;
@@ -101,14 +101,14 @@ module Celluloid
 
       # Receives a message
       def recv(maxlen, flags = nil)
-        raise NotImplementedError, "flags not supported" if flags && !flags.zero?
+        fail NotImplementedError, "flags not supported" if flags && !flags.zero?
         readpartial(maxlen)
       end
 
       # Send a message
       def send(msg, flags, dest_sockaddr = nil)
-        raise NotImplementedError, "dest_sockaddr not supported" if dest_sockaddr
-        raise NotImplementedError, "flags not supported" unless flags.zero?
+        fail NotImplementedError, "dest_sockaddr not supported" if dest_sockaddr
+        fail NotImplementedError, "flags not supported" unless flags.zero?
         write(msg)
       end
     end