knapsack_pro 7.14.0 → 8.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 113e9ca31d058ab9623d6a0bb278768ad0a864db8bb8776440d00ceb2a648b37
-  data.tar.gz: '084be6d88bf072c8ece112b3de2a6707b240816e993f039701cd68e7920f7988'
+  metadata.gz: c531fc28ddde021a2417447b60d2feaec8924994bb5575cf1f3cd63484d2fa2b
+  data.tar.gz: 28eb5e92aff6522f1dfb31b2c2c076bb54f6e50daec25985a09286fb337fec90
 SHA512:
-  metadata.gz: 97015f7b3db931f3a9f68e7ef59aecb99f0befa5202b148d5aa56736d256048c842c00babc265c47c583534f2a0dafc488c49b748b4b3084f93a2d42f6013d84
-  data.tar.gz: 62fd8be74b14f402840ea4b9b6866a9ac008daa09d279e2cee21bd3f513d8f746f635c770c83e65db36139aa6e9ebb362301794e6aad70a9d59796dd86167d90
+  metadata.gz: 5b66568ea07f6ab6ef881e61d3f3affa5d9ba0c0201c64c2292573fc11afc8e212e4d848e63c22b2596b9e4ea36780ad4f5b72a25f729370e463f865aed324c4
+  data.tar.gz: '0021619b437b7815807667549ee8a49ffcfca23358b3456e3cbbc5331f2a03a535f271c9cdbf5c83db632709c47ec82e50f3806aab30a0660763011efe9e7800'

data/.circleci/config.yml

@@ -62,6 +62,8 @@ jobs:
       - setup_knapsack_pro_ruby
       - run: gem install rubocop
       - run: rubocop --fail-level A --only Style/FrozenStringLiteralComment,Layout/EmptyLineAfterMagicComment lib/
+      - run: bundle update rspec
+      - run: bundle exec rspec --version
       - run: bundle exec rspec spec
       - run: bundle exec ruby spec/knapsack_pro/formatters/time_tracker_specs.rb
 
@@ -192,6 +194,15 @@ jobs:
             export KNAPSACK_PRO_RSPEC_SPLIT_BY_TEST_EXAMPLES=true
             export KNAPSACK_PRO_SLOW_TEST_FILE_PATTERN="spec/features/calculator_spec.rb"
             bundle exec rake knapsack_pro:rspec
+      - run:
+          working_directory: ~/rails-app-with-knapsack_pro
+          command: |
+            # split custom files by test examples AND the --tag option passed ||
+            export KNAPSACK_PRO_BRANCH="$CIRCLE_BRANCH--$CIRCLE_BUILD_NUM--regular--split-custom-files--tag-option"
+            export KNAPSACK_PRO_RSPEC_SPLIT_BY_TEST_EXAMPLES=true
+            export KNAPSACK_PRO_SLOW_TEST_FILE_PATTERN="spec/bar_spec.rb"
+            export SKIP_ME_OR_I_WILL_FAIL=true
+            bundle exec rake "knapsack_pro:rspec[--tag tag_x -t ~tag_y --tag ~skip_me_or_i_will_fail --format documentation]"
 
   e2e-queue-rspec:
     parameters:
@@ -287,24 +298,47 @@ jobs:
             export KNAPSACK_PRO_CI_NODE_TOTAL=1
             export KNAPSACK_PRO_CI_NODE_INDEX=0
             bundle exec rake knapsack_pro:queue:rspec
+      - run:
+          working_directory: ~/rails-app-with-knapsack_pro
+          command: |
+            # split custom files by test examples AND the --tag option passed ||
+            export KNAPSACK_PRO_BRANCH="$CIRCLE_BRANCH--$CIRCLE_BUILD_NUM--queue--split-custom-files--tag-option"
+            export KNAPSACK_PRO_RSPEC_SPLIT_BY_TEST_EXAMPLES=true
+            export KNAPSACK_PRO_SLOW_TEST_FILE_PATTERN="spec/bar_spec.rb"
+            export SKIP_ME_OR_I_WILL_FAIL=true
+            bundle exec rake "knapsack_pro:queue:rspec[--tag tag_x -t ~tag_y --tag ~skip_me_or_i_will_fail --format documentation]"
       - run:
           working_directory: ~/rails-app-with-knapsack_pro
           command: |
             # turnip ||
+            mv .rspec .rspec.off
+            cp .rspec.turnip .rspec
             export KNAPSACK_PRO_BRANCH="$CIRCLE_BRANCH--$CIRCLE_BUILD_NUM--queue--turnip"
             export KNAPSACK_PRO_FIXED_QUEUE_SPLIT=true
             export KNAPSACK_PRO_TEST_DIR=turnip
             export KNAPSACK_PRO_TEST_FILE_PATTERN="turnip/**/*.feature"
-            bundle exec rake "knapsack_pro:queue:rspec[-r turnip/rspec]"
+            export KNAPSACK_PRO_SLOW_TEST_FILE_PATTERN="turnip/acceptance/foo.feature"
+            bundle exec rake knapsack_pro:queue:rspec
+            RSPEC_EXIT_CODE=$?
+            rm .rspec
+            mv .rspec.off .rspec
+            exit $RSPEC_EXIT_CODE
       - run:
           working_directory: ~/rails-app-with-knapsack_pro
           command: |
             # turnip retry ||
+            mv .rspec .rspec.off
+            cp .rspec.turnip .rspec
             export KNAPSACK_PRO_BRANCH="$CIRCLE_BRANCH--$CIRCLE_BUILD_NUM--queue--turnip"
             export KNAPSACK_PRO_FIXED_QUEUE_SPLIT=true
             export KNAPSACK_PRO_TEST_DIR=turnip
             export KNAPSACK_PRO_TEST_FILE_PATTERN="turnip/**/*.feature"
-            bundle exec rake "knapsack_pro:queue:rspec[-r turnip/rspec]"
+            export KNAPSACK_PRO_SLOW_TEST_FILE_PATTERN="turnip/acceptance/foo.feature"
+            bundle exec rake knapsack_pro:queue:rspec
+            RSPEC_EXIT_CODE=$?
+            rm .rspec
+            mv .rspec.off .rspec
+            exit $RSPEC_EXIT_CODE
 
   e2e-regular-minitest:
     parallelism: 2

data/CHANGELOG.md

@@ -1,5 +1,23 @@
 # Changelog
 
+### 8.0.0
+
+* Enable [`KNAPSACK_PRO_RSPEC_SPLIT_BY_TEST_EXAMPLES`](https://docs.knapsackpro.com/ruby/split-by-test-examples/) by default
+    * This should improve the speed of your builds, but you can disable it with [`KNAPSACK_PRO_RSPEC_SPLIT_BY_TEST_EXAMPLES=false`](https://docs.knapsackpro.com/ruby/reference/#knapsack_pro_rspec_split_by_test_examples-rspec)
+* Support RSpec tags when using [RSpec split by examples](https://docs.knapsackpro.com/ruby/split-by-test-examples/).
+
+    https://github.com/KnapsackPro/knapsack_pro-ruby/pull/288
+
+https://github.com/KnapsackPro/knapsack_pro-ruby/compare/v7.14.1...v8.0.0
+
+### 7.14.1
+
+* Improve execution time tracking for RSpec individual test examples
+
+    https://github.com/KnapsackPro/knapsack_pro-ruby/pull/289
+
+https://github.com/KnapsackPro/knapsack_pro-ruby/compare/v7.14.0...v7.14.1
+
 ### 7.14.0
 
 * Improve debugging for hanging CI nodes: show hanging spec files in the RSpec output and a command to reproduce the current batch of tests.

data/knapsack_pro.gemspec

@@ -29,15 +29,15 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'rake', '>= 0'
 
   spec.add_development_dependency 'bundler', '>= 1.6'
+  spec.add_development_dependency 'cucumber', '>= 0'
+  spec.add_development_dependency 'minitest', '>= 5.0.0'
+  spec.add_development_dependency 'ostruct', '>= 0.6.0'
+  spec.add_development_dependency 'pry', '~> 0'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rspec-its', '~> 1.3'
-  spec.add_development_dependency 'cucumber', '>= 0'
   spec.add_development_dependency 'spinach', '>= 0.8'
-  spec.add_development_dependency 'minitest', '>= 5.0.0'
   spec.add_development_dependency 'test-unit', '>= 3.0.0'
-  spec.add_development_dependency 'pry', '~> 0'
+  spec.add_development_dependency 'timecop', '>= 0.9.9'
   spec.add_development_dependency 'vcr', '>= 6.0'
   spec.add_development_dependency 'webmock', '>= 3.13'
-  spec.add_development_dependency 'timecop', '>= 0.9.9'
-  spec.add_development_dependency 'ostruct', '>= 0.6.0'
 end

data/lib/knapsack_pro/adapters/base_adapter.rb

@@ -59,13 +59,13 @@ module KnapsackPro
         KnapsackPro::Config::TempFiles.ensure_temp_directory_exists!
         File.write(self.class.adapter_bind_method_called_file, nil)
 
-        if KnapsackPro::Config::Env.recording_enabled?
+        if KnapsackPro::Config::Env.regular_mode?
           KnapsackPro.logger.debug('Regular Mode enabled.')
           bind_time_tracker
           bind_save_report
         end
 
-        if KnapsackPro::Config::Env.queue_recording_enabled?
+        if KnapsackPro::Config::Env.queue_mode?
           KnapsackPro.logger.debug('Queue Mode enabled.')
           bind_queue_mode
         end

data/lib/knapsack_pro/adapters/rspec_adapter.rb

@@ -6,6 +6,7 @@ module KnapsackPro
   module Adapters
     class RSpecAdapter < BaseAdapter
       TEST_DIR_PATTERN = 'spec/**{,/*/**}/*_spec.rb'
+      ID_PATH_REGEX = /.+_spec\.rb\[.+\]$/
 
       def self.split_by_test_cases_enabled?
         return false unless KnapsackPro::Config::Env.rspec_split_by_test_examples?
@@ -36,18 +37,6 @@ module KnapsackPro
         KnapsackPro::TestCaseDetectors::RSpecTestExampleDetector.new.test_file_example_paths
       end
 
-      def self.ensure_no_tag_option_when_rspec_split_by_test_examples_enabled!(cli_args)
-        if KnapsackPro::Config::Env.rspec_split_by_test_examples? && has_tag_option?(cli_args)
-          error_message = "It is not allowed to use the RSpec tag option together with the RSpec split by test examples feature. Please see: #{KnapsackPro::Urls::RSPEC__SPLIT_BY_TEST_EXAMPLES__TAG}"
-          KnapsackPro.logger.error(error_message)
-          raise error_message
-        end
-      end
-
-      def self.has_tag_option?(cli_args)
-        !!parsed_options(cli_args)&.[](:inclusion_filter)
-      end
-
       def self.has_format_option?(cli_args)
         !!parsed_options(cli_args)&.[](:formatters)
       end
@@ -60,6 +49,17 @@ module KnapsackPro
         parsed_options(cli_args)&.[](:order)
       end
 
+      def self.remove_formatters(cli_args)
+        formatter_options = ['-f', '--format', '-o', '--out']
+        cli_args.dup.each_with_index do |arg, index|
+          if formatter_options.include?(arg)
+            cli_args[index] = nil
+            cli_args[index + 1] = nil
+          end
+        end
+        cli_args.compact
+      end
+
       def self.file_path_for(example)
         [
           -> { parse_file_path(example.id) },
@@ -80,6 +80,10 @@ module KnapsackPro
         id.match(/\A(.*?)(?:\[([\d\s:,]+)\])?\z/).captures.first
       end
 
+      def self.id_path?(path)
+        ID_PATH_REGEX.match?(path)
+      end
+
       def self.rails_helper_exists?(test_dir)
         File.exist?("#{test_dir}/rails_helper.rb")
       end
@@ -95,6 +99,7 @@ module KnapsackPro
 
       def bind_time_tracker
         ensure_no_focus!
+        bind_regular_mode_time_tracker
         log_tests_duration
       end
 
@@ -117,10 +122,19 @@ module KnapsackPro
         ::RSpec.configure do |config|
           config.append_after(:suite) do
             time_tracker = KnapsackPro::Formatters::TimeTrackerFetcher.call
-            if time_tracker
-              formatted = KnapsackPro::Presenter.global_time(time_tracker.duration)
-              KnapsackPro.logger.debug(formatted)
-            end
+            formatted = KnapsackPro::Presenter.global_time(time_tracker.duration)
+            KnapsackPro.logger.debug(formatted)
+          end
+        end
+      end
+
+      def bind_regular_mode_time_tracker
+        return unless KnapsackPro::Config::Env.regular_mode?
+
+        ::RSpec.configure do |config|
+          config.append_before(:suite) do
+            time_tracker = KnapsackPro::Formatters::TimeTrackerFetcher.call
+            time_tracker.scheduled_paths = KnapsackPro::Adapters::RSpecAdapter.scheduled_paths
           end
         end
       end
@@ -158,6 +172,10 @@ module KnapsackPro
         ::RSpec.configuration
       end
 
+      def self.scheduled_paths
+        rspec_configuration.instance_variable_get(:@files_or_directories_to_run) || []
+      end
+
       def self.parsed_options(cli_args)
         ::RSpec::Core::Parser.parse(cli_args)
       rescue SystemExit

data/lib/knapsack_pro/base_allocator_builder.rb

@@ -23,15 +23,15 @@ module KnapsackPro
       KnapsackPro::Config::Env.test_dir || TestFilePattern.test_dir(adapter_class)
     end
 
-    # in fallback mode we always want to run the whole test files
-    # (not split by test cases) to guarantee that each test will be executed
-    # at least once across parallel CI nodes
+    # In Fallback Mode, we always want to run whole test files (not split by
+    # test cases) to guarantee that each test will be executed at least once
+    # across parallel CI nodes.
     def fallback_mode_test_files
       all_test_files_to_run
     end
 
-    # detect test files present on the disk that should be run
-    # this may include some fast test files + slow test files split by test cases
+    # Detect test files present on the disk that should be run.
+    # This may include fast test files + slow test files split by test cases.
     def fast_and_slow_test_files_to_run
       test_files_to_run = all_test_files_to_run
 

data/lib/knapsack_pro/config/env.rb

@@ -87,24 +87,12 @@ module KnapsackPro
           ENV['KNAPSACK_PRO_REPOSITORY_ADAPTER']
         end
 
-        def recording_enabled
-          ENV['KNAPSACK_PRO_RECORDING_ENABLED']
-        end
-
-        def recording_enabled?
-          recording_enabled == 'true'
-        end
-
         def regular_mode?
-          recording_enabled?
+          ENV['KNAPSACK_PRO_REGULAR_MODE_ENABLED'] == 'true'
         end
 
-        def queue_recording_enabled
-          ENV['KNAPSACK_PRO_QUEUE_RECORDING_ENABLED']
-        end
-
-        def queue_recording_enabled?
-          queue_recording_enabled == 'true'
+        def queue_mode?
+          ENV['KNAPSACK_PRO_QUEUE_MODE_ENABLED'] == 'true'
         end
 
         def queue_id
@@ -191,10 +179,17 @@ module KnapsackPro
         def rspec_split_by_test_examples?
           return @rspec_split_by_test_examples if defined?(@rspec_split_by_test_examples)
 
-          split = ENV.fetch('KNAPSACK_PRO_RSPEC_SPLIT_BY_TEST_EXAMPLES', false).to_s == 'true'
+          env = ENV['KNAPSACK_PRO_RSPEC_SPLIT_BY_TEST_EXAMPLES']
+
+          if test_files_encrypted? && env.nil?
+            KnapsackPro.logger.warn("Skipping split by test examples because test file names encryption is enabled:\n#{KnapsackPro::Urls::ENCRYPTION}\n#{KnapsackPro::Urls::SPLIT_BY_TEST_EXAMPLES}")
+            return (@rspec_split_by_test_examples = false)
+          end
+
+          split = (env || true).to_s == 'true'
 
           if split && ci_node_total < 2
-            KnapsackPro.logger.debug('Skipping split of test files by test examples because you are running tests on a single CI node (no parallelism)')
+            KnapsackPro.logger.debug('Skipping split by test examples because tests are running on a single CI node (no parallelism)')
             @rspec_split_by_test_examples = false
           else
             @rspec_split_by_test_examples = split

data/lib/knapsack_pro/formatters/time_tracker.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'stringio'
+require 'set'
 require_relative '../utils'
 
 module KnapsackPro
@@ -22,6 +23,18 @@ module KnapsackPro
         @group = {}
         @paths = {}
         @suite_started = now
+        @scheduled_paths = []
+        @split_by_test_example_file_paths = Set.new
+      end
+
+      def scheduled_paths=(scheduled_paths)
+        @scheduled_paths = scheduled_paths
+        @scheduled_paths.each do |path|
+          if KnapsackPro::Adapters::RSpecAdapter.id_path?(path)
+            file_path = KnapsackPro::Adapters::RSpecAdapter.parse_file_path(path)
+            @split_by_test_example_file_paths << file_path
+          end
+        end
       end
 
       def example_group_started(notification)
@@ -49,12 +62,12 @@ module KnapsackPro
         @group = {}
       end
 
-      def queue(scheduled_paths)
+      def queue
         recorded_paths = @paths.values.map do |example|
           KnapsackPro::Adapters::RSpecAdapter.parse_file_path(example[:path])
         end
 
-        missing = (scheduled_paths - recorded_paths).each_with_object({}) do |path, object|
+        missing = (@scheduled_paths - recorded_paths).each_with_object({}) do |path, object|
           object[path] = { path: path, time_execution: 0.0 }
         end
 
@@ -73,12 +86,12 @@ module KnapsackPro
         now - @suite_started
       end
 
-      def unexecuted_test_files(scheduled_paths)
+      def unexecuted_test_files
         pending_paths = @paths.values
           .filter { |example| example[:time_execution] == 0.0 }
           .map { |example| example[:path] }
 
-        not_run_paths = scheduled_paths -
+        not_run_paths = @scheduled_paths -
           @paths.values
           .map { |example| example[:path] }
 
@@ -111,21 +124,22 @@ module KnapsackPro
       end
 
       def path_for(example)
-        file = file_path_for(example)
-        return nil if file == ""
+        file_path = file_path_for(example)
+        return nil if file_path == ""
 
-        path = rspec_split_by_test_example?(file) ? example.id : file
-        KnapsackPro::TestFileCleaner.clean(path)
+        if rspec_split_by_test_example?(file_path)
+          KnapsackPro::TestFileCleaner.clean(example.id)
+        else
+          file_path
+        end
       end
 
-      def rspec_split_by_test_example?(file)
-        return false unless KnapsackPro::Config::Env.rspec_split_by_test_examples?
-        return false unless KnapsackPro::Adapters::RSpecAdapter.slow_test_file?(KnapsackPro::Adapters::RSpecAdapter, file)
-        true
+      def rspec_split_by_test_example?(file_path)
+        @split_by_test_example_file_paths.include?(file_path)
       end
 
       def file_path_for(example)
-        KnapsackPro::Adapters::RSpecAdapter.file_path_for(example)
+        KnapsackPro::TestFileCleaner.clean(KnapsackPro::Adapters::RSpecAdapter.file_path_for(example))
       end
 
       def time_execution_for(example, started_at)

data/lib/knapsack_pro/formatters/time_tracker_fetcher.rb

@@ -10,10 +10,10 @@ module KnapsackPro
           .find { |f| f.class.to_s == "KnapsackPro::Formatters::TimeTracker" }
       end
 
-      def self.unexecuted_test_files(scheduled_paths)
+      def self.unexecuted_test_files
         time_tracker = call
         return [] unless time_tracker
-        time_tracker.unexecuted_test_files(scheduled_paths)
+        time_tracker.unexecuted_test_files
       end
     end
   end

data/lib/knapsack_pro/runners/cucumber_runner.rb

@@ -5,7 +5,7 @@ module KnapsackPro
     class CucumberRunner < BaseRunner
       def self.run(args)
         ENV['KNAPSACK_PRO_TEST_SUITE_TOKEN'] = KnapsackPro::Config::Env.test_suite_token_cucumber
-        ENV['KNAPSACK_PRO_RECORDING_ENABLED'] = 'true'
+        ENV['KNAPSACK_PRO_REGULAR_MODE_ENABLED'] = 'true'
 
         adapter_class = KnapsackPro::Adapters::CucumberAdapter
         KnapsackPro::Config::Env.set_test_runner_adapter(adapter_class)

data/lib/knapsack_pro/runners/minitest_runner.rb

@@ -5,7 +5,7 @@ module KnapsackPro
     class MinitestRunner < BaseRunner
       def self.run(args)
         ENV['KNAPSACK_PRO_TEST_SUITE_TOKEN'] = KnapsackPro::Config::Env.test_suite_token_minitest
-        ENV['KNAPSACK_PRO_RECORDING_ENABLED'] = 'true'
+        ENV['KNAPSACK_PRO_REGULAR_MODE_ENABLED'] = 'true'
 
         adapter_class = KnapsackPro::Adapters::MinitestAdapter
         KnapsackPro::Config::Env.set_test_runner_adapter(adapter_class)

data/lib/knapsack_pro/runners/queue/cucumber_runner.rb

@@ -8,7 +8,7 @@ module KnapsackPro
           require 'cucumber/rake/task'
 
           ENV['KNAPSACK_PRO_TEST_SUITE_TOKEN'] = KnapsackPro::Config::Env.test_suite_token_cucumber
-          ENV['KNAPSACK_PRO_QUEUE_RECORDING_ENABLED'] = 'true'
+          ENV['KNAPSACK_PRO_QUEUE_MODE_ENABLED'] = 'true'
           ENV['KNAPSACK_PRO_QUEUE_ID'] = KnapsackPro::Config::EnvGenerator.set_queue_id
 
           adapter_class = KnapsackPro::Adapters::CucumberAdapter

data/lib/knapsack_pro/runners/queue/minitest_runner.rb

@@ -12,7 +12,7 @@ module KnapsackPro
           ::Minitest.class_variable_set('@@installed_at_exit', true)
 
           ENV['KNAPSACK_PRO_TEST_SUITE_TOKEN'] = KnapsackPro::Config::Env.test_suite_token_minitest
-          ENV['KNAPSACK_PRO_QUEUE_RECORDING_ENABLED'] = 'true'
+          ENV['KNAPSACK_PRO_QUEUE_MODE_ENABLED'] = 'true'
           ENV['KNAPSACK_PRO_QUEUE_ID'] = KnapsackPro::Config::EnvGenerator.set_queue_id
 
           adapter_class = KnapsackPro::Adapters::MinitestAdapter

data/lib/knapsack_pro/runners/queue/rspec_runner.rb

@@ -21,6 +21,7 @@ module KnapsackPro
         end
 
         def initialize(adapter_class, rspec_pure, args, stream_error, stream_out)
+          ENV['KNAPSACK_PRO_RSPEC_OPTIONS'] = args.to_s
           super(adapter_class)
           @adapter_class = adapter_class
           @rspec_pure = rspec_pure
@@ -143,13 +144,12 @@ module KnapsackPro
         end
 
         def pre_run_setup
-          ENV['KNAPSACK_PRO_QUEUE_RECORDING_ENABLED'] = 'true'
+          ENV['KNAPSACK_PRO_QUEUE_MODE_ENABLED'] = 'true'
           ENV['KNAPSACK_PRO_QUEUE_ID'] = KnapsackPro::Config::EnvGenerator.set_queue_id
 
           KnapsackPro::Config::Env.set_test_runner_adapter(@adapter_class)
 
           ENV['SPEC_OPTS'] = @rspec_pure.add_knapsack_pro_formatters_to(ENV['SPEC_OPTS'])
-          @adapter_class.ensure_no_tag_option_when_rspec_split_by_test_examples_enabled!(@cli_args)
 
           rspec_configuration_options = ::RSpec::Core::ConfigurationOptions.new(@cli_args)
           @rspec_runner = ::RSpec::Core::Runner.new(rspec_configuration_options)
@@ -164,7 +164,7 @@ module KnapsackPro
           log_rspec_queue_command
 
           time_tracker = KnapsackPro::Formatters::TimeTrackerFetcher.call
-          KnapsackPro::Report.save_node_queue_to_api(time_tracker&.queue(@node_test_file_paths))
+          KnapsackPro::Report.save_node_queue_to_api(time_tracker&.queue)
 
           Kernel.exit(exit_code)
         end
@@ -183,6 +183,10 @@ module KnapsackPro
             executed_test_files: @node_test_file_paths
           )
           @node_test_file_paths += test_file_paths
+
+          time_tracker = KnapsackPro::Formatters::TimeTrackerFetcher.call
+          time_tracker.scheduled_paths = @node_test_file_paths
+
           test_file_paths
         end
 
@@ -222,7 +226,7 @@ module KnapsackPro
         end
 
         def unexecuted_test_files
-          KnapsackPro::Formatters::TimeTrackerFetcher.unexecuted_test_files(@node_test_file_paths)
+          KnapsackPro::Formatters::TimeTrackerFetcher.unexecuted_test_files
         end
       end
     end

data/lib/knapsack_pro/runners/rspec_runner.rb

@@ -7,7 +7,8 @@ module KnapsackPro
         require 'rspec/core'
 
         ENV['KNAPSACK_PRO_TEST_SUITE_TOKEN'] = KnapsackPro::Config::Env.test_suite_token_rspec
-        ENV['KNAPSACK_PRO_RECORDING_ENABLED'] = 'true'
+        ENV['KNAPSACK_PRO_REGULAR_MODE_ENABLED'] = 'true'
+        ENV['KNAPSACK_PRO_RSPEC_OPTIONS'] = args.to_s
 
         adapter_class = KnapsackPro::Adapters::RSpecAdapter
         KnapsackPro::Config::Env.set_test_runner_adapter(adapter_class)
@@ -16,9 +17,6 @@ module KnapsackPro
         if runner.test_files_to_execute_exist?
           adapter_class.verify_bind_method_called
 
-          cli_args = (args || '').split
-          adapter_class.ensure_no_tag_option_when_rspec_split_by_test_examples_enabled!(cli_args)
-
           require 'rspec/core/rake_task'
 
           task_name = 'knapsack_pro:rspec_run'

data/lib/knapsack_pro/runners/spinach_runner.rb

@@ -15,7 +15,7 @@ module KnapsackPro
 
           KnapsackPro.tracker.set_prerun_tests(runner.test_file_paths)
 
-          cmd = %Q[KNAPSACK_PRO_RECORDING_ENABLED=true KNAPSACK_PRO_TEST_SUITE_TOKEN=#{ENV['KNAPSACK_PRO_TEST_SUITE_TOKEN']} bundle exec spinach #{args} --features_path #{runner.test_dir} -- #{runner.stringify_test_file_paths}]
+          cmd = %Q[KNAPSACK_PRO_REGULAR_MODE_ENABLED=true KNAPSACK_PRO_TEST_SUITE_TOKEN=#{ENV['KNAPSACK_PRO_TEST_SUITE_TOKEN']} bundle exec spinach #{args} --features_path #{runner.test_dir} -- #{runner.stringify_test_file_paths}]
 
           Kernel.system(cmd)
           Kernel.exit(child_status.exitstatus) unless child_status.exitstatus.zero?

data/lib/knapsack_pro/runners/test_unit_runner.rb

@@ -5,7 +5,7 @@ module KnapsackPro
     class TestUnitRunner < BaseRunner
       def self.run(args)
         ENV['KNAPSACK_PRO_TEST_SUITE_TOKEN'] = KnapsackPro::Config::Env.test_suite_token_test_unit
-        ENV['KNAPSACK_PRO_RECORDING_ENABLED'] = 'true'
+        ENV['KNAPSACK_PRO_REGULAR_MODE_ENABLED'] = 'true'
 
         adapter_class = KnapsackPro::Adapters::TestUnitAdapter
         KnapsackPro::Config::Env.set_test_runner_adapter(adapter_class)

data/lib/knapsack_pro/test_case_detectors/rspec_test_example_detector.rb

@@ -3,7 +3,9 @@
 module KnapsackPro
   module TestCaseDetectors
     class RSpecTestExampleDetector
-      def generate_json_report
+      def generate_json_report(rspec_args)
+        raise "The internal KNAPSACK_PRO_RSPEC_OPTIONS environment variable is unset. Ensure it is not overridden accidentally. Otherwise, please report this as a bug: #{KnapsackPro::Urls::SUPPORT}" if rspec_args.nil?
+
         require 'rspec/core'
 
         cli_format =
@@ -25,7 +27,11 @@ module KnapsackPro
           return
         end
 
-        cli_args = cli_format + [
+        args = (rspec_args || '').split
+        cli_args_without_formatters = KnapsackPro::Adapters::RSpecAdapter.remove_formatters(args)
+
+        # Apply a --format option which overrides formatters from the RSpec custom option files like `.rspec`.
+        cli_args = cli_args_without_formatters + cli_format + [
           '--dry-run',
           '--no-color',
           '--out', report_path,

data/lib/knapsack_pro/test_case_mergers/rspec_merger.rb

@@ -11,7 +11,7 @@ module KnapsackPro
           path = test_file.fetch('path')
           test_file_path = extract_test_file_path(path)
 
-          if rspec_id_path?(path)
+          if KnapsackPro::Adapters::RSpecAdapter.id_path?(path)
             merged_test_file_examples_hash[test_file_path] ||= 0.0
             merged_test_file_examples_hash[test_file_path] += test_file.fetch('time_execution')
           else
@@ -41,12 +41,6 @@ module KnapsackPro
       def extract_test_file_path(path)
         path.gsub(/\.rb\[.+\]$/, '.rb')
       end
-
-      def rspec_id_path?(path)
-        path_with_id_regex = /.+_spec\.rb\[.+\]$/
-
-        path&.match?(path_with_id_regex)
-      end
     end
   end
 end

data/lib/knapsack_pro/tracker.rb

@@ -113,7 +113,7 @@ module KnapsackPro
     end
 
     def read_prerun_tests_report
-      raise "Report #{prerun_tests_report_path} doest not exist on the disk. Most likely, it was removed accidentally. Please report the bug to the Knapsack Pro support team at #{KnapsackPro::Urls::SUPPORT}" unless File.exist?(prerun_tests_report_path)
+      raise "Report #{prerun_tests_report_path} does not exist on the disk. Most likely, it was removed accidentally. Please report the bug to the Knapsack Pro support team at #{KnapsackPro::Urls::SUPPORT}" unless File.exist?(prerun_tests_report_path)
       JSON.parse(File.read(prerun_tests_report_path))
     end
 

data/lib/knapsack_pro/urls.rb

@@ -32,8 +32,6 @@ module KnapsackPro
 
     RSPEC__SKIPS_TESTS = "#{HOST}/perma/ruby/rspec-skips-tests"
 
-    RSPEC__SPLIT_BY_TEST_EXAMPLES__TAG = "#{HOST}/perma/ruby/rspec-split-by-test-examples-tag"
-
     SPLIT_BY_TEST_EXAMPLES = "#{HOST}/perma/ruby/split-by-test-examples"
 
     TEST_UNIT__TEST_FILE_PATH_DETECTION = "#{HOST}/perma/ruby/test-unit-test-file-path-detection"

data/lib/knapsack_pro/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module KnapsackPro
-  VERSION = '7.14.0'
+  VERSION = '8.0.0'
 end

data/lib/tasks/rspec.rake

@@ -13,6 +13,6 @@ namespace :knapsack_pro do
     ENV.delete('SPEC_OPTS')
 
     detector = KnapsackPro::TestCaseDetectors::RSpecTestExampleDetector.new
-    detector.generate_json_report
+    detector.generate_json_report(ENV['KNAPSACK_PRO_RSPEC_OPTIONS'])
   end
 end