rspec-conductor 1.0.10 → 1.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9de36557f5b670ac37493d920d186e4dcbcaca0c958d59914448b91aa5e6e488
-  data.tar.gz: 9d2371b5598a12adbc6ac907d80dfc4fbbe5f9c7d1c2b0f75cb17337345f51e4
+  metadata.gz: 4a4f284fb6887972bbd325f6a5d6ce77b3c384d3cc7b8933c19bd04af2aa3ada
+  data.tar.gz: 733f1d8de0935949b77aa54374f37f97976a007c7dc53381b1dc8d8bb3e6922d
 SHA512:
-  metadata.gz: cb67874bb0e5f84176ac601588d7931c97d70e3f8f6caff111e7cc1607b15007fcbc17f0053ff2c92f8e438cdad343530c91667de4d99f4fc7b95ac504f868fd
-  data.tar.gz: 4cb10a52cf0a0a6f9948c36287f2b6c5d35183df0ce6370196f9342e67c29ce5332780d8da8172d585be264170958fcbb317d77f03f3c23cb4ff70394b6e4cbe
+  metadata.gz: e23c66e05afe4064b4a6062d6f7880429e641c5e2a3eac73f60a50ba5bd4c75ecb2b36a8484405200e9e8102f0cfd24b20fb99a0fbdf959be376e0087cf4006d
+  data.tar.gz: ebc3ad89f178da346ce4a5aee153e280b8b10b98f2c1d4e55894035237ee9f990e34206f272f35128d0e94da7c01847acd15225ab7a8db0516ceb674618f1887

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [1.0.11] - 2026-08-03
+
+- Fix a bug in 2.x that would cause an exception because of the 3.x syntax usage (`_1`) in the formatter base
+- Remove a potential bottleneck when spec files run under 10ms on average
+- Fix performance issue with recalculating the file/location list over and over (which would coincidentally also take around 10ms for large directories)
+  - In other words, if you had a lot of super fast spec files, it will run them fast as well
+
 ## [1.0.10] - 2026-03-08
 
 - Add --print-slowest cli param to display the slowest specs in the suite

data/lib/rspec/conductor/formatters/base.rb

@@ -74,7 +74,7 @@ module RSpec
               #{message[:location]}
               #{message[:exception_class]}: #{message[:message]}
               Backtrace:
-            #{message[:backtrace].map { "    #{_1}" }.join("\n")}
+            #{message[:backtrace].map { |line| "    #{line}" }.join("\n")}
           EOM
         end
 

data/lib/rspec/conductor/server.rb

@@ -4,7 +4,6 @@ module RSpec
   module Conductor
     class Server
       MAX_SEED = 2**16
-      WORKER_POLL_INTERVAL = 0.01
 
       # @option worker_count [Integer] How many workers to spin
       # @option rspec_args [Array<String>] A list of rspec options

data/lib/rspec/conductor/util/child_process.rb

@@ -1,12 +1,14 @@
 # frozen_string_literal: true
 
+require "socket"
+
 module RSpec
   module Conductor
     module Util
       class ChildProcess
         POLL_INTERVAL = 0.01
 
-        attr_reader :pid, :exit_status
+        attr_reader :pid, :message_socket, :exit_status, :ios
 
         def self.fork(**args, &block)
           new(**args).fork(&block)
@@ -22,44 +24,47 @@ module RSpec
 
         def self.tick_all(processes, poll_interval: POLL_INTERVAL)
           processes_by_io = processes.each_with_object({}) do |process, memo|
-            process.pipes.reject(&:closed?).each { |pipe| memo[pipe] = process }
+            process.ios.reject(&:closed?).each { |io| memo[io] = process }
           end
           return false if processes_by_io.empty?
 
           ready, = IO.select(processes_by_io.keys, nil, nil, poll_interval)
-          ready&.each { |pipe| processes_by_io[pipe].read_available(pipe) }
+          ready&.each { |io| processes_by_io[io].handle_available(io) }
 
           true
         end
 
-        def initialize(on_stdout: nil, on_stderr: nil)
+        def initialize(on_stdout: nil, on_stderr: nil, on_message: nil)
           @on_stdout = on_stdout
           @on_stderr = on_stderr
+          @on_message = on_message
           @pid = nil
           @exit_status = nil
           @stdout_pipe = nil
           @stderr_pipe = nil
           @stdout_buffer = +""
           @stderr_buffer = +""
+          @message_socket = nil
+          @ios = []
           @done = false
         end
 
-        def pipes
-          [@stdout_pipe, @stderr_pipe].compact
-        end
-
         def fork(&block)
           raise ArgumentError, '.fork should be called with a block' unless block_given?
 
           stdout_read, stdout_write = IO.pipe
           stderr_read, stderr_write = IO.pipe
+          parent_socket, child_socket = Socket.pair(:UNIX, :STREAM, 0) if @on_message
 
           @stdout_pipe = stdout_read
           @stderr_pipe = stderr_read
+          @message_socket = parent_socket
+          @ios = [@stdout_pipe, @stderr_pipe, @message_socket].compact
 
           @pid = Kernel.fork do
             stdout_read.close
             stderr_read.close
+            parent_socket&.close
 
             $stdout = stdout_write
             $stderr = stderr_write
@@ -69,13 +74,14 @@ module RSpec
             STDIN.reopen($stdin)
 
             begin
-              yield self
+              yield self, child_socket
             rescue => e
               stderr_write.puts "#{e.class}: #{e.message}\n#{e.backtrace.join("\n")}"
               exit 1
             ensure
               stdout_write.close
               stderr_write.close
+              child_socket&.close
             end
 
             exit 0
@@ -83,6 +89,7 @@ module RSpec
 
           stdout_write.close
           stderr_write.close
+          child_socket&.close
 
           self
         end
@@ -91,17 +98,27 @@ module RSpec
           @done
         end
 
-        def read_available(pipe)
+        def handle_available(io)
           return if done?
-          return if pipe.closed?
-
-          buffer, callback = if pipe == @stdout_pipe
-            [@stdout_buffer, @on_stdout]
-          elsif pipe == @stderr_pipe
-            [@stderr_buffer, @on_stderr]
-          else
-            return
+          return if io.closed?
+
+          case io
+          when @stdout_pipe, @stderr_pipe
+            read_pipe(io)
+          when @message_socket
+            @on_message&.call
           end
+        end
+
+        def read_pipe(pipe)
+          buffer, callback = case pipe
+                             when @stdout_pipe
+                               [@stdout_buffer, @on_stdout]
+                             when @stderr_pipe
+                               [@stderr_buffer, @on_stderr]
+                             else
+                               return
+                             end
 
           begin
             data = pipe.read_nonblock(4096, exception: false)
@@ -132,6 +149,8 @@ module RSpec
           rescue Errno::ECHILD
           end
 
+          @message_socket&.close
+
           self
         end
 

data/lib/rspec/conductor/version.rb

@@ -2,6 +2,6 @@
 
 module RSpec
   module Conductor
-    VERSION = "1.0.10"
+    VERSION = "1.0.11"
   end
 end

data/lib/rspec/conductor/worker.rb

@@ -48,8 +48,6 @@ module RSpec
         debug "Worker crashed: #{e.class}: #{e.message}"
         debug e.backtrace.join("\n")
         raise
-      ensure
-        @socket.close
       end
 
       private
@@ -109,12 +107,12 @@ module RSpec
       def run_spec(file)
         RSpec.world.reset
         RSpec.configuration.reset
-        RSpec.configuration.files_or_directories_to_run = [file]
         RSpec.configuration.output_stream = null_io_out
         RSpec.configuration.error_stream = null_io_out
         RSpec.configuration.formatter_loader.formatters.clear
         RSpec.configuration.add_formatter(RSpecSubscriber.new(@socket, file, -> { check_for_shutdown }))
         parsed_options.configure(RSpec.configuration)
+        RSpec.configuration.files_or_directories_to_run = location_entries_for(file)
         RSpec.configuration.files_to_run # this seemingly random line is necessary for rspec to set up the inclusion filters (e.g. hello_spec.rb:123 -> the :123 part is an inclusion filter)
 
         begin
@@ -133,7 +131,7 @@ module RSpec
 
           @socket.send_message(
             type: :spec_complete,
-            file: file
+            file: file,
           )
         rescue StandardError => e
           debug "Spec error: #{e.class}: #{e.message}"
@@ -167,6 +165,21 @@ module RSpec
         @parsed_options ||= RSpec::Core::ConfigurationOptions.new(@rspec_args).tap { |co| co.options.delete(:requires) }
       end
 
+      # Returns all the location entries for a filename
+      # RSpec syntax for locations:
+      # * ./a_spec.rb - run whole file
+      # * ./a_spec.rb:18 - run specific spec
+      # * ./a_spec.rb[1:2:1] - run specific spec group
+      # You can specify locations more than once for a single file, so you need to find all relevant entries in the runner
+      def location_entries_for(filename)
+        filename = File.expand_path(filename)
+        entries = Array(parsed_options.options[:files_or_directories_to_run]).select do |entry|
+          entry_filename = File.expand_path(entry.sub(/(\[\d+(:\d+)*\])+\z/, "").sub(/(:\d+)+\z/, ""))
+          entry_filename == filename
+        end
+        entries.empty? ? filename : entries
+      end
+
       def debug(message)
         @debug_io.puts message if @debug_io
       end

data/lib/rspec/conductor/worker_process.rb

@@ -1,38 +1,25 @@
 # frozen_string_literal: true
 
-require "socket"
-
 module RSpec
   module Conductor
-    WorkerProcess = Struct.new(:pid, :child_process, :number, :on_message, :status, :socket, :current_spec, keyword_init: true) do
+    class WorkerProcess
       def self.spawn(number:, test_env_number:, on_message:, on_stdout: nil, on_stderr: nil, **worker_init_args)
-        parent_socket, child_socket = Socket.pair(:UNIX, :STREAM, 0)
-        child_process = Util::ChildProcess.fork(on_stdout: on_stdout, on_stderr: on_stderr) do
+        worker_process = new(number: number, on_message: on_message)
+
+        child_process = Util::ChildProcess.fork(on_stdout: on_stdout, on_stderr: on_stderr, on_message: proc { worker_process.handle_message }) do |_, child_socket|
           ENV["TEST_ENV_NUMBER"] = test_env_number
-          parent_socket.close
           Worker.new(
             worker_number: number,
             socket: Protocol::Socket.new(child_socket),
             **worker_init_args
           ).run
         end
-        child_socket.close
-
-        new(
-          pid: child_process.pid,
-          child_process: child_process,
-          on_message: on_message,
-          number: number,
-          status: :running,
-          socket: Protocol::Socket.new(parent_socket),
-          current_spec: nil
-        )
+
+        worker_process.child_process = child_process
+        worker_process
       end
 
       def self.tick_all(worker_processes)
-        worker_processes_by_io = worker_processes.select(&:running?).to_h { |w| [w.socket.io, w] }
-        readable_ios, = IO.select(worker_processes_by_io.keys, nil, nil, 0)
-        readable_ios&.each { |io| worker_processes_by_io.fetch(io).handle_message }
         Util::ChildProcess.tick_all(worker_processes.map(&:child_process))
       end
 
@@ -40,11 +27,23 @@ module RSpec
         Util::ChildProcess.wait_all(worker_processes.map(&:child_process))
       end
 
+      attr_reader :number
+      attr_accessor :current_spec, :child_process, :status
+
+      def initialize(number:, on_message: nil)
+        @number = number
+        @on_message = on_message
+        @status = :running
+      end
+
       def handle_message
         message = receive_message
-        return unless message && on_message
+        unless message
+          socket.close
+          return
+        end
 
-        on_message.call(self, message)
+        @on_message&.call(self, message)
       end
 
       def send_message(message)
@@ -55,11 +54,18 @@ module RSpec
         socket.receive_message
       end
 
+      def socket
+        @socket ||= Protocol::Socket.new(child_process.message_socket)
+      end
+
+      def pid
+        child_process.pid
+      end
+
       def shut_down(status)
         return unless running?
 
-        self.status = status
-        socket.close
+        @status = status
       end
 
       def running?

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec-conductor
 version: !ruby/object:Gem::Version
-  version: 1.0.10
+  version: 1.0.11
 platform: ruby
 authors:
 - Mark Abramov
+autorequire:
 bindir: exe
 cert_chain: []
-date: 1980-01-02 00:00:00.000000000 Z
+date: 2026-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-core
@@ -68,6 +69,7 @@ metadata:
   homepage_uri: https://github.com/markiz/rspec-conductor
   source_code_uri: https://github.com/markiz/rspec-conductor
   changelog_uri: https://github.com/markiz/rspec-conductor/blob/master/CHANGELOG.md
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -82,7 +84,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.6
+rubygems_version: 3.3.26
+signing_key:
 specification_version: 4
 summary: Queue-based parallel test runner for rspec
 test_files: []