parallel_tests 2.15.0 → 2.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c475b70366d96f840ad6857d86c8ff9cfbf6bc5
-  data.tar.gz: df7751a1d3d61172c1ef0a2ac4d7950f6232f910
+  metadata.gz: b379a6559260bc09ecbdf2f662561213b1f765d4
+  data.tar.gz: 7589375b613e87e4eab4753cc7694afb46d3de4b
 SHA512:
-  metadata.gz: 79ffeb8fa61bb454ca5b7bef04fe66a2b8a071a376fff36f65f0fb84e23c0d1e8b3517ce8e51eacd8e88cbf34916a8495f118c6dc56b63efdcf183f7abd5bfcd
-  data.tar.gz: 6c5a8844af6c3f9e1b0ed2dac1426593bca85139ff16dc0aa0624c923b6a765011e861c20aa66a212e6f161e772171531360a7e4843109dcc81d798cfef0e21b
+  metadata.gz: 8531b811305f22ae1206776d2068fb99699f65a0458376036b1efcb661176032d2ae46068f6c6d1a964dfa9066e627ff7698de14b43112bae834f8639bc3fe18
+  data.tar.gz: cbd83e152eb227ad954fadd7b97c85d3c7209d7cadf142add277e55c2c155ae95edfd0afc6b5917b04ad1ed4fbbb3a75a4fbecc05d40dab601b0b4ba3c171e9a

data/Readme.md

@@ -2,6 +2,7 @@
 
 [![Gem Version](https://badge.fury.io/rb/parallel_tests.svg)](https://rubygems.org/gems/parallel_tests)
 [![Build Status](https://travis-ci.org/grosser/parallel_tests.svg)](https://travis-ci.org/grosser/parallel_tests/builds)
+[![Build status](https://ci.appveyor.com/api/projects/status/708b1up4pqc34x3y?svg=true)](https://ci.appveyor.com/project/grosser/parallel-tests)
 
 Speedup Test::Unit + RSpec + Cucumber + Spinach by running parallel on multiple CPU cores.<br/>
 ParallelTests splits tests into even groups (by number of lines or runtime) and runs each group in a single process with its own database.

data/lib/parallel_tests.rb

@@ -4,17 +4,12 @@ require "rbconfig"
 
 module ParallelTests
   WINDOWS = (RbConfig::CONFIG['host_os'] =~ /cygwin|mswin|mingw|bccwin|wince|emx/)
-  GREP_PROCESSES_COMMAND = \
-  if WINDOWS
-    "wmic process get commandline | findstr TEST_ENV_NUMBER | find /c \"TEST_ENV_NUMBER=\" 2>&1"
-  else
-    "ps -ef | grep [T]EST_ENV_NUMBER= 2>&1"
-  end
   RUBY_BINARY = File.join(RbConfig::CONFIG['bindir'], RbConfig::CONFIG['ruby_install_name'])
 
   autoload :CLI, "parallel_tests/cli"
   autoload :VERSION, "parallel_tests/version"
   autoload :Grouper, "parallel_tests/grouper"
+  autoload :Pids, "parallel_tests/pids"
 
   class << self
     def determine_number_of_processes(count)
@@ -25,6 +20,14 @@ module ParallelTests
       ].detect{|c| not c.to_s.strip.empty? }.to_i
     end
 
+    def pids
+      @pids ||= Pids.new(pid_file_path)
+    end
+
+    def pid_file_path
+      ENV['PARALLEL_PID_FILE'] ||= Tempfile.new('parallel-tests-pidfile').path
+    end
+
     # copied from http://github.com/carlhuda/bundler Bundler::SharedHelpers#find_gemfile
     def bundler_enabled?
       return true if Object.const_defined?(:Bundler)
@@ -70,11 +73,8 @@ module ParallelTests
       sleep 1 until number_of_running_processes <= 1
     end
 
-    # Fun fact: this includes the current process if it's run via parallel_tests
     def number_of_running_processes
-      result = `#{GREP_PROCESSES_COMMAND}`
-      raise "Could not grep for processes -> #{result}" if result.strip != "" && !$?.success?
-      result.split("\n").size
+      pids.count
     end
 
     # real time even if someone messed with timecop in tests

data/lib/parallel_tests/cli.rb

@@ -28,6 +28,7 @@ module ParallelTests
       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?

data/lib/parallel_tests/pids.rb

@@ -0,0 +1,60 @@
+require 'tempfile'
+require 'json'
+
+module ParallelTests
+  class Pids
+    attr_reader :pids, :file_path, :mutex
+
+    def initialize(file_path)
+      @file_path = file_path
+      @mutex = Mutex.new
+    end
+
+    def add(pid)
+      pids << pid.to_i
+      save
+    end
+
+    def delete(pid)
+      pids.delete(pid.to_i)
+      save
+    end
+
+    def count
+      read
+      pids.count
+    end
+
+    private
+
+    def pids
+      @pids ||= []
+    end
+
+    def all
+      read
+      pids
+    end
+
+    def clear
+      @pids = []
+      save
+    end
+
+    def read
+      sync do
+        contents = IO.read(file_path)
+        return if contents.empty?
+        @pids = JSON.parse(contents)
+      end
+    end
+
+    def save
+      sync { IO.write(file_path, pids.to_json) }
+    end
+
+    def sync
+      mutex.synchronize { yield }
+    end
+  end
+end

data/lib/parallel_tests/test/runner.rb

@@ -71,8 +71,9 @@ module ParallelTests
 
         def execute_command(cmd, process_number, num_processes, options)
           env = (options[:env] || {}).merge(
-            "TEST_ENV_NUMBER" => test_env_number(process_number, options),
-            "PARALLEL_TEST_GROUPS" => num_processes
+            "TEST_ENV_NUMBER" => test_env_number(process_number, options).to_s,
+            "PARALLEL_TEST_GROUPS" => num_processes.to_s,
+            "PARALLEL_PID_FILE" => ParallelTests.pid_file_path,
           )
           cmd = "nice #{cmd}" if options[:nice]
           cmd = "#{cmd} 2>&1" if options[:combine_stderr]
@@ -84,18 +85,13 @@ module ParallelTests
         end
 
         def execute_command_and_capture_output(env, cmd, silence)
-          # make processes descriptive / visible in ps -ef
-          separator = (WINDOWS ? ' & ' : ';')
-          exports = env.map do |k,v|
-            if WINDOWS
-              "(SET \"#{k}=#{v}\")"
-            else
-              "#{k}=#{v};export #{k}"
-            end
-          end.join(separator)
-          cmd = "#{exports}#{separator}#{cmd}"
-
-          output = open("|#{cmd}", "r") { |output| capture_output(output, silence) }
+          pid = nil
+          output = IO.popen(env, cmd) do |io|
+            pid = io.pid
+            ParallelTests.pids.add(pid)
+            capture_output(io, silence)
+          end
+          ParallelTests.pids.delete(pid) if pid
           exitstatus = $?.exitstatus
           seed = output[/seed (\d+)/,1]
 

data/lib/parallel_tests/version.rb

@@ -1,3 +1,3 @@
 module ParallelTests
-  VERSION = Version = '2.15.0'
+  VERSION = Version = '2.16.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parallel_tests
 version: !ruby/object:Gem::Version
-  version: 2.15.0
+  version: 2.16.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-02 00:00:00.000000000 Z
+date: 2017-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel
@@ -50,6 +50,7 @@ files:
 - lib/parallel_tests/gherkin/runner.rb
 - lib/parallel_tests/gherkin/runtime_logger.rb
 - lib/parallel_tests/grouper.rb
+- lib/parallel_tests/pids.rb
 - lib/parallel_tests/railtie.rb
 - lib/parallel_tests/rspec/failures_logger.rb
 - lib/parallel_tests/rspec/logger_base.rb