parallel_tests 2.21.0 → 2.21.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b21c43a2b0797b545335a094d846b070d300c576
-  data.tar.gz: 7ce394c192647e4aed53937d42494a8bfd2ae4b8
+  metadata.gz: 859dbc6f86dedda88f0eddc04d5f07e949e737ff
+  data.tar.gz: c62eacaa3c1d018957fd94d47d025df1e06e9d6d
 SHA512:
-  metadata.gz: cfe3cf7c94d8af96f075cb72b1cb100a85c4fc08e7f682c8e6f1b72f9dfd89e3090c8cd4507b14db72f81fad74ed8d3b9e903729a87c662d9b540898d64d61f7
-  data.tar.gz: 800d91f9284cbb94e0d16d7f93b9e21309818c1271c89eee80e934da80bc5eb32c12d5162710001085659555b2fb71e09519a07bb3ee87a3bea4f63953fd3380
+  metadata.gz: b306f589ad75ed0ac4ad636cbdda41f370ab58f036d1013536c997a2dc80fce8662e0ed83e157e7809b514ba2c149b88588af6c252d56531b84daaf775f14fc9
+  data.tar.gz: ebf66916a6ddb13e185013251f8e1f3a1b5a7be8d84d4815ad79e8adb336e2c6878cd036d4d2e9afa0e9e420cefecf99991f3e894a3b1fc01c14e343e2cd8d8f

data/lib/parallel_tests.rb

@@ -20,12 +20,27 @@ module ParallelTests
       ].detect{|c| not c.to_s.strip.empty? }.to_i
     end
 
+    def with_pid_file
+      Tempfile.open('parallel_tests-pidfile') do |f|
+        begin
+          ENV['PARALLEL_PID_FILE'] = f.path
+          # Pids object should be created before threads will start adding pids to it
+          # Otherwise we would have to use Mutex to prevent creation of several instances
+          @pids = pids
+          yield
+        ensure
+          ENV['PARALLEL_PID_FILE'] = nil
+          @pids = nil
+        end
+      end
+    end
+
     def pids
       @pids ||= Pids.new(pid_file_path)
     end
 
     def pid_file_path
-      ENV['PARALLEL_PID_FILE'] ||= Tempfile.new('parallel-tests-pidfile').path
+      ENV.fetch('PARALLEL_PID_FILE')
     end
 
     def stop_all_processes

data/lib/parallel_tests/cli.rb

@@ -39,17 +39,18 @@ module ParallelTests
 
     def execute_in_parallel(items, num_processes, options)
       Tempfile.open 'parallel_tests-lock' do |lock|
-        progress_indicator = simulate_output_for_ci if options[:serialize_stdout]
-
-        ParallelTests.pids # setup the class vars here so we dont initialize in the threads
-        Parallel.map(items, :in_threads => num_processes) do |item|
-          result = yield(item)
-          if progress_indicator && progress_indicator.alive?
-            progress_indicator.exit
-            puts
+        ParallelTests.with_pid_file do
+          progress_indicator = simulate_output_for_ci if options[:serialize_stdout]
+
+          Parallel.map(items, :in_threads => num_processes) do |item|
+            result = yield(item)
+            if progress_indicator && progress_indicator.alive?
+              progress_indicator.exit
+              puts
+            end
+            reprint_output(result, lock.path) if options[:serialize_stdout]
+            result
           end
-          reprint_output(result, lock.path) if options[:serialize_stdout]
-          result
         end
       end
     end
@@ -276,8 +277,10 @@ module ParallelTests
         (0...num_processes).to_a
       end
       results = if options[:non_parallel]
-        runs.map do |i|
-          ParallelTests::Test::Runner.execute_command(command, i, num_processes, options)
+        ParallelTests.with_pid_file do
+          runs.map do |i|
+            ParallelTests::Test::Runner.execute_command(command, i, num_processes, options)
+          end
         end
       else
         execute_in_parallel(runs, runs.size, options) do |i|

data/lib/parallel_tests/pids.rb

@@ -1,4 +1,3 @@
-require 'tempfile'
 require 'json'
 
 module ParallelTests

data/lib/parallel_tests/version.rb

@@ -1,3 +1,3 @@
 module ParallelTests
-  VERSION = Version = '2.21.0'
+  VERSION = Version = '2.21.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parallel_tests
 version: !ruby/object:Gem::Version
-  version: 2.21.0
+  version: 2.21.1
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-19 00:00:00.000000000 Z
+date: 2018-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel