parallel_tests 0.6.7 → 0.6.8

data/Readme.md

@@ -1,5 +1,5 @@
 Speedup Test::Unit + RSpec + Cucumber by running parallel on multiple CPUs (or cores).<br/>
-ParallelTests splits tests into even groups and runs each group in a single process with its own database.
+ParallelTests splits tests into even groups(by number of tests or runtime) and runs each group in a single process with its own database.
 
 Setup for Rails
 ===============
@@ -87,7 +87,7 @@ Spec Loggers
 Even process runtimes
 -----------------
 
-Log test runtime to give each process the same test runtime.
+Log test runtime to give each process the same runtime.
 
 Add to your `spec/parallel_spec.opts` (or `spec/spec.opts`) :
 
@@ -102,7 +102,7 @@ Add to your `spec/parallel_spec.opts` (or `spec/spec.opts`) :
 SpecSummaryLogger
 --------------------
 
-This logger stops the different processes overwriting each other's output.
+This logger logs the test output without the different processes overwriting each other.
 
 Add the following to your `spec/parallel_spec.opts` (or `spec/spec.opts`) :
 
@@ -116,7 +116,7 @@ Add the following to your `spec/parallel_spec.opts` (or `spec/spec.opts`) :
 SpecFailuresLogger
 -----------------------
 
-This logger produces command lines for running any failing examples.
+This logger produces pasteable command-line snippets for each failed example.
 
 E.g.
 
@@ -177,6 +177,7 @@ TIPS
  - [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)
+ - [RSpec] remove --loadby from you spec/*.opts
  - [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)
@@ -219,4 +220,5 @@ inspired by [pivotal labs](http://pivotallabs.com/users/miked/blog/articles/849-
 
 [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...
+Hereby placed under public domain, do what you want, just do not hold me accountable...<br/>
+[![Flattr](http://api.flattr.com/button/flattr-badge-large.png)](https://flattr.com/submit/auto?user_id=grosser&url=https://github.com/grosser/parallel_tests&title=parallel_tests&language=en_GB&tags=github&category=software)

data/VERSION

@@ -1 +1 @@
-0.6.7
+0.6.8

data/bin/parallel_test

@@ -21,6 +21,10 @@ BANNER
   opts.on("--no-sort", "do not sort files before running them"){ |no_sort| options[:no_sort] = no_sort }
   opts.on("-m [FLOAT]", "--multiply-processes [FLOAT]", Float, "use given number as a multiplier of processes to run"){ |multiply| options[:multiply] = multiply }
   opts.on("-r", '--root [PATH]', "execute test commands from this path"){|path| options[:root] = path }
+  opts.on("-s [PATTERN]", "--single [PATTERN]", "Run all matching files in only one process") do |pattern|
+    options[:single_process] ||= []
+    options[:single_process] << /#{pattern}/
+  end
   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 }
@@ -30,6 +34,8 @@ BANNER
   opts.on("-h", "--help", "Show this.") { puts opts; exit }
 end.parse!
 
+raise "--no-sort and --single-process are not supported" if options[:no_sort] and options[:single_process]
+
 # get files to run from arguments
 options[:files] = ARGV if ARGV.size > 0
 
@@ -63,7 +69,7 @@ else
   tests_folder = task
   tests_folder = File.join(options[:root], tests_folder) unless options[:root].to_s.empty?
 
-  groups = klass.tests_in_groups(options[:files] || tests_folder, num_processes, :no_sort => options[:no_sort], :pattern => options[:pattern])
+  groups = klass.tests_in_groups(options[:files] || tests_folder, num_processes, options)
   num_processes = groups.size
 
   #adjust processes to groups

data/lib/parallel_tests/grouper.rb

@@ -1,31 +1,50 @@
 class ParallelTests
   class Grouper
     def self.in_groups(items, num_groups)
-      [].tap do |groups|
-        while ! items.empty?
-          (0...num_groups).map do |group_number|
-            groups[group_number] ||= []
-            groups[group_number] << items.shift
-          end
+      groups = Array.new(num_groups){ [] }
+
+      until items.empty?
+        num_groups.times do |group_number|
+          groups[group_number] << items.shift
         end
-      end.map(&:sort)
+      end
+
+      groups.map!(&:sort!)
     end
 
-    def self.in_even_groups_by_size(items_with_sizes, num_groups)
-      items_with_size = smallest_first(items_with_sizes)
+    def self.in_even_groups_by_size(items_with_sizes, num_groups, options={})
       groups = Array.new(num_groups){{:items => [], :size => 0}}
-      items_with_size.each do |item, size|
-        # always add to smallest group
-        smallest = groups.sort_by{|g| g[:size] }.first
-        smallest[:items] << item
-        smallest[:size] += size
+
+      # add all files that should run in a single process to one group
+      (options[:single_process]||[]).each do |pattern|
+        matched, items_with_sizes = items_with_sizes.partition{|item, size| item =~ pattern }
+        puts matched.inspect
+        smallest = smallest_group(groups)
+        matched.each{|item,size| add_to_group(smallest, item, size) }
+      end
+
+      # add all other files
+      smallest_first(items_with_sizes).each do |item, size|
+        smallest = smallest_group(groups)
+        add_to_group(smallest, item, size)
       end
 
-      groups.map{|g| g[:items].sort }
+      groups.map!{|g| g[:items].sort }
     end
 
     def self.smallest_first(files)
       files.sort_by{|item, size| size }.reverse
     end
+
+  private
+
+    def self.smallest_group(groups)
+      groups.min_by{|g| g[:size] }
+    end
+
+    def self.add_to_group(group, item, size)
+      group[:items] << item
+      group[:size] += size
+    end
   end
 end

data/lib/parallel_tests.rb

@@ -31,13 +31,12 @@ class ParallelTests
       Grouper.in_groups(tests, num_groups)
     else
       tests = with_runtime_info(tests)
-      Grouper.in_even_groups_by_size(tests, num_groups)
+      Grouper.in_even_groups_by_size(tests, num_groups, options)
     end
   end
 
   def self.run_tests(test_files, process_number, options)
     require_list = test_files.map { |filename| %{"#{File.expand_path filename}"} }.join(",")
-    test_options = "- #{options[:test_options]}" unless RUBY_VERSION > '1.9.2' # test options passing is broken on 1.9.3 see issue #64
     cmd = "ruby -Itest -e '[#{require_list}].each {|f| require f }' -- #{options[:test_options]}"
     execute_command(cmd, process_number, options)
   end

data/parallel_tests.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{parallel_tests}
-  s.version = "0.6.7"
+  s.name = "parallel_tests"
+  s.version = "0.6.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]
-  s.date = %q{2011-10-05}
-  s.email = %q{grosser.michael@gmail.com}
-  s.executables = ["parallel_cucumber", "parallel_test", "parallel_spec"]
+  s.date = "2011-11-02"
+  s.email = "grosser.michael@gmail.com"
+  s.executables = ["parallel_cucumber", "parallel_spec", "parallel_test"]
   s.files = [
     "Gemfile",
     "Gemfile.lock",
@@ -40,10 +40,10 @@ Gem::Specification.new do |s|
     "spec/parallel_tests_spec.rb",
     "spec/spec_helper.rb"
   ]
-  s.homepage = %q{http://github.com/grosser/parallel_tests}
+  s.homepage = "http://github.com/grosser/parallel_tests"
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
-  s.summary = %q{Run tests / specs / features in parallel}
+  s.rubygems_version = "1.8.10"
+  s.summary = "Run tests / specs / features in parallel"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

data/spec/integration_spec.rb

@@ -49,6 +49,13 @@ describe 'CLI' do
     $?.success?.should == true
   end
 
+  it "does not run any tests if there are none" do
+    write 'spec/xxx.rb', 'xxx'
+    result = run_tests
+    result.should include('No examples found')
+    result.should include('Took')
+  end
+
   it "fails when tests fail" do
     write 'spec/xxx_spec.rb', 'describe("it"){it("should"){puts "TEST1"}}'
     write 'spec/xxx2_spec.rb', 'describe("it"){it("should"){1.should == 2}}'

data/spec/parallel_tests_spec.rb

@@ -71,6 +71,12 @@ describe ParallelTests do
       ParallelTests::Grouper.should_receive(:smallest_first).and_return([])
       ParallelTests.tests_in_groups [], 1
     end
+
+    it "groups by single_process pattern and then via size" do
+      ParallelTests.should_receive(:with_runtime_info).and_return([['aaa',5],['aaa2',5],['bbb',2],['ccc',1],['ddd',1]])
+      result = ParallelTests.tests_in_groups [], 3, :single_process => [/^a.a/]
+      result.should == [["aaa", "aaa2"], ["bbb"], ["ccc", "ddd"]]
+    end
   end
 
   describe :find_results do
@@ -94,7 +100,7 @@ EOF
       ParallelTests.find_results(output).should == ['10 tests, 20 assertions, 0 failures, 0 errors','14 tests, 20 assertions, 0 failures, 0 errors']
     end
 
-    it "is robust against scrambeled output" do
+    it "is robust against scrambled output" do
       output = <<EOF
 Loaded suite /opt/ruby-enterprise/lib/ruby/gems/1.8/gems/rake-0.8.4/lib/rake/rake_test_loader
 Started

metadata

@@ -1,48 +1,36 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: parallel_tests
-version: !ruby/object:Gem::Version 
-  hash: 9
+version: !ruby/object:Gem::Version
+  version: 0.6.8
   prerelease: 
-  segments: 
-  - 0
-  - 6
-  - 7
-  version: 0.6.7
 platform: ruby
-authors: 
+authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-10-05 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  requirement: &id001 !ruby/object:Gem::Requirement 
+date: 2011-11-02 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: parallel
+  requirement: &76244280 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  name: parallel
-  version_requirements: *id001
   prerelease: false
+  version_requirements: *76244280
 description: 
 email: grosser.michael@gmail.com
-executables: 
+executables:
 - parallel_cucumber
-- parallel_test
 - parallel_spec
+- parallel_test
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - Gemfile
 - Gemfile.lock
 - Rakefile
@@ -69,39 +57,31 @@ files:
 - spec/parallel_specs_spec.rb
 - spec/parallel_tests_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/grosser/parallel_tests
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -400446063
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Run tests / specs / features in parallel
 test_files: []
-