parallel_split_test 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4cd1d692dde899db03bd2f824af156bb38b708fe
-  data.tar.gz: 7c9d58d739df030889c15203687a72a40a5f848f
+  metadata.gz: 45de1287c50f21414ec9cfd8cd44f15063757423
+  data.tar.gz: 77b10746bf20d6b9b0bbc334617d3c1648c7ba5f
 SHA512:
-  metadata.gz: 06c36c0c0acb25def7f2006472603a80b0849347f9173d68ce28d7c17d348ed7169405c1261016ed8fca50a5b0b528b4f00b61b123365ccd4ff395bd989d4af5
-  data.tar.gz: ed46c3d631cde68b6e0b15e9d7da79639ba14796823edceb82d2a40f10a4a9e86871ef8de244b5f5a4b2e4d22add15838d67c30bcfb0b2b5268243053e181c98
+  metadata.gz: 01bf113de23323bdbb7f64eef5f4aeb885cf40dd915e0d1701dc6bf9995b7773b43f8c1cc06f1ad9b4d086453cec57e45da5dc4b550281917e30ae8bd5d8f7e7
+  data.tar.gz: e72f3554bae41f8590eb896d9e8ae69da8ae62ff2f9efb4a844274142f8b0a6a73dc068b1585d0cdfc22df8c19924270d56b2f3a9c6778074a7051776aae4e28

data/lib/parallel_split_test/command_line.rb

@@ -3,6 +3,7 @@ require 'parallel_split_test/output_recorder'
 require 'parallel'
 require 'rspec'
 require 'parallel_split_test/core_ext/rspec_example'
+require 'parallel_split_test/core_ext/rspec_world'
 
 module ParallelSplitTest
   class CommandLine < RSpec::Core::Runner
@@ -26,11 +27,9 @@ module ParallelSplitTest
         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]
+        [super(err, out), out.recorded]
       end
 
-
       combine_out_files if out_file unless no_merge
 
       reprint_result_lines(out, results.map(&:last)) unless no_summary
@@ -41,7 +40,7 @@ module ParallelSplitTest
 
     # modify + reparse args to unify output
     def modify_out_file_in_args(process_number)
-      @args[out_file_position] = "#{out_file_basename}.#{process_number}#{File.extname(out_file)}"
+      @args[out_file_position] = "#{out_file_parent_dir}/#{out_file_basename}.#{process_number}#{File.extname(out_file)}"
       @options = RSpec::Core::ConfigurationOptions.new(@args)
     end
 
@@ -53,6 +52,10 @@ module ParallelSplitTest
       @out_file ||= @args[out_file_position] if out_file_position
     end
 
+    def out_file_parent_dir
+      @out_file_parent_dir ||= File.expand_path("#{out_file}/../.")
+    end
+
     def out_file_basename
       @out_file_basename ||= File.basename(out_file, File.extname(out_file))
     end
@@ -67,7 +70,7 @@ module ParallelSplitTest
 
     def combine_out_files
       File.open(out_file, "w") do |f|
-        Dir["#{out_file_basename}.*#{File.extname(out_file)}"].each do |file|
+        Dir["#{out_file_parent_dir}/#{out_file_basename}.*#{File.extname(out_file)}"].each do |file|
           f.write File.read(file)
           File.delete(file)
         end
@@ -79,24 +82,5 @@ module ParallelSplitTest
       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
-
-      @configuration.reporter.report(example_count) do |reporter|
-        groups = @world.example_groups
-        results = groups.map {|g| g.run(reporter)}
-        results.all? ? 0 : @configuration.failure_exit_code
-      end
-    end
-
-    # https://github.com/rspec/rspec-core/blob/6ee92a0d47bcb1f3abcd063dca2cee005356d709/lib/rspec/core/runner.rb#L93
-    def setup_copied_from_rspec(err, out)
-      @configuration.error_stream = err
-      @configuration.output_stream = out if @configuration.output_stream == $stdout
-      @options.configure(@configuration)
-      @configuration.load_spec_files
-      @world.announce_filters
-    end
   end
 end

data/lib/parallel_split_test/core_ext/rspec_world.rb

@@ -0,0 +1,15 @@
+require 'parallel_split_test'
+require 'rspec/core/example'
+
+RSpec::Core::World.class_eval do
+  alias :example_count_without_parallel_split_test :example_count
+  def example_count(*args, &block)
+    count = example_count_without_parallel_split_test(*args, &block)
+    quotient = count / ParallelSplitTest.processes
+    if ParallelSplitTest.process_number < count % ParallelSplitTest.processes
+      quotient + 1
+    else
+      quotient
+    end
+  end
+end

data/lib/parallel_split_test/output_recorder.rb

@@ -7,7 +7,7 @@ module ParallelSplitTest
       @out = out
     end
 
-    %w[puts write print putc flush].each do |method|
+    %w[puts write print putc flush tty? closed?].each do |method|
       class_eval <<-RUBY, __FILE__, __LINE__
         def #{method}(*args)
           @recorded.#{method}(*args)

data/lib/parallel_split_test/version.rb

@@ -1,3 +1,3 @@
 module ParallelSplitTest
-  VERSION = '0.6.0'
+  VERSION = '0.7.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parallel_split_test
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-22 00:00:00.000000000 Z
+date: 2017-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -50,6 +50,7 @@ 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/core_ext/rspec_world.rb
 - lib/parallel_split_test/output_recorder.rb
 - lib/parallel_split_test/runner.rb
 - lib/parallel_split_test/version.rb
@@ -73,7 +74,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Split a big test file into multiple chunks and run them in parallel