knapsack_pro 9.0.0 → 9.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f83ec80d7b3dcbd9415335f5f340e48908fbeaeee13e92203cb78df1232f82e
-  data.tar.gz: 19c08fe18b1555fd1a5d218b32d8baf1534e9cc87b63fc9d17d1c7ddb0129f46
+  metadata.gz: 69f4cd183de10604ce425379105354fd37da56929568c6bac466d682dc893088
+  data.tar.gz: 3c9c33a0aed5050e6d6582ff66550d8497b833383b1b34c09e622dd8f57bc6b8
 SHA512:
-  metadata.gz: d00064e828c1a90a3f2001cbbbee5086f7ac565b6f6ffe015237b6cab12bbdcc48a6a6199f615aaf1ff73ec4bdf4c666c84df44a8e6bc792e4d33387f4c55d71
-  data.tar.gz: b5dd5757440d7e38a54a44c69fe0c650185ade87dc00b00ebf24242fb637e3a062cdb45b7b85e39eae28547cd8513ad888aa8c6488a3734750a44530c64b6596
+  metadata.gz: bac25fed3f1e309e57f21bbce67391ed2d638d8484c91ce99900aa9ab22bbebde61bf0a968e9bf208f45d9d684574cb8a0b9fd549a0f5875c036b4c0e6aeec30
+  data.tar.gz: 35f0c05d901993faa07ceeffc211e596b693aa852671e9a04aa12ca845ef78bb39e332b8011b846a93be6cab17f803197f2e7a008fe9f7d9140ba9df75240561

data/lib/knapsack_pro/adapters/base_adapter.rb

@@ -15,26 +15,10 @@ module KnapsackPro
         false
       end
 
-      def self.test_file_cases_for(slow_test_files)
+      def self.calculate_slow_id_paths
         raise NotImplementedError
       end
 
-      def self.slow_test_file?(adapter_class, test_file_path)
-        @slow_test_file_paths ||=
-          begin
-            slow_test_files =
-              if KnapsackPro::Config::Env.slow_test_file_pattern
-                KnapsackPro::TestFileFinder.slow_test_files_by_pattern(adapter_class)
-              else
-                # get slow test files from JSON file based on data from API
-                KnapsackPro::SlowTestFileDeterminer.read_from_json_report
-              end
-            KnapsackPro::TestFilePresenter.paths(slow_test_files)
-          end
-        clean_path = KnapsackPro::TestFileCleaner.clean(test_file_path)
-        @slow_test_file_paths.include?(clean_path)
-      end
-
       def self.bind
         adapter = new
         adapter.bind

data/lib/knapsack_pro/adapters/minitest_adapter.rb

@@ -7,19 +7,14 @@ module KnapsackPro
       @@parent_of_test_dir = nil
 
       def self.test_path(obj)
-        # Pick the first public method in the class itself, that starts with "test_"
-        test_method_name = obj.public_methods(false).select{|m| m =~ /^test_/ }.first
-        if test_method_name.nil?
-          # case for shared examples
-          method_object = obj.method(obj.location.sub(/.*?test_/, 'test_'))
-        else
-          method_object = obj.method(test_method_name)
-        end
-        full_test_path = method_object.source_location.first
-        parent_of_test_dir_regexp = Regexp.new("^#{@@parent_of_test_dir}")
-        test_path = full_test_path.gsub(parent_of_test_dir_regexp, '.')
-        # test_path will look like ./test/dir/unit_test.rb
-        test_path
+        path, _line =
+          begin
+            Object.const_source_location(obj.class.to_s)
+          rescue NameError
+            test_method_name = obj.class.runnable_methods.first
+            obj.method(test_method_name).source_location
+          end
+        path.gsub(Regexp.new("^#{@@parent_of_test_dir}"), '.')
       end
 
       # See how to write hooks and plugins

data/lib/knapsack_pro/adapters/rspec_adapter.rb

@@ -20,22 +20,17 @@ module KnapsackPro
         true
       end
 
-      def self.test_file_cases_for(slow_test_files)
-        KnapsackPro.logger.info("Generating RSpec test examples JSON report for slow test files to prepare it to be split by test examples (by individual test cases). Thanks to that, a single slow test file can be split across parallel CI nodes. Analyzing #{slow_test_files.size} slow test files.")
-
-        # generate the RSpec JSON report in a separate process to not pollute the RSpec state
+      def self.calculate_slow_id_paths
+        # Shell out not to pollute the RSpec state
         cmd = [
           'RACK_ENV=test',
           'RAILS_ENV=test',
           KnapsackPro::Config::Env.rspec_test_example_detector_prefix,
           'rake knapsack_pro:rspec_test_example_detector',
         ].join(' ')
-        unless Kernel.system(cmd)
-          raise "Could not generate JSON report for RSpec. Rake task failed when running #{cmd}"
-        end
+        raise "Failed to calculate Split by Test Examples: #{cmd}" unless Kernel.system(cmd)
 
-        # read the JSON report
-        KnapsackPro::TestCaseDetectors::RSpecTestExampleDetector.new.test_file_example_paths
+        KnapsackPro::TestCaseDetectors::RSpecTestExampleDetector.new.slow_id_paths!
       end
 
       def self.has_format_option?(cli_args)
@@ -86,6 +81,13 @@ module KnapsackPro
         !id.nil?
       end
 
+      def self.concat_paths(test_files, id_paths)
+        paths = KnapsackPro::TestFilePresenter.paths(test_files)
+        file_paths = id_paths.map { |id_path| parse_file_path(id_path) }
+        acc = paths + id_paths - file_paths
+        KnapsackPro::TestFilePresenter.test_files(acc)
+      end
+
       def self.rails_helper_exists?(test_dir)
         File.exist?("#{test_dir}/rails_helper.rb")
       end

data/lib/knapsack_pro/build_distribution_fetcher.rb

@@ -7,10 +7,6 @@ module KnapsackPro
         @response = response
       end
 
-      def time_execution
-        response.fetch('time_execution')
-      end
-
       def test_files
         response.fetch('test_files')
       end
@@ -20,12 +16,6 @@ module KnapsackPro
       attr_reader :response
     end
 
-    def self.call
-      new.call
-    end
-
-    # get test files and time execution for last build distribution matching:
-    # branch, node_total, node_index
     def call
       connection = KnapsackPro::Client::Connection.new(build_action)
       response = connection.call
@@ -33,11 +23,8 @@ module KnapsackPro
         raise ArgumentError.new(response) if connection.errors?
         BuildDistributionEntity.new(response)
       else
-        KnapsackPro.logger.warn("Slow test files fallback behaviour started. We could not connect with Knapsack Pro API to fetch last CI build test files that are needed to determine slow test files. No test files will be split by test cases. It means all test files will be split by the whole test files as if split by test cases would be disabled #{KnapsackPro::Urls::SPLIT_BY_TEST_EXAMPLES}")
-        BuildDistributionEntity.new({
-          'time_execution' => 0.0,
-          'test_files' => [],
-        })
+        KnapsackPro.logger.warn("Failed to fetch slow test files. Split by Test Examples disabled. See: #{KnapsackPro::Urls::SPLIT_BY_TEST_EXAMPLES}")
+        BuildDistributionEntity.new({ 'time_execution' => 0.0, 'test_files' => [] })
       end
     end
 
@@ -48,12 +35,29 @@ module KnapsackPro
     end
 
     def build_action
-      KnapsackPro::Client::API::V1::BuildDistributions.last(
+      request_hash = {
         commit_hash: repository_adapter.commit_hash,
         branch: repository_adapter.branch,
         node_total: KnapsackPro::Config::Env.ci_node_total,
-        node_index: KnapsackPro::Config::Env.ci_node_index,
-      )
+        node_index: KnapsackPro::Config::Env.ci_node_index
+      }.merge(additional_params)
+
+      KnapsackPro::Client::API::V1::BuildDistributions.last(request_hash)
+    end
+
+    def additional_params
+      {}
+    end
+  end
+
+  class OptimizedBuildDistributionFetcher < BuildDistributionFetcher
+    private
+
+    def additional_params
+      {
+        node_build_id: KnapsackPro::Config::Env.ci_node_build_id,
+        none_if_queue_initialized: true
+      }
     end
   end
 end

data/lib/knapsack_pro/client/api/v1/build_distributions.rb

@@ -35,16 +35,11 @@ module KnapsackPro
               )
             end
 
-            def last(args)
+            def last(request_hash)
               action_class.new(
                 endpoint_path: '/v1/build_distributions/last',
                 http_method: :get,
-                request_hash: {
-                  :commit_hash => args.fetch(:commit_hash),
-                  :branch => args.fetch(:branch),
-                  :node_total => args.fetch(:node_total),
-                  :node_index => args.fetch(:node_index),
-                }
+                request_hash: request_hash
               )
             end
           end

data/lib/knapsack_pro/client/api/v1/queues.rb

@@ -36,6 +36,33 @@ module KnapsackPro
                 request_hash: request_hash
               )
             end
+
+            def initialize(paths)
+              git_adapter = KnapsackPro::RepositoryAdapters::GitAdapter.new
+              repository_adapter = KnapsackPro::RepositoryAdapterInitiator.call
+
+              request_hash = {
+                attempt_connect_to_queue: false,
+                branch: KnapsackPro::Crypto::BranchEncryptor.call(repository_adapter.branch),
+                build_author: git_adapter.build_author,
+                can_initialize_queue: true,
+                commit_authors: git_adapter.commit_authors,
+                commit_hash: repository_adapter.commit_hash,
+                fixed_queue_split: KnapsackPro::Config::Env.fixed_queue_split,
+                node_build_id: KnapsackPro::Config::Env.ci_node_build_id,
+                node_index: KnapsackPro::Config::Env.ci_node_index,
+                node_total: KnapsackPro::Config::Env.ci_node_total,
+                skip_pull: true,
+                test_files: KnapsackPro::Crypto::Encryptor.call(paths),
+                user_seat: KnapsackPro::Config::Env.masked_user_seat,
+              }
+
+              action_class.new(
+                endpoint_path: '/v1/queues/queue',
+                http_method: :post,
+                request_hash: request_hash
+              )
+            end
           end
         end
       end

data/lib/knapsack_pro/client/connection.rb

@@ -142,7 +142,7 @@ module KnapsackPro
           "curl -v #{endpoint_uri.host}:#{endpoint_uri.port}",
           "nc -vz #{endpoint_uri.host} #{endpoint_uri.port}",
           "openssl s_client -connect #{endpoint_uri.host}:#{endpoint_uri.port} < /dev/null",
-          'env'
+          'env | grep KNAPSACK_PRO | grep -v TOKEN'
         ].each do |cmd|
           logger.warn(cmd)
           logger.warn('=' * cmd.size)

data/lib/knapsack_pro/config/env.rb

@@ -67,6 +67,14 @@ module KnapsackPro
           ENV['KNAPSACK_PRO_SLOW_TEST_FILE_PATTERN']
         end
 
+        def slow_test_file_threshold
+          ENV.fetch('KNAPSACK_PRO_SLOW_TEST_FILE_THRESHOLD', nil)&.to_f
+        end
+
+        def slow_test_file_threshold?
+          !!slow_test_file_threshold
+        end
+
         def test_file_exclude_pattern
           ENV['KNAPSACK_PRO_TEST_FILE_EXCLUDE_PATTERN']
         end
@@ -132,19 +140,7 @@ module KnapsackPro
         end
 
         def endpoint
-          env_name = 'KNAPSACK_PRO_ENDPOINT'
-          return ENV[env_name] if ENV[env_name]
-
-          case mode
-          when :development
-            'http://api.knapsackpro.test:3000'
-          when :test
-            'https://api-staging.knapsackpro.com'
-          when :production
-            'https://api.knapsackpro.com'
-          else
-            required_env(env_name)
-          end
+          ENV.fetch('KNAPSACK_PRO_ENDPOINT', 'https://api.knapsackpro.com')
         end
 
         def fixed_test_suite_split
@@ -200,14 +196,6 @@ module KnapsackPro
           ENV.fetch('KNAPSACK_PRO_RSPEC_TEST_EXAMPLE_DETECTOR_PREFIX', 'bundle exec')
         end
 
-        def slow_test_file_threshold
-          ENV.fetch('KNAPSACK_PRO_SLOW_TEST_FILE_THRESHOLD', nil)&.to_f
-        end
-
-        def slow_test_file_threshold?
-          !!slow_test_file_threshold
-        end
-
         def test_suite_token
           env_name = 'KNAPSACK_PRO_TEST_SUITE_TOKEN'
           ENV[env_name] || raise("Missing environment variable #{env_name}. You should set environment variable like #{env_name}_RSPEC (note there is suffix _RSPEC at the end). knapsack_pro gem will set #{env_name} based on #{env_name}_RSPEC value. If you use other test runner than RSpec then use proper suffix.")
@@ -233,17 +221,6 @@ module KnapsackPro
           ENV['KNAPSACK_PRO_TEST_SUITE_TOKEN_SPINACH']
         end
 
-        def mode
-          mode = ENV['KNAPSACK_PRO_MODE']
-          return :production if mode.nil?
-          mode = mode.to_sym
-          if [:development, :test, :production].include?(mode)
-            mode
-          else
-            raise ArgumentError.new('Wrong mode name')
-          end
-        end
-
         def detected_ci
           detected = KnapsackPro::Config::CI.constants.map do |constant|
             Object.const_get("KnapsackPro::Config::CI::#{constant}").new.detected

data/lib/knapsack_pro/queue_allocator.rb

@@ -141,8 +141,9 @@ module KnapsackPro
       end
     end
 
+    # Run file paths to guarantee at-least-once execution across CI nodes.
     def fallback_test_files(executed_test_files)
-      test_flat_distributor = KnapsackPro::TestFlatDistributor.new(test_suite.fallback_test_files, ci_node_total)
+      test_flat_distributor = KnapsackPro::TestFlatDistributor.new(test_suite.all_test_files_to_run, ci_node_total)
       test_files_for_node_index = test_flat_distributor.test_files_for_node(ci_node_index)
       KnapsackPro::TestFilePresenter.paths(test_files_for_node_index) - executed_test_files
     end

data/lib/knapsack_pro/queue_initializer.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module KnapsackPro
+  module RSpec
+    class QueueInitializer
+      def call(args)
+        slow_id_paths = KnapsackPro::TestCaseDetectors::RSpecTestExampleDetector.new.calculate_slow_id_paths(args.to_s)
+        all_test_files_to_run = KnapsackPro::TestSuite.new(KnapsackPro::Adapters::RSpecAdapter).all_test_files_to_run
+        paths = KnapsackPro::Adapters::RSpecAdapter.concat_paths(all_test_files_to_run, slow_id_paths)
+
+        raise 'No paths to run' if paths.empty?
+        action = KnapsackPro::Client::API::V1::Queues.initialize(paths)
+        connection = KnapsackPro::Client::Connection.new(action)
+        response = connection.call
+        return unless response.key?('url') # Race to initialize lost to another parallel node
+
+        KnapsackPro.logger.info "Build URL: #{response.fetch('url')}"
+      end
+    end
+  end
+end

data/lib/knapsack_pro/regular_allocator.rb

@@ -131,8 +131,9 @@ module KnapsackPro
       end
     end
 
+    # Run file paths to guarantee at-least-once execution across CI nodes.
     def fallback_test_files
-      test_flat_distributor = KnapsackPro::TestFlatDistributor.new(test_suite.fallback_test_files, ci_node_total)
+      test_flat_distributor = KnapsackPro::TestFlatDistributor.new(test_suite.all_test_files_to_run, ci_node_total)
       test_files_for_node_index = test_flat_distributor.test_files_for_node(ci_node_index)
       KnapsackPro::TestFilePresenter.paths(test_files_for_node_index)
     end

data/lib/knapsack_pro/rspec_slow_test_file_finder.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module KnapsackPro
+  class RSpecSlowTestFileFinder
+    def initialize(build_distribution_fetcher)
+      @build_distribution_fetcher = build_distribution_fetcher
+    end
+
+    def call
+      if KnapsackPro::Config::Env.test_files_encrypted?
+        raise "Split by test cases is not possible when you have enabled test file names encryption ( #{KnapsackPro::Urls::ENCRYPTION} ). You need to disable encryption with KNAPSACK_PRO_TEST_FILES_ENCRYPTED=false in order to use split by test cases #{KnapsackPro::Urls::SPLIT_BY_TEST_EXAMPLES}"
+      end
+
+      test_files_from_api = @build_distribution_fetcher.call.test_files
+      merged_test_files_from_api = KnapsackPro::TestCaseMergers::RSpecMerger.new(test_files_from_api).call
+      test_files_existing_on_disk = KnapsackPro::TestFileFinder.select_test_files_that_can_be_run(KnapsackPro::Adapters::RSpecAdapter, merged_test_files_from_api)
+      KnapsackPro::SlowTestFileDeterminer.call(test_files_existing_on_disk)
+    end
+  end
+end

data/lib/knapsack_pro/slow_test_file_determiner.rb

@@ -18,27 +18,5 @@ module KnapsackPro
         execution_time >= KnapsackPro::Config::Env.slow_test_file_threshold
       end
     end
-
-    def self.save_to_json_report(test_files)
-      KnapsackPro::Config::TempFiles.ensure_temp_directory_exists!
-      FileUtils.mkdir_p(report_dir)
-      File.write(report_path, test_files.to_json)
-    end
-
-    def self.read_from_json_report
-      raise "The report with slow test files has not been generated yet. If you have enabled split by test cases #{KnapsackPro::Urls::SPLIT_BY_TEST_EXAMPLES} and you see this error it means that your tests accidentally cleaned up the .knapsack_pro directory. Please do not remove this directory during tests runtime!" unless File.exist?(report_path)
-      slow_test_files_json_report = File.read(report_path)
-      JSON.parse(slow_test_files_json_report)
-    end
-
-    private
-
-    def self.report_path
-      "#{report_dir}/slow_test_files_node_#{KnapsackPro::Config::Env.ci_node_index}.json"
-    end
-
-    def self.report_dir
-      "#{KnapsackPro::Config::TempFiles::TEMP_DIRECTORY_PATH}/slow_test_file_determiner"
-    end
   end
 end

data/lib/knapsack_pro/test_case_detectors/rspec_test_example_detector.rb

@@ -3,87 +3,80 @@
 module KnapsackPro
   module TestCaseDetectors
     class RSpecTestExampleDetector
-      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 =
-          if Gem::Version.new(::RSpec::Core::Version::STRING) < Gem::Version.new('3.6.0')
-            require_relative '../formatters/rspec_json_formatter'
-            ['--format', KnapsackPro::Formatters::RSpecJsonFormatter.to_s]
-          else
-            ['--format', 'json']
-          end
-
-        ensure_report_dir_exists
-        remove_old_json_report
-
-        test_file_entities = slow_test_files
-
-        if test_file_entities.empty?
-          no_examples_json = { examples: [] }.to_json
-          File.write(report_path, no_examples_json)
-          return
-        end
+      def dry_run_to_file(rspec_args, slow_test_files = slow_test_files(KnapsackPro::BuildDistributionFetcher.new))
+        KnapsackPro::Config::TempFiles.ensure_temp_directory_exists!
+        FileUtils.mkdir_p(File.dirname(report_path))
+        File.delete(report_path) if File.exist?(report_path)
+        return File.write(report_path, { examples: [] }.to_json) if slow_test_files.empty?
 
+        KnapsackPro.logger.info("Calculating Split by Test Examples. Analyzing #{slow_test_files.size} slow test files.")
         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',
           '--out', report_path,
           '--default-path', test_dir
-        ] + KnapsackPro::TestFilePresenter.paths(test_file_entities)
-        exit_code = begin
-          options = ::RSpec::Core::ConfigurationOptions.new(cli_args)
-          ::RSpec::Core::Runner.new(options).run($stderr, $stdout)
-        rescue SystemExit => e
-          e.status
-        end
-
+        ] + KnapsackPro::TestFilePresenter.paths(slow_test_files)
+        exit_code = dry_run(cli_args)
         return if exit_code.zero?
 
         report.fetch('messages', []).each { |message| puts message }
         command = (['bundle exec rspec'] + cli_args).join(' ')
-        KnapsackPro.logger.error("Failed to generate the slow test files report: #{command}")
+        KnapsackPro.logger.error("Failed to calculate Split by Test Examples: #{command}")
         exit exit_code
       end
 
-      def test_file_example_paths
+      def calculate_slow_id_paths(rspec_args)
+        dry_run_to_file(rspec_args, slow_test_files(KnapsackPro::OptimizedBuildDistributionFetcher.new))
+        slow_id_paths!
+      end
+
+      def slow_id_paths!
         raise "No report found at #{report_path}" unless File.exist?(report_path)
 
-        json_report = File.read(report_path)
-        hash_report = JSON.parse(json_report)
-        hash_report
+        JSON.parse(File.read(report_path))
           .fetch('examples')
-          .map { |e| e.fetch('id') }
-          .map { |path_with_example_id| test_file_hash_for(path_with_example_id) }
+          .map { |example| TestFileCleaner.clean(example.fetch('id')) }
       end
 
-      def slow_test_files
-        if KnapsackPro::Config::Env.slow_test_file_pattern
-          KnapsackPro::TestFileFinder.slow_test_files_by_pattern(adapter_class)
+      private
+
+      # Apply a --format option which overrides formatters from the RSpec custom option files like `.rspec`.
+      def cli_format
+        require 'rspec/core'
+
+        if Gem::Version.new(::RSpec::Core::Version::STRING) < Gem::Version.new('3.6.0')
+          require_relative '../formatters/rspec_json_formatter'
+          ['--format', KnapsackPro::Formatters::RSpecJsonFormatter.to_s]
         else
-          # read slow test files from JSON file on disk that was generated
-          # by lib/knapsack_pro/base_allocator_builder.rb
-          KnapsackPro::SlowTestFileDeterminer.read_from_json_report
+          ['--format', 'json']
         end
       end
 
-      private
+      def dry_run(cli_args)
+        require 'rspec/core'
 
-      def report_dir
-        "#{KnapsackPro::Config::TempFiles::TEMP_DIRECTORY_PATH}/test_case_detectors/rspec"
+        options = ::RSpec::Core::ConfigurationOptions.new(cli_args)
+        ::RSpec::Core::Runner.new(options).run($stderr, $stdout)
+      rescue SystemExit => e
+        e.status
       end
 
       def report_path
-        "#{report_dir}/rspec_dry_run_json_report_node_#{KnapsackPro::Config::Env.ci_node_index}.json"
+        "#{KnapsackPro::Config::TempFiles::TEMP_DIRECTORY_PATH}/test_case_detectors/rspec/rspec_dry_run_json_report_node_#{KnapsackPro::Config::Env.ci_node_index}.json"
+      end
+
+      def slow_test_files(build_distribution_fetcher)
+        if KnapsackPro::Config::Env.slow_test_file_pattern
+          KnapsackPro::TestFileFinder.slow_test_files_by_pattern(adapter_class)
+        else
+          KnapsackPro::RSpecSlowTestFileFinder.new(build_distribution_fetcher).call
+        end
       end
 
       def report
         return {} unless File.exist?(report_path)
+
         JSON.parse(File.read(report_path))
       end
 
@@ -94,25 +87,6 @@ module KnapsackPro
       def test_dir
         KnapsackPro::Config::Env.test_dir || KnapsackPro::TestFilePattern.test_dir(adapter_class)
       end
-
-      def test_file_pattern
-        KnapsackPro::TestFilePattern.call(adapter_class)
-      end
-
-      def ensure_report_dir_exists
-        KnapsackPro::Config::TempFiles.ensure_temp_directory_exists!
-        FileUtils.mkdir_p(report_dir)
-      end
-
-      def remove_old_json_report
-        File.delete(report_path) if File.exist?(report_path)
-      end
-
-      def test_file_hash_for(test_file_path)
-        {
-          'path' => TestFileCleaner.clean(test_file_path)
-        }
-      end
     end
   end
 end

data/lib/knapsack_pro/test_case_mergers/rspec_merger.rb

@@ -2,44 +2,32 @@
 
 module KnapsackPro
   module TestCaseMergers
-    class RSpecMerger < BaseMerger
+    class RSpecMerger
+      def initialize(test_files)
+        @test_files = test_files
+      end
+
       def call
-        all_test_files_hash = {}
-        merged_test_file_examples_hash = {}
+        file_paths = {}
+        id_paths = {}
 
-        test_files.each do |test_file|
-          path = test_file.fetch('path')
-          test_file_path = extract_test_file_path(path)
+        @test_files.each do |test_file|
+          raw_path = test_file.fetch('path')
+          file_path = KnapsackPro::Adapters::RSpecAdapter.parse_file_path(raw_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')
+          if KnapsackPro::Adapters::RSpecAdapter.id_path?(raw_path)
+            id_paths[file_path] ||= 0.0
+            id_paths[file_path] += test_file.fetch('time_execution')
           else
-            all_test_files_hash[test_file_path] = test_file.fetch('time_execution')
+            file_paths[file_path] = test_file.fetch('time_execution') # may be nil
           end
         end
 
-        merged_test_file_examples_hash.each do |path, time_execution|
-          all_test_files_hash[path] = [time_execution, all_test_files_hash[path]].compact.max
-        end
-
-        merged_test_files = []
-        all_test_files_hash.each do |path, time_execution|
-          merged_test_files << {
-            'path' => path,
-            'time_execution' => time_execution
-          }
-        end
-        merged_test_files
-      end
-
-      private
-
-      # path - can be:
-      # test file path: spec/a_spec.rb
-      # or test example path: spec/a_spec.rb[1:1]
-      def extract_test_file_path(path)
-        path.gsub(/\.rb\[.+\]$/, '.rb')
+        file_paths
+          .merge(id_paths) { |_, v1, v2| [v1, v2].compact.max }
+          .map do |file_path, time_execution|
+            { 'path' => file_path, 'time_execution' => time_execution }
+          end
       end
     end
   end