knapsack_pro 11.0.0 → 11.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 228fc40233719e372291f82fe1c6d5c25ed0396ae12fb3e0f28edac71e69754d
-  data.tar.gz: ce7cb564e98830745734efd59850e50c43c0abd49ed6131ecd4392801dd4758e
+  metadata.gz: 9ef9cbd99ef5c4bdb062a04337881da1422b6d06d9b217f915501ae29205e223
+  data.tar.gz: 36f197ac02ab0a653e46f4400d0b1cafd8600528255a4d1262c7d1db988345cd
 SHA512:
-  metadata.gz: ff6be1076a78549e3f4a8f57362ec560cd482ddd332513280bf67155248e7066478291014cd6f166c904344be81d520f374fdb565884d4540f2344b8577739d1
-  data.tar.gz: 8131b135fa3f86574b77ae3576ed538c88c871073c1d9756f283ad88245a84ed50dd55ab203ab330a39e578e5aeedf3e700051f8bab3f622611db9380926e42a
+  metadata.gz: 9381634364fd597f823ee9bb836fad096b1ce9e38c03dc106d95a07ceadaf7f1930f0f4849e5e0e478316d3950b4ce1d509207150ca8f50a863972ee071a319e
+  data.tar.gz: 4dcb81bf900413c96199674a8077cfb1e6abc8027813c742dfb2a4f625258d72794e1f24c165bd3c0e77849ded2afc75bf9ef7048c7a8a343e6998efb8668b29

data/lib/knapsack_pro/adapters/rspec_adapter.rb

@@ -7,7 +7,9 @@ module KnapsackPro
     class RSpecAdapter < BaseAdapter
       TEST_DIR_PATTERN = 'spec/**{,/*/**}/*_spec.rb'
       # https://github.com/rspec/rspec/blob/86b5e4218eece4c1913fe9aad24c0a96d8bc9f40/rspec-core/lib/rspec/core/example.rb#L122
-      REGEX = /\A(.*?)(?:\[([\d\s:,]+)\])?\z/.freeze
+      ID_REGEX = /\[[\d\s:,]+\]\z/.freeze
+      ID_PATH_PREFIX = '['
+      ID_PATH_SUFFIX = ']'
 
       def self.split_by_test_cases_enabled?
         return false unless KnapsackPro::Config::Env.rspec_split_by_test_examples?
@@ -57,28 +59,33 @@ module KnapsackPro
       end
 
       def self.file_path_for(example)
-        [
-          -> { parse_file_path(example.id) },
-          -> { example.metadata[:file_path] },
-          -> { example.metadata[:example_group][:file_path] },
-          -> { top_level_group(example)[:file_path] },
-        ]
-          .each do |path|
-            p = path.call
-            return p if p.include?('_spec.rb') || p.include?('.feature')
-          end
+        p = parse_file_path(example.id)
+        return p if p.include?('_spec.rb') || p.include?('.feature')
+
+        p = example.metadata[:file_path]
+        return p if p.include?('_spec.rb') || p.include?('.feature')
+
+        p = example.metadata[:example_group][:file_path]
+        return p if p.include?('_spec.rb') || p.include?('.feature')
 
-        return ''
+        p = top_level_group(example)[:file_path]
+        return p if p.include?('_spec.rb') || p.include?('.feature')
+
+        ''
       end
 
       def self.parse_file_path(path)
-        file, _id = path.match(REGEX).captures
-        file
+        return path unless path.end_with?(ID_PATH_SUFFIX)
+
+        index = path.rindex(ID_PATH_PREFIX)
+        return path if index.nil?
+        return path unless ID_REGEX.match?(path, index)
+
+        path[0, index]
       end
 
       def self.id_path?(path)
-        _file, id = path.match(REGEX).captures
-        !id.nil?
+        path.end_with?(ID_PATH_SUFFIX) && ID_REGEX.match?(path)
       end
 
       def self.concat_test_files(test_files, id_paths)

data/lib/knapsack_pro/formatters/time_tracker.rb

@@ -81,7 +81,7 @@ module KnapsackPro
 
         add_hooks_time(@group, @time_all_by_group_id_path)
         @time_all_by_group_id_path = Hash.new(0)
-        @paths = merge(@paths, @group)
+        merge!(@paths, @group)
         @group = {}
       end
 
@@ -94,7 +94,9 @@ module KnapsackPro
           object[path] = { path: path, time_execution: 0.0 }
         end
 
-        merge(@paths, missing).values.map do |example|
+        merge!(@paths, missing)
+
+        @paths.values.map do |example|
           example.transform_keys(&:to_s)
         end
       end
@@ -189,12 +191,13 @@ module KnapsackPro
         end
       end
 
-      def merge(h1, h2)
-        h1.merge(h2) do |key, v1, v2|
-          {
-            path: key,
-            time_execution: v1[:time_execution] + v2[:time_execution]
-          }
+      def merge!(h1, h2)
+        h2.each do |path, example|
+          if recorded = h1[path]
+            recorded[:time_execution] += example[:time_execution]
+          else
+            h1[path] = example
+          end
         end
       end
 

data/lib/knapsack_pro/version.rb

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

data/lib/knapsack_pro.rb

@@ -110,17 +110,17 @@ module KnapsackPro
     end
 
     def logger
-      if KnapsackPro::Config::Env.log_dir
-        default_logger = Logger.new("#{KnapsackPro::Config::Env.log_dir}/knapsack_pro_node_#{KnapsackPro::Config::Env.ci_node_index}.log")
-        default_logger.level = KnapsackPro::Config::Env.log_level
-        self.logger = default_logger
-      end
+      return @logger if @logger
 
-      unless @logger
-        default_logger = ::Logger.new(stdout)
-        default_logger.level = KnapsackPro::Config::Env.log_level
-        self.logger = default_logger
-      end
+      log_dir = KnapsackPro::Config::Env.log_dir
+      default_logger =
+        if log_dir
+          ::Logger.new("#{log_dir}/knapsack_pro_node_#{KnapsackPro::Config::Env.ci_node_index}.log")
+        else
+          ::Logger.new(stdout)
+        end
+      default_logger.level = KnapsackPro::Config::Env.log_level
+      self.logger = default_logger
 
       @logger
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knapsack_pro
 version: !ruby/object:Gem::Version
-  version: 11.0.0
+  version: 11.0.1
 platform: ruby
 authors:
 - ArturT