parallel_tests 0.4.0 → 0.4.1

data/Rakefile

@@ -1,6 +1,6 @@
 task :default => :spec
 require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new {|t| t.spec_opts = ['--color']}
+Spec::Rake::SpecTask.new {|t| t.spec_opts = ['--color --backtrace']}
 
 begin
   require 'jeweler'

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.4.1

data/bin/parallel_test

@@ -1,8 +1,9 @@
 #!/usr/bin/env ruby
 require 'rubygems'
 require 'optparse'
-lib_folder = File.join(File.dirname(__FILE__), '..', 'lib')
-require File.join(lib_folder, "parallel_tests")
+require 'parallel'
+$LOAD_PATH << File.join(File.dirname(__FILE__), '..', 'lib')
+require "parallel_tests"
 
 options = {}
 OptionParser.new do |opts|
@@ -26,12 +27,10 @@ end.parse!
 # get files to run from arguments
 options[:files] = ARGV if ARGV.size > 0
 
-require 'parallel'
 num_processes = options[:count] || Parallel.processor_count
 num_processes = num_processes * (options[:multiply] || 1)
 
 if options[:execute]
-  require File.join(lib_folder, "parallel_tests")
   Parallel.in_processes(num_processes) do |i|
     ParallelTests.execute_command(options[:execute], i)
   end
@@ -42,7 +41,7 @@ else
     'features' => ["cucumber", "feature", "features"]
   }[options[:type]||'test']
 
-  require File.join(lib_folder, "parallel_#{lib}")
+  require "parallel_#{lib}"
   klass = eval("Parallel#{lib.capitalize}")
 
   start = Time.now
@@ -77,4 +76,4 @@ else
   # - rake parallel:test && echo 123 ==> 123 should not show up when test failed
   # - rake parallel:test db:reset ==> works when tests succeed
   abort "#{name.capitalize}s Failed" if klass.failed?(results)
-end
+end

data/lib/parallel_tests.rb

@@ -1,4 +1,5 @@
 require 'parallel'
+require 'parallel_tests/grouper'
 
 class ParallelTests
   VERSION = File.read( File.join(File.dirname(__FILE__),'..','VERSION') ).strip
@@ -18,11 +19,11 @@ class ParallelTests
   end
 
   # finds all tests and partitions them into groups
-  def self.tests_in_groups(root, num, options={})
+  def self.tests_in_groups(root, num_groups, options={})
     if options[:no_sort] == true
-      distribute_tests_in_groups(root, num)
+      Grouper.in_groups(find_tests(root), num_groups)
     else
-      sorted_tests_in_groups(root, num)
+      Grouper.in_even_groups_by_size(tests_with_runtime(root), num_groups)
     end
   end
 
@@ -64,40 +65,6 @@ class ParallelTests
 
   protected
 
-
-  def self.sorted_tests_in_groups(root, num)
-    # always add to smallest group
-    groups = Array.new(num){{:tests => [], :size => 0}}
-    tests_with_sizes(root).each do |test, size|
-      smallest = groups.sort_by{|g| g[:size] }.first
-      smallest[:tests] << test
-      smallest[:size] += size
-    end
-
-    groups.map{|g| g[:tests] }
-  end
-
-  def self.distribute_tests_in_groups(root, num)
-    tests = find_tests(root)
-    [].tap do |groups|
-      while ! tests.empty?
-        (0...num).map do |group_number|
-          groups[group_number] ||= []
-          groups[group_number] << tests.shift
-        end
-      end
-    end
-  end
-
-  def self.tests_with_sizes(root)
-    tests_with_sizes = find_tests_with_sizes(root)
-    slow_specs_first(tests_with_sizes)
-  end
-
-  def self.slow_specs_first(tests)
-    tests.sort_by{|test, size| size }.reverse
-  end
-
   def self.line_is_result?(line)
     line =~ /\d+ failure/
   end
@@ -106,36 +73,28 @@ class ParallelTests
     line =~ /(\d{2,}|[1-9]) (failure|error)/
   end
 
-  def self.group_size(tests_with_sizes, num_groups)
-    total_size = tests_with_sizes.inject(0) { |sum, test| sum += test[1] }
-    total_size / num_groups.to_f
+  def self.test_suffix
+    "_test.rb"
   end
 
-  def self.find_tests_with_sizes(root)
-    tests = find_tests(root).sort
-
-    #TODO get the real root, atm this only works for complete runs when root point to e.g. real_root/spec
+  def self.tests_with_runtime(root)
+    tests = find_tests(root)
     runtime_file = File.join(root,'..','tmp','parallel_profile.log')
     lines = File.read(runtime_file).split("\n") rescue []
 
+    # use recorded test runtime if we got enough data
     if lines.size * 1.5 > tests.size
-      # use recorded test runtime if we got enough data
       times = Hash.new(1)
       lines.each do |line|
         test, time = line.split(":")
         times[test] = time.to_f
       end
-      tests.map { |test| [ test, times[test] ] }
-    else
-      # use file sizes
-      tests.map { |test| [ test, File.stat(test).size ] }
+      tests.sort.map{|test| [test, times[test]] }
+    else # use file sizes
+      tests.sort.map{|test| [test, File.stat(test).size] }
     end
   end
 
-  def self.test_suffix
-    "_test.rb"
-  end
-
   def self.find_tests(root)
     if root.is_a?(Array)
       root

data/lib/parallel_tests/grouper.rb

@@ -0,0 +1,31 @@
+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
+        end
+      end
+    end
+
+    def self.in_even_groups_by_size(items_with_sizes, num_groups)
+      items_with_size = smallest_first(items_with_sizes)
+      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
+      end
+
+      groups.map{|g| g[:items] }
+    end
+
+    def self.smallest_first(files)
+      files.sort_by{|item, size| size }.reverse
+    end
+  end
+end

data/lib/tasks/parallel_tests.rake

@@ -25,7 +25,8 @@ namespace :parallel do
   ['test', 'spec', 'features'].each do |type|
     desc "run #{type} in parallel with parallel:#{type}[num_cpus]"
     task type, :count, :path_prefix, :options do |t,args|
-      require File.join(File.dirname(__FILE__), '..', "parallel_tests")
+      $LOAD_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}'"
     end

data/parallel_tests.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{parallel_tests}
-  s.version = "0.4.0"
+  s.version = "0.4.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]
-  s.date = %q{2010-05-29}
+  s.date = %q{2010-06-03}
   s.email = %q{grosser.michael@gmail.com}
   s.executables = ["parallel_spec", "parallel_cucumber", "parallel_test"]
   s.extra_rdoc_files = [
@@ -27,6 +27,7 @@ Gem::Specification.new do |s|
      "lib/parallel_specs.rb",
      "lib/parallel_specs/spec_runtime_logger.rb",
      "lib/parallel_tests.rb",
+     "lib/parallel_tests/grouper.rb",
      "lib/tasks/parallel_tests.rake",
      "parallel_tests.gemspec",
      "spec/integration_spec.rb",

data/spec/parallel_tests_spec.rb

@@ -51,19 +51,13 @@ describe ParallelTests do
 
   describe :test_in_groups do
     it "does not sort when passed false do_sort option" do
-      ParallelTests.should_not_receive(:slow_specs_first)
+      ParallelTests.should_not_receive(:smallest_first)
       ParallelTests.tests_in_groups [], 1, :no_sort => true
     end
 
     it "does sort when not passed do_sort option" do
-      ParallelTests.stub!(:find_tests_with_sizes).and_return([])
-      ParallelTests.should_receive(:slow_specs_first).and_return([])
-      ParallelTests.tests_in_groups [], 1
-    end
-
-    it "does sort when not passed true do_sort option" do
-      ParallelTests.stub!(:find_tests_with_sizes).and_return([])
-      ParallelTests.should_receive(:slow_specs_first).and_return([])
+      ParallelTests.stub!(:tests_with_runtime).and_return([])
+      ParallelTests::Grouper.should_receive(:smallest_first).and_return([])
       ParallelTests.tests_in_groups [], 1
     end
   end

data/spec/spec_helper.rb

@@ -32,7 +32,7 @@ def test_tests_in_groups(klass, folder, suffix)
 
     it "groups when given an array of files" do
       list_of_files = Dir["#{test_root}/**/*#{suffix}"]
-      found = klass.find_tests_with_sizes(list_of_files)
+      found = klass.tests_with_runtime(list_of_files)
       found.should =~ list_of_files.map{ |file| [file, File.stat(file).size]}
     end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  - 0
-  version: 0.4.0
+  - 1
+  version: 0.4.1
 platform: ruby
 authors: 
 - Michael Grosser
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-29 00:00:00 +02:00
+date: 2010-06-03 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -51,6 +51,7 @@ files:
 - lib/parallel_specs.rb
 - lib/parallel_specs/spec_runtime_logger.rb
 - lib/parallel_tests.rb
+- lib/parallel_tests/grouper.rb
 - lib/tasks/parallel_tests.rake
 - parallel_tests.gemspec
 - spec/integration_spec.rb