parallel_split_test 0.2.1 → 0.3.0

data/Gemfile.lock

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

data/Readme.md

@@ -10,9 +10,10 @@ 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'] %>
-
+```Yaml
+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`
@@ -20,44 +21,43 @@ To use 1 database per test-process, add this to your `config/database.yml`<br/>
 
 ### 2: find a slow/big test file
 
-    # spec/xxx_spec.rb
-    require "spec_helper"
+```Ruby
+# spec/xxx_spec.rb
+require "spec_helper"
 
-    describe "X" do
-      it {sleep 5}
-      it {sleep 5}
-      it {sleep 5}
-    end
+describe "X" do
+  it {sleep 5}
+  it {sleep 5}
+  it {sleep 5}
+end
+```
 
 ### 3: run
-    parallel_split_test spec/xxx_spec.rb [regular rspec options]
+```Bash
+parallel_split_test spec/xxx_spec.rb [regular test options]
+```
 
 Output
 ======
 
-    parallel_split_test spec/xx_spec.rb
-
-    Running examples in 2 processes
-    .
-
-    Finished in 5 seconds
-    1 example, 0 failures
-    ..
+```Bash
+parallel_split_test spec/xx_spec.rb
 
-    Finished in 1 seconds
-    2 examples, 0 failures
+Running examples in 2 processes
+.
 
-    Summary:
-    1 example, 0 failures
-    2 examples, 0 failures
-    Took 10.06 seconds with 2 processes
+Finished in 5 seconds
+1 example, 0 failures
+..
 
+Finished in 1 seconds
+2 examples, 0 failures
 
-Options
-=======
-<!-- last section of ./bin/parallel_split_test -h -->
-
-    -o, --test-options STRING        Run tests with these options
+Summary:
+1 example, 0 failures
+2 examples, 0 failures
+Took 10.06 seconds with 2 processes
+```
 
 TIPS
 ====

data/bin/parallel_split_test

@@ -2,27 +2,22 @@
 require "optparse"
 $LOAD_PATH << File.join(File.dirname(__FILE__), '..', 'lib')
 
-options = {}
-parser = OptionParser.new do |opts|
-  opts.banner = <<BANNER
-Split a big test file into multiple chunks and run them in parallel, giving ENV['TEST_ENV_NUMBER'] ('', '2', '3', ...)
+if ARGV.include?("-v") or ARGV.include?("--version")
+  require 'parallel_split_test/version'
+  puts ParallelSplitTest::VERSION; exit
+elsif ARGV.include?("-h") or ARGV.include?("--help") or ARGV.empty?
+  puts <<-TEXT
+Split a big test file into multiple chunks and run them in parallel, giving ENV['TEST_ENV_NUMBER'] as '', '2', '3', ...
 
 Usage:
-    parallel_split_test test/baz/xxx_text.rb
+    parallel_split_test test/baz/xxx_text.rb [other rspec options]
 
 Options are:
-BANNER
-  opts.on("-v", "--version", "Show Version"){ require 'parallel_split_test/version'; puts ParallelSplitTest::VERSION; exit}
-  opts.on("-h", "--help", "Show this.") { puts opts; exit }
-  opts.on("-o", "--test-options STRING", "Run tests with these options") { |test_options| options[:test_options] = test_options }
-end
-
-parser.parse!
-
-if ARGV.empty?
-  puts parser
+    -v, --version                    Display the program version.
+    -h, --help                       Display this help message.
+  TEXT
   exit
 end
 
 require 'parallel_split_test/runner'
-exit ParallelSplitTest::Runner.run(ARGV, options)
+exit ParallelSplitTest::Runner.run(ARGV, $stderr, $stdout)

data/lib/parallel_split_test/command_line.rb

@@ -6,24 +6,66 @@ require 'parallel_split_test/core_ext/rspec_example'
 
 module ParallelSplitTest
   class CommandLine < RSpec::Core::CommandLine
+    def initialize(args)
+      @args = args
+      super
+    end
+
     def run(err, out)
-      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)
+      processes = ParallelSplitTest.choose_number_of_processes
+      out.puts "Running examples in #{processes} processes"
 
+      results = Parallel.in_processes(processes) do |process_number|
         ParallelSplitTest.example_counter = 0
         ParallelSplitTest.process_number = process_number
+        set_test_env_number(process_number)
+        modify_out_file_in_args(process_number) if out_file
 
+        out = OutputRecorder.new(out)
+        setup_copied_from_rspec(err, out)
         [run_group_of_tests, out.recorded]
       end
 
+      combine_out_files if out_file
+
       reprint_result_lines(out, results.map(&:last))
       results.map(&:first).max # combine exit status
     end
 
     private
 
+    # modify + reparse args to unify output
+    def modify_out_file_in_args(process_number)
+      @args[out_file_position] = "#{out_file}.#{process_number}"
+      @options = RSpec::Core::ConfigurationOptions.new(@args)
+      @options.parse_options
+    end
+
+    def set_test_env_number(process_number)
+      ENV['TEST_ENV_NUMBER'] = (process_number == 0 ? '' : (process_number + 1).to_s)
+    end
+
+    def out_file
+      @out_file ||= @args[out_file_position] if out_file_position
+    end
+
+    def out_file_position
+      @out_file_position ||= begin
+        if out_position = @args.index { |i| ["-o", "--out"].include?(i) }
+          out_position + 1
+        end
+      end
+    end
+
+    def combine_out_files
+      File.open(out_file, "w") do |f|
+        Dir["#{out_file}.*"].each do |file|
+          f.write File.read(file)
+          File.delete(file)
+        end
+      end
+    end
+
     def reprint_result_lines(out, printed_outputs)
       out.puts
       out.puts "Summary:"

data/lib/parallel_split_test/runner.rb

@@ -4,21 +4,13 @@ require 'shellwords'
 # a cleaned up version of the RSpec runner, e.g. no drb support
 module ParallelSplitTest
   class Runner < RSpec::Core::Runner
-    def self.run(args, options={})
-      err = $stderr
-      out = $stdout
+    # @overwrite
+    # stripped down version of run without --drb support / option parsing
+    def self.run(args, err=$stderr, out=$stdout)
       trap_interrupt
 
-      args += Shellwords.shellwords(options[:test_options]) if options[:test_options] # TODO smarter parsing ...
-
-      options = RSpec::Core::ConfigurationOptions.new(args)
-      options.parse_options
-
-      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)
+        ParallelSplitTest::CommandLine.new(args).run(err, out)
       end
     ensure
       RSpec.reset

data/lib/parallel_split_test/version.rb

@@ -1,3 +1,3 @@
 module ParallelSplitTest
-  VERSION = '0.2.1'
+  VERSION = '0.3.0'
 end

data/spec/parallel_split_test_spec.rb

@@ -223,7 +223,7 @@ describe ParallelSplitTest do
         result.should include("1 example, 0 failures\n1 example, 0 failures")
       end
 
-      it "can use --test-options" do
+      it "can use rspec options" do
         write "xxx_spec.rb", <<-RUBY
           describe "xxx" do
             it "yyy" do
@@ -231,9 +231,38 @@ describe ParallelSplitTest do
           end
         RUBY
 
-        result = parallel_split_test "xxx_spec.rb --test-options '--format html'"
+        result = parallel_split_test "xxx_spec.rb --format html"
         result.should include "</body>"
       end
+
+      it "writes a unified --out" do
+        write "xxx_spec.rb", <<-RUBY
+          describe "xxx" do
+            it "yyy" do
+            end
+
+            it "zzz" do
+            end
+          end
+        RUBY
+
+        result = parallel_split_test "xxx_spec.rb --format d --out xxx"
+
+        # output does not show up in stdout
+        result.should_not include "xxx"
+        result.should_not include "yyy"
+
+        # basic output is still there
+        result.should include "Running examples in"
+
+        # recorded output is combination of both
+        out = File.read("xxx")
+        out.should include "yyy"
+        out.should include "zzz"
+
+        # parts are cleaned up
+        Dir["xxx.*"].should == []
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: parallel_split_test
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -83,7 +83,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4510026555026143828
+      hash: 4514306617232661236
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -92,7 +92,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4510026555026143828
+      hash: 4514306617232661236
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25