parallel_tests 0.3.7 → 0.3.8

data/VERSION

@@ -1 +1 @@
-0.3.7
+0.3.8

data/lib/parallel_specs.rb

@@ -2,9 +2,6 @@ require File.join(File.dirname(__FILE__), 'parallel_tests')
 
 class ParallelSpecs < ParallelTests
   def self.run_tests(test_files, process_number, options)
-    spec_opts = ['spec/parallel_spec.opts', 'spec/spec.opts'].detect{|f| File.file?(f) }
-    spec_opts = (spec_opts ? "-O #{spec_opts}" : nil)
-    color = ($stdout.tty? ? 'RSPEC_COLOR=1 ; export RSPEC_COLOR ;' : '')#display color when we are in a terminal
     cmd = "RAILS_ENV=test ; export RAILS_ENV ; #{color} #{executable} #{options} #{spec_opts} #{test_files*' '}"
     execute_command(cmd, process_number)
   end
@@ -21,6 +18,16 @@ class ParallelSpecs < ParallelTests
 
   protected
 
+  def self.spec_opts
+    opts = ['spec/parallel_spec.opts', 'spec/spec.opts'].detect{|f| File.file?(f) }
+    opts ? "-O #{opts}" : nil
+  end
+
+  #display color when we are in a terminal
+  def self.color
+    ($stdout.tty? ? 'RSPEC_COLOR=1 ; export RSPEC_COLOR ;' : '')
+  end
+
   def self.test_suffix
     "_spec.rb"
   end

data/lib/parallel_tests.rb

@@ -4,7 +4,7 @@ class ParallelTests
   VERSION = File.read( File.join(File.dirname(__FILE__),'..','VERSION') ).strip
 
   # parallel:spec[2,controller] <-> parallel:spec[controller]
-  def self.parse_rake_args (args)
+  def self.parse_rake_args(args)
     num_processes = Parallel.processor_count
     options = ""
     if args[:count].to_s =~ /^\d*$/ # number or empty
@@ -19,18 +19,11 @@ class ParallelTests
 
   # finds all tests and partitions them into groups
   def self.tests_in_groups(root, num, options={})
-    tests_with_sizes = find_tests_with_sizes(root)
-    tests_with_sizes = slow_specs_first(tests_with_sizes) unless options[:no_sort]
-
-    # always add to smallest group
-    groups = Array.new(num){{:tests => [], :size => 0}}
-    tests_with_sizes.each do |test, size|
-      smallest = groups.sort_by{|g| g[:size] }.first
-      smallest[:tests] << test
-      smallest[:size] += size
+    if options[:no_sort] == true
+      distribute_tests_in_groups(root, num)
+    else
+      sorted_tests_in_groups(root, num)
     end
-
-    groups.map{|g| g[:tests] }
   end
 
   def self.run_tests(test_files, process_number, options)
@@ -71,6 +64,36 @@ 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

data/parallel_tests.gemspec

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

data/spec/spec_helper.rb

@@ -70,5 +70,13 @@ def test_tests_in_groups(klass, folder, suffix)
       # 7 + 6 + 4 + 2 = 19
       groups[1].should == [@files[7],@files[6],@files[4],@files[2]]
     end
+
+    it "partitions by round-robin when not sorting" do
+      files = ["file1.rb", "file2.rb", "file3.rb", "file4.rb"]
+      klass.should_receive(:find_tests).and_return(files)
+      groups = klass.tests_in_groups(files, 2, :no_sort => true)
+      groups[0].should == ["file1.rb", "file3.rb"]
+      groups[1].should == ["file2.rb", "file4.rb"]
+    end
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 7
-  version: 0.3.7
+  - 8
+  version: 0.3.8
 platform: ruby
 authors: 
 - Michael Grosser
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-15 00:00:00 +02:00
+date: 2010-05-17 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency