parallel_tests 0.11.6 → 0.12.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    parallel_tests (0.11.6)
+    parallel_tests (0.12.0)
       parallel
 
 GEM

data/lib/parallel_tests.rb

@@ -43,12 +43,8 @@ module ParallelTests
 
   # Fun fact: this includes the current process if it's run via parallel_tests
   def self.number_of_running_processes
-    if RUBY_ENGINE == "jruby"
-      Thread.list.count { |t| t[:running_parallel_test] }
-    else
-      result = `#{GREP_PROCESSES_COMMAND}`
-      raise "Could not grep for processes -> #{result}" if result.strip != "" && !$?.success?
-      result.split("\n").size
-    end
+    result = `#{GREP_PROCESSES_COMMAND}`
+    raise "Could not grep for processes -> #{result}" if result.strip != "" && !$?.success?
+    result.split("\n").size
   end
 end

data/lib/parallel_tests/cli.rb

@@ -20,8 +20,7 @@ module ParallelTests
 
     def execute_in_parallel(items, num_processes, options)
       Tempfile.open 'parallel_tests-lock' do |lock|
-        mode = (RUBY_ENGINE == "jruby" ? :in_threads : :in_processes)
-        return Parallel.map(items, mode => num_processes) do |item|
+        return Parallel.map(items, :in_threads => num_processes) do |item|
           result = yield(item)
           report_output(result, lock) if options[:serialize_stdout]
           result

data/lib/parallel_tests/test/runner.rb

@@ -65,8 +65,8 @@ module ParallelTests
 
         output, errput, exitstatus = nil
         if RUBY_ENGINE == "jruby"
-          Thread.current[:running_parallel_test] = true
-          # JRuby's popen3 doesn't pass arguments correctly to the shell, so we use stdin
+          # - JRuby's popen3 doesn't pass arguments correctly to the shell, so we use stdin
+          # - JRuby's open cannot handle local variables properly so we would have to use instance variables
           Open3.popen3("sh -") do |stdin, stdout, stderr, thread|
              stdin.puts cmd
              stdin.close

data/lib/parallel_tests/version.rb

@@ -1,3 +1,3 @@
 module ParallelTests
-  VERSION = Version = '0.11.6'
+  VERSION = Version = '0.12.0'
 end

data/spec/integration_spec.rb

@@ -139,7 +139,7 @@ describe 'CLI' do
   end
 
   it "runs faster with more processes" do
-    pending if RUBY_ENGINE == "jruby"
+    pending if RUBY_ENGINE == "jruby"  # just too slow ...
     2.times{|i|
       write "spec/xxx#{i}_spec.rb",  'describe("it"){it("should"){sleep 5}}; $stderr.puts ENV["TEST_ENV_NUMBER"]'
     }
@@ -198,7 +198,7 @@ describe 'CLI' do
   end
 
   it "can wait_for_other_processes_to_finish" do
-    pending if RUBY_ENGINE == "jruby"
+    pending if RUBY_ENGINE == "jruby" # just too slow ...
     write "test/a_test.rb", "require 'parallel_tests'; sleep 0.5 ; ParallelTests.wait_for_other_processes_to_finish; puts 'a'"
     write "test/b_test.rb", "sleep 1; puts 'b'"
     write "test/c_test.rb", "sleep 1.5; puts 'c'"

data/spec/parallel_tests_spec.rb

@@ -108,16 +108,7 @@ describe ParallelTests do
 
     it "is 2 when 2 are running" do
       wait = 0.2
-      2.times do
-        Thread.new do
-          if RUBY_ENGINE == "jruby"
-            Thread.current[:running_parallel_test] = true
-            sleep wait
-          else
-            `TEST_ENV_NUMBER=1; sleep #{wait}`
-          end
-        end
-      end
+      2.times { Thread.new { `TEST_ENV_NUMBER=1; sleep #{wait}` } }
       sleep wait / 2
       ParallelTests.number_of_running_processes.should == 2
       sleep wait

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: parallel_tests
 version: !ruby/object:Gem::Version
-  version: 0.11.6
+  version: 0.12.0
   prerelease: 
 platform: ruby
 authors:
@@ -96,7 +96,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3981454467502280658
+      hash: 3143223892246402054
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -105,7 +105,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3981454467502280658
+      hash: 3143223892246402054
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25