test-prof 1.0.7 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f55e42ee372a9ebe0f8981487931bf70ab3209e38163b32f84a7553bdfb4249
-  data.tar.gz: 3ca0352ca4671c11d18937d3ee1de361322c827671d199d079b1460667c32a1c
+  metadata.gz: 9e1623dde5386ea71184b81cf99eb67ac377613d46b2ebac3ce874164103fcbd
+  data.tar.gz: 1b9fa94cb2616226019cbc57ee8dbefa5c03db8f42f0be277352884ab6dfdb48
 SHA512:
-  metadata.gz: 00dcd7797667e28b54fe32e36392e44b80a1dd6fdcc04b8a0565084311c5420bbe017eecba2ae553b84b2cdd6bc92886f15a919da8e1ba7a293aa737bc2c81da
-  data.tar.gz: eed04e297d23872fae979d7da614d4cf2730c4414b7eb26ad14095e619eeabd872619cd3e51293a4949fc04f214807cb10425da4a7ebe343df8a8f9af766f413
+  metadata.gz: 7eeec86920c82c3afb8b89478b3992bf1750fdacd949913c0a6c18a684bcefb5998880e4da2cecec1c8d5866dcc89b8a16de31e7e881713f8a4707aa08b25fd6
+  data.tar.gz: 793ec788e3cb95c29b8b3b1a9026db05e64d1ae828ca2ce8a180ffc460cf3d653710b2c4356e47d0dbc3aa8a3fd5ea633502fa5c0f0114a467a5dd01ae99b5b5

data/CHANGELOG.md

@@ -1,6 +1,14 @@
 # Change log
 
-## master (unrealeased)
+## master (unreleased)
+
+## 1.0.8 (2022-03-11)
+
+- Restore the lock_thread value after rollback. ([@cou929][])
+
+- Fixes the configuration of a printer for factory_prof runs
+
+- Ensure that defaults are stored in a threadsafe manner
 
 ## 1.0.7 (2021-08-30)
 
@@ -267,3 +275,5 @@ See [changelog](https://github.com/test-prof/test-prof/blob/v0.8.0/CHANGELOG.md)
 [@stefkin]: https://github.com/stefkin
 [@jaimerson]: https://github.com/jaimerson
 [@alexvko]: https://github.com/alexvko
+[@grillermo]: https://github.com/grillermo
+[@cou929]: https://github.com/cou929

data/lib/test_prof/any_fixture/dump/postgresql.rb

@@ -23,7 +23,7 @@ module TestProf
         end
 
         def compile_sql(sql, binds)
-          sql.gsub(/\$\d+/) { binds.shift }
+          sql.gsub(/\$\d+/) { binds.shift.gsub("\n", "' || chr(10) || '") }
         end
 
         def import(path)

data/lib/test_prof/any_fixture/dump/sqlite.rb

@@ -18,7 +18,7 @@ module TestProf
         end
 
         def compile_sql(sql, binds)
-          sql.gsub(/\?/) { binds.shift }
+          sql.gsub(/\?/) { binds.shift.gsub("\n", "' || char(10) || '") }
         end
 
         def import(path)

data/lib/test_prof/any_fixture.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require "test_prof"
 require "test_prof/ext/float_duration"
 require "test_prof/any_fixture/dump"
 

data/lib/test_prof/before_all/adapters/active_record.rb

@@ -37,6 +37,9 @@ module TestProf
       end
     end
 
+    # avoid instance variable collisions with cats
+    PREFIX_RESTORE_LOCK_THREAD = "@😺"
+
     configure do |config|
       # Make sure ActiveRecord uses locked thread.
       # It only gets locked in `before` / `setup` hook,
@@ -44,8 +47,14 @@ module TestProf
       # might lead to leaking connections
       config.before(:begin) do
         next unless ::ActiveRecord::Base.connection.pool.respond_to?(:lock_thread=)
+        instance_variable_set("#{PREFIX_RESTORE_LOCK_THREAD}_orig_lock_thread", ::ActiveRecord::Base.connection.pool.instance_variable_get(:@lock_thread))
         ::ActiveRecord::Base.connection.pool.lock_thread = true
       end
+
+      config.after(:rollback) do
+        next unless ::ActiveRecord::Base.connection.pool.respond_to?(:lock_thread=)
+        ::ActiveRecord::Base.connection.pool.lock_thread = instance_variable_get("#{PREFIX_RESTORE_LOCK_THREAD}_orig_lock_thread")
+      end
     end
   end
 end

data/lib/test_prof/before_all.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "test_prof"
+
 module TestProf
   # `before_all` helper configuration
   module BeforeAll

data/lib/test_prof/cops/rspec/aggregate_examples/matchers_with_side_effects.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative "../language"
+require "test_prof/cops/rspec/language"
 
 module RuboCop
   module Cop

data/lib/test_prof/cops/rspec/aggregate_examples/node_matchers.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative "../language"
+require "test_prof/cops/rspec/language"
 
 module RuboCop
   module Cop

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

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require_relative "aggregate_examples/line_range_helpers"
-require_relative "aggregate_examples/metadata_helpers"
-require_relative "aggregate_examples/node_matchers"
+require "test_prof/cops/rspec/aggregate_examples/line_range_helpers"
+require "test_prof/cops/rspec/aggregate_examples/metadata_helpers"
+require "test_prof/cops/rspec/aggregate_examples/node_matchers"
 
-require_relative "aggregate_examples/its"
-require_relative "aggregate_examples/matchers_with_side_effects"
+require "test_prof/cops/rspec/aggregate_examples/its"
+require "test_prof/cops/rspec/aggregate_examples/matchers_with_side_effects"
 
 module RuboCop
   module Cop

data/lib/test_prof/factory_all_stub.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require "test_prof"
 require "test_prof/factory_bot"
 require "test_prof/factory_all_stub/factory_bot_patch"
 

data/lib/test_prof/factory_default.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require "test_prof"
 require "test_prof/factory_bot"
 require "test_prof/factory_default/factory_bot_patch"
 
@@ -31,7 +32,6 @@ module TestProf
         TestProf::FactoryBot::Strategy::Build.prepend StrategyExt
         TestProf::FactoryBot::Strategy::Stub.prepend StrategyExt
 
-        @store = {}
         # default is false to retain backward compatibility
         @preserve_traits = false
       end
@@ -57,12 +57,14 @@ module TestProf
       end
 
       def reset
-        @store.clear
+        store.clear
       end
 
       private
 
-      attr_reader :store
+      def store
+        Thread.current[:testprof_factory_store] ||= {}
+      end
     end
   end
 end

data/lib/test_prof/factory_prof.rb

@@ -100,15 +100,21 @@ module TestProf
       def run
         init
 
-        printer = config.printer
-
         started_at = TestProf.now
 
-        at_exit { printer.dump(result, start_time: started_at) }
+        at_exit do
+          print(started_at)
+        end
 
         start
       end
 
+      def print(started_at)
+        printer = config.printer
+
+        printer.dump(result, start_time: started_at)
+      end
+
       def start
         reset!
         @running = true

data/lib/test_prof/recipes/logging.rb

@@ -24,8 +24,6 @@ module TestProf
           ]
         end
 
-        # rubocop:disable Metrics/CyclomaticComplexity
-        # rubocop:disable Metrics/PerceivedComplexity
         def all_loggables
           return @all_loggables if instance_variable_defined?(:@all_loggables)
 

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require "test_prof"
-require_relative "./before_all"
+require "test_prof/recipes/rspec/before_all"
 
 module TestProf
   # Just like `let`, but persist the result for the whole group.
@@ -75,7 +75,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 = RUBY_ENGINE == "jruby" ? "@__jruby_is_not_cat_friendly__" : "@😸"
+    PREFIX = "@😸"
 
     FROZEN_ERROR_HINT = "\nIf you are using `let_it_be`, you may want to pass `reload: true` or `refind: true` modifier to it."
 

data/lib/test_prof/rspec_dissect/collectors/before.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative "./base"
+require "test_prof/rspec_dissect/collectors/base"
 
 module TestProf
   module RSpecDissect

data/lib/test_prof/rspec_dissect/collectors/let.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative "./base"
+require "test_prof/rspec_dissect/collectors/base"
 
 module TestProf
   module RSpecDissect

data/lib/test_prof/rspec_stamp/parser.rb

@@ -28,8 +28,6 @@ module TestProf
       end
 
       class << self
-        # rubocop: disable Metrics/CyclomaticComplexity
-        # rubocop: disable Metrics/PerceivedComplexity
         def parse(code)
           sexp = Ripper.sexp(code)
           return unless sexp

data/lib/test_prof/rspec_stamp.rb

@@ -116,8 +116,6 @@ module TestProf
 
       private
 
-      # rubocop: disable Metrics/CyclomaticComplexity
-      # rubocop: disable Metrics/PerceivedComplexity
       def stamp_example(example, tags)
         matches = example.match(EXAMPLE_RXP)
         return false unless matches

data/lib/test_prof/rubocop.rb

@@ -9,5 +9,5 @@ end
 
 require "rubocop"
 
-require_relative "cops/inject"
+require "test_prof/cops/inject"
 require "test_prof/cops/rspec/aggregate_examples"

data/lib/test_prof/stack_prof.rb

@@ -162,13 +162,13 @@ module TestProf
         log :info, <<~MSG
           Run the following command to generate a flame graph report:
 
-          stackprof --flamegraph #{path} > #{html_path} && stackprof --flamegraph-viewer=#{html_path}
+          stackprof --d3-flamegraph #{path} > #{html_path} && stackprof --flamegraph-viewer=#{html_path}
         MSG
       end
 
       def dump_json_report(path)
         report = ::StackProf::Report.new(
-          Marshal.load(IO.binread(path)) # rubocop:disable Security/MarshalLoad
+          Marshal.load(IO.binread(path))
         )
         json_path = path.gsub(/\.dump$/, ".json")
         File.write(json_path, JSON.generate(report.data))

data/lib/test_prof/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: test-prof
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.8
 platform: ruby
 authors:
 - Vladimir Dementyev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-30 00:00:00.000000000 Z
+date: 2022-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -237,7 +237,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Ruby applications tests profiling tools