Merge 1a74391 into af7f456

.travis.yml

@@ -16,6 +16,17 @@ rvm:
 matrix:
   fast_finish: true
 
+jobs:
+  include:
+    - stage: linting
+      rvm: ruby-2.4.1 # Pre-installed on TravisCI
+      install: true # Do not bundle install
+      script: gem install rubocop --no-document && rubocop
+
+stages:
+  - linting
+  - test
+
 branches:
   only:
     - master

Gemfile

@@ -12,7 +12,7 @@ end
 group :test do
   gem "coveralls", require: false
   gem "rspec", "~> 3.7", require: false
-  gem "rubocop", "0.52.1", require: false
+  gem "rubocop", "= 0.65.0", require: false
 end
 
 group :development, :test do

Rakefile

@@ -5,7 +5,4 @@ require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 RSpec::Core::RakeTask.new
 
-require "rubocop/rake_task"
-RuboCop::RakeTask.new
-
-task default: %w[spec rubocop]
+task default: %w[spec]

lib/socketry/resolver/resolv.rb

@@ -39,7 +39,8 @@ def initialize(*args)
       # @raise [Socketry::AddressError] the name was resolved to an unsupported address
       def resolve(hostname, timeout: nil)
         raise TypeError, "expected String, got #{hostname.class}" unless hostname.is_a?(String)
-        return IPAddr.new(@hosts.getaddress(hostname).sub(/%.*$/, ""))
+
+        IPAddr.new(@hosts.getaddress(hostname).sub(/%.*$/, ""))
       rescue ::Resolv::ResolvError
         case timeout
         when Integer, Float

lib/socketry/ssl/server.rb

@@ -39,11 +39,11 @@ def accept(timeout: nil, **args)
         tcp_socket = super(timeout: timeout, **args)
 
         ssl_socket = Socketry::SSL::Socket.new(
-          read_timeout:     @read_timeout,
-          write_timeout:    @write_timeout,
-          resolver:         @resolver,
+          read_timeout: @read_timeout,
+          write_timeout: @write_timeout,
+          resolver: @resolver,
           ssl_socket_class: @ssl_socket_class,
-          ssl_params:       @ssl_params
+          ssl_params: @ssl_params
         )
 
         ssl_socket.accept(tcp_socket, timeout: timeout)

lib/socketry/ssl/socket.rb

@@ -75,6 +75,7 @@ def connect(
           raise Socketry::TimeoutError, "connection to #{remote_addr}:#{remote_port} timed out"
         rescue OpenSSL::SSL::SSLError => ex
           raise Socketry::SSL::CertificateVerifyError, ex.message if ex.message.include?("certificate verify failed")
+
           raise Socketry::SSL::Error, ex.message, ex.backtrace
         end
 

lib/socketry/tcp/server.rb

@@ -57,6 +57,7 @@ def accept(timeout: nil)
         while (socket = accept_nonblock) == :wait_readable
           # Ruby 2.2 has trouble using io/wait here
           next if IO.select([@server], nil, nil, time_remaining(timeout))
+
           raise Socketry::TimeoutError, "no connection received after #{timeout} seconds"
         end
 
@@ -72,10 +73,10 @@ def accept_nonblock
         # Note: `exception: false` for TCPServer#accept_nonblock is only supported in Ruby 2.3+
         # TODO: Switch to `exception: false` when we drop support for Ruby 2.2.
         Socketry::TCP::Socket.new(
-          read_timeout:  @read_timeout,
+          read_timeout: @read_timeout,
           write_timeout: @write_timeout,
-          resolver:      @resolver,
-          socket_class:  @socket_class
+          resolver: @resolver,
+          socket_class: @socket_class
         ).from_socket(@server.accept_nonblock)
       rescue IO::WaitReadable, Errno::EAGAIN
         :wait_readable
@@ -84,6 +85,7 @@ def accept_nonblock
       # Close the server
       def close
         return false unless @server
+
         @server.close rescue nil
         @server = nil
         true

lib/socketry/tcp/socket.rb

@@ -204,6 +204,7 @@ def reconnect(timeout: Socketry::Timeout::DEFAULT_TIMEOUTS[:connect])
       def from_socket(socket)
         ensure_state :disconnected
         raise TypeError, "expected #{@socket_class}, got #{socket.class}" unless socket.is_a?(@socket_class)
+
         @socket = socket
         @state  = :connected
 
@@ -248,6 +249,7 @@ def readpartial(size, outbuf: nil, timeout: @read_timeout)
         begin
           while (result = read_nonblock(size, outbuf: outbuf)) == :wait_readable
             next if @socket.wait_readable(time_remaining(timeout))
+
             raise TimeoutError, "read timed out after #{timeout} seconds"
           end
         ensure
@@ -314,6 +316,7 @@ def writepartial(data, timeout: @write_timeout)
         begin
           while (result = write_nonblock(data)) == :wait_writable
             next if @socket.wait_writable(time_remaining(timeout))
+
             raise TimeoutError, "write timed out after #{timeout} seconds"
           end
         ensure
@@ -344,6 +347,7 @@ def write(data, timeout: @write_timeout)
             return :eof if bytes_written == :eof
 
             break if bytes_written == data.bytesize
+
             data = data.byteslice(bytes_written..-1)
           end
         end
@@ -432,14 +436,17 @@ def change_state(new_state)
         when :connecting
           raise "@socket is unset in #{@state} state" unless @socket
           raise(StateError, "not in the disconnected state (actual: #{@state})") unless @state == :disconnected
+
           @state = :connecting
         when :connected
           raise "@socket is unset in #{@state} state" unless @socket
           raise(StateError, "not in the connecting state (actual: #{@state})") unless @state == :connecting
+
           @state = :connected
         when :disconnected
           raise "@socket is still set while disconnecting (in #{@state} state)" if @socket
           raise(StateError, "already in the disconnected state") if @state == :disconnected
+
           @state = :disconnected
         else raise ArgumentError, "bad state argument: #{state.inspect}"
         end

lib/socketry/timeout.rb

@@ -7,8 +7,8 @@ module Timeout
 
     # Default timeouts (in seconds)
     DEFAULT_TIMEOUTS = {
-      read:    5,
-      write:   5,
+      read: 5,
+      write: 5,
       connect: 5
     }.freeze
 
@@ -33,6 +33,7 @@ def start_timer(timer = DEFAULT_TIMER.new)
     # @raise [Socketry::InternalError] if timer has not been started
     def lifetime
       raise Socketry::InternalError, "timer not started" unless @timer
+
       @timer.to_f
     end
 
@@ -56,6 +57,7 @@ def set_timeout(timeout)
     def clear_timeout(timeout)
       return unless timeout
       raise Socketry::InternalError, "no deadline set" unless @deadline
+
       @deadline = nil
     end
 
@@ -68,8 +70,10 @@ def clear_timeout(timeout)
     def time_remaining(timeout)
       return unless timeout
       raise Socketry::InternalError, "no deadline set" unless @deadline
+
       remaining = @deadline - lifetime
       raise Socketry::TimeoutError, "time expired" if remaining <= 0
+
       remaining
     end
   end

lib/socketry/udp/socket.rb

@@ -135,6 +135,7 @@ def recvfrom(maxlen, timeout: @read_timeout)
         begin
           while (result = recvfrom_nonblock(maxlen)) == :wait_readable
             next if @socket.wait_readable(time_remaining(timeout))
+
             raise Socketry::TimeoutError, "recvfrom timed out after #{timeout} seconds"
           end
         ensure
@@ -168,6 +169,7 @@ def send(msg, host: nil, port: nil)
       # @return [true, false] true if the socket was open, false if closed
       def close
         return false if closed?
+
         @socket.close
         true
       ensure

socketry.gemspec

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-lib = File.expand_path("../lib", __FILE__)
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "socketry/version"
 

spec/socketry/ssl/server_spec.rb

@@ -14,7 +14,7 @@
   let(:ssl_server_params) do
     {
       cert: OpenSSL::X509::Certificate.new(server_cert_file.read),
-      key:  OpenSSL::PKey::RSA.new(server_key_file.read)
+      key: OpenSSL::PKey::RSA.new(server_key_file.read)
     }
   end
 

spec/spec_helper.rb

@@ -3,7 +3,7 @@
 require "coveralls"
 Coveralls.wear!
 
-$LOAD_PATH.unshift File.expand_path("../../lib", __FILE__)
+$LOAD_PATH.unshift File.expand_path("../lib", __dir__)
 require "socketry"
 
 RSpec.configure(&:disable_monkey_patching!)