parallel_tests 2.13.0 → 2.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c5093d00208e78bd29823d73e12a7409588adbd
-  data.tar.gz: f937ad2c7a3036ceda12fd4d2e432c45c5209822
+  metadata.gz: f326996fc88803c4f76b9e184aa5bf2c1150e4d4
+  data.tar.gz: a4aa419cef3d0af3cc401082bd462028b8fbd825
 SHA512:
-  metadata.gz: 61241e2a1133c15307e8b50ac845aa0655c2120a98356e4bd08e1e14fbfbbd5b7bde367e55e934ad538183f9daa3b83707613d933136805130a30612a7d76355
-  data.tar.gz: 1f7a44c636ade949d48cec7253186f3be7052cf9fdd711004060e445ed0b357d1263ddd010d5abae318f683ae46a5eab5900e6c6d7e00d8648c9786165ab47d2
+  metadata.gz: b81bfb8d8ddeb59c8383b1e5eda35ff3cddb0923d66efb38d548076d3629b7b1558029de0b8a28b27a6c071a788b56dd3d9655f1bcb44b11d4ce73c05f4263dc
+  data.tar.gz: d8598855d1e18ee95dad3540ef49015da0ce51836a7e3f90e904d7274993ac7c4c1bb3aeaa000a46af8e4d0f383874ded46a0466dfbbf1e648743eb5ee5d077f

data/Readme.md

@@ -359,6 +359,7 @@ inspired by [pivotal labs](https://blog.pivotal.io/labs/labs/parallelize-your-rs
  - [Rhett Sutphin](https://github.com/rsutphin)
  - [Doc Ritezel](https://github.com/ohrite)
  - [Alexandre Wilhelm](https://github.com/dogild)
+ - [Jerry](https://github.com/boblington)
 
 
 [Michael Grosser](http://grosser.it)<br/>

data/lib/parallel_tests/rspec/failures_logger.rb

@@ -2,20 +2,7 @@ require 'parallel_tests/rspec/logger_base'
 require 'parallel_tests/rspec/runner'
 
 class ParallelTests::RSpec::FailuresLogger < ParallelTests::RSpec::LoggerBase
-  if RSPEC_1
-    # RSpec 1: does not keep track of failures, so we do
-    def example_failed(example, *args)
-      if RSPEC_1
-        @failed_examples ||= []
-        @failed_examples << example
-      else
-        super
-      end
-    end
-
-    def dump_failure(*args)
-    end
-  elsif RSPEC_2
+  if RSPEC_2
     def dump_failures(*args)
     end
   else
@@ -24,29 +11,16 @@ class ParallelTests::RSpec::FailuresLogger < ParallelTests::RSpec::LoggerBase
 
   def dump_summary(*args)
     lock_output do
-      if RSPEC_1
-        dump_commands_to_rerun_failed_examples_rspec_1
-      elsif RSPEC_3
+      if RSPEC_2
+        dump_commands_to_rerun_failed_examples
+      else
         notification = args.first
         unless notification.failed_examples.empty?
           colorizer = ::RSpec::Core::Formatters::ConsoleCodes
           output.puts notification.colorized_rerun_commands(colorizer)
         end
-      else
-        dump_commands_to_rerun_failed_examples
       end
     end
     @output.flush
   end
-
-  private
-
-  def dump_commands_to_rerun_failed_examples_rspec_1
-    (@failed_examples||[]).each do |example|
-      file, line = example.location.to_s.split(':')
-      next unless file and line
-      file.gsub!(%r(^.*?/spec/), './spec/')
-      @output.puts "#{ParallelTests::RSpec::Runner.send(:executable)} #{file}:#{line} # #{example.description}"
-    end
-  end
 end

data/lib/parallel_tests/rspec/logger_base.rb

@@ -3,25 +3,15 @@ module ParallelTests
   end
 end
 
-begin
-  require 'rspec/core/formatters/base_text_formatter'
-  base = RSpec::Core::Formatters::BaseTextFormatter
-rescue LoadError
-  require 'spec/runner/formatter/base_text_formatter'
-  base = Spec::Runner::Formatter::BaseTextFormatter
-end
-
-ParallelTests::RSpec::LoggerBaseBase = base
+require 'rspec/core/formatters/base_text_formatter'
 
-class ParallelTests::RSpec::LoggerBase < ParallelTests::RSpec::LoggerBaseBase
-  RSPEC_1 = !defined?(RSpec::Core::Formatters::BaseTextFormatter) # do not test for Spec, this will trigger deprecation warning in rspec 2
-  RSPEC_2 = !RSPEC_1 && RSpec::Core::Version::STRING.start_with?('2')
-  RSPEC_3 = !RSPEC_1 && RSpec::Core::Version::STRING.start_with?('3')
+class ParallelTests::RSpec::LoggerBase < RSpec::Core::Formatters::BaseTextFormatter
+  RSPEC_2 = RSpec::Core::Version::STRING.start_with?('2')
 
   def initialize(*args)
     super
 
-    @output ||= args[1] || args[0] # rspec 1 has output as second argument
+    @output ||= args[0]
 
     if String === @output # a path ?
       FileUtils.mkdir_p(File.dirname(@output))

data/lib/parallel_tests/rspec/runner.rb

@@ -9,9 +9,7 @@ module ParallelTests
       class << self
         def run_tests(test_files, process_number, num_processes, options)
           exe = executable # expensive, so we cache
-          version = (exe =~ /\brspec\b/ ? 2 : 1)
-          cmd = [exe, options[:test_options], (rspec_2_color if version == 2), spec_opts, *test_files].compact.join(" ")
-          options = options.merge(:env => rspec_1_color) if version == 1
+          cmd = [exe, options[:test_options], color, spec_opts, *test_files].compact.join(" ")
           execute_command(cmd, process_number, num_processes, options)
         end
 
@@ -19,8 +17,6 @@ module ParallelTests
           cmd = case
           when File.exist?("bin/rspec")
             WINDOWS ? "ruby bin/rspec" : "bin/rspec"
-          when File.file?("script/spec")
-            "script/spec"
           when ParallelTests.bundler_enabled?
             cmd = (run("bundle show rspec-core") =~ %r{Could not find gem.*} ? "spec" : "rspec")
             "bundle exec #{cmd}"
@@ -65,15 +61,7 @@ module ParallelTests
           `#{cmd}`
         end
 
-        def rspec_1_color
-          if $stdout.tty?
-            {'RSPEC_COLOR' => "1"}
-          else
-            {}
-          end
-        end
-
-        def rspec_2_color
+        def color
           '--color --tty' if $stdout.tty?
         end
 

data/lib/parallel_tests/rspec/runtime_logger.rb

@@ -5,39 +5,26 @@ class ParallelTests::RSpec::RuntimeLogger < ParallelTests::RSpec::LoggerBase
   def initialize(*args)
     super
     @example_times = Hash.new(0)
-    @group_nesting = 0 unless RSPEC_1
+    @group_nesting = 0
   end
 
-  if RSPEC_3
+  unless RSPEC_2
     RSpec::Core::Formatters.register self, :example_group_started, :example_group_finished, :start_dump
   end
 
-  if RSPEC_1
-    def example_started(*args)
-      @time = ParallelTests.now
-      super
-    end
-
-    def example_passed(example)
-      file = example.location.split(':').first
-      @example_times[file] += ParallelTests.now - @time
-      super
-    end
-  else
-    def example_group_started(example_group)
-      @time = ParallelTests.now if @group_nesting == 0
-      @group_nesting += 1
-      super
-    end
+  def example_group_started(example_group)
+    @time = ParallelTests.now if @group_nesting == 0
+    @group_nesting += 1
+    super
+  end
 
-    def example_group_finished(notification)
-      @group_nesting -= 1
-      if @group_nesting == 0
-        path = (RSPEC_3 ? notification.group.file_path : notification.file_path)
-        @example_times[path] += ParallelTests.now - @time
-      end
-      super if defined?(super)
+  def example_group_finished(notification)
+    @group_nesting -= 1
+    if @group_nesting == 0
+      path = (RSPEC_2 ? notification.file_path : notification.group.file_path)
+      @example_times[path] += ParallelTests.now - @time
     end
+    super if defined?(super)
   end
 
   def dump_summary(*args);end

data/lib/parallel_tests/rspec/summary_logger.rb

@@ -1,19 +1,12 @@
 require 'parallel_tests/rspec/failures_logger'
 
 class ParallelTests::RSpec::SummaryLogger < ParallelTests::RSpec::LoggerBase
-  if RSPEC_3
+  unless RSPEC_2
     RSpec::Core::Formatters.register self, :dump_failures
   end
 
-  if RSPEC_1
-    def dump_failure(*args)
-      lock_output { super }
-      @output.flush
-    end
-  else
-    def dump_failures(*args)
-      lock_output { super }
-      @output.flush
-    end
+  def dump_failures(*args)
+    lock_output { super }
+    @output.flush
   end
 end

data/lib/parallel_tests/version.rb

@@ -1,3 +1,3 @@
 module ParallelTests
-  VERSION = Version = '2.13.0'
+  VERSION = Version = '2.14.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parallel_tests
 version: !ruby/object:Gem::Version
-  version: 2.13.0
+  version: 2.14.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-12 00:00:00.000000000 Z
+date: 2017-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel