parallel_tests 0.6.2 → 0.6.3

data/Readme.md

@@ -181,6 +181,7 @@ TIPS
  - [Capybara setup](https://github.com/grosser/parallel_tests/wiki)
  - [Sphinx setup](https://github.com/grosser/parallel_tests/wiki)
  - [SQL schema format] use :ruby schema format to get faster parallel:prepare`
+ - `export PARALLEL_TEST_PROCESSORS=X` in your environment and parallel_tests will use this number of processors by default
  - with zsh this would be `rake "parallel:prepare[3]"`
 
 TODO
@@ -214,6 +215,7 @@ inspired by [pivotal labs](http://pivotallabs.com/users/miked/blog/articles/849-
  - [Joe Yates](http://titusd.co.uk)
  - [asmega](http://www.ph-lee.com)
  - [Doug Barth](https://github.com/dougbarth)
+ - [Geoffrey Hichborn](https://github.com/phene)
 
 [Michael Grosser](http://grosser.it)<br/>
 michael@grosser.it<br/>

data/VERSION

@@ -1 +1 @@
-0.6.2
+0.6.3

data/lib/parallel_tests.rb

@@ -37,7 +37,7 @@ class ParallelTests
 
   def self.run_tests(test_files, process_number, options)
     require_list = test_files.map { |filename| "\"#{filename}\"" }.join(",")
-    cmd = "ruby -Itest #{options[:test_options]} -e '[#{require_list}].each {|f| require f }'"
+    cmd = "ruby -Itest -e '[#{require_list}].each {|f| require f }' - #{options[:test_options]}"
     execute_command(cmd, process_number, options)
   end
 

data/parallel_tests.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{parallel_tests}
-  s.version = "0.6.2"
+  s.version = "0.6.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]
-  s.date = %q{2011-09-15}
+  s.date = %q{2011-09-26}
   s.email = %q{grosser.michael@gmail.com}
   s.executables = ["parallel_cucumber", "parallel_test", "parallel_spec"]
   s.files = [

data/spec/integration_spec.rb

@@ -14,7 +14,7 @@ describe 'CLI' do
   end
 
   def write(file, content)
-    path = "#{folder}/spec/#{file}"
+    path = "#{folder}/#{file}"
     `mkdir -p #{File.dirname(path)}` unless File.exist?(File.dirname(path))
     File.open(path, 'w'){|f| f.write content }
     path
@@ -28,14 +28,14 @@ describe 'CLI' do
     "#{bin_folder}/parallel_test"
   end
 
-  def run_specs(options={})
-    `cd #{folder} && #{executable} --chunk-timeout 999 -t spec -n #{options[:processes]||2} #{options[:add]} 2>&1`
+  def run_tests(options={})
+    `cd #{folder} && #{executable} --chunk-timeout 999 -t #{options[:type] || 'spec'} -n #{options[:processes]||2} #{options[:add]} 2>&1`
   end
 
   it "runs tests in parallel" do
-    write 'xxx_spec.rb', 'describe("it"){it("should"){puts "TEST1"}}'
-    write 'xxx2_spec.rb', 'describe("it"){it("should"){puts "TEST2"}}'
-    result = run_specs
+    write 'spec/xxx_spec.rb', 'describe("it"){it("should"){puts "TEST1"}}'
+    write 'spec/xxx2_spec.rb', 'describe("it"){it("should"){puts "TEST2"}}'
+    result = run_tests
 
     # test ran and gave their puts
     result.should include('TEST1')
@@ -50,9 +50,9 @@ describe 'CLI' do
   end
 
   it "fails when tests fail" do
-    write 'xxx_spec.rb', 'describe("it"){it("should"){puts "TEST1"}}'
-    write 'xxx2_spec.rb', 'describe("it"){it("should"){1.should == 2}}'
-    result = run_specs
+    write 'spec/xxx_spec.rb', 'describe("it"){it("should"){puts "TEST1"}}'
+    write 'spec/xxx2_spec.rb', 'describe("it"){it("should"){1.should == 2}}'
+    result = run_tests
 
     result.scan('1 example, 1 failure').size.should == 1
     result.scan('1 example, 0 failure').size.should == 1
@@ -86,28 +86,34 @@ describe 'CLI' do
 
   it "runs faster with more processes" do
     2.times{|i|
-      write "xxx#{i}_spec.rb",  'describe("it"){it("should"){sleep 5}}; $stderr.puts ENV["TEST_ENV_NUMBER"]'
+      write "spec/xxx#{i}_spec.rb",  'describe("it"){it("should"){sleep 5}}; $stderr.puts ENV["TEST_ENV_NUMBER"]'
     }
     t = Time.now
-    puts run_specs(:processes => 2)
+    puts run_tests(:processes => 2)
     expected = 10
     (Time.now - t).should <= expected
   end
 
   it "can can with given files" do
-    write "x1_spec.rb", "puts '111'"
-    write "x2_spec.rb", "puts '222'"
-    write "x3_spec.rb", "puts '333'"
-    result = run_specs(:add => 'spec/x1_spec.rb spec/x3_spec.rb')
+    write "spec/x1_spec.rb", "puts '111'"
+    write "spec/x2_spec.rb", "puts '222'"
+    write "spec/x3_spec.rb", "puts '333'"
+    result = run_tests(:add => 'spec/x1_spec.rb spec/x3_spec.rb')
     result.should include('111')
     result.should include('333')
     result.should_not include('222')
   end
 
   it "can run with test-options" do
-    write "x1_spec.rb", ""
-    write "x2_spec.rb", ""
-    result = run_specs(:add => "--test-options ' --version'", :processes => 2)
+    write "spec/x1_spec.rb", ""
+    write "spec/x2_spec.rb", ""
+    result = run_tests(:add => "--test-options ' --version'", :processes => 2)
     result.should =~ /\d+\.\d+\.\d+.*\d+\.\d+\.\d+/m # prints version twice
   end
+
+  it "passes test options to test::unit" do
+    write "test/x1_test.rb", "require 'test/unit'; class XTest < Test::Unit::TestCase; def test_xxx; end; end"
+    result = run_tests(:type => :test, :add => '--test-options "-v"')
+    result.should include('test_xxx(XTest)') # verbose output of every test
+  end
 end

data/spec/parallel_tests_spec.rb

@@ -48,7 +48,7 @@ describe ParallelTests do
     end
 
     it "uses options" do
-      ParallelTests.should_receive(:open).with{|x,y| x=~ %r{ruby -Itest -v}}.and_return mocked_process
+      ParallelTests.should_receive(:open).with{|x,y| x=~ %r{ruby -Itest .* - -v}}.and_return mocked_process
       ParallelTests.run_tests(['xxx'],1,:test_options => '-v')
     end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: parallel_tests
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: 
   segments: 
   - 0
   - 6
-  - 2
-  version: 0.6.2
+  - 3
+  version: 0.6.3
 platform: ruby
 authors: 
 - Michael Grosser
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-15 00:00:00 +02:00
+date: 2011-09-26 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency