parallel_tests 0.11.5 → 0.11.6

data/.travis.yml

@@ -2,3 +2,5 @@ rvm:
   - ree
   - 1.9.3
   - 2.0.0
+  - jruby-1.7.3
+  - jruby-head

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    parallel_tests (0.11.5)
+    parallel_tests (0.11.6)
       parallel
 
 GEM
@@ -18,7 +18,10 @@ GEM
     diff-lcs (1.1.3)
     gherkin (2.7.6)
       json (>= 1.4.6)
+    gherkin (2.7.6-java)
+      json (>= 1.4.6)
     json (1.7.5)
+    json (1.7.5-java)
     parallel (0.6.4)
     rake (10.0.3)
     rspec (2.12.0)
@@ -33,6 +36,7 @@ GEM
     test-unit (2.4.4)
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES

data/Readme.md

@@ -231,7 +231,6 @@ TODO
  - fix tests vs cucumber >= 1.2 `unknown option --format`
  - add integration tests for the rake tasks, maybe generate a rails project ...
  - add unit tests for cucumber runtime formatter
- - make jRuby compatible [basics](http://yehudakatz.com/2009/07/01/new-rails-isolation-testing/)
  - make windows compatible
 
 Authors
@@ -285,6 +284,7 @@ inspired by [pivotal labs](http://pivotallabs.com/users/miked/blog/articles/849-
  - [Caleb Tomlinson](https://github.com/calebTomlinson)
  - [Jawwad Ahmad](https://github.com/jawwad)
  - [Iain Beeston](https://github.com/iainbeeston)
+ - [Alejandro Pulver](https://github.com/alepulver)
 
 [Michael Grosser](http://grosser.it)<br/>
 michael@grosser.it<br/>

data/lib/parallel_tests.rb

@@ -43,8 +43,12 @@ module ParallelTests
 
   # Fun fact: this includes the current process if it's run via parallel_tests
   def self.number_of_running_processes
-    result = `#{GREP_PROCESSES_COMMAND}`
-    raise "Could not grep for processes -> #{result}" if result.strip != "" && !$?.success?
-    result.split("\n").size
+    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
   end
 end

data/lib/parallel_tests/cli.rb

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

data/lib/parallel_tests/test/runner.rb

@@ -64,8 +64,16 @@ module ParallelTests
         cmd = "#{exports};#{cmd}"
 
         output, errput, exitstatus = nil
-
-        if RUBY_VERSION =~ /^1\.8/ or ENV["TEAMCITY_RAKE_RUNNER_MODE"] # fix #207
+        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
+          Open3.popen3("sh -") do |stdin, stdout, stderr, thread|
+             stdin.puts cmd
+             stdin.close
+             output, errput = capture_output(stdout, stderr, silence)
+          end
+          exitstatus = $?.exitstatus
+        elsif RUBY_VERSION =~ /^1\.8/ or ENV["TEAMCITY_RAKE_RUNNER_MODE"] # fix #207
           open("|#{cmd}", "r") do |output|
             output, errput = capture_output(output, nil, silence)
           end

data/lib/parallel_tests/version.rb

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

data/spec/integration_spec.rb

@@ -139,6 +139,7 @@ describe 'CLI' do
   end
 
   it "runs faster with more processes" do
+    pending if RUBY_ENGINE == "jruby"
     2.times{|i|
       write "spec/xxx#{i}_spec.rb",  'describe("it"){it("should"){sleep 5}}; $stderr.puts ENV["TEST_ENV_NUMBER"]'
     }
@@ -197,6 +198,7 @@ describe 'CLI' do
   end
 
   it "can wait_for_other_processes_to_finish" do
+    pending if RUBY_ENGINE == "jruby"
     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/test/runner_spec.rb

@@ -60,6 +60,7 @@ describe ParallelTests::Test::Runner do
     end
 
     it "groups by size and adds isolated separately" do
+      pending if RUBY_ENGINE == "jruby"
       ParallelTests::Test::Runner.should_receive(:with_runtime_info).
         and_return([
           ['aaa', 0],
@@ -173,6 +174,7 @@ EOF
     end
 
     it "finds test files but ignores those in symlinked folders" do
+      pending if RUBY_ENGINE == "jruby"
       with_files(['a/a_test.rb','b/b_test.rb']) do |root|
         `ln -s #{root}/a #{root}/b/link`
         call(["#{root}/b"], :symlinks => false).sort.should == [
@@ -353,6 +355,7 @@ EOF
     end
 
     it "prints output while running" do
+      pending if RUBY_ENGINE == "jruby"
       run_with_file("$stdout.sync = true; puts 123; sleep 0.1; print 345; sleep 0.1; puts 567") do |path|
         $stdout.should_receive(:print).with("123\n")
         if RUBY_VERSION =~ /^1\.8/

data/spec/parallel_tests_spec.rb

@@ -90,6 +90,7 @@ describe ParallelTests do
     end
 
     it "waits for other processes to finish" do
+      pending if RUBY_ENGINE == "jruby"
       ENV["TEST_ENV_NUMBER"] = "2"
       counter = 0
       ParallelTests.stub(:sleep).with{ sleep 0.1; counter += 1 }
@@ -107,8 +108,17 @@ describe ParallelTests do
 
     it "is 2 when 2 are running" do
       wait = 0.2
-      2.times { Thread.new{ `TEST_ENV_NUMBER=1; sleep #{wait}` } }
-      sleep 0.1
+      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
+      sleep wait / 2
       ParallelTests.number_of_running_processes.should == 2
       sleep wait
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: parallel_tests
 version: !ruby/object:Gem::Version
-  version: 0.11.5
+  version: 0.11.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-04 00:00:00.000000000 Z
+date: 2013-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel
@@ -96,7 +96,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3716285998925814124
+      hash: -3981454467502280658
 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: 3716285998925814124
+      hash: -3981454467502280658
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25