selective-ruby-rspec 0.1.3 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 28d546ae7d10547709d4b3180b1b52851d9ba8ab1f9e9f819d5b49abcde56136
-  data.tar.gz: 1037b6b16f88ab08b67a51d4176f4d41d0ef43c7693793b8886b1e93f1c01dbe
+  metadata.gz: 742c9d113ea3409cd38857cad3943deaf6bf8c660f8061e97c57957b35ff2d07
+  data.tar.gz: 420c8ea9dac4e9b21a0346c7eba4ee8a0430ee83225f8f2dc1254bd175b0d413
 SHA512:
-  metadata.gz: c50265ba4980fc2d49b2cca5eff7320b7ed6357d9ce03153b10e0bc8a3a1e180a6d65ec9645da1d89ff5fbc8eadecd3bbebd97150fe927e5d5354f94f1151786
-  data.tar.gz: 29995bbfea2b82f9ffc3fb3996b3d35138ba9a95bee280e70d4adb0a5e73aaed1e83e3d2856b97909ccecfaa909fccfe76d4561e34d3c4665e7fbb25970354ab
+  metadata.gz: 5e8e31650ee078e7f0cabf43120c99b06f3a500b463b3c04fbe49dd9723db2a97ced3565c82729956f1f13a8c3fc0d0442d4eac96e8f228a7a02b2e3e483592e
+  data.tar.gz: 269a44800fb7a24bf58f32552d7313d54ddf6cb033eb252f1cebc220f2364b92fe67ee822d25cce1db731d1175266a85bf7d58931f770f1054409c32cfcff1d4

data/.semaphore/semaphore.yml

@@ -0,0 +1,19 @@
+version: v1.0
+name: Ruby
+agent:
+  machine:
+    type: e1-standard-2
+    os_image: ubuntu2004
+blocks:
+  - name: Run RSpec tests
+    task:
+      jobs:
+        - name: Run RSpec tests
+          parallelism: 2
+          commands:
+            - sem-version ruby 3.3.0
+            - checkout
+            - bundle install
+            - bundle exec selective rspec
+      secrets:
+        - name: Selective

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

@@ -0,0 +1,25 @@
+module Selective
+  module Ruby
+    module RSpec
+      class Formatter
+        ::RSpec::Core::Formatters.register self, :example_passed, :example_failed, :example_pending
+
+        def initialize(...); end
+
+        def self.callback=(callback)
+          @callback = callback
+        end
+
+        def self.callback
+          @callback
+        end
+        
+        %i(example_passed example_failed example_pending).each do |method|
+          define_method(method) do |notification|
+            self.class.callback.call(notification.example)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -139,10 +139,10 @@ module Selective
           end
         end
 
-        module Hooks
-          hooks = %i(before prepend_before after append_after)
 
-          hooks.each do |hook|
+        HOOKS = %i(before prepend_before after append_after)
+        module Hooks
+          HOOKS.each do |hook|
             define_method(hook) do |*args, &block|
               args = args.map { |a| a == :all ? :each : a }
               super(*args, &block)
@@ -150,7 +150,21 @@ module Selective
           end
         end
 
-        def self.apply
+        module RequireEachHooks
+          HOOKS.each do |hook|
+            define_method(hook) do |*args, &block|
+              if args.none? { |a| a == :all}
+                super(*args, &block)
+              else
+                super(*args) do
+                  raise "Before :all hooks are not supported when using --require-each-hooks. Please use before(:each) instead."
+                end
+              end
+            end
+          end
+        end
+
+        def self.apply(config)
           ::RSpec::Support.require_rspec_core("formatters/base_text_formatter")
 
           MAP.each do |module_name, _methods|
@@ -163,7 +177,11 @@ module Selective
           # a bug in < Ruby 3.0 that prevents us from doing so. Instead,
           # we extend the ExampleGroup class which is where the Hooks module
           # is included.
-          ::RSpec::Core::ExampleGroup.extend(Hooks)
+          if config[:require_each_hooks]
+            ::RSpec::Core::ExampleGroup.extend(RequireEachHooks)
+          else
+            ::RSpec::Core::ExampleGroup.extend(Hooks)
+          end
 
           ::RSpec.singleton_class.prepend(RSpec)
           ::RSpec::Core::Reporter.prepend(Reporter)

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

@@ -7,26 +7,45 @@ module Selective
       class RunnerWrapper
         class TestManifestError < StandardError; end
 
-        attr_reader :args, :rspec_runner, :config
+        attr_reader :rspec_runner, :config, :example_callback
 
+        FRAMEWORK = "rspec"
         DEFAULT_SPEC_PATH = "./spec"
 
-        def initialize(args)
-          Selective::Ruby::RSpec::Monkeypatches.apply
+        def initialize(args, example_callback)
+          @example_callback = example_callback
+          rspec_args, wrapper_config_hash = parse_args(args)
+          Selective::Ruby::RSpec::Monkeypatches.apply(wrapper_config_hash)
           apply_rspec_configuration
 
-          args << "--format=progress" unless args.any? { |e| e.start_with?("--format") }
-          @args = args
-
-          @config = ::RSpec::Core::ConfigurationOptions.new(args)
+          @config = ::RSpec::Core::ConfigurationOptions.new(rspec_args)
           if config.options[:files_or_directories_to_run].empty?
             config.options[:files_or_directories_to_run] = [DEFAULT_SPEC_PATH]
           end
 
+          Formatter.callback = method(:report_example)
+
           @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|
@@ -43,12 +62,22 @@ module Selective
           raise_test_manifest_error(e.message)
         end
 
-        def run_test_cases(test_case_ids, callback)
+        def run_test_cases(test_case_ids)
           ::RSpec.world.reporter.send(:start, nil)
           Selective::Ruby::Core::Controller.suppress_reporting!
-          test_case_ids.flatten.each do |test_case_id|
-            run_test_case(test_case_id, callback)
+
+          ::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]
           end
+
+          rspec_runner.run_specs(example_groups.to_a)
         end
 
         def exec
@@ -78,20 +107,20 @@ module Selective
           ::RSpec.world.reporter.finish
         end
 
-        private
+        def framework
+          RunnerWrapper::FRAMEWORK
+        end
 
-        def run_test_case(test_case_id, callback)
-          ::RSpec.configuration.reset_filters
-          ::RSpec.world.prepare_example_filtering
-          config.options[:files_or_directories_to_run] = test_case_id
-          rspec_runner.options = config
-          rspec_runner.setup($stderr, $stdout)
+        def framework_version
+          ::RSpec::Core::Version::STRING
+        end
 
-          # $rspec_rerun_debug = true if test_case == './spec/selective_spec.rb[1:2]' && ::RSpec.world.reporter.examples.length == 5
-          rspec_runner.run_specs([::RSpec.world.example_map[test_case_id]])
-          callback.call(format_example(get_example_from_reporter(test_case_id)))
+        def wrapper_version
+          RSpec::VERSION
         end
 
+        private
+
         def get_example_from_reporter(test_case_id)
           ::RSpec.world.reporter.examples.detect { |e| e.id == test_case_id }
         end
@@ -123,6 +152,10 @@ 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/]
@@ -133,6 +166,13 @@ module Selective
         def raise_test_manifest_error(output)
           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)
+
+          config.options[:formatters] << formatter
+        end
       end
     end
   end

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

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

data/lib/selective-ruby-rspec.rb

@@ -2,6 +2,7 @@
 
 require "zeitwerk"
 require "rspec/core"
+require "#{__dir__}/selective/ruby/rspec/version"
 
 loader = Zeitwerk::Loader.for_gem(warn_on_extra_files: false)
 loader.inflector.inflect("rspec" => "RSpec")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: selective-ruby-rspec
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.5
 platform: ruby
 authors:
 - Benjamin Wood
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-12-08 00:00:00.000000000 Z
+date: 2024-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zeitwerk
@@ -31,14 +31,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.2
 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
@@ -50,9 +50,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".semaphore/semaphore.yml"
 - LICENSE
 - Rakefile
 - lib/selective-ruby-rspec.rb
+- lib/selective/ruby/rspec/formatter.rb
 - lib/selective/ruby/rspec/monkeypatches.rb
 - lib/selective/ruby/rspec/runner_wrapper.rb
 - lib/selective/ruby/rspec/version.rb