test-prof 0.3.0.pre2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e8016e347e65b9c7be1918f7d9b34f6cf0da920
-  data.tar.gz: 93e9805bad937f7eb0e2e730274c61e58018c52a
+  metadata.gz: eb103d86ccc7a513de8b30ae8ddf536c9bbc6255
+  data.tar.gz: f0fe1c206faab5761b4419ccbf8745f4060d3e82
 SHA512:
-  metadata.gz: c837ef686608e8110cd6224e4fa2a942e287c5dc492dd6d8eb21b58399feed435e5470b8b91abfd8cc6f767360b6dd6800156d91b70145dca141477875f150a6
-  data.tar.gz: f800cc10fb99658fd3757259ca1e37afd2ccfab496b4f96bc455d09e781bdc2a2ed80128515ee8081918a933121af70643fa5f736ca4209b5824c3913dfbfeb8
+  metadata.gz: f6a4881cfc954438fa4184c2cd9be1784d10bfcd6d92931ea5132c8422aa08866b77e60ec91066ddd6afb620c524e99b4584818d158f396176f9649ef3a0e038
+  data.tar.gz: a699bd6e308b370aa4e53447025551a5b2f30249eb893356d30238eaed4dc135bb69335c780ea9d0b306ce569bca29117494ab91b6a70bbb7a22f714a65f827f

data/CHANGELOG.md

@@ -2,7 +2,21 @@
 
 ## 0.3.0
 
-Features:
+### Features:
+
+- Combine RSpecStamp with FactoryDoctor. ([@palkan][])
+
+Automatically mark _bad_ examples with custom tags.
+
+- [#17](https://github.com/palkan/test-prof/pull/17) Combine RSpecStamp with EventProf and RSpecDissect. ([@palkan][])
+
+It is possible now to automatically mark _slow_ examples and groups with custom tags. For example:
+
+```sh
+EVENT_PROF="sql.active_record" EVENT_PROF_STAMP="slow:sql" rspec ...
+```
+
+After running the command above the top 5 slowest example groups would be marked with `slow: :sql` tag.
 
 - [#14](https://github.com/palkan/test-prof/pull/14) RSpecDissect profiler. ([@palkan][])
 
@@ -13,6 +27,26 @@ and memoization helpers (i.e. `let`) in your tests.
 
 Just like `let`, but persist the result for the whole group (i.e. `let` + `before_all`).
 
+### Improvements:
+
+- Add ability to specify RubyProf report through `TEST_RUBY_PROF` env variable. ([@palkan][])
+
+- Add ability to specify StackProf raw mode through `TEST_STACK_PROF` env variable. ([@palkan][])
+
+### Changes
+
+- Use RubyProf `FlatPrinter` by default (was `CallStackPrinter`). ([@palkan][])
+
+## 0.2.5
+
+- [#16](https://github.com/palkan/test-prof/pull/16) Support Ruby >= 2.2.0 (was >= 2.3.0). ([@palkan][])
+
+## 0.2.4
+
+- EventProf: Fix regression bug with examples profiling. ([@palkan][])
+
+There was a bug when an event occurs before the example has started (e.g. in `before(:context)` hook).
+
 ## 0.2.3
 
 - Minor improvements. ([@palkan][])

data/README.md

@@ -10,7 +10,7 @@ Simply speaking, slow tests waste your time making you less productive.
 
 TestProf toolbox aims to help you identify bottlenecks in your test suite. It contains:
 
-- Plug'n'Play integrations for general Ruby profilers ([`ruby-prof`](https://github.com/ruby-prof), [`stackprof`](https://github.com/tmm1/stackprof))
+- Plug'n'Play integrations for general Ruby profilers ([`ruby-prof`](https://github.com/ruby-prof/ruby-prof), [`stackprof`](https://github.com/tmm1/stackprof))
 
 - Factories usage analyzers and profilers
 
@@ -20,10 +20,16 @@ TestProf toolbox aims to help you identify bottlenecks in your test suite. It co
 
 - etc.
 
-Of course, we have some [solutions](#tips-and-tricks) for common performance issues too, bundled into the gem.
+Of course, we have some [solutions](#tips-and-tricks-or-recipes) for common performance issues too, bundled into the gem.
 
 See [Table of Contents](#table-of-contents) for more.
 
+Supported Ruby versions:
+
+- Ruby (MRI) >= 2.2.0
+
+- JRuby >= 9.1.0.0
+
 <a href="https://evilmartians.com/">
 <img src="https://evilmartians.com/badges/sponsored-by-evil-martians.svg" alt="Sponsored by Evil Martians" width="236" height="54"></a>
 

data/guides/event_prof.md

@@ -66,6 +66,16 @@ EVENT_PROF_RANK=count EVENT_PROF='instantiation.active_record' be rspec
 
 See [event_prof.rb](https://github.com/palkan/test-prof/tree/master/lib/test_prof/event_prof.rb) for all available configuration options and their usage.
 
+## Using with RSpecStamp
+
+EventProf can be used with [RSpec Stamp](https://github.com/palkan/test-prof/tree/master/guides/rspec_stamp.md) to automatically mark _slow_ examples with custom tags. For example:
+
+```sh
+EVENT_PROF="sql.active_record" EVENT_PROF_STAMP="slow:sql" rspec ...
+```
+
+After running the command above the slowest example groups (and examples if configured) would be marked with the `slow: :sql` tag.
+
 ## Custom Instrumentation
 
 To use EventProf with your instrumentation engine just complete the two following steps:

data/guides/factory_doctor.md

@@ -62,3 +62,13 @@ To activate FactoryDoctor use `FDOC` environment variable:
 ```sh
 FDOC=1 rspec ...
 ```
+
+## Using with RSpecStamp
+
+FactoryDoctor can be used with [RSpec Stamp](https://github.com/palkan/test-prof/tree/master/guides/rspec_stamp.md) to automatically mark _bad_ examples with custom tags. For example:
+
+```sh
+FDOC=1 FDOC_STAMP="fdoc:consider" rspec ...
+```
+
+After running the command above all _potentially_ bad examples would be marked with the `fdoc: :consider` tag.

data/guides/rspec_dissect.md

@@ -35,15 +35,24 @@ AvailableSlotsController (./spec/controllers/available_slots_controller_spec.rb:
 
 RSpecDissect can only be used with RSpec (which is clear from the name).
 
-To activate RSpecDissect use `RD` environment variable:
+To activate RSpecDissect use `RD_PROF` environment variable:
 
 ```sh
-RD=1 rspec ...
+RD_PROF=1 rspec ...
 ```
 
-You can also specify the number of top slow groups through `RD_TOP` variable:
+You can also specify the number of top slow groups through `RD_PROF_TOP` variable:
 
 ```sh
-RD=1 RD_TOP=10 rspec ...
+RD_PROF=1 RD_PROF_TOP=10 rspec ...
 ```
 
+## Using with RSpecStamp
+
+RSpecDissect can be used with [RSpec Stamp](https://github.com/palkan/test-prof/tree/master/guides/rspec_stamp.md) to automatically mark _slow_ examples with custom tags. For example:
+
+```sh
+RD_PROF=1 RD_PROF_STAMP="slow" rspec ...
+```
+
+After running the command above the slowest example groups would be marked with the `:slow` tag.

data/guides/ruby_prof.md

@@ -42,21 +42,21 @@ end
 
 The most useful configuration option is `printer` – it allows you to specify a RubyProf [printer](https://github.com/ruby-prof/ruby-prof#printers).
 
-You can specify a printer through environment variable `TEST_RUBY_PROF_PRINTER`:
+You can specify a printer through environment variable `TEST_RUBY_PROF`:
 
 ```sh
-TEST_RUBY_PROF_PRINTER=flat bundle exec rake test
+TEST_RUBY_PROF=call_stack bundle exec rake test
 ```
 
 Or in your code:
 
 ```ruby
 TestProf::RubyProf.configure do |config|
-  config.printer = :flat
+  config.printer = :call_stack
 end
 ```
 
-By default, we use `CallStackPrinter`.
+By default, we use `FlatPrinter`.
 
 Also, you can specify RubyProf mode (`wall`, `cpu`, etc) through `TEST_RUBY_PROF_MODE` env variable.
 

data/guides/stack_prof.md

@@ -42,6 +42,6 @@ end
 
 You can change StackProf mode (which is `wall` by default) through `TEST_STACK_PROF_MODE` env variable.
 
-If you want to generate flame graphs you should collect _raw_ data. Turn _raw_ collection on by passing `TEST_STACK_PROF_RAW=1`.
+If you want to generate flame graphs you should collect _raw_ data. Turn _raw_ collection on by passing `TEST_STACK_PROF=raw`.
 
 See [stack_prof.rb](https://github.com/palkan/test-prof/tree/master/lib/test_prof/stack_prof.rb) for all available configuration options and their usage.

data/lib/test_prof/cops/rspec/aggregate_failures.rb

@@ -39,7 +39,7 @@ module RuboCop
 
         def on_block(node)
           method, _args, body = *node
-          return unless body&.begin_type?
+          return unless body && body.begin_type?
 
           _receiver, method_name, _object = *method
           return unless GROUP_BLOCKS.include?(method_name)
@@ -109,7 +109,7 @@ module RuboCop
         end
 
         def oneliner?(node)
-          node&.block_type? &&
+          node && node.block_type? &&
             (node.source.lines.size == 1) &&
             example_node?(node)
         end

data/lib/test_prof/event_prof.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require "test_prof/rspec_stamp"
 require "test_prof/event_prof/instrumentations/active_support"
 require "test_prof/utils/sized_ordered_set"
 
@@ -39,6 +40,13 @@ module TestProf
         @top_count = (ENV['EVENT_PROF_TOP'] || 5).to_i
         @per_example = ENV['EVENT_PROF_EXAMPLES'] == '1'
         @rank_by = (ENV['EVENT_PROF_RANK'] || :time).to_sym
+        @stamp = ENV['EVENT_PROF_STAMP']
+
+        RSpecStamp.config.tags = @stamp if stamp?
+      end
+
+      def stamp?
+        !@stamp.nil?
       end
 
       def per_example?
@@ -76,7 +84,7 @@ module TestProf
     class Profiler # :nodoc:
       include TestProf::Logging
 
-      attr_reader :event, :top_count, :rank_by, :total_count, :total_time
+      attr_reader :event, :total_count, :total_time
 
       def initialize(event:, instrumenter:)
         @event = event
@@ -105,7 +113,7 @@ module TestProf
         @time += time
         @count += 1
 
-        return unless config.per_example?
+        return if @current_example.nil?
 
         @example_time += time
         @example_count += 1
@@ -124,8 +132,10 @@ module TestProf
         @current_group = nil
       end
 
-      def example_started(_id)
-        reset_example! if config.per_example?
+      def example_started(id)
+        return unless config.per_example?
+        reset_example!
+        @current_example = id
       end
 
       def example_finished(id)
@@ -134,6 +144,7 @@ module TestProf
 
         data = { id: id, time: @example_time, count: @example_count }
         @examples << data unless data[rank_by].zero?
+        @current_example = nil
       end
 
       def results

data/lib/test_prof/event_prof/custom_events/factory_create.rb

@@ -1,5 +1,9 @@
 # frozen_string_literal: true
 
+require "test_prof/ext/string_strip_heredoc"
+
+using TestProf::StringStripHeredoc
+
 module TestProf::EventProf::CustomEvents
   module FactoryCreate # :nodoc: all
     module RunnerPatch
@@ -42,7 +46,7 @@ end
 TestProf.activate('EVENT_PROF', 'factory.create') do
   if TestProf.require(
     'factory_girl',
-    <<~MSG
+    <<-MSG.strip_heredoc
       Failed to load FactoryGirl.
 
       Make sure that "factory_girl" gem is in your Gemfile.

data/lib/test_prof/event_prof/custom_events/sidekiq_inline.rb

@@ -1,5 +1,9 @@
 # frozen_string_literal: true
 
+require "test_prof/ext/string_strip_heredoc"
+
+using TestProf::StringStripHeredoc
+
 module TestProf::EventProf::CustomEvents
   module SidekiqInline # :nodoc: all
     module ClientPatch
@@ -39,7 +43,7 @@ end
 TestProf.activate('EVENT_PROF', 'sidekiq.inline') do
   if TestProf.require(
     'sidekiq/testing',
-    <<~MSG
+    <<-MSG.strip_heredoc
       Failed to load Sidekiq.
 
       Make sure that "sidekiq" gem is in your Gemfile.

data/lib/test_prof/event_prof/custom_events/sidekiq_jobs.rb

@@ -1,5 +1,9 @@
 # frozen_string_literal: true
 
+require "test_prof/ext/string_strip_heredoc"
+
+using TestProf::StringStripHeredoc
+
 module TestProf::EventProf::CustomEvents
   module SidekiqJobs # :nodoc: all
     module ClientPatch
@@ -26,7 +30,7 @@ end
 TestProf.activate('EVENT_PROF', 'sidekiq.jobs') do
   if TestProf.require(
     'sidekiq/testing',
-    <<~MSG
+    <<-MSG.strip_heredoc
       Failed to load Sidekiq.
 
       Make sure that "sidekiq" gem is in your Gemfile.

data/lib/test_prof/event_prof/rspec.rb

@@ -2,6 +2,7 @@
 
 require "test_prof/ext/float_duration"
 require "test_prof/ext/string_truncate"
+require "test_prof/ext/string_strip_heredoc"
 
 module TestProf
   module EventProf
@@ -9,6 +10,7 @@ module TestProf
       include Logging
       using FloatDuration
       using StringTruncate
+      using StringStripHeredoc
 
       NOTIFICATIONS = %i[
         example_group_started
@@ -45,7 +47,7 @@ module TestProf
         msgs = []
 
         msgs <<
-          <<~MSG
+          <<-MSG.strip_heredoc
             EventProf results for #{@profiler.event}
 
             Total time: #{@profiler.total_time.duration}
@@ -60,7 +62,7 @@ module TestProf
           location = group[:id].metadata[:location]
 
           msgs <<
-            <<~GROUP
+            <<-GROUP.strip_heredoc
               #{description.truncate} (#{location}) – #{group[:time].duration} (#{group[:count]} / #{group[:examples]})
             GROUP
         end
@@ -72,13 +74,48 @@ module TestProf
             description = example[:id].description
             location = example[:id].metadata[:location]
             msgs <<
-              <<~GROUP
+              <<-GROUP.strip_heredoc
                 #{description.truncate} (#{location}) – #{example[:time].duration} (#{example[:count]})
               GROUP
           end
         end
 
         log :info, msgs.join
+
+        stamp! if EventProf.config.stamp?
+      end
+
+      def stamp!
+        result = @profiler.results
+
+        stamper = RSpecStamp::Stamper.new
+
+        examples = Hash.new { |h, k| h[k] = [] }
+
+        (result[:groups].to_a + result.fetch(:examples, []).to_a)
+          .map { |obj| obj[:id].metadata[:location] }.each do |location|
+          file, line = location.split(":")
+          examples[file] << line.to_i
+        end
+
+        examples.each do |file, lines|
+          stamper.stamp_file(file, lines.uniq)
+        end
+
+        msgs = []
+
+        msgs <<
+          <<-MSG.strip_heredoc
+            RSpec Stamp results
+
+            Total patches: #{stamper.total}
+            Total files: #{examples.keys.size}
+
+            Failed patches: #{stamper.failed}
+            Ignored files: #{stamper.ignored}
+          MSG
+
+        log :info, msgs.join
       end
     end
   end

data/lib/test_prof/ext/array_bsearch_index.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module TestProf
+  # Ruby 2.3 #bsearch_index method (for usage with older Rubies)
+  # Straighforward and non-optimal implementation,
+  # just for compatiblity
+  module ArrayBSearchIndex
+    refine Array do
+      def bsearch_index(&block)
+        el = bsearch(&block)
+        index(el)
+      end
+    end
+  end
+end

data/lib/test_prof/ext/string_strip_heredoc.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module TestProf
+  # Add #strip_heredoc method to use instead of
+  # squiggly docs (to support older Rubies)
+  module StringStripHeredoc
+    refine String do
+      def strip_heredoc
+        min = scan(/^[ \t]*(?=\S)/).min
+        indent = min ? min.size : 0
+        gsub(/^[ \t]{#{indent}}/, '')
+      end
+    end
+  end
+end

data/lib/test_prof/factory_doctor.rb

@@ -16,7 +16,7 @@ module TestProf
       end
 
       def bad?
-        count.positive? && queries_count.zero?
+        count > 0 && queries_count.zero?
       end
     end
 
@@ -54,6 +54,14 @@ module TestProf
           defined?(::FactoryGirl)
 
         subscribe!
+
+        @stamp = ENV['FDOC_STAMP']
+
+        RSpecStamp.config.tags = @stamp if stamp?
+      end
+
+      def stamp?
+        !@stamp.nil?
       end
 
       def start
@@ -111,7 +119,7 @@ module TestProf
       end
 
       def within_factory?
-        @depth.positive?
+        @depth > 0
       end
 
       def ignore?

data/lib/test_prof/factory_doctor/rspec.rb

@@ -1,14 +1,16 @@
 # frozen_string_literal: true
 
 require "test_prof/ext/float_duration"
+require "test_prof/ext/string_strip_heredoc"
 
 module TestProf
   module FactoryDoctor
     class RSpecListener # :nodoc:
       include Logging
       using FloatDuration
+      using StringStripHeredoc
 
-      SUCCESS_MESSAGE = 'FactoryDoctor says: "Looks good to me!"'
+      SUCCESS_MESSAGE = 'FactoryDoctor says: "Looks good to me!"'.freeze
 
       NOTIFICATIONS = %i[
         example_started
@@ -49,7 +51,7 @@ module TestProf
         msgs = []
 
         msgs <<
-          <<~MSG
+          <<-MSG.strip_heredoc
             FactoryDoctor report
 
             Total (potentially) bad examples: #{@count}
@@ -68,6 +70,40 @@ module TestProf
         end
 
         log :info, msgs.join
+
+        stamp! if FactoryDoctor.stamp?
+      end
+
+      def stamp!
+        stamper = RSpecStamp::Stamper.new
+
+        examples = Hash.new { |h, k| h[k] = [] }
+
+        @example_groups.each_value do |bad_examples|
+          bad_examples.each do |example|
+            file, line = example.metadata[:location].split(":")
+            examples[file] << line.to_i
+          end
+        end
+
+        examples.each do |file, lines|
+          stamper.stamp_file(file, lines.uniq)
+        end
+
+        msgs = []
+
+        msgs <<
+          <<-MSG.strip_heredoc
+            RSpec Stamp results
+
+            Total patches: #{stamper.total}
+            Total files: #{examples.keys.size}
+
+            Failed patches: #{stamper.failed}
+            Ignored files: #{stamper.ignored}
+          MSG
+
+        log :info, msgs.join
       end
 
       private

data/lib/test_prof/factory_prof/printers/simple.rb

@@ -1,16 +1,19 @@
 # frozen_string_literal: true
 
+require "test_prof/ext/string_strip_heredoc"
+
 module TestProf::FactoryProf
   module Printers
     module Simple # :nodoc: all
       class << self
         include TestProf::Logging
+        using TestProf::StringStripHeredoc
 
         def dump(result)
           msgs = []
 
           msgs <<
-            <<~MSG
+            <<-MSG.strip_heredoc
               Factories usage
 
                total      top-level                            name

data/lib/test_prof/recipes/rspec/any_fixture.rb

@@ -12,7 +12,7 @@ RSpec.shared_context "any_fixture:clean", with_clean_fixture: true do
 
   def open_transaction?
     pool = ActiveRecord::Base.connection_pool
-    pool.active_connection? && pool.connection.open_transactions.positive?
+    pool.active_connection? && pool.connection.open_transactions > 0
   end
 end
 

data/lib/test_prof/recipes/rspec/let_it_be.rb

@@ -22,7 +22,7 @@ module TestProf
     # Use uniq prefix for instance variables to avoid collisions
     # We want to use the power of Ruby's unicode support)
     # And we love cats!)
-    PREFIX = "@😸"
+    PREFIX = RUBY_ENGINE == 'jruby' ? "@__jruby_is_not_cat_friendly__".freeze : "@😸".freeze
 
     def let_it_be(identifier, **options, &block)
       initializer = proc do
@@ -41,7 +41,13 @@ module TestProf
     def define_let_it_be_methods(identifier, reload: false, refind: false)
       let_accessor = -> { instance_variable_get(:"#{PREFIX}#{identifier}") }
 
-      let_accessor = -> { instance_variable_get(:"#{PREFIX}#{identifier}")&.reload } if reload
+      if reload
+        let_accessor = lambda do
+          record = instance_variable_get(:"#{PREFIX}#{identifier}")
+          next unless record.is_a?(::ActiveRecord::Base)
+          record.reload
+        end
+      end
 
       if refind
         let_accessor = lambda do

data/lib/test_prof/rspec_dissect.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require "test_prof/rspec_stamp"
 require "test_prof/logging"
 
 module TestProf
@@ -35,7 +36,14 @@ module TestProf
       attr_accessor :top_count
 
       def initialize
-        @top_count = (ENV['RD_TOP'] || 5).to_i
+        @top_count = (ENV['RD_PROF_TOP'] || 5).to_i
+        @stamp = ENV['RD_PROF_STAMP']
+
+        RSpecStamp.config.tags = @stamp if stamp?
+      end
+
+      def stamp?
+        !@stamp.nil?
       end
     end
 
@@ -99,6 +107,6 @@ end
 
 require "test_prof/rspec_dissect/rspec" if defined?(RSpec::Core)
 
-TestProf.activate('RD') do
+TestProf.activate('RD_PROF') do
   TestProf::RSpecDissect.init
 end

data/lib/test_prof/rspec_dissect/rspec.rb

@@ -3,6 +3,7 @@
 require "test_prof/ext/float_duration"
 require "test_prof/ext/string_truncate"
 require "test_prof/utils/sized_ordered_set"
+require "test_prof/ext/string_strip_heredoc"
 
 module TestProf
   module RSpecDissect
@@ -10,6 +11,7 @@ module TestProf
       include Logging
       using FloatDuration
       using StringTruncate
+      using StringStripHeredoc
 
       NOTIFICATIONS = %i[
         example_finished
@@ -58,7 +60,7 @@ module TestProf
         msgs = []
 
         msgs <<
-          <<~MSG
+          <<-MSG.strip_heredoc
             RSpecDissect report
 
             Total time: #{@total_examples_time.duration}
@@ -68,32 +70,66 @@ module TestProf
           MSG
 
         msgs <<
-          <<~MSG
+          <<-MSG.strip_heredoc
             Top #{top_count} slowest suites (by `before(:each)` time):
 
           MSG
 
         @before_results.each do |group|
           msgs <<
-            <<~GROUP
+            <<-GROUP.strip_heredoc
               #{group[:desc].truncate} (#{group[:loc]}) – #{group[:before].duration} of #{group[:total].duration} (#{group[:count]})
             GROUP
         end
 
         msgs <<
-          <<~MSG
+          <<-MSG.strip_heredoc
+
             Top #{top_count} slowest suites (by `let` time):
 
           MSG
 
         @memo_results.each do |group|
           msgs <<
-            <<~GROUP
+            <<-GROUP.strip_heredoc
               #{group[:desc].truncate} (#{group[:loc]}) – #{group[:memo].duration} of #{group[:total].duration} (#{group[:count]})
             GROUP
         end
 
         log :info, msgs.join
+
+        stamp! if RSpecDissect.config.stamp?
+      end
+
+      def stamp!
+        stamper = RSpecStamp::Stamper.new
+
+        examples = Hash.new { |h, k| h[k] = [] }
+
+        (@before_results.to_a + @memo_results.to_a)
+          .map { |obj| obj[:loc] }.each do |location|
+          file, line = location.split(":")
+          examples[file] << line.to_i
+        end
+
+        examples.each do |file, lines|
+          stamper.stamp_file(file, lines.uniq)
+        end
+
+        msgs = []
+
+        msgs <<
+          <<-MSG.strip_heredoc
+            RSpec Stamp results
+
+            Total patches: #{stamper.total}
+            Total files: #{examples.keys.size}
+
+            Failed patches: #{stamper.failed}
+            Ignored files: #{stamper.ignored}
+          MSG
+
+        log :info, msgs.join
       end
 
       private
@@ -106,7 +142,7 @@ module TestProf
 end
 
 # Register RSpecDissect listener
-TestProf.activate('RD') do
+TestProf.activate('RD_PROF') do
   RSpec.configure do |config|
     listener = TestProf::RSpecDissect::Listener.new
 

data/lib/test_prof/rspec_stamp.rb

@@ -10,7 +10,8 @@ module TestProf
 
     # RSpecStamp configuration
     class Configuration
-      attr_accessor :ignore_files, :dry_run, :tags
+      attr_reader :tags
+      attr_accessor :ignore_files, :dry_run
 
       def initialize
         @ignore_files = [%r{spec/support}]
@@ -44,6 +45,49 @@ module TestProf
       end
     end
 
+    # Stamper collects statistics about applying tags
+    # to examples.
+    class Stamper
+      include TestProf::Logging
+
+      attr_reader :total, :failed, :ignored
+
+      def initialize
+        @total = 0
+        @failed = 0
+        @ignored = 0
+      end
+
+      def stamp_file(file, lines)
+        @total += lines.size
+        return if ignored?(file)
+
+        log :info, "(dry-run) Patching #{file}" if dry_run?
+
+        code = File.readlines(file)
+
+        @failed += RSpecStamp.apply_tags(code, lines, RSpecStamp.config.tags)
+
+        File.write(file, code.join) unless dry_run?
+      end
+
+      private
+
+      def ignored?(file)
+        ignored = RSpecStamp.config.ignore_files.find do |pattern|
+          file =~ pattern
+        end
+
+        return unless ignored
+        log :warn, "Ignore stamping file: #{file}"
+        @ignored += 1
+      end
+
+      def dry_run?
+        RSpecStamp.config.dry_run?
+      end
+    end
+
     class << self
       include TestProf::Logging
 
@@ -84,11 +128,11 @@ module TestProf
         parsed = Parser.parse(code)
         return false unless parsed
 
-        parsed.desc ||= 'works'
+        desc = parsed.desc_const || quote(parsed.desc || 'works')
 
         tags.each do |t|
           if t.is_a?(Hash)
-            t.keys.each do |k|
+            t.each_key do |k|
               parsed.remove_tag(k)
               parsed.add_htag(k, t[k])
             end
@@ -101,9 +145,9 @@ module TestProf
         need_parens = block == "{"
 
         tags_str = parsed.tags.map { |t| t.is_a?(Symbol) ? ":#{t}" : t }.join(", ") unless
-          parsed.tags.nil?
+          parsed.tags.nil? || parsed.tags.empty?
 
-        unless parsed.htags.nil?
+        unless parsed.htags.nil? || parsed.htags.empty?
           htags_str = parsed.htags.map do |(k, v)|
             vstr = v.is_a?(Symbol) ? ":#{v}" : quote(v)
 
@@ -112,7 +156,7 @@ module TestProf
         end
 
         replacement = "\\1#{parsed.fname}#{need_parens ? '(' : ' '}"\
-                      "#{[quote(parsed.desc), tags_str, htags_str].compact.join(', ')}"\
+                      "#{[desc, tags_str, htags_str].compact.join(', ')}"\
                       "#{need_parens ? ') ' : ' '}\\3"
 
         if config.dry_run?
@@ -126,6 +170,7 @@ module TestProf
       # rubocop: enable Metrics/PerceivedComplexity
 
       def quote(str)
+        return str unless str.is_a?(String)
         if str.include?("'")
           "\"#{str}\""
         else

data/lib/test_prof/rspec_stamp/parser.rb

@@ -2,15 +2,13 @@
 
 require "ripper"
 
-# rubocop: disable Metrics/CyclomaticComplexity
-
 module TestProf
   module RSpecStamp
     # Parse examples headers
     module Parser
       # Contains the result of parsing
       class Result
-        attr_accessor :fname, :desc
+        attr_accessor :fname, :desc, :desc_const
         attr_reader :tags, :htags
 
         def add_tag(v)
@@ -24,12 +22,14 @@ module TestProf
         end
 
         def remove_tag(tag)
-          @tags&.delete(tag)
-          @htags&.delete_if { |(k, _v)| k == tag }
+          @tags.delete(tag) if @tags
+          @htags.delete_if { |(k, _v)| k == tag } if @htags
         end
       end
 
       class << self
+        # rubocop: disable Metrics/CyclomaticComplexity
+        # rubocop: disable Metrics/PerceivedComplexity
         def parse(code)
           sexp = Ripper.sexp(code)
           return unless sexp
@@ -58,11 +58,17 @@ module TestProf
           res = Result.new
 
           fcall = sexp[1][0][1]
-          fcall = fcall[1] if fcall.first == :fcall
-          res.fname = fcall[1]
-
           args_block = sexp[1][0][2]
 
+          if fcall.first == :fcall
+            fcall = fcall[1]
+          elsif fcall.first == :var_ref
+            res.fname = [parse_const(fcall), sexp[1][0][3][1]].join(".")
+            args_block = sexp[1][0][4]
+          end
+
+          res.fname ||= fcall[1]
+
           return res if args_block.nil?
 
           args_block = args_block[1] if args_block.first == :arg_paren
@@ -71,12 +77,16 @@ module TestProf
 
           if args.first.first == :string_literal
             res.desc = parse_literal(args.shift)
+          elsif args.first.first == :var_ref || args.first.first == :const_path_ref
+            res.desc_const = parse_const(args.shift)
           end
 
           parse_arg(res, args.shift) until args.empty?
 
           res
         end
+        # rubocop: enable Metrics/CyclomaticComplexity
+        # rubocop: enable Metrics/PerceivedComplexity
 
         private
 
@@ -90,7 +100,24 @@ module TestProf
 
         def parse_hash(res, hash_arg)
           hash_arg.each do |(_, label, val)|
-            res.add_htag label[1][0..-2].to_sym, parse_literal(val)
+            res.add_htag label[1][0..-2].to_sym, parse_value(val)
+          end
+        end
+
+        # Expr of the form:
+        #  bool - [:var_ref, [:@kw, "true", [1, 24]]]
+        #  string - [:string_literal, [:string_content, [...]]]
+        #  int - [:@int, "3", [1, 52]]]]
+        def parse_value(expr)
+          case expr.first
+          when :var_ref
+            expr[1][1] == "true"
+          when :@int
+            expr[1].to_i
+          when :@float
+            expr[1].to_f
+          else
+            parse_literal(expr)
           end
         end
 
@@ -102,6 +129,25 @@ module TestProf
                               expr[0] == :assoc_new
           val
         end
+
+        # Expr of the form:
+        #  [:var_ref, [:@const, "User", [1, 9]]]
+        #
+        #  or
+        #
+        #  [:const_path_ref, [:const_path_ref, [:var_ref,
+        #    [:@const, "User", [1, 17]]],
+        #    [:@const, "Guest", [1, 23]]],
+        #    [:@const, "Collection", [1, 30]]
+        def parse_const(expr)
+          if expr.first == :var_ref
+            expr[1][1]
+          elsif expr.first == :@const
+            expr[1]
+          elsif expr.first == :const_path_ref
+            expr[1..-1].map(&method(:parse_const)).join("::")
+          end
+        end
       end
     end
   end

data/lib/test_prof/rspec_stamp/rspec.rb

@@ -1,9 +1,12 @@
 # frozen_string_literal: true
 
+require "test_prof/ext/string_strip_heredoc"
+
 module TestProf
   module RSpecStamp
     class RSpecListener # :nodoc:
       include Logging
+      using StringStripHeredoc
 
       NOTIFICATIONS = %i[
         example_failed
@@ -27,54 +30,27 @@ module TestProf
       end
 
       def stamp!
+        stamper = Stamper.new
+
         @examples.each do |file, lines|
-          stamp_file(file, lines.uniq)
+          stamper.stamp_file(file, lines.uniq)
         end
 
         msgs = []
 
         msgs <<
-          <<~MSG
+          <<-MSG.strip_heredoc
             RSpec Stamp results
 
-            Total patches: #{@total}
+            Total patches: #{stamper.total}
             Total files: #{@examples.keys.size}
 
-            Failed patches: #{@failed}
-            Ignored files: #{@ignored}
+            Failed patches: #{stamper.failed}
+            Ignored files: #{stamper.ignored}
           MSG
 
         log :info, msgs.join
       end
-
-      private
-
-      def stamp_file(file, lines)
-        @total += lines.size
-        return if ignored?(file)
-
-        log :info, "(dry-run) Patching #{file}" if dry_run?
-
-        code = File.readlines(file)
-
-        @failed += RSpecStamp.apply_tags(code, lines, RSpecStamp.config.tags)
-
-        File.write(file, code.join) unless dry_run?
-      end
-
-      def ignored?(file)
-        ignored = RSpecStamp.config.ignore_files.find do |pattern|
-          file =~ pattern
-        end
-
-        return unless ignored
-        log :warn, "Ignore stamping file: #{file}"
-        @ignored += 1
-      end
-
-      def dry_run?
-        RSpecStamp.config.dry_run?
-      end
     end
   end
 end

data/lib/test_prof/ruby_prof.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "test_prof/ext/string_strip_heredoc"
+
 module TestProf
   # RubyProf wrapper.
   #
@@ -48,7 +50,8 @@ module TestProf
                     :include_threads, :eliminate_methods
 
       def initialize
-        @printer = ENV.fetch('TEST_RUBY_PROF_PRINTER', :call_stack).to_sym
+        @printer = ENV['TEST_RUBY_PROF'].to_sym if PRINTERS.key?(ENV['TEST_RUBY_PROF'])
+        @printer ||= ENV.fetch('TEST_RUBY_PROF_PRINTER', :flat).to_sym
         @mode = ENV.fetch('TEST_RUBY_PROF_MODE', :wall).to_sym
         @min_percent = 1
         @include_threads = false
@@ -119,6 +122,7 @@ module TestProf
 
     class << self
       include Logging
+      using StringStripHeredoc
 
       def config
         @config ||= Configuration.new
@@ -172,7 +176,7 @@ module TestProf
         ENV["RUBY_PROF_MEASURE_MODE"] = config.mode.to_s
         @initialized = TestProf.require(
           'ruby-prof',
-          <<~MSG
+          <<-MSG.strip_heredoc
             Please, install 'ruby-prof' first:
                # Gemfile
               gem 'ruby-prof', '>= 0.16.0', require: false
@@ -184,7 +188,7 @@ module TestProf
         if Utils.verify_gem_version('ruby-prof', at_least: '0.16.0')
           true
         else
-          log :error, <<~MGS
+          log :error, <<-MGS.strip_heredoc
             Please, upgrade 'ruby-prof' to version >= 0.16.0.
           MGS
           false

data/lib/test_prof/stack_prof.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "test_prof/ext/string_strip_heredoc"
+
 module TestProf
   # StackProf wrapper.
   #
@@ -26,12 +28,13 @@ module TestProf
 
       def initialize
         @mode = ENV.fetch('TEST_STACK_PROF_MODE', :wall).to_sym
-        @raw = ENV['TEST_STACK_PROF_RAW'] == '1'
+        @raw = ENV['TEST_STACK_PROF'] == 'raw' || ENV['TEST_STACK_PROF_RAW'] == 1
       end
     end
 
     class << self
       include Logging
+      using StringStripHeredoc
 
       def config
         @config ||= Configuration.new
@@ -88,7 +91,7 @@ module TestProf
 
         html_path = path.gsub(/\.dump$/, '.html')
 
-        log :info, <<~MSG
+        log :info, <<-MSG.strip_heredoc
           Run the following command to generate a flame graph report:
 
           stackprof --flamegraph #{path} > #{html_path} && stackprof --flamegraph-viewer=#{html_path}
@@ -111,7 +114,7 @@ module TestProf
         return @initialized if instance_variable_defined?(:@initialized)
         @initialized = TestProf.require(
           'stackprof',
-          <<~MSG
+          <<-MSG.strip_heredoc
             Please, install 'stackprof' first:
                # Gemfile
               gem 'stackprof', '>= 0.2.9', require: false
@@ -123,9 +126,9 @@ module TestProf
         if Utils.verify_gem_version('stackprof', at_least: '0.2.9')
           true
         else
-          log :error, <<~MGS
+          log :error, <<-MSG.strip_heredoc
             Please, upgrade 'stackprof' to version >= 0.2.9.
-          MGS
+          MSG
           false
         end
       end

data/lib/test_prof/tag_prof/rspec.rb

@@ -1,12 +1,14 @@
 # frozen_string_literal: true
 
 require "test_prof/ext/float_duration"
+require "test_prof/ext/string_strip_heredoc"
 
 module TestProf
   module TagProf
     class RSpecListener # :nodoc:
       include Logging
       using FloatDuration
+      using StringStripHeredoc
 
       NOTIFICATIONS = %i[
         example_started
@@ -37,7 +39,7 @@ module TestProf
         msgs = []
 
         msgs <<
-          <<~MSG
+          <<-MSG.strip_heredoc
             TagProf report for #{@tag}
           MSG
 

data/lib/test_prof/utils/sized_ordered_set.rb

@@ -4,6 +4,11 @@ module TestProf
   module Utils
     # Ordered set with capacity
     class SizedOrderedSet
+      unless [].respond_to?(:bsearch_index)
+        require "test_prof/ext/array_bsearch_index"
+        using ArrayBSearchIndex
+      end
+
       include Enumerable
 
       def initialize(max_size, sort_by: nil)
@@ -49,7 +54,7 @@ module TestProf
       end
 
       def to_a
-        data
+        data.dup
       end
 
       private

data/lib/test_prof/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module TestProf
-  VERSION = "0.3.0.pre2"
+  VERSION = "0.3.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: test-prof
 version: !ruby/object:Gem::Version
-  version: 0.3.0.pre2
+  version: 0.3.0
 platform: ruby
 authors:
 - Vladimir Dementyev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-28 00:00:00.000000000 Z
+date: 2017-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -72,28 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.49'
+        version: '0.50'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.49'
-- !ruby/object:Gem::Dependency
-  name: pry-byebug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.50'
 description: "\n    Ruby applications tests profiling tools.\n\n    Contains tools
   to anylyze factories usage, integrate with Ruby profilers,\n    profile your examples
   using ActiveSupport notifications (if any) and\n    statically analyze your code
@@ -142,7 +128,9 @@ files:
 - lib/test_prof/event_prof/instrumentations/active_support.rb
 - lib/test_prof/event_prof/minitest.rb
 - lib/test_prof/event_prof/rspec.rb
+- lib/test_prof/ext/array_bsearch_index.rb
 - lib/test_prof/ext/float_duration.rb
+- lib/test_prof/ext/string_strip_heredoc.rb
 - lib/test_prof/ext/string_truncate.rb
 - lib/test_prof/factory_default.rb
 - lib/test_prof/factory_default/factory_girl_patch.rb
@@ -188,12 +176,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.11