parallel_split_test 0.1.5 → 0.2.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    parallel_split_test (0.1.5)
+    parallel_split_test (0.2.0)
       parallel (>= 0.5.13)
       rspec (>= 2)
 

data/Readme.md

@@ -38,7 +38,9 @@ To use 1 database per test-process, add this to your `config/database.yml`<br/>
 Output
 ======
 
-    time ./bin/parallel_split_test spec/xx_spec.rb
+    parallel_split_test spec/xx_spec.rb
+
+    Running examples in 2 processes
     .
 
     Finished in 5 seconds
@@ -48,9 +50,10 @@ Output
     Finished in 1 seconds
     2 examples, 0 failures
 
-    real  0m11.015s
-    user  0m0.908s
-    sys  0m0.080s
+    Summary:
+    1 example, 0 failures
+    2 examples, 0 failures
+    Took 10.06 seconds with 2 processes
 
 
 TIPS
@@ -59,7 +62,6 @@ TIPS
 
 TODO
 ====
- - re-print summary of all test results
  - Cucumber support
  - Test::Unit support
 

data/bin/parallel_split_test

@@ -23,4 +23,4 @@ if ARGV.empty?
 end
 
 require 'parallel_split_test/runner'
-exit ParallelSplitTest::Runner.run(ARGV).max
+exit ParallelSplitTest::Runner.run(ARGV)

data/lib/parallel_split_test/command_line.rb

@@ -1,4 +1,5 @@
 require 'parallel_split_test'
+require 'parallel_split_test/output_recorder'
 require 'parallel'
 require 'rspec'
 require 'parallel_split_test/core_ext/rspec_example'
@@ -6,21 +7,29 @@ require 'parallel_split_test/core_ext/rspec_example'
 module ParallelSplitTest
   class CommandLine < RSpec::Core::CommandLine
     def run(err, out)
-      ParallelSplitTest.choose_number_of_processes
-
-      Parallel.in_processes(ParallelSplitTest.processes) do |process_number|
+      results = Parallel.in_processes(ParallelSplitTest.processes) do |process_number|
         ENV['TEST_ENV_NUMBER'] = (process_number == 0 ? '' : (process_number + 1).to_s)
+        out = OutputRecorder.new(out)
         setup_copied_from_rspec(err, out)
 
         ParallelSplitTest.example_counter = 0
         ParallelSplitTest.process_number = process_number
 
-        run_group_of_tests
+        [run_group_of_tests, out.recorded]
       end
+
+      reprint_result_lines(out, results.map(&:last))
+      results.map(&:first).max # combine exit status
     end
 
     private
 
+    def reprint_result_lines(out, printed_outputs)
+      out.puts
+      out.puts "Summary:"
+      out.puts printed_outputs.map{|o| o[/.*\d+ failure.*/] }.join("\n")
+    end
+
     def run_group_of_tests
       example_count = @world.example_count / ParallelSplitTest.processes
 

data/lib/parallel_split_test/output_recorder.rb

@@ -0,0 +1,24 @@
+require 'stringio'
+
+module ParallelSplitTest
+  class OutputRecorder
+    def initialize(out)
+      @recorded = StringIO.new
+      @out = out
+    end
+
+    %w[puts write print putc].each do |method|
+      class_eval <<-RUBY, __FILE__, __LINE__
+        def #{method}(*args)
+          @recorded.puts(*args)
+          @out.puts(*args)
+        end
+      RUBY
+    end
+
+    def recorded
+      @recorded.rewind
+      @recorded.read
+    end
+  end
+end

data/lib/parallel_split_test/runner.rb

@@ -7,9 +7,23 @@ module ParallelSplitTest
       trap_interrupt
       options = RSpec::Core::ConfigurationOptions.new(args)
       options.parse_options
-      ParallelSplitTest::CommandLine.new(options).run(err, out)
+
+      ParallelSplitTest.choose_number_of_processes
+      out.puts "Running examples in #{ParallelSplitTest.processes} processes"
+
+      report_execution_time(out) do
+        ParallelSplitTest::CommandLine.new(options).run(err, out)
+      end
     ensure
       RSpec.reset
     end
+
+    def self.report_execution_time(out)
+      start = Time.now.to_f
+      result = yield
+      runtime = Time.now.to_f - start
+      out.puts "Took %.2f seconds with #{ParallelSplitTest.processes} processes" % runtime
+      result
+    end
   end
 end

data/lib/parallel_split_test/version.rb

@@ -1,3 +1,3 @@
 module ParallelSplitTest
-  VERSION = '0.1.5'
+  VERSION = '0.2.0'
 end

data/spec/parallel_split_test/output_recorder_spec.rb

@@ -0,0 +1,26 @@
+require "spec_helper"
+
+describe ParallelSplitTest::OutputRecorder do
+  ['write', 'puts', 'print'].each do |method|
+    it "records #{method}" do
+      out = StringIO.new("")
+      recorder = ParallelSplitTest::OutputRecorder.new(out)
+      recorder.send(method, "XXX")
+
+      # output got recorded
+      recorder.recorded.strip.should == "XXX"
+      out.read.should == ""
+
+      # output was written to original
+      out.rewind
+      out.read.strip.should == "XXX"
+    end
+  end
+
+  it "can puts without arguments" do
+    out = StringIO.new("")
+    recorder = ParallelSplitTest::OutputRecorder.new(out)
+    recorder.puts
+    recorder.recorded.should == "\n"
+  end
+end

data/spec/parallel_split_test_spec.rb

@@ -104,7 +104,7 @@ describe ParallelSplitTest do
         end
         RUBY
         result = parallel_split_test "xxx_spec.rb"
-        result.scan('1 example, 0 failures').size.should == 2
+        result.scan('1 example, 0 failures').size.should == 4
         result.scan(/it-ran-.-in-.?-/).sort.should == ["it-ran-a-in--", "it-ran-b-in-2-"]
       end
 
@@ -134,7 +134,7 @@ describe ParallelSplitTest do
 
         result = nil
         time{ result = parallel_split_test "xxx_spec.rb" }.should < 2
-        result.scan('1 example, 0 failures').size.should == 2
+        result.scan('1 example, 0 failures').size.should == 4
       end
 
       it "sets up TEST_ENV_NUMBER before loading the test files, so db connections are set up correctly" do
@@ -167,7 +167,7 @@ describe ParallelSplitTest do
 
         # test works because if :fail => true does not fail it raises
         result = parallel_split_test "xxx_spec.rb", :fail => true
-        result.scan('1 example, 1 failure').size.should == 2
+        result.scan('1 example, 1 failure').size.should == 4
       end
 
       it "passes when no tests where run" do
@@ -178,6 +178,35 @@ describe ParallelSplitTest do
         result = parallel_split_test "xxx_spec.rb"
         result.should include('No examples found')
       end
+
+      it "prints a summary before running" do
+        write "xxx_spec.rb", <<-RUBY
+        describe "X" do
+        end
+        RUBY
+        result = parallel_split_test "xxx_spec.rb"
+        result.should include('Running examples in 2 processes')
+      end
+
+      it "prints a runtime summary at the end" do
+        write "xxx_spec.rb", <<-RUBY
+        describe "X" do
+        end
+        RUBY
+        result = parallel_split_test "xxx_spec.rb"
+        result.should =~ /Took [\d\.]+ seconds with 2 processes/
+      end
+
+      it "reprints all summary lines at the end" do
+        write "xxx_spec.rb", <<-RUBY
+        describe "X" do
+          it {  }
+          it { sleep 0.1  }
+        end
+        RUBY
+        result = parallel_split_test "xxx_spec.rb"
+        result.should include("1 example, 0 failures\n1 example, 0 failures")
+      end
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,3 +1,4 @@
 $LOAD_PATH.unshift 'lib'
 require 'parallel_split_test'
-require 'parallel_split_test/version'
+require 'parallel_split_test/version'
+require 'parallel_split_test/output_recorder'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: parallel_split_test
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-03 00:00:00.000000000 Z
+date: 2012-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &85485570 !ruby/object:Gem::Requirement
+  requirement: &81205430 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '2'
   type: :runtime
   prerelease: false
-  version_requirements: *85485570
+  version_requirements: *81205430
 - !ruby/object:Gem::Dependency
   name: parallel
-  requirement: &85485320 !ruby/object:Gem::Requirement
+  requirement: &81205180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: 0.5.13
   type: :runtime
   prerelease: false
-  version_requirements: *85485320
+  version_requirements: *81205180
 description: 
 email: michael@grosser.it
 executables:
@@ -49,9 +49,11 @@ files:
 - 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/output_recorder.rb
 - lib/parallel_split_test/runner.rb
 - lib/parallel_split_test/version.rb
 - parallel_split_test.gemspec
+- spec/parallel_split_test/output_recorder_spec.rb
 - spec/parallel_split_test_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/grosser/parallel_split_test
@@ -69,7 +71,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -731152051
+      hash: 131892335
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -78,7 +80,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -731152051
+      hash: 131892335
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10