forking_test_runner 1.13.0 → 1.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d802108391cd0edbb4c9a9628ca56d447dbc07992f07cf8c1ffc1e61d770d5a
-  data.tar.gz: cabbf4e263465b03e1bc47435b15ce5186c3478f409095f57d2197e49ca5e0e5
+  metadata.gz: 0a7ebca8b454c091bb661a22944f47dfe076bca28881204c35d5c5406e2edf99
+  data.tar.gz: 2fdc6f9e18ae663f4c6ebca965e494af978e99ed6bd38fa91527e530844a9f2b
 SHA512:
-  metadata.gz: 921396a5eec38e183f71ab4ba42340dad7c34f81d622af12ad9df156c639ce0c41d53ba0bcaff9c3e5efa6e52d5416a1676a018f6cacb1e4aa01fb820d338781
-  data.tar.gz: c79fcf65d60af55227c194baf05c86275a1d6d2b1132fa14bd311480d982b490b40d991c02f8a14ad9a95f7578fbd92ee1b6f7a7e32108dc9a853c4d92594f90
+  metadata.gz: 53998b0c82cea8ab99a6605f2a834b251d62f24c174b8dc482f917bdcc249c691a6602508e1d23b728a67a04cdd3c6c82b104fe4586dcce243f4845f9789c692
+  data.tar.gz: 6e507d5539e50ddf61efcc23c879270a74e7a81f28f7bf4d278b0bf19183ca2234c23ec776f0cc2ab269640b53f5bb902ac6aae186af5a1f44643bcc67f48a8d

data/bin/forking-test-runner

@@ -1,7 +1,8 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 # enable local usage from cloned repo
-root = File.expand_path("../..", __FILE__)
+root = File.expand_path('..', __dir__)
 $LOAD_PATH << "#{root}/lib" if File.exist?("#{root}/Gemfile")
 
 require 'forking_test_runner'

data/lib/forking_test_runner/cli.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ForkingTestRunner
   # read and delete options we support and pass the rest through to the underlying test runner (-v / --seed etc)
   module CLI
@@ -11,9 +12,9 @@ module ForkingTestRunner
       [
         :record_runtime,
         "--record-runtime=MODE",
-        "\n      Record test runtime:\n" <<
-          "        simple = write to disk at --runtime-log)\n" <<
-          "        amend  = write from multiple remote workers via http://github.com/grosser/amend, needs TRAVIS_REPO_SLUG & TRAVIS_BUILD_NUMBER",
+        "\n      Record test runtime:\n        " \
+        "simple = write to disk at --runtime-log)\n        " \
+        "amend  = write from multiple remote workers via http://github.com/grosser/amend, needs TRAVIS_REPO_SLUG & TRAVIS_BUILD_NUMBER",
         String
       ],
       [:runtime_log, "--runtime-log=FILE", "File to store runtime log in or runtime.log", String],
@@ -22,12 +23,12 @@ module ForkingTestRunner
       [:groups, "--groups=NUM", "How many groups there are in total (use with --group)", Integer],
       [:version, "--version", "Show version"],
       [:help, "--help", "Show help"]
-    ]
+    ].freeze
 
     class << self
       def parse_options(argv)
         options = OPTIONS.each_with_object({}) do |(setting, flag, _, type), all|
-          all[setting] = delete_argv(flag.split('=', 2)[0], argv, type: type)
+          all[setting] = delete_argv(flag.split('=', 2)[0], argv, type:)
         end
 
         # show version
@@ -43,8 +44,8 @@ module ForkingTestRunner
         end
 
         # check if we can use merge_coverage
-        if options.fetch(:merge_coverage)
-          abort "merge_coverage does not work on ruby prior to 2.3" if RUBY_VERSION < "2.3.0"
+        if options.fetch(:merge_coverage) && "2.3.0" > RUBY_VERSION
+          abort "merge_coverage does not work on ruby prior to 2.3"
         end
 
         if !!options.fetch(:group) ^ !!options.fetch(:groups)

data/lib/forking_test_runner/coverage_capture.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ForkingTestRunner
   module CoverageCapture
     # override Coverage.result to add pre-fork captured coverage
@@ -7,8 +8,7 @@ module ForkingTestRunner
     end
 
     # deprecated, single_cov checks for this, so leave it here
-    def capture_coverage!
-    end
+    def capture_coverage!; end
 
     class << self
       attr_accessor :coverage
@@ -49,7 +49,7 @@ module ForkingTestRunner
       def merge_lines_coverage(a, b)
         b.each_with_index.map do |b_count, i|
           a_count = a[i]
-          (a_count.nil? && b_count.nil?) ? nil : a_count.to_i + b_count.to_i
+          a_count.nil? && b_count.nil? ? nil : a_count.to_i + b_count.to_i
         end
       end
 

data/lib/forking_test_runner/version.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ForkingTestRunner
-  VERSION = "1.13.0"
+  VERSION = "1.15.0"
 end

data/lib/forking_test_runner.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'benchmark'
 require 'optparse'
 require 'forking_test_runner/version'
@@ -8,10 +9,9 @@ require 'tempfile'
 
 module ForkingTestRunner
   CLEAR = "------"
-  CONVERAGE_REPORT_PREFIX = "coverage/fork-"
+  COVERAGE_REPORT_PREFIX = "coverage/fork-"
 
   class << self
-
     attr_accessor :before_fork_callbacks, :after_fork_callbacks
 
     def cli(argv)
@@ -42,19 +42,19 @@ module ForkingTestRunner
 
       # run all the tests
       results = with_lock do |lock|
-        Parallel.map_with_index(test_groups, in_processes: parallel || 0) do |tests, env_index|
+        Parallel.map_with_index(test_groups, in_processes: parallel || 0) do |tests_group, env_index|
           if parallel
             ENV["TEST_ENV_NUMBER"] = (env_index == 0 ? '' : (env_index + 1).to_s) # NOTE: does not support first_is_1 option
           end
 
           reraise_clean_ar_error { load_test_env }
 
-          tests.map do |file, expected|
+          tests_group.map do |file, expected|
             print_started file unless parallel
             result = [file, expected, *benchmark { run_test(file) }]
             sync_stdout lock do
               print_started file if parallel
-              print_finished *result
+              print_finished(*result)
             end
             result
           end
@@ -64,9 +64,11 @@ module ForkingTestRunner
       unless @options.fetch(:quiet)
         # pretty print the results
         puts "\nResults:"
-        puts results.
-          sort_by { |_,_,_,r,_| r ? 0 : 1 }. # failures should be last so they are easy to find
-          map { |f,_,_,r,_| "#{f}: #{r ? "OK" : "Fail"}"}
+        puts(
+          results
+                    .sort_by { |_, _, _, r, _| r ? 0 : 1 } # failures should be last so they are easy to find
+                    .map { |f, _, _, r, _| "#{f}: #{r ? "OK" : "Fail"}" }
+        )
         puts
       end
 
@@ -94,9 +96,9 @@ module ForkingTestRunner
 
     private
 
-    def with_lock(&block)
+    def with_lock(&)
       return yield unless @options.fetch(:parallel)
-      Tempfile.open"forking-test-runner-lock", &block
+      Tempfile.open("forking-test-runner-lock", &)
     end
 
     def sync_stdout(lock)
@@ -161,7 +163,7 @@ module ForkingTestRunner
         File.write(log, data)
       when 'amend'
         if id = ENV["BUILDKITE_JOB_ID"]
-          slug = ENV.fetch("BUILDKITE_ORG_SLUG") + "-" + ENV.fetch("BUILDKITE_PIPELINE_SLUG")
+          slug = "#{ENV.fetch("BUILDKITE_ORG_SLUG")}-#{ENV.fetch("BUILDKITE_PIPELINE_SLUG")}"
         else
           slug = ENV.fetch("TRAVIS_REPO_SLUG").sub("/", "-")
           id = ENV.fetch("TRAVIS_BUILD_NUMBER")
@@ -212,7 +214,7 @@ module ForkingTestRunner
       e = begin
         yield
         nil
-      rescue
+      rescue StandardError
         $!
       end
 
@@ -223,7 +225,7 @@ module ForkingTestRunner
     def load_test_helper
       disable_test_autorun
       require 'rspec/core' if @options.fetch(:rspec)
-      helper =  @options.fetch(:helper) || (@options.fetch(:rspec) ? "spec/spec_helper" : "test/test_helper")
+      helper = @options.fetch(:helper) || (@options.fetch(:rspec) ? "spec/spec_helper" : "test/test_helper")
       require "./#{helper}"
     end
 
@@ -235,14 +237,21 @@ module ForkingTestRunner
       # reuse our pre-loaded fixtures even if we have a different connection
       fixtures = ActiveRecord::FixtureSet
       fixtures_eigenclass = class << fixtures; self; end
-      fixtures_eigenclass.send(:define_method, :cache_for_connection) do |_connection|
+
+      name = (ActiveRecord::VERSION::STRING >= "7.2.0" ? :cache_for_connection_pool : :cache_for_connection)
+      fixtures_eigenclass.send(:define_method, name) do |_pool|
         fixtures.class_variable_get(:@@all_cached_fixtures)[:unique]
       end
 
       ActiveSupport::TestCase.fixtures :all
 
       fixtures.create_fixtures(
-        ActiveSupport::TestCase.fixture_path,
+        (if ActiveSupport::TestCase.respond_to?(:fixture_paths)
+           ActiveSupport::TestCase.fixture_paths
+         else
+           ActiveSupport::TestCase.fixture_path
+         end
+        ), # TODO: remove after dropping rails 7,0 support
         ActiveSupport::TestCase.fixture_table_names,
         ActiveSupport::TestCase.fixture_class_names
       )
@@ -268,7 +277,7 @@ module ForkingTestRunner
 
       wpipe.close
 
-      buffer = ""
+      buffer = +""
 
       while ch = rpipe.read(1)
         buffer << ch
@@ -283,7 +292,11 @@ module ForkingTestRunner
     def preserve_tty
       was_tty = $stdout.tty?
       yield
-      def $stdout.tty?; true; end if was_tty
+      if was_tty
+        def $stdout.tty?;
+          true;
+        end
+      end
     end
 
     def run_test(file)
@@ -294,14 +307,13 @@ module ForkingTestRunner
             SimpleCov.command_name file
           end
           if partial_reports_for_single_cov?
-            SingleCov.coverage_report = "#{CONVERAGE_REPORT_PREFIX}#{Process.pid}.json"
+            SingleCov.coverage_report = "#{COVERAGE_REPORT_PREFIX}#{Process.pid}.json"
           end
 
           @after_fork_callbacks.each(&:call)
 
           if active_record?
-            key = (ActiveRecord::VERSION::STRING >= "4.1.0" ? :test : "test")
-            ActiveRecord::Base.establish_connection key
+            ActiveRecord::Base.establish_connection :test
           end
           enable_test_autorun(file)
         end
@@ -317,7 +329,8 @@ module ForkingTestRunner
     def change_program_name_to(name)
       return yield if @options.fetch(:parallel)
       begin
-        old, $0 = $0, name
+        old = $0
+        $0 = name
         yield
       ensure
         $0 = old
@@ -331,14 +344,14 @@ module ForkingTestRunner
       tests = ParallelTests::Test::Runner.send(
         :tests_with_size,
         tests,
-        runtime_log: runtime_log,
-        group_by: group_by
+        runtime_log:,
+        group_by:
       )
       groups = ParallelTests::Grouper.in_even_groups_by_size(tests, group_count, {})
       group = groups[group - 1] || raise("Group #{group} not found")
 
       # return tests with runtime
-      tests = Hash[tests]
+      tests = tests.to_h
       group.map { |test| [test, (tests[test] if group_by == :runtime)] }
     end
 
@@ -354,7 +367,7 @@ module ForkingTestRunner
       end
     end
 
-    def toggle_test_autorun(value, file=nil)
+    def toggle_test_autorun(value, file = nil)
       if @options.fetch(:rspec)
         if value
           exit(RSpec::Core::Runner.run([file] + ARGV))
@@ -376,7 +389,7 @@ module ForkingTestRunner
     end
 
     def summarize_partial_reports
-      reports = Dir.glob("#{CONVERAGE_REPORT_PREFIX}*")
+      reports = Dir.glob("#{COVERAGE_REPORT_PREFIX}*")
       return if reports.empty?
       key = nil
 
@@ -391,7 +404,7 @@ module ForkingTestRunner
         File.unlink(report) # do not leave junk behind
       end
 
-      data = JSON.pretty_generate(key => {"coverage" => coverage, "timestamp" => Time.now.to_i })
+      data = JSON.pretty_generate(key => { "coverage" => coverage, "timestamp" => Time.now.to_i })
       File.write(SingleCov.coverage_report, data)
 
       # make it not override our report when it finishes for main process

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forking_test_runner
 version: !ruby/object:Gem::Version
-  version: 1.13.0
+  version: 1.15.0
 platform: ruby
 authors:
 - Michael Grosser
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-05 00:00:00.000000000 Z
+date: 2024-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel_tests
@@ -39,7 +39,27 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.4.22
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.4.22
+- !ruby/object:Gem::Dependency
+  name: drb
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,7 +73,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: logger
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +87,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +101,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: mutex_m
+  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'
+- !ruby/object:Gem::Dependency
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -94,7 +128,49 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+- !ruby/object:Gem::Dependency
+  name: rspec
+  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'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.66.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.66.1
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+description:
 email: michael@grosser.it
 executables:
 - forking-test-runner
@@ -111,7 +187,7 @@ homepage: https://github.com/grosser/forking_test_runner
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -119,15 +195,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.16
-signing_key: 
+rubygems_version: 3.4.10
+signing_key:
 specification_version: 4
 summary: Run every test in a fork to avoid pollution and get clean output per test
 test_files: []