parallel_tests 3.10.1 → 3.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 777189ca793239a4c1f468a50d69c3518047cb5ea72432521fd99ab8b9a7b61c
-  data.tar.gz: 47b6fad3f42ab691d29ed8037cb0025d318ef791b90769aafc86edf8ca88cb1f
+  metadata.gz: 43b7f3d9cbea0ac1e60e570c94794ce1e6c5dc341c07beadea2c967a2504b284
+  data.tar.gz: cccd254b7ea61a2d718590647d8f4fb6166603bf5207de0dffc8ab359400d3a1
 SHA512:
-  metadata.gz: a473918b8acb6391550a1a2a5d4f7a261994aea2937b37ad927b73282b4c9a9d61a3d9a656ce429abeb76321ae9a2a3ee084fb962c4bb026e8692712b9b8b9ce
-  data.tar.gz: 75d3625ec3b6f89cdd3b8a7463b156de059cabd5da49b3bbd4797b413e35ee0cd9955f0274a289f09d82293b19ae9ae084a371b67cba3c2a2cc22fc5e3a52057
+  metadata.gz: 7f1a3d2a5644d801647d6650257c59fc2b33f9de9eb23d4475a9e53d6b9f14573a445c5dbf56d4af8f9066a9d9315380fe656cfccd1bbb796254bd66e49277ae
+  data.tar.gz: f60aebf5e1156f0fe05822c0c2e18f29469d2897a9b8db90963f257b93a4f8f79ea54f655447ec43b09127c69647d3081ad860a5a04b5f67ee014276c9366c0e

data/Readme.md

@@ -403,6 +403,7 @@ inspired by [pivotal labs](https://blog.pivotal.io/labs/labs/parallelize-your-rs
  - [Joshua Pinter](https://github.com/joshuapinter)
  - [Zach Dennis](https://github.com/zdennis)
  - [Jon Dufresne](https://github.com/jdufresne)
+ - [Eric Kessler](https://github.com/enkessler)
 
 [Michael Grosser](http://grosser.it)<br/>
 michael@grosser.it<br/>

data/lib/parallel_tests/cli.rb

@@ -61,20 +61,15 @@ module ParallelTests
         groups = @runner.tests_in_groups(options[:files], num_processes, options)
         groups.reject!(&:empty?)
 
-        test_results = if options[:only_group]
-          groups_to_run = options[:only_group].map { |i| groups[i - 1] }.compact
-          report_number_of_tests(groups_to_run) unless options[:quiet]
-          execute_in_parallel(groups_to_run, groups_to_run.size, options) do |group|
-            run_tests(group, groups_to_run.index(group), 1, options)
-          end
-        else
-          report_number_of_tests(groups) unless options[:quiet]
-
-          execute_in_parallel(groups, groups.size, options) do |group|
-            run_tests(group, groups.index(group), num_processes, options)
-          end
+        if options[:only_group]
+          groups = options[:only_group].map { |i| groups[i - 1] }.compact
+          num_processes = 1
         end
 
+        report_number_of_tests(groups) unless options[:quiet]
+        test_results = execute_in_parallel(groups, groups.size, options) do |group|
+          run_tests(group, groups.index(group), num_processes, options)
+        end
         report_results(test_results, options) unless options[:quiet]
       end
 
@@ -228,7 +223,7 @@ module ParallelTests
             processes in a specific formation. Commas indicate specs in the same process,
             pipes indicate specs in a new process. Cannot use with --single, --isolate, or
             --isolate-n.  Ex.
-            $ parallel_tests -n 3 . --specify-groups '1_spec.rb,2_spec.rb|3_spec.rb'
+            $ parallel_test -n 3 . --specify-groups '1_spec.rb,2_spec.rb|3_spec.rb'
               Process 1 will contain 1_spec.rb and 2_spec.rb
               Process 2 will contain 3_spec.rb
               Process 3 will contain all other specs
@@ -396,7 +391,7 @@ module ParallelTests
     def simulate_output_for_ci(simulate)
       if simulate
         progress_indicator = Thread.new do
-          interval = Float(ENV.fetch('PARALLEL_TEST_HEARTBEAT_INTERVAL', 60))
+          interval = Float(ENV['PARALLEL_TEST_HEARTBEAT_INTERVAL'] || 60)
           loop do
             sleep interval
             print '.'

data/lib/parallel_tests/cucumber/scenarios.rb

@@ -52,7 +52,9 @@ module ParallelTests
             feature_tags = feature.tags.map(&:name)
 
             # We loop on each children of the feature
-            feature.tests.each do |test|
+            test_models = feature.tests
+            test_models += feature.rules.flat_map(&:tests) if feature.respond_to?(:rules) # cuke_modeler >= 3.2 supports rules
+            test_models.each do |test|
               # It's a scenario, we add it to the scenario_line_logger
               scenario_line_logger.visit_feature_element(document.path, test, feature_tags, line_numbers: test_lines)
             end

data/lib/parallel_tests/tasks.rb

@@ -102,6 +102,29 @@ module ParallelTests
         end
       end
 
+      def build_run_command(type, args)
+        count, pattern, options, pass_through = ParallelTests::Tasks.parse_args(args)
+        test_framework = {
+          'spec' => 'rspec',
+          'test' => 'test',
+          'features' => 'cucumber',
+          'features-spinach' => 'spinach'
+        }.fetch(type)
+
+        type = 'features' if test_framework == 'spinach'
+
+        # Using the relative path to find the binary allow to run a specific version of it
+        executable = File.expand_path('../../bin/parallel_test', __dir__)
+        executable = ParallelTests.with_ruby_binary(executable)
+
+        command = [*executable, type, '--type', test_framework]
+        command += ['-n', count.to_s] if count
+        command += ['--pattern', pattern] if pattern
+        command += ['--test-options', options] if options
+        command += Shellwords.shellsplit pass_through if pass_through
+        command
+      end
+
       private
 
       def rails_7_or_greater?
@@ -237,24 +260,7 @@ namespace :parallel do
     task type, [:count, :pattern, :options, :pass_through] do |_t, args|
       ParallelTests::Tasks.check_for_pending_migrations
       ParallelTests::Tasks.load_lib
-
-      count, pattern, options, pass_through = ParallelTests::Tasks.parse_args(args)
-      test_framework = {
-        'spec' => 'rspec',
-        'test' => 'test',
-        'features' => 'cucumber',
-        'features-spinach' => 'spinach'
-      }.fetch(type)
-
-      type = 'features' if test_framework == 'spinach'
-      # Using the relative path to find the binary allow to run a specific version of it
-      executable = File.expand_path('../../bin/parallel_test', __dir__)
-
-      command = [*ParallelTests.with_ruby_binary(executable), type, '--type', test_framework]
-      command += ['-n', count.to_s] if count
-      command += ['--pattern', pattern] if pattern
-      command += ['--test-options', options] if options
-      command += Shellwords.shellsplit pass_through if pass_through
+      command = ParallelTests::Tasks.build_run_command(type, args)
 
       abort unless system(*command) # allow to chain tasks e.g. rake parallel:spec parallel:features
     end

data/lib/parallel_tests/test/runner.rb

@@ -5,6 +5,8 @@ require 'parallel_tests'
 module ParallelTests
   module Test
     class Runner
+      RuntimeLogTooSmallError = Class.new(StandardError)
+
       class << self
         # --- usually overwritten by other runners
 
@@ -84,13 +86,17 @@ module ParallelTests
         end
 
         def execute_command(cmd, process_number, num_processes, options)
+          number = test_env_number(process_number, options).to_s
           env = (options[:env] || {}).merge(
-            "TEST_ENV_NUMBER" => test_env_number(process_number, options).to_s,
+            "TEST_ENV_NUMBER" => number,
             "PARALLEL_TEST_GROUPS" => num_processes.to_s,
             "PARALLEL_PID_FILE" => ParallelTests.pid_file_path
           )
           cmd = ["nice", *cmd] if options[:nice]
 
+          # being able to run with for example `-output foo-$TEST_ENV_NUMBER` worked originally and is convenient
+          cmd.map! { |c| c.gsub("$TEST_ENV_NUMBER", number).gsub("${TEST_ENV_NUMBER}", number) }
+
           puts Shellwords.shelljoin(cmd) if report_process_command?(options) && !options[:serialize_stdout]
 
           execute_command_and_capture_output(env, cmd, options)
@@ -147,8 +153,8 @@ module ParallelTests
         protected
 
         def executable
-          if ENV.include?('PARALLEL_TESTS_EXECUTABLE')
-            [ENV['PARALLEL_TESTS_EXECUTABLE']]
+          if (executable = ENV['PARALLEL_TESTS_EXECUTABLE'])
+            [executable]
           else
             determine_executable
           end
@@ -199,7 +205,7 @@ module ParallelTests
             allowed_missing -= 1 unless time = runtimes[test]
             if allowed_missing < 0
               log = options[:runtime_log] || runtime_log
-              raise "Runtime log file '#{log}' does not contain sufficient data to sort #{tests.size} test files, please update or remove it."
+              raise RuntimeLogTooSmallError, "Runtime log file '#{log}' does not contain sufficient data to sort #{tests.size} test files, please update or remove it."
             end
             [test, time]
           end

data/lib/parallel_tests/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module ParallelTests
-  VERSION = '3.10.1'
+  VERSION = '3.12.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parallel_tests
 version: !ruby/object:Gem::Version
-  version: 3.10.1
+  version: 3.12.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-24 00:00:00.000000000 Z
+date: 2022-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel
@@ -68,8 +68,8 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/grosser/parallel_tests/issues
-  documentation_uri: https://github.com/grosser/parallel_tests/blob/v3.10.1/Readme.md
-  source_code_uri: https://github.com/grosser/parallel_tests/tree/v3.10.1
+  documentation_uri: https://github.com/grosser/parallel_tests/blob/v3.12.0/Readme.md
+  source_code_uri: https://github.com/grosser/parallel_tests/tree/v3.12.0
   wiki_uri: https://github.com/grosser/parallel_tests/wiki
 post_install_message: 
 rdoc_options: []