test-prof 1.3.1 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c81241143c4e7788e5fef3e5508534e878615a8e1b9e577a389d50da04cf445c
-  data.tar.gz: cd4d3ff2cee2cc93c569d8d25fa574653c8c9b29a1e67d97673b6e784e341146
+  metadata.gz: a719a17544a705f447aeefc448f75bb2ffc11c268661735c11095b593e0d9417
+  data.tar.gz: 3d461a0c4573a0a7c43a7db57b8ecce96baf2c1a60998f56019c437a20ad1f60
 SHA512:
-  metadata.gz: 812d6f7fd0672cd5a08f3812aafb60b677be8ae8131620ca13495ae9f79b6b23bac3b3a9cec1c1f64bc6c7cba4cae156baa5fb2441756bf21dc41e2bfe2c4b70
-  data.tar.gz: 6990de149f5824297ea8ff60ed07cc4ad8098fbb52a990d602418aaf37222a9a0583895ec2fa8c9a78fc6e54c8abadb344cdf53468e2f39daf900bbb54377352
+  metadata.gz: '0549376752f1b0e6d718333f2e378c2d0cd3bee94a18f52440c0110710f9ab9bc1a23aaaadcd84e1cbf1171402d11cd4eaa98718bbc736cfdcc3f50740cc7e89'
+  data.tar.gz: 3f6546e3d091b6c0aba067d94c12bfd1bf8542d0725b851f06cac81b8507685de4ef7ca25bd38b2bec9b2a98f21c99cfddd68997dca90ab739bbc3f19820fef6

data/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 ## master (unreleased)
 
+## 1.3.3 (2024-04-19)
+
+- Fix MemProf bugs. ([@palkan][])
+
+## 1.3.2 (2024-03-08) 🌷
+
+- Add Minitest support for TagProf. ([@lioneldebauge][])
+
 ## 1.3.1 (2023-12-12)
 
 - Add support for dumping FactoryProf results in JSON format. ([@uzushino][])
@@ -381,3 +389,4 @@ See [changelog](https://github.com/test-prof/test-prof/blob/v0.8.0/CHANGELOG.md)
 [@bf4]: https://github.com/bf4
 [@Vankiru]: https://github.com/Vankiru
 [@uzushino]: https://github.com/uzushino
+[@lioneldebauge]: https://github.com/lioneldebauge

data/lib/minitest/test_prof_plugin.rb

@@ -3,6 +3,7 @@
 require "test_prof/event_prof/minitest"
 require "test_prof/factory_doctor/minitest"
 require "test_prof/memory_prof/minitest"
+require "test_prof/tag_prof/minitest"
 
 module Minitest # :nodoc:
   module TestProf # :nodoc:
@@ -16,6 +17,7 @@ module Minitest # :nodoc:
         opts[:sample] = true if ENV["SAMPLE"] || ENV["SAMPLE_GROUPS"]
         opts[:mem_prof_mode] = ENV["TEST_MEM_PROF"] if ENV["TEST_MEM_PROF"]
         opts[:mem_prof_top_count] = ENV["TEST_MEM_PROF_COUNT"] if ENV["TEST_MEM_PROF_COUNT"]
+        opts[:tag_prof] = true if ENV["TAG_PROF"] == "type"
       end
     end
   end
@@ -50,6 +52,7 @@ module Minitest # :nodoc:
     reporter << TestProf::EventProfReporter.new(options[:io], options) if options[:event]
     reporter << TestProf::FactoryDoctorReporter.new(options[:io], options) if options[:fdoc]
     reporter << TestProf::MemoryProfReporter.new(options[:io], options) if options[:mem_prof_mode]
+    reporter << Minitest::TestProf::TagProfReporter.new(options[:io], options) if options[:tag_prof]
 
     ::TestProf::MinitestSample.call if options[:sample]
   end

data/lib/test_prof/before_all.rb

@@ -66,7 +66,7 @@ module TestProf
       private
 
       def filters_apply?(metadata)
-        return true unless filters.present? && TestProf.rspec?
+        return true unless filters.is_a?(Hash) && TestProf.rspec?
 
         ::RSpec::Core::MetadataFilter.apply?(
           :all?,

data/lib/test_prof/memory_prof/printer.rb

@@ -50,6 +50,8 @@ module TestProf
       end
 
       def memory_percentage(item)
+        return 0 if tracker.total_memory.zero? || item[:memory].zero?
+
         (100.0 * item[:memory] / tracker.total_memory).round(2)
       end
 

data/lib/test_prof/memory_prof/rspec.rb

@@ -16,23 +16,26 @@ module TestProf
         @tracker = MemoryProf.tracker
         @printer = MemoryProf.printer(tracker)
 
+        @current_group = nil
+        @current_example = nil
+
         @tracker.start
       end
 
       def example_started(notification)
-        tracker.example_started(example(notification))
+        tracker.example_started(notification.example, example(notification))
       end
 
       def example_finished(notification)
-        tracker.example_finished(example(notification))
+        tracker.example_finished(notification.example)
       end
 
       def example_group_started(notification)
-        tracker.group_started(group(notification))
+        tracker.group_started(notification.group, group(notification))
       end
 
       def example_group_finished(notification)
-        tracker.group_finished(group(notification))
+        tracker.group_finished(notification.group)
       end
 
       def report

data/lib/test_prof/memory_prof/tracker/linked_list.rb

@@ -52,19 +52,20 @@ module TestProf
         attr_reader :head
 
         def initialize(memory_at_start)
-          add_node(:total, memory_at_start)
+          add_node(:total, :total, memory_at_start)
         end
 
-        def add_node(item, memory_at_start)
+        def add_node(id, item, memory_at_start)
           @head = LinkedListNode.new(
+            id: id,
             item: item,
             previous: head,
             memory_at_start: memory_at_start
           )
         end
 
-        def remove_node(item, memory_at_finish)
-          return if head.item != item
+        def remove_node(id, memory_at_finish)
+          return if head.id != id
           head.finish(memory_at_finish)
 
           current = head
@@ -75,9 +76,10 @@ module TestProf
       end
 
       class LinkedListNode
-        attr_reader :item, :previous, :memory_at_start, :memory_at_finish, :nested_memory
+        attr_reader :id, :item, :previous, :memory_at_start, :memory_at_finish, :nested_memory
 
-        def initialize(item:, memory_at_start:, previous:)
+        def initialize(id:, item:, memory_at_start:, previous:)
+          @id = id
           @item = item
           @previous = previous
 

data/lib/test_prof/memory_prof/tracker.rb

@@ -36,22 +36,26 @@ module TestProf
         @total_memory = node.total_memory
       end
 
-      def example_started(example)
-        list.add_node(example, track)
+      def example_started(id, example = id)
+        list.add_node(id, example, track)
       end
 
-      def example_finished(example)
-        node = list.remove_node(example, track)
-        examples << {**example, memory: node.total_memory}
+      def example_finished(id)
+        node = list.remove_node(id, track)
+        return unless node
+
+        examples << {**node.item, memory: node.total_memory}
       end
 
-      def group_started(group)
-        list.add_node(group, track)
+      def group_started(id, group = id)
+        list.add_node(id, group, track)
       end
 
-      def group_finished(group)
-        node = list.remove_node(group, track)
-        groups << {**group, memory: node.hooks_memory}
+      def group_finished(id)
+        node = list.remove_node(id, track)
+        return unless node
+
+        groups << {**node.item, memory: node.hooks_memory}
       end
     end
 

data/lib/test_prof/tag_prof/minitest.rb

@@ -0,0 +1,74 @@
+# frozen_string_literal: true
+
+module Minitest
+  module TestProf
+    class TagProfReporter < BaseReporter # :nodoc:
+      attr_reader :results
+
+      def initialize(io = $stdout, _options = {})
+        super
+        @results = ::TestProf::TagProf::Result.new("type")
+
+        if event_prof_activated?
+          require "test_prof/event_prof"
+          @current_group_id = nil
+          @events_profiler = configure_profiler
+          @results = ::TestProf::TagProf::Result.new("type", @events_profiler.events)
+        end
+      end
+
+      def prerecord(group, example)
+        return unless event_prof_activated?
+
+        # enable event profiling
+        @events_profiler.group_started(true)
+      end
+
+      def record(result)
+        results.track(main_folder_path(result), time: result.time, events: fetch_events_data)
+        @events_profiler.group_started(nil) if event_prof_activated? # reset and disable event profilers
+      end
+
+      def report
+        printer = (ENV["TAG_PROF_FORMAT"] == "html") ? ::TestProf::TagProf::Printers::HTML : ::TestProf::TagProf::Printers::Simple
+        printer.dump(results)
+      end
+
+      private
+
+      def main_folder_path(result)
+        return :__unknown__ if absolute_path_from(result).nil?
+
+        absolute_path_from(result)
+      end
+
+      def absolute_path_from(result)
+        absolute_path = File.expand_path(result.source_location.first)
+        absolute_path.slice(/(?<=(?:spec|test)\/)\w*/)
+      end
+
+      def configure_profiler
+        ::TestProf::EventProf::CustomEvents.activate_all(tag_prof_event)
+        ::TestProf::EventProf.build(tag_prof_event)
+      end
+
+      def event_prof_activated?
+        return false if tag_prof_event.nil?
+
+        !tag_prof_event.empty?
+      end
+
+      def tag_prof_event
+        ENV["TAG_PROF_EVENT"]
+      end
+
+      def fetch_events_data
+        return {} unless @events_profiler
+
+        @events_profiler.profilers.map do |profiler|
+          [profiler.event, profiler.time || 0.0]
+        end.to_h
+      end
+    end
+  end
+end

data/lib/test_prof/tag_prof/result.rb

@@ -21,8 +21,8 @@ module TestProf
       def track(tag, time:, events: {})
         data[tag][:count] += 1
         data[tag][:time] += time
-        events.each do |k, v|
-          data[tag][k] += v
+        events.each do |event, time|
+          data[tag][event] += time
         end
       end
 

data/lib/test_prof/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module TestProf
-  VERSION = "1.3.1"
+  VERSION = "1.3.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: test-prof
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.3
 platform: ruby
 authors:
 - Vladimir Dementyev
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-12-12 00:00:00.000000000 Z
+date: 2024-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -213,6 +213,7 @@ files:
 - lib/test_prof/stack_prof.rb
 - lib/test_prof/stack_prof/rspec.rb
 - lib/test_prof/tag_prof.rb
+- lib/test_prof/tag_prof/minitest.rb
 - lib/test_prof/tag_prof/printers/html.rb
 - lib/test_prof/tag_prof/printers/simple.rb
 - lib/test_prof/tag_prof/result.rb
@@ -234,7 +235,7 @@ metadata:
   homepage_uri: https://test-prof.evilmartians.io/
   source_code_uri: https://github.com/test-prof/test-prof
   funding_uri: https://github.com/sponsors/test-prof
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -249,8 +250,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.20
-signing_key:
+rubygems_version: 3.4.19
+signing_key: 
 specification_version: 4
 summary: Ruby applications tests profiling tools
 test_files: []