parallel_split_test 0.1.1 → 0.1.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    parallel_split_test (0.1.1)
+    parallel_split_test (0.1.2)
       parallel (>= 0.5.12)
       rspec (>= 2)
 

data/Readme.md

@@ -9,21 +9,30 @@ Or
 
 Usage
 =====
+
+### 1: prepare your databases
+To use 1 database per test-process, add this to your `config/database.yml`<br/>
+
+    test:
+      database: yourproject_test<%= ENV['TEST_ENV_NUMBER'] %>
+
+
+ - `TEST_ENV_NUMBER` is '' for the first process and 2 for the 2nd, it reuses your normal test database
+ - Optionally install [parallel_tests](https://github.com/grosser/parallel_tests) to get database helper tasks like `rake parallel:prepare`
+
+
+### 2: find a slow/big test file
+
     # spec/xxx_spec.rb
     require "spec_helper"
 
     describe "X" do
       it {sleep 5}
-    end
-
-    describe "Y" do
       it {sleep 5}
-    end
-
-    describe "Z" do
       it {sleep 5}
     end
 
+### 3: run
     parallel_split_test spec/xxx_spec.rb [regular rspec options]
 
 Output
@@ -51,9 +60,9 @@ TIPS
 TODO
 ====
  - combine exit status (1 + 0 == 1)
- - support a single group with multiple sub-groups
- - Test::Unit support
+ - re-print summary of all test results
  - Cucumber support
+ - Test::Unit support
 
 Author
 ======

data/lib/parallel_split_test.rb

@@ -1,2 +1,10 @@
 module ParallelSplitTest
+  class << self
+    attr_accessor :example_counter, :process_count, :process_number
+  end
+
+  def self.run_example?
+    self.example_counter += 1
+    (example_counter - 1) % process_count == process_number
+  end
 end

data/lib/parallel_split_test/command_line.rb

@@ -1,5 +1,7 @@
+require 'parallel_split_test'
 require 'parallel'
 require 'rspec/core/command_line'
+require 'parallel_split_test/core_ext/rspec_example'
 
 module ParallelSplitTest
   class CommandLine < RSpec::Core::CommandLine
@@ -8,20 +10,24 @@ module ParallelSplitTest
       processes = (ENV['PARALLEL_SPLIT_TEST_PROCESSES'] || Parallel.processor_count).to_i
 
       Parallel.in_processes(processes) do |process_number|
+        ParallelSplitTest.example_counter = 0
+        ParallelSplitTest.process_count = processes
+        ParallelSplitTest.process_number = process_number
+
         ENV['TEST_ENV_NUMBER'] = (process_number == 0 ? '' : (process_number + 1).to_s)
-        run_group_of_tests(processes, process_number)
+        run_group_of_tests(processes)
       end
     end
 
     private
 
-    def run_group_of_tests(processes, process_number)
+    def run_group_of_tests(processes)
       example_count = @world.example_count / processes
 
       @configuration.reporter.report(example_count, seed) do |reporter|
         begin
           @configuration.run_hook(:before, :suite)
-          groups = groups_for_this_process(@world.example_groups.ordered, process_number, processes)
+          groups = @world.example_groups.ordered
           groups.map {|g| g.run(reporter)}.all? ? 0 : @configuration.failure_exit_code
         ensure
           @configuration.run_hook(:after, :suite)
@@ -33,14 +39,6 @@ module ParallelSplitTest
       @configuration.randomize? ? @configuration.seed : nil
     end
 
-    def groups_for_this_process(groups, number, count)
-      selected = []
-      groups.each_with_index do |group, i|
-        selected << group if i % count == number
-      end
-      selected
-    end
-
     def setup_copied_from_rspec(err, out)
       @configuration.error_stream = err
       @configuration.output_stream ||= out

data/lib/parallel_split_test/core_ext/rspec_example.rb

@@ -0,0 +1,11 @@
+require 'parallel_split_test'
+require 'rspec/core/example'
+
+RSpec::Core::Example.class_eval do
+  alias :run_without_parallel_split_test :run
+  def run(*args, &block)
+    if ParallelSplitTest.run_example?
+      run_without_parallel_split_test(*args, &block)
+    end
+  end
+end

data/lib/parallel_split_test/version.rb

@@ -1,3 +1,3 @@
 module ParallelSplitTest
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

data/spec/parallel_split_test_spec.rb

@@ -80,6 +80,7 @@ describe ParallelSplitTest do
         end
         RUBY
         result = parallel_split_test "xxx_spec.rb"
+        result.scan('1 example, 0 failures').size.should == 2
 
         processes = ["a","b"].map do |process|
           rex = /it-ran-#{process}-in-(\d)-/
@@ -103,6 +104,21 @@ describe ParallelSplitTest do
 
         time{ parallel_split_test "xxx_spec.rb" }.should < 2
       end
+
+      it "splits based on examples" do
+        write "xxx_spec.rb", <<-RUBY
+        describe "X" do
+          describe "Y" do
+            it { sleep 1  }
+            it { sleep 1  }
+          end
+        end
+        RUBY
+
+        result = nil
+        time{ result = parallel_split_test "xxx_spec.rb" }.should < 2
+        result.scan('1 example, 0 failures').size.should == 2
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: parallel_split_test
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &82916840 !ruby/object:Gem::Requirement
+  requirement: &83628200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '2'
   type: :runtime
   prerelease: false
-  version_requirements: *82916840
+  version_requirements: *83628200
 - !ruby/object:Gem::Dependency
   name: parallel
-  requirement: &82916590 !ruby/object:Gem::Requirement
+  requirement: &83627950 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: 0.5.12
   type: :runtime
   prerelease: false
-  version_requirements: *82916590
+  version_requirements: *83627950
 description: 
 email: michael@grosser.it
 executables:
@@ -48,6 +48,7 @@ files:
 - bin/parallel_split_test
 - lib/parallel_split_test.rb
 - lib/parallel_split_test/command_line.rb
+- lib/parallel_split_test/core_ext/rspec_example.rb
 - lib/parallel_split_test/runner.rb
 - lib/parallel_split_test/version.rb
 - parallel_split_test.gemspec
@@ -68,7 +69,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1019850003
+      hash: 40026127
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -77,7 +78,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1019850003
+      hash: 40026127
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10