parallel_tests 0.4.2 → 0.4.3

data/VERSION

@@ -1 +1 @@
-0.4.2
+0.4.3

data/bin/parallel_test

@@ -2,6 +2,7 @@
 require 'rubygems'
 require 'optparse'
 require 'parallel'
+raise "please ' gem install parallel '" if Gem::Version.new(Parallel::VERSION) < Gem::Version.new('0.4.2')
 $LOAD_PATH << File.join(File.dirname(__FILE__), '..', 'lib')
 require "parallel_tests"
 
@@ -31,9 +32,10 @@ num_processes = options[:count] || Parallel.processor_count
 num_processes = num_processes * (options[:multiply] || 1)
 
 if options[:execute]
-  Parallel.in_processes(num_processes) do |i|
+  results = Parallel.map(0...num_processes, :in_processes => num_processes) do |i|
     ParallelTests.execute_command(options[:execute], i)
   end
+  abort if results.any?{|r| r[:exit_status] != 0 }
 else
   lib, name, task = {
     'test' => ["tests", "test", "test"],

data/lib/parallel_cucumber.rb

@@ -4,7 +4,7 @@ class ParallelCucumber < ParallelTests
   def self.run_tests(test_files, process_number, options)
     color = ($stdout.tty? ? 'AUTOTEST=1 ; export AUTOTEST ;' : '')#display color when we are in a terminal
     cmd = "#{color} #{executable} #{options} #{test_files*' '}"
-    execute_command(cmd, process_number)
+    execute_command(cmd, process_number)[:stdout]
   end
 
   def self.executable

data/lib/parallel_specs.rb

@@ -3,7 +3,7 @@ require File.join(File.dirname(__FILE__), 'parallel_tests')
 class ParallelSpecs < ParallelTests
   def self.run_tests(test_files, process_number, options)
     cmd = "#{color} #{executable} #{options} #{spec_opts} #{test_files*' '}"
-    execute_command(cmd, process_number)
+    execute_command(cmd, process_number)[:stdout]
   end
 
   def self.executable

data/lib/parallel_tests.rb

@@ -30,7 +30,7 @@ class ParallelTests
   def self.run_tests(test_files, process_number, options)
     require_list = test_files.map { |filename| "\"#{filename}\"" }.join(",")
     cmd = "ruby -Itest #{options} -e '[#{require_list}].each {|f| require f }'"
-    execute_command(cmd, process_number)
+    execute_command(cmd, process_number)[:stdout]
   end
 
   def self.execute_command(cmd, process_number)
@@ -43,7 +43,8 @@ class ParallelTests
       print char
       STDOUT.flush
     end
-    all
+    f.close
+    {:stdout => all, :exit_status => $?.exitstatus}
   end
 
   def self.find_results(test_output)

data/lib/tasks/parallel_tests.rake

@@ -1,7 +1,9 @@
 namespace :parallel do
   def run_in_parallel(cmd, options)
     count = (options[:count] ? options[:count].to_i : nil)
-    system "#{File.join(File.dirname(__FILE__), '..', '..', 'bin', 'parallel_test')} --exec '#{cmd}' -n #{count}"
+    executable = File.join(File.dirname(__FILE__), '..', '..', 'bin', 'parallel_test')
+    command = "#{executable} --exec '#{cmd}' -n #{count}"
+    abort unless system(command)
   end
 
   desc "update test databases by running db:test:prepare for each test db --> parallel:prepare[num_cpus]"
@@ -28,7 +30,9 @@ namespace :parallel do
       $LOAD_PATH << File.expand_path(File.join(File.dirname(__FILE__), '..'))
       require "parallel_tests"
       count, prefix, options = ParallelTests.parse_rake_args(args)
-      exec "#{File.join(File.dirname(__FILE__), '..', '..', 'bin', 'parallel_test')} --type #{type} -n #{count} -p '#{prefix}' -r '#{RAILS_ROOT}' -o '#{options}'"
+      executable = File.join(File.dirname(__FILE__), '..', '..', 'bin', 'parallel_test')
+      command = "#{executable} --type #{type} -n #{count} -p '#{prefix}' -r '#{RAILS_ROOT}' -o '#{options}'"
+      abort unless system(command) # allow to chain tasks e.g. rake parallel:spec parallel:features
     end
   end
 end

data/parallel_tests.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{parallel_tests}
-  s.version = "0.4.2"
+  s.version = "0.4.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]
-  s.date = %q{2010-06-03}
+  s.date = %q{2010-07-15}
   s.email = %q{grosser.michael@gmail.com}
   s.executables = ["parallel_spec", "parallel_cucumber", "parallel_test"]
   s.extra_rdoc_files = [

data/spec/integration_spec.rb

@@ -1,3 +1,5 @@
+require 'spec/spec_helper'
+
 describe 'CLI' do
   before do
     `rm -rf #{folder}`
@@ -63,6 +65,14 @@ describe 'CLI' do
     result.split("\n").sort.should == %w["" "2" "3" "4"]
   end
 
+  it "exists with success if all sub-processes returned success" do
+    system("#{executable} -e 'cat /dev/null' -n 4").should == true
+  end
+
+  it "exists with failure if any sub-processes returned failure" do
+    system("#{executable} -e 'test -e xxxx' -n 4").should == false
+  end
+
   it "can run through parallel_spec / parallel_cucumber" do
     version = `#{executable} -v`
     `#{bin_folder}/parallel_spec -v`.should == version

data/spec/parallel_cucumber_spec.rb

@@ -10,12 +10,12 @@ describe ParallelCucumber do
     end
 
     it "uses TEST_ENV_NUMBER=blank when called for process 0" do
-      ParallelCucumber.should_receive(:open).with{|x,y| x=~/TEST_ENV_NUMBER= /}.and_return mock(:getc=>false)
+      ParallelCucumber.should_receive(:open).with{|x,y| x=~/TEST_ENV_NUMBER= /}.and_return mocked_process
       ParallelCucumber.run_tests(['xxx'],0,'')
     end
 
     it "uses TEST_ENV_NUMBER=2 when called for process 1" do
-      ParallelCucumber.should_receive(:open).with{|x,y| x=~/TEST_ENV_NUMBER=2/}.and_return mock(:getc=>false)
+      ParallelCucumber.should_receive(:open).with{|x,y| x=~/TEST_ENV_NUMBER=2/}.and_return mocked_process
       ParallelCucumber.run_tests(['xxx'],1,'')
     end
 
@@ -28,23 +28,23 @@ describe ParallelCucumber do
 
     it "runs bundle exec cucumber when on bundler 0.9" do
       ParallelCucumber.stub!(:bundler_enabled?).and_return true
-      ParallelCucumber.should_receive(:open).with{|x,y| x =~ %r{bundle exec cucumber}}.and_return mock(:getc=>false)
+      ParallelCucumber.should_receive(:open).with{|x,y| x =~ %r{bundle exec cucumber}}.and_return mocked_process
       ParallelCucumber.run_tests(['xxx'],1,'')
     end
 
     it "runs script/cucumber when script/cucumber is found" do
-      ParallelCucumber.should_receive(:open).with{|x,y| x =~ %r{script/cucumber}}.and_return mock(:getc=>false)
+      ParallelCucumber.should_receive(:open).with{|x,y| x =~ %r{script/cucumber}}.and_return mocked_process
       ParallelCucumber.run_tests(['xxx'],1,'')
     end
 
     it "runs cucumber by default" do
       File.stub!(:file?).with('script/cucumber').and_return false
-      ParallelCucumber.should_receive(:open).with{|x,y| x !~ %r{(script/cucumber)|(bundle exec cucumber)}}.and_return mock(:getc=>false)
+      ParallelCucumber.should_receive(:open).with{|x,y| x !~ %r{(script/cucumber)|(bundle exec cucumber)}}.and_return mocked_process
       ParallelCucumber.run_tests(['xxx'],1,'')
     end
 
     it "uses options passed in" do
-      ParallelCucumber.should_receive(:open).with{|x,y| x =~ %r{script/cucumber -p default}}.and_return mock(:getc=>false)
+      ParallelCucumber.should_receive(:open).with{|x,y| x =~ %r{script/cucumber -p default}}.and_return mocked_process
       ParallelCucumber.run_tests(['xxx'],1,'-p default')
     end
   end

data/spec/parallel_specs_spec.rb

@@ -12,64 +12,64 @@ describe ParallelSpecs do
     end
 
     it "uses TEST_ENV_NUMBER=blank when called for process 0" do
-      ParallelSpecs.should_receive(:open).with{|x,y|x=~/TEST_ENV_NUMBER= /}.and_return mock(:getc=>false)
+      ParallelSpecs.should_receive(:open).with{|x,y|x=~/TEST_ENV_NUMBER= /}.and_return mocked_process
       ParallelSpecs.run_tests(['xxx'],0,'')
     end
 
     it "uses TEST_ENV_NUMBER=2 when called for process 1" do
-      ParallelSpecs.should_receive(:open).with{|x,y| x=~/TEST_ENV_NUMBER=2/}.and_return mock(:getc=>false)
+      ParallelSpecs.should_receive(:open).with{|x,y| x=~/TEST_ENV_NUMBER=2/}.and_return mocked_process
       ParallelSpecs.run_tests(['xxx'],1,'')
     end
 
     it "runs with color when called from cmdline" do
-      ParallelSpecs.should_receive(:open).with{|x,y| x=~/RSPEC_COLOR=1/}.and_return mock(:getc=>false)
+      ParallelSpecs.should_receive(:open).with{|x,y| x=~/RSPEC_COLOR=1/}.and_return mocked_process
       $stdout.should_receive(:tty?).and_return true
       ParallelSpecs.run_tests(['xxx'],1,'')
     end
 
     it "runs without color when not called from cmdline" do
-      ParallelSpecs.should_receive(:open).with{|x,y| x !~ /RSPEC_COLOR/}.and_return mock(:getc=>false)
+      ParallelSpecs.should_receive(:open).with{|x,y| x !~ /RSPEC_COLOR/}.and_return mocked_process
       $stdout.should_receive(:tty?).and_return false
       ParallelSpecs.run_tests(['xxx'],1,'')
     end
 
     it "run bundle exec spec when on bundler 0.9" do
       ParallelSpecs.stub!(:bundler_enabled?).and_return true
-      ParallelSpecs.should_receive(:open).with{|x,y| x =~ %r{bundle exec spec}}.and_return mock(:getc=>false)
+      ParallelSpecs.should_receive(:open).with{|x,y| x =~ %r{bundle exec spec}}.and_return mocked_process
       ParallelSpecs.run_tests(['xxx'],1,'')
     end
 
     it "runs script/spec when script/spec can be found" do
       File.should_receive(:file?).with('script/spec').and_return true
-      ParallelSpecs.should_receive(:open).with{|x,y| x =~ %r{script/spec}}.and_return mock(:getc=>false)
+      ParallelSpecs.should_receive(:open).with{|x,y| x =~ %r{script/spec}}.and_return mocked_process
       ParallelSpecs.run_tests(['xxx'],1,'')
     end
 
     it "runs spec when script/spec cannot be found" do
       File.stub!(:file?).with('script/spec').and_return false
-      ParallelSpecs.should_receive(:open).with{|x,y| x !~ %r{(script/spec)|(bundle exec spec)}}.and_return mock(:getc=>false)
+      ParallelSpecs.should_receive(:open).with{|x,y| x !~ %r{(script/spec)|(bundle exec spec)}}.and_return mocked_process
       ParallelSpecs.run_tests(['xxx'],1,'')
     end
 
     it "uses no -O when no opts where found" do
       File.stub!(:file?).with('spec/spec.opts').and_return false
-      ParallelSpecs.should_receive(:open).with{|x,y| x !~ %r{spec/spec.opts}}.and_return mock(:getc=>false)
+      ParallelSpecs.should_receive(:open).with{|x,y| x !~ %r{spec/spec.opts}}.and_return mocked_process
       ParallelSpecs.run_tests(['xxx'],1,'')
     end
 
     it "uses spec/spec.opts when found" do
-      ParallelSpecs.should_receive(:open).with{|x,y| x =~ %r{script/spec\s+-O spec/spec.opts}}.and_return mock(:getc=>false)
+      ParallelSpecs.should_receive(:open).with{|x,y| x =~ %r{script/spec\s+-O spec/spec.opts}}.and_return mocked_process
       ParallelSpecs.run_tests(['xxx'],1,'')
     end
 
     it "uses spec/parallel_spec.opts when found" do
       File.should_receive(:file?).with('spec/parallel_spec.opts').and_return true
-      ParallelSpecs.should_receive(:open).with{|x,y| x =~ %r{script/spec\s+-O spec/parallel_spec.opts}}.and_return mock(:getc=>false)
+      ParallelSpecs.should_receive(:open).with{|x,y| x =~ %r{script/spec\s+-O spec/parallel_spec.opts}}.and_return mocked_process
       ParallelSpecs.run_tests(['xxx'],1,'')
     end
 
     it "uses options passed in" do
-      ParallelSpecs.should_receive(:open).with{|x,y| x =~ %r{script/spec -f n}}.and_return mock(:getc=>false)
+      ParallelSpecs.should_receive(:open).with{|x,y| x =~ %r{script/spec -f n}}.and_return mocked_process
       ParallelSpecs.run_tests(['xxx'],1,'-f n')
     end
 

data/spec/parallel_tests_spec.rb

@@ -27,17 +27,17 @@ describe ParallelTests do
 
   describe :run_tests do
     it "uses TEST_ENV_NUMBER=blank when called for process 0" do
-      ParallelTests.should_receive(:open).with{|x,y|x=~/TEST_ENV_NUMBER= /}.and_return mock(:getc=>false)
+      ParallelTests.should_receive(:open).with{|x,y|x=~/TEST_ENV_NUMBER= /}.and_return mocked_process
       ParallelTests.run_tests(['xxx'],0,'')
     end
 
     it "uses TEST_ENV_NUMBER=2 when called for process 1" do
-      ParallelTests.should_receive(:open).with{|x,y| x=~/TEST_ENV_NUMBER=2/}.and_return mock(:getc=>false)
+      ParallelTests.should_receive(:open).with{|x,y| x=~/TEST_ENV_NUMBER=2/}.and_return mocked_process
       ParallelTests.run_tests(['xxx'],1,'')
     end
 
     it "uses options" do
-      ParallelTests.should_receive(:open).with{|x,y| x=~ %r{ruby -Itest -v}}.and_return mock(:getc=>false)
+      ParallelTests.should_receive(:open).with{|x,y| x=~ %r{ruby -Itest -v}}.and_return mocked_process
       ParallelTests.run_tests(['xxx'],1,'-v')
     end
 

data/spec/spec_helper.rb

@@ -7,6 +7,10 @@ FAKE_RAILS_ROOT = '/tmp/pspecs/fixtures'
 require 'parallel_specs'
 require 'parallel_cucumber'
 
+def mocked_process
+  open('|cat /dev/null')
+end
+
 def size_of(group)
   group.inject(0) { |sum, test| sum += File.stat(test).size }
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  - 2
-  version: 0.4.2
+  - 3
+  version: 0.4.3
 platform: ruby
 authors: 
 - Michael Grosser
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-03 00:00:00 +02:00
+date: 2010-07-15 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency