parallel_tests 0.4.11 → 0.4.12

data/Readme.md

@@ -1,4 +1,4 @@
-Speedup Test::Unit + RSpec + Cucumber by running parallel on multiple CPUs.
+Speedup Test::Unit + RSpec + Cucumber by running parallel on multiple CPUs(or cores).
 
 Setup for Rails
 ===============
@@ -90,8 +90,9 @@ Options are:
     -m, --multiply-processes [FLOAT] use given number as a multiplier of processes to run
     -r, --root [PATH]                execute test commands from this path
     -e, --exec [COMMAND]             execute this code parallel and with ENV['TEST_ENV_NUM']
-    -o, --test-options '[OPTIONS]' execute test commands with those options
+    -o, --test-options '[OPTIONS]'   execute test commands with those options
     -t, --type [TYPE]                which type of tests to run? test, spec or features
+        --non-parallel               execute same commands but do not in parallel, needs --exec
     -v, --version                    Show Version
     -h, --help                       Show this.
 
@@ -112,14 +113,15 @@ You can run any kind of code with -e / --execute
 TIPS
 ====
  - [Capybara + Selenium] add to env.rb: `Capybara.server_port = 8888 + ENV['TEST_ENV_NUMBER'].to_i`
- - [RSpec] add a `spec/parallel_spec.opts` to use different options, e.g. no --drb (default: `spec/spec.opts`) 
+ - [RSpec] add a `spec/parallel_spec.opts` to use different options, e.g. no --drb (default: `spec/spec.opts`)
  - [RSpec] if something looks fishy try to delete `script/spec`
  - [RSpec] if `script/spec` is missing parallel:spec uses just `spec` (which solves some issues with double-loaded environment.rb)
  - [RSpec] 'script/spec_server' or [spork](http://github.com/timcharper/spork/tree/master) do not work in parallel
  - [RSpec] `./script/generate rspec` if you are running rspec from gems (this plugin uses script/spec which may fail if rspec files are outdated)
  - [Bundler] if you have a `Gemfile` then `bundle exec` will be used to run tests
  - [Capybara setup](https://github.com/grosser/parallel_tests/wiki)
- - [Sphinx 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`
  - with zsh this would be `rake "parallel:prepare[3]"`
 
 TODO
@@ -129,7 +131,7 @@ TODO
 
 Authors
 ====
-inspired by [pivotal labs](http://pivotallabs.com/users/miked/blog/articles/849-parallelize-your-rspec-suite)  
+inspired by [pivotal labs](http://pivotallabs.com/users/miked/blog/articles/849-parallelize-your-rspec-suite)
 
 ### [Contributors](http://github.com/grosser/parallel_tests/contributors)
  - [Charles Finkel](http://charlesfinkel.com/)
@@ -149,6 +151,6 @@ inspired by [pivotal labs](http://pivotallabs.com/users/miked/blog/articles/849-
  - [xxx](https://github.com/xxx)
  - [Levent Ali](http://purebreeze.com/)
 
-[Michael Grosser](http://pragmatig.wordpress.com)  
-grosser.michael@gmail.com  
+[Michael Grosser](http://grosser.it)<br/>
+michael@grosser.it<br/>
 Hereby placed under public domain, do what you want, just do not hold me accountable...

data/VERSION

@@ -1 +1 @@
-0.4.11
+0.4.12

data/bin/parallel_test

@@ -24,6 +24,7 @@ BANNER
   opts.on("-e", '--exec [COMMAND]', "execute this code parallel and with ENV['TEST_ENV_NUM']"){|path| options[:execute] = path }
   opts.on("-o", "--test-options '[OPTIONS]'", "execute test commands with those options"){|arg| options[:test_options] = arg }
   opts.on("-t", "--type [TYPE]", "which type of tests to run? test, spec or features"){|type| options[:type] = type }
+  opts.on("--non-parallel", "execute same commands but do not in parallel, needs --exec"){|type| options[:non_parallel] = true }
   opts.on('-v', '--version', 'Show Version'){ puts ParallelTests::VERSION; exit}
   opts.on("-h", "--help", "Show this.") { puts opts; exit }
 end.parse!
@@ -35,8 +36,15 @@ num_processes = options[:count] || Parallel.processor_count
 num_processes = num_processes * (options[:multiply] || 1)
 
 if options[:execute]
-  results = Parallel.map(0...num_processes, :in_processes => num_processes) do |i|
-    ParallelTests.execute_command(options[:execute], i)
+  runs = (0...num_processes).to_a
+  results = if options[:non_parallel]
+    runs.map do |i|
+      ParallelTests.execute_command(options[:execute], i)
+    end
+  else
+    Parallel.map(runs, :in_processes => num_processes) do |i|
+      ParallelTests.execute_command(options[:execute], i)
+    end
   end.flatten
   abort if results.any?{|r| r[:exit_status] != 0 }
 else

data/lib/parallel_tests/tasks.rb

@@ -2,7 +2,7 @@ namespace :parallel do
   def run_in_parallel(cmd, options)
     count = (options[:count] ? options[:count].to_i : nil)
     executable = File.join(File.dirname(__FILE__), '..', '..', 'bin', 'parallel_test')
-    command = "#{executable} --exec '#{cmd}' -n #{count}"
+    command = "#{executable} --exec '#{cmd}' -n #{count} #{'--non-parallel' if options[:non_parallel]}"
     abort unless system(command)
   end
 
@@ -23,8 +23,9 @@ namespace :parallel do
       Rake::Task['db:schema:dump'].invoke
       Rake::Task['parallel:load_schema'].invoke(args[:count])
     else
-      # there is no separate dump / load for schema_format :sql, schema file can get corrupted
-      run_in_parallel('rake db:test:prepare', args)
+      # there is no separate dump / load for schema_format :sql -> do it safe and slow
+      args = args.to_hash.merge(:non_parallel => true) # normal merge returns nil
+      run_in_parallel('rake db:test:prepare --trace', args)
     end
   end
 
@@ -37,7 +38,6 @@ namespace :parallel do
   # just load the schema (good for integration server <-> no development db)
   desc "load dumped schema for test databases via db:schema:load --> parallel:load_schema[num_cpus]"
   task :load_schema, :count do |t,args|
-    puts args.inspect
     run_in_parallel('rake db:test:load', args)
   end
 

data/parallel_tests.gemspec

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

data/spec/integration_spec.rb

@@ -63,6 +63,11 @@ describe 'CLI' do
     result.split("\n").sort.should == %w["" "2" "3" "4"]
   end
 
+  it "can exec given command non-parallel" do
+    result = `#{executable} -e 'ruby -e "sleep(rand(10)/100.0); puts ENV[:TEST_ENV_NUMBER.to_s].inspect"' -n 4 --non-parallel`
+    result.split("\n").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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: parallel_tests
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 4
-  - 11
-  version: 0.4.11
+  - 12
+  version: 0.4.12
 platform: ruby
 authors: 
 - Michael Grosser
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-04 00:00:00 +01:00
+date: 2011-02-18 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency