selective-ruby-rspec 0.1.5 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 742c9d113ea3409cd38857cad3943deaf6bf8c660f8061e97c57957b35ff2d07
-  data.tar.gz: 420c8ea9dac4e9b21a0346c7eba4ee8a0430ee83225f8f2dc1254bd175b0d413
+  metadata.gz: ec0984fc3f7bb4c0e7b38d9f89b75d9f62e75496c9381ef9f8e588a61951360d
+  data.tar.gz: 861480972fafe20898532edc2ddaff16c51ebe4d9346c7b5d2524d4d83c9b703
 SHA512:
-  metadata.gz: 5e8e31650ee078e7f0cabf43120c99b06f3a500b463b3c04fbe49dd9723db2a97ced3565c82729956f1f13a8c3fc0d0442d4eac96e8f228a7a02b2e3e483592e
-  data.tar.gz: 269a44800fb7a24bf58f32552d7313d54ddf6cb033eb252f1cebc220f2364b92fe67ee822d25cce1db731d1175266a85bf7d58931f770f1054409c32cfcff1d4
+  metadata.gz: 3c6d4c9b94b2be6e7f2194554604621c2ce43aa682dc5891ff7c3021821d8f89d2627d45cf90410c51a33478ba343f316cd81ee375be8b091e7b4707c6183646
+  data.tar.gz: 4ba8a04a33b92b644455ff168b2a3f379412ff4f1df1bb57800875a25911f5281f2fc17c56d9f4c05975503201f45aacef4caa993416eba6e7981bb376032ba9

data/lib/selective/ruby/rspec/formatter.rb

@@ -6,17 +6,21 @@ module Selective
 
         def initialize(...); end
 
-        def self.callback=(callback)
-          @callback = callback
+        def self.runner_wrapper=(runner_wrapper)
+          @runner_wrapper = runner_wrapper
         end
 
-        def self.callback
-          @callback
+        def self.runner_wrapper
+          @runner_wrapper
         end
         
         %i(example_passed example_failed example_pending).each do |method|
           define_method(method) do |notification|
-            self.class.callback.call(notification.example)
+            self.class.runner_wrapper.report_example(notification.example)
+          rescue Selective::Ruby::Core::ConnectionLostError
+            ::RSpec.world.wants_to_quit = true
+            self.class.runner_wrapper.connection_lost = true
+            self.class.runner_wrapper.remove_test_case_result(notification.example.id)
           end
         end
       end

data/lib/selective/ruby/rspec/monkeypatches.rb

@@ -97,6 +97,16 @@ module Selective
             super
             @example_map = {}
           end
+
+          def prepare_example_filtering
+            @filtered_examples = Hash.new do |hash, group|
+              hash[group] = if ::RSpec.configuration.dry_run?
+                filter_manager.prune(group.examples)
+              else
+                []
+              end
+            end
+          end
         end
 
         module Runner
@@ -106,7 +116,7 @@ module Selective
         module Example
           def initialize(*args)
             super
-            ::RSpec.world.example_map[id] = example_group.parent_groups.last
+            ::RSpec.world.example_map[id] = self
           end
 
           def run(*args)

data/lib/selective/ruby/rspec/runner_wrapper.rb

@@ -8,6 +8,7 @@ module Selective
         class TestManifestError < StandardError; end
 
         attr_reader :rspec_runner, :config, :example_callback
+        attr_accessor :connection_lost
 
         FRAMEWORK = "rspec"
         DEFAULT_SPEC_PATH = "./spec"
@@ -23,29 +24,12 @@ module Selective
             config.options[:files_or_directories_to_run] = [DEFAULT_SPEC_PATH]
           end
 
-          Formatter.callback = method(:report_example)
+          Formatter.runner_wrapper = self
 
           @rspec_runner = ::RSpec::Core::Runner.new(@config)
           @rspec_runner.setup($stderr, $stdout)
         end
 
-        def parse_args(args)
-          supported_wrapper_args = %w[--require-each-hooks]
-          wrapper_args, rspec_args = args.partition do |arg|
-            supported_wrapper_args.any? do |p|
-              arg.start_with?(p)
-            end
-          end
-
-          wrapper_config_hash = wrapper_args.each_with_object({}) do |arg, hash|
-            key = arg.sub('--', '').tr('-', '_').to_sym
-            hash[key] = true
-          end
-
-          rspec_args << "--format=progress" unless args.any? { |e| e.start_with?("--format") }
-          [rspec_args, wrapper_config_hash]
-        end
-
         def manifest
           output = nil
           Tempfile.create("selective-rspec-dry-run") do |f|
@@ -63,28 +47,20 @@ module Selective
         end
 
         def run_test_cases(test_case_ids)
-          ::RSpec.world.reporter.send(:start, nil)
-          Selective::Ruby::Core::Controller.suppress_reporting!
-
-          ::RSpec.configuration.reset_filters
-          ::RSpec.world.prepare_example_filtering
-          config.options[:files_or_directories_to_run] = test_case_ids
-          ensure_formatter
-
-          rspec_runner.setup($stderr, $stdout)
-
-          example_groups = test_case_ids.each_with_object(Set.new) do |test_case_id, set|
-            set << ::RSpec.world.example_map[test_case_id]
+          ensure_test_phase
+          configure(test_case_ids)
+          rspec_runner.run_specs(optimize_test_filtering(test_case_ids).to_a)
+          if connection_lost
+            self.connection_lost = false
+            raise Selective::Ruby::Core::ConnectionLostError
           end
-
-          rspec_runner.run_specs(example_groups.to_a)
         end
 
         def exec
           rspec_runner.run($stderr, $stdout)
         end
 
-        def remove_failed_test_case_result(test_case_id)
+        def remove_test_case_result(test_case_id)
           failure = ::RSpec.world.reporter.failed_examples.detect { |e| e.id == test_case_id }
           if (failed_example_index = ::RSpec.world.reporter.failed_examples.index(failure))
             ::RSpec.world.reporter.failed_examples.delete_at(failed_example_index)
@@ -119,8 +95,29 @@ module Selective
           RSpec::VERSION
         end
 
+        def report_example(example)
+          example_callback.call(format_example(example))
+        end
+
         private
 
+        def parse_args(args)
+          supported_wrapper_args = %w[--require-each-hooks]
+          wrapper_args, rspec_args = args.partition do |arg|
+            supported_wrapper_args.any? do |p|
+              arg.start_with?(p)
+            end
+          end
+
+          wrapper_config_hash = wrapper_args.each_with_object({}) do |arg, hash|
+            key = arg.sub('--', '').tr('-', '_').to_sym
+            hash[key] = true
+          end
+
+          rspec_args << "--format=progress" unless args.any? { |e| e.start_with?("--format") }
+          [rspec_args, wrapper_config_hash]
+        end
+
         def get_example_from_reporter(test_case_id)
           ::RSpec.world.reporter.examples.detect { |e| e.id == test_case_id }
         end
@@ -152,10 +149,6 @@ module Selective
           }
         end
 
-        def report_example(example)
-          example_callback.call(format_example(example))
-        end
-
         def apply_rspec_configuration
           ::RSpec.configure do |config|
             config.backtrace_exclusion_patterns = config.backtrace_exclusion_patterns | [/lib\/selective/]
@@ -167,11 +160,40 @@ module Selective
           raise TestManifestError.new("Selective could not generate a test manifest. The output was:\n#{output}")
         end
 
-        def ensure_formatter
-          formatter = [Selective::Ruby::RSpec::Formatter.to_s]
-          return if config.options[:formatters].include?(formatter)
+        def configure(test_case_ids)
+          ::RSpec.world.wants_to_quit = false
+          ::RSpec.configuration.reset_filters
+          ::RSpec.world.filtered_examples.clear
+
+          config.options[:files_or_directories_to_run] = test_case_ids
+          rspec_runner.configure($stderr, $stdout)
+          ::RSpec.configuration.load_spec_files
+        end
+
+        def optimize_test_filtering(test_case_ids)
+          # The following is an optimization to avoid RSpec's usual filtering mechanism
+          # which has a significant performance overhead.
+          test_case_ids.each_with_object(Set.new) do |test_case_id, set|
+            example = ::RSpec.world.example_map[test_case_id]
+            if ::RSpec.world.filtered_examples.key?(example.example_group)
+              ::RSpec.world.filtered_examples[example.example_group] << example
+            else
+              ::RSpec.world.filtered_examples[example.example_group] = [example]
+            end
+            set << example.example_group.parent_groups.last
+          end
+        end
+
+        def ensure_test_phase
+          @test_phase_initialized ||= begin
+            ::RSpec.world.reporter.send(:start, nil)
+            Selective::Ruby::Core::Controller.suppress_reporting!
+            apply_formatter
+          end
+        end
 
-          config.options[:formatters] << formatter
+        def apply_formatter
+          config.options[:formatters] << [Selective::Ruby::RSpec::Formatter.to_s]
         end
       end
     end

data/lib/selective/ruby/rspec/version.rb

@@ -3,7 +3,7 @@
 module Selective
   module Ruby
     module RSpec
-      VERSION = "0.1.5"
+      VERSION = "0.1.7"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: selective-ruby-rspec
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.7
 platform: ruby
 authors:
 - Benjamin Wood
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-01-26 00:00:00.000000000 Z
+date: 2024-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zeitwerk
@@ -31,14 +31,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.2.3
 description: Selective is an intelligent test runner for your current CI provider.
   Get real-time test results, intelligent ordering based on code changes, shorter
   run times, automatic flake detection, the ability to re-enqueue failed tests, and