parallel_split_test 0.1.3 → 0.1.4

data/Gemfile.lock

@@ -1,15 +1,15 @@
 PATH
   remote: .
   specs:
-    parallel_split_test (0.1.3)
-      parallel (>= 0.5.12)
+    parallel_split_test (0.1.4)
+      parallel (>= 0.5.13)
       rspec (>= 2)
 
 GEM
   remote: http://rubygems.org/
   specs:
     diff-lcs (1.1.3)
-    parallel (0.5.12)
+    parallel (0.5.13)
     rake (0.9.2)
     rspec (2.8.0)
       rspec-core (~> 2.8.0)

data/bin/parallel_split_test

@@ -1,7 +1,6 @@
 #!/usr/bin/env ruby
 require "optparse"
 $LOAD_PATH << File.join(File.dirname(__FILE__), '..', 'lib')
-require "parallel_split_test"
 
 parser = OptionParser.new do |opts|
   opts.banner = <<BANNER
@@ -23,8 +22,5 @@ if ARGV.empty?
   exit
 end
 
-require "rspec"
-require "parallel"
-
 require 'parallel_split_test/runner'
 ParallelSplitTest::Runner.run(ARGV)

data/lib/parallel_split_test.rb

@@ -1,10 +1,24 @@
+require 'parallel'
+
 module ParallelSplitTest
   class << self
-    attr_accessor :example_counter, :process_count, :process_number
+    attr_accessor :example_counter, :processes, :process_number
   end
 
   def self.run_example?
     self.example_counter += 1
-    (example_counter - 1) % process_count == process_number
+    (example_counter - 1) % processes == process_number
+  end
+
+  def self.choose_number_of_processes
+    self.processes = best_number_of_processes
+  end
+
+  def self.best_number_of_processes
+    [
+      ENV['PARALLEL_SPLIT_TEST_PROCESSES'],
+      Parallel.physical_processor_count,
+      Parallel.processor_count
+    ].map(&:to_i).find{|number| number > 0 }
   end
 end

data/lib/parallel_split_test/command_line.rb

@@ -1,29 +1,28 @@
 require 'parallel_split_test'
 require 'parallel'
-require 'rspec/core/command_line'
+require 'rspec'
 require 'parallel_split_test/core_ext/rspec_example'
 
 module ParallelSplitTest
   class CommandLine < RSpec::Core::CommandLine
     def run(err, out)
-      processes = (ENV['PARALLEL_SPLIT_TEST_PROCESSES'] || Parallel.processor_count).to_i
+      ParallelSplitTest.choose_number_of_processes
 
-      Parallel.in_processes(processes) do |process_number|
+      Parallel.in_processes(ParallelSplitTest.processes) do |process_number|
         ENV['TEST_ENV_NUMBER'] = (process_number == 0 ? '' : (process_number + 1).to_s)
         setup_copied_from_rspec(err, out)
 
         ParallelSplitTest.example_counter = 0
-        ParallelSplitTest.process_count = processes
         ParallelSplitTest.process_number = process_number
 
-        run_group_of_tests(processes)
+        run_group_of_tests
       end
     end
 
     private
 
-    def run_group_of_tests(processes)
-      example_count = @world.example_count / processes
+    def run_group_of_tests
+      example_count = @world.example_count / ParallelSplitTest.processes
 
       @configuration.reporter.report(example_count, seed) do |reporter|
         begin

data/lib/parallel_split_test/runner.rb

@@ -1,5 +1,3 @@
-require 'rspec/core/runner'
-require 'rspec/core/configuration_options'
 require 'parallel_split_test/command_line'
 
 # a cleaned up version of the RSpec runner, e.g. no drb support

data/lib/parallel_split_test/version.rb

@@ -1,3 +1,3 @@
 module ParallelSplitTest
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 end

data/parallel_split_test.gemspec

@@ -10,6 +10,6 @@ Gem::Specification.new name, ParallelSplitTest::VERSION do |s|
   s.files = `git ls-files`.split("\n")
   s.executables = ["parallel_split_test"]
   s.add_dependency "rspec", ">=2"
-  s.add_dependency "parallel", ">=0.5.12"
+  s.add_dependency "parallel", ">=0.5.13"
   s.license = "MIT"
 end

data/spec/parallel_split_test_spec.rb

@@ -5,6 +5,30 @@ describe ParallelSplitTest do
     ParallelSplitTest::VERSION.should =~ /^[\.\da-z]+$/
   end
 
+  describe ".best_number_of_processes" do
+    before do
+      ENV['PARALLEL_SPLIT_TEST_PROCESSES'] = nil
+    end
+
+    let(:count) { ParallelSplitTest.send(:best_number_of_processes) }
+
+    it "uses ENV" do
+      ENV['PARALLEL_SPLIT_TEST_PROCESSES'] = "5"
+      count.should == 5
+    end
+
+    it "uses physical_processor_count" do
+      Parallel.stub(:physical_processor_count).and_return 6
+      count.should == 6
+    end
+
+    it "uses processor_count if everything else fails" do
+      Parallel.stub(:physical_processor_count).and_return 0
+      Parallel.stub(:processor_count).and_return 7
+      count.should == 7
+    end
+  end
+
   describe "cli" do
     def run(command, options={})
       result = `#{command} 2>&1`

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: parallel_split_test
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &71624760 !ruby/object:Gem::Requirement
+  requirement: &78874300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,18 +21,18 @@ dependencies:
         version: '2'
   type: :runtime
   prerelease: false
-  version_requirements: *71624760
+  version_requirements: *78874300
 - !ruby/object:Gem::Dependency
   name: parallel
-  requirement: &71624510 !ruby/object:Gem::Requirement
+  requirement: &78874050 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.5.12
+        version: 0.5.13
   type: :runtime
   prerelease: false
-  version_requirements: *71624510
+  version_requirements: *78874050
 description: 
 email: michael@grosser.it
 executables:
@@ -69,7 +69,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -426615473
+      hash: -660068355
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -78,7 +78,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -426615473
+      hash: -660068355
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10