arachni-reactor 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8f90922fd68d3df405cf0aa7537924db3f3c118
-  data.tar.gz: 5bd9e5042618276a83909b43879651d60f8e0538
+  metadata.gz: 6c421c44ae454d55db1adc102b4c9d0819375ff0
+  data.tar.gz: b05b9f1ddf6048d8e0df60684b738e879628e48c
 SHA512:
-  metadata.gz: ff7c11326a30b31030b95ac93cd7ee3e5c37ab6f7097bb6f9a4829354b13bc683d484e8243bb9d14e88b8248bd69481a9a43ac01d475a708e61199595ec4632b
-  data.tar.gz: f1563d0bafe856937029267327fa8c049b05a56122e8fa8dd5c1fd0b45bb7e9784f250eb8dfd4d6438d8b866cd402de4340b9382d5a304c204fd54552c4a389c
+  metadata.gz: 83ba17f94bed4e8d8d8b6125ed06288051a3bc59bd34733f355db80757e01f65d7074459670c1cedb95ffc2c0242dfc8219ea4988199f5fb0c63139152e6182c
+  data.tar.gz: e7a6690fa5d3c8f496e19a34e6d7d942548dc5dbb3ef62905a1e2c7a29c9fbd5b3923527ad2cf60c3ed707666ec6854577f6e135ef30eabe87ca9d3db50b18ec

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # ChangeLog
 
+## Version 0.1.1
+
+- `Connection`
+    - `#_write` -- Use `String#byteslice` instead of `String#slice` and
+        `String#bytesize` instead of `String#size`.
+    - `Error.translate` -- Translate `Errno::ECONNABORTED` as `Error::Reset`.
+
 ## Version 0.1.0
 
 - Cleaned up connection handling structure for JRuby support.

data/LICENSE.md

@@ -1,6 +1,6 @@
 # License
 
-    Copyright (C) 2014, Tasos Laskos <tasos.laskos@gmail.com>
+    Copyright (C) 2014-2016, Tasos Laskos <tasos.laskos@gmail.com>
     All rights reserved.
 
     Redistribution and use in source and binary forms, with or without modification,

data/README.md

@@ -3,7 +3,7 @@
 <table>
     <tr>
         <th>Version</th>
-        <td>0.1.0</td>
+        <td>0.1.1</td>
     </tr>
     <tr>
         <th>Github page</th>
@@ -23,7 +23,7 @@
     </tr>
     <tr>
         <th>Copyright</th>
-        <td>2014</td>
+        <td>2014-2016</td>
     </tr>
     <tr>
         <th>License</th>

data/lib/arachni/reactor.rb

@@ -668,9 +668,11 @@ class Reactor
         # So force a read for SSL sockets to cover all our bases.
         #
         # This is apparent especially on JRuby.
-        (readables - selected_sockets[0]).each do |socket|
-            next if !socket.is_a?( OpenSSL::SSL::SSLSocket )
-            selected_sockets[0] << socket
+        if readables.size != selected_sockets[0].size
+            (readables - selected_sockets[0]).each do |socket|
+                next if !socket.is_a?( OpenSSL::SSL::SSLSocket )
+                selected_sockets[0] << socket
+            end
         end
 
         if selected_sockets[0].empty? && selected_sockets[1].empty? &&

data/lib/arachni/reactor/connection.rb

@@ -41,17 +41,21 @@ class Connection
     #   `true` when using a UNIX-domain socket, `nil` if no {#socket} is
     #   available, `false` otherwise.
     def unix?
+        return @is_unix if !@is_unix.nil?
         return if !to_io
         return false if !Arachni::Reactor.supports_unix_sockets?
-        to_io.is_a?( UNIXServer ) || to_io.is_a?( UNIXSocket )
+
+        @is_unix = to_io.is_a?( UNIXServer ) || to_io.is_a?( UNIXSocket )
     end
 
     # @return   [Bool]
     #   `true` when using an Internet socket, `nil` if no {#socket} is
     #   available, `false` otherwise.
     def inet?
+        return @is_inet if !@is_inet.nil?
         return if !to_io
-        to_io.is_a?( TCPServer ) || to_io.is_a?( TCPSocket ) || to_io.is_a?( Socket )
+
+        @is_inet = to_io.is_a?( TCPServer ) || to_io.is_a?( TCPSocket ) || to_io.is_a?( Socket )
     end
 
     # @return   [IO, nil]
@@ -64,8 +68,10 @@ class Connection
     # @return   [Bool]
     #   `true` if the connection is a server listener.
     def listener?
+        return @is_listener if !@is_listener.nil?
         return if !to_io
-        to_io.is_a?( TCPServer ) || (unix? && to_io.is_a?( UNIXServer ))
+
+        @is_listener = to_io.is_a?( TCPServer ) || (unix? && to_io.is_a?( UNIXServer ))
     end
 
     # @note The data will be buffered and sent in future {Reactor} ticks.
@@ -228,7 +234,7 @@ class Connection
                 socket.connect_nonblock( Socket.sockaddr_in( @port, @host ) )
             end
         # Already connected. :)
-        rescue Errno::EISCONN
+        rescue Errno::EISCONN, Errno::EALREADY
         end
 
         @connected = true
@@ -277,7 +283,7 @@ class Connection
     def _write
         return _connect if !connected?
 
-        chunk = write_buffer.slice( 0, BLOCK_SIZE )
+        chunk = write_buffer.byteslice( 0, BLOCK_SIZE )
         total_written = 0
 
         begin
@@ -285,13 +291,13 @@ class Connection
                 # Send out the chunk, **all** of it, or at least try to.
                 loop do
                     total_written += written = @socket.write_nonblock( chunk )
-                    write_buffer.slice!( 0, written )
+                    @write_buffer = @write_buffer.byteslice( written..-1 )
 
                     # Call #on_write every time any of the buffer is consumed.
                     on_write
 
-                    break if written == chunk.size
-                    chunk.slice!( 0, written )
+                    break if written == chunk.bytesize
+                    chunk = chunk.byteslice( written..-1 )
                 end
             end
 

data/lib/arachni/reactor/connection/error.rb

@@ -35,7 +35,7 @@ class Error < Arachni::Reactor::Error
             # non-existent server.
             Errno::EADDRINUSE => e
             raise_with_proper_backtrace( e, Refused )
-        rescue Errno::ECONNRESET => e
+        rescue Errno::ECONNRESET, Errno::ECONNABORTED => e
             raise_with_proper_backtrace( e, Reset )
         rescue Errno::EACCES => e
             raise_with_proper_backtrace( e, Permission )

data/lib/arachni/reactor/version.rb

@@ -9,7 +9,7 @@
 module Arachni
 class Reactor
 
-    VERSION = '0.1.0'
+    VERSION = '0.1.1'
 
 end
 end

data/spec/arachni/reactor/tasks/delayed_spec.rb

@@ -35,7 +35,9 @@ describe Arachni::Reactor::Tasks::Delayed do
                 time = Time.now
                 task.call while called < 1
 
-                (Time.now - time).round(2).should == 0.25
+                elapsed = (Time.now - time).round(2)
+                elapsed.should >= 0.25
+                elapsed.should < 0.30
             end
 
             it 'calls #done' do

data/spec/arachni/reactor/tasks/periodic_spec.rb

@@ -33,7 +33,9 @@ describe Arachni::Reactor::Tasks::Periodic do
                 time = Time.now
                 task.call while called < 5
 
-                (Time.now - time).round(2).should == 1.25
+                elapsed = (Time.now - time).round(2)
+                elapsed.should >= 1.25
+                elapsed.should < 1.35
             end
         end
 

data/spec/support/lib/servers.rb

@@ -77,7 +77,7 @@ class Servers
         return if !server_info[:pid]
 
         begin
-            Process.kill( Gem.win_platform? ? 'QUIT' : 'KILL', server_info[:pid] ) while sleep 0.1
+            Process.kill( 'KILL', server_info[:pid] ) while sleep 0.1
         rescue Errno::ESRCH
             server_info.delete(:pid)
 

data/spec/support/shared/reactor.rb

@@ -816,6 +816,9 @@ shared_examples_for 'Arachni::Reactor' do
                 subject.listen( host, port, echo_server_handler, *options )
 
                 @socket = tcp_writer.call( host, port, data )
+
+                sleep 5
+
                 subject.connections.values.first.initialization_args.should == options
             end
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arachni-reactor
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Tasos Laskos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-21 00:00:00.000000000 Z
+date: 2016-01-26 00:00:00.000000000 Z
 dependencies: []
 description: |2
       Arachni::Reactor is a simple, lightweight, pure-Ruby implementation of the Reactor
@@ -98,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A pure-Ruby implementation of the Reactor pattern.