rspec-abq 1.1.0 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 29210d070dba423ba2bb9aad82deb1df9e4a4fb01e70bec05b1d728d20e29d5e
-  data.tar.gz: 1771fe5b152192dd256b29cc412526fc275c381c1c697cec4a51b6ae5a4b0174
+  metadata.gz: ed680f830f8937cce3a3732e0a03ca62da77ff054cd23e26dcd59f54b019b51b
+  data.tar.gz: 1042ac324987d4659bab86194dd2e4a59eeb439f7c0794c76d771c68c3a7e4ea
 SHA512:
-  metadata.gz: 8f89f037b50d88458b443c534ec78e20d9bbf4661d81cf68774f2bd7438a588cace8a991dfe101d1a4424a98956e186ba20f65d51f47d837ff5237dbf4b00a4f
-  data.tar.gz: 22bf4931dc4ee3639334e1e91451e0577591c215ad279802560d8ae7256b56a31a93fcb495b932f9e490658aa2e1bc23e1100c29ed735b0515312f1e9dae2c6f
+  metadata.gz: e4c3adc4d24036d2c838057ad7f25b033d39f35d0a1a7b681291b7523ef47c262a29dbbc2a28b46fa7244db2896fdf0a19560922d6f6c46a5a488069e5f4e265
+  data.tar.gz: d97a1f0fd596dff067b8b87efb7b36a422bd99a512f47df38b1e70643b2c8df258b25c89343d1bb0ceabcb61b99602888ff7378becd526cab5892fc2bae83152

data/README.md

@@ -38,7 +38,7 @@ require 'rspec/abq'
 
 This gem is actively tested against
 
-- rubies 2.6-3.1
+- rubies 2.7-3.1
 - rspecs 3.5-3.12
 
 as well as a handful of rspec plugins:

data/lib/rspec/abq/version.rb

@@ -1,6 +1,6 @@
 module RSpec
   module Abq
     # current version!
-    VERSION = "1.1.0"
+    VERSION = "1.1.2"
   end
 end

data/lib/rspec/abq.rb

@@ -148,8 +148,20 @@ module RSpec
       Extensions.setup!
     end
 
+    # Base ABQ error.
+    Error = Class.new(StandardError)
+
     # raised when check_configuration fails
-    UnsupportedConfigurationError = Class.new(StandardError)
+    UnsupportedConfigurationError = Class.new(Error)
+
+    # Failed to connect and initialize handshake.
+    ConnectionFailed = Class.new(Error)
+
+    # Communication between abq sockets follows the following protocol:
+    #   - The first 4 bytes an unsigned 32-bit integer (big-endian) representing
+    #     the size of the rest of the message.
+    #   - The rest of the message is a JSON-encoded payload.
+    ConnectionBroken = Class.new(Error)
 
     # raises if RSpec is configured in a way that's incompatible with rspec-abq
     def self.check_configuration!(config)
@@ -214,12 +226,16 @@ module RSpec
 
     # Creates the socket to communicate with the worker and sends the worker the protocol
     # @!visibility private
-    def self.socket
-      @socket ||= TCPSocket.new(*ENV[ABQ_SOCKET].split(":")).tap do |socket|
-        # Messages sent to/received from the ABQ worker should be done so ASAP.
-        # Since we're on a local network, we don't care about packet reduction here.
-        socket.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
-        protocol_write(NATIVE_RUNNER_SPAWNED_MESSAGE, socket)
+    def self.socket(connect_timeout: 5)
+      @socket ||= begin
+        Socket.tcp(*ENV[ABQ_SOCKET].split(":"), connect_timeout: connect_timeout).tap do |socket|
+          # Messages sent to/received from the ABQ worker should be done so ASAP.
+          # Since we're on a local network, we don't care about packet reduction here.
+          socket.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
+          protocol_write(NATIVE_RUNNER_SPAWNED_MESSAGE, socket)
+        end
+      rescue
+        raise ConnectionFailed, "Unable to connect to ABQ socket #{ENV[ABQ_SOCKET]}"
       end
     end
 
@@ -245,25 +261,18 @@ module RSpec
         end
     end
 
-    # Communication between abq sockets follows the following protocol:
-    #   - The first 4 bytes an unsigned 32-bit integer (big-endian) representing
-    #     the size of the rest of the message.
-    #   - The rest of the message is a JSON-encoded payload.
-    class AbqConnBroken < StandardError
-    end
-
     # Writes a message to an Abq socket using the 4-byte header protocol.
     #
     # @param socket [TCPSocket]
     # @param msg
     def self.protocol_write(msg, socket = Abq.socket)
       json_msg = JSON.dump msg
-      begin
-        socket.write [json_msg.bytesize].pack("N")
-        socket.write json_msg
-      rescue
-        raise AbqConnBroken
-      end
+      socket.write [json_msg.bytesize].pack("N")
+      socket.write json_msg
+    rescue SystemCallError, IOError
+      raise ConnectionBroken
+    rescue
+      raise Error
     end
 
     # Writes a message to an Abq socket using the 4-byte header protocol.
@@ -273,10 +282,16 @@ module RSpec
     def self.protocol_read(socket = Abq.socket)
       len_bytes = socket.read 4
       return :abq_done if len_bytes.nil?
+
       len = len_bytes.unpack1("N")
       json_msg = socket.read len
       return :abq_done if json_msg.nil?
+
       JSON.parse json_msg
+    rescue SystemCallError, IOError
+      raise ConnectionBroken
+    rescue
+      raise Error
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-abq
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.2
 platform: ruby
 authors:
 - Ayaz Hafiz
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-10 00:00:00.000000000 Z
+date: 1980-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-core
@@ -63,44 +63,44 @@ dependencies:
   name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.36.0
+        version: 3.38.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.36.0
+        version: 3.38.0
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 4.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 4.8.0
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.13.10
+        version: 1.14.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.13.10
+        version: 1.14.2
 - !ruby/object:Gem::Dependency
   name: webdrivers
   requirement: !ruby/object:Gem::Requirement
@@ -135,14 +135,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.6.5
+        version: 6.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.6.5
+        version: 6.1.0
 - !ruby/object:Gem::Dependency
   name: capybara-inline-screenshot
   requirement: !ruby/object:Gem::Requirement
@@ -215,7 +215,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.2.26
 signing_key:
 specification_version: 4
 summary: RSpec::Abq allows for parallel rspec runs using abq