parallelized_specs 0.3.59 → 0.3.60

data/Rakefile

@@ -12,7 +12,7 @@ begin
     gem.email    = "jake@instructure.com"
     gem.homepage = "http://github.com/jakesorce/#{gem.name}"
     gem.authors  = "Jake Sorce, Bryan Madsen, Shawn Meredith"
-    gem.version = "0.3.59"
+    gem.version = "0.3.60"
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/lib/parallelized_specs.rb

@@ -110,32 +110,23 @@ class ParallelizedSpecs
     #parse and print results
     results = find_results(test_results.map { |result| result[:stdout] }*"")
     puts ""
-    summary = summarize_results(results)
-    puts "#{summary}"
+    puts summarize_results(results)
 
-    total_ran_examples = summary.match(/\d*/).to_s
-    total_expected_examples = 0
-
-    File.open('tmp/parallel_log/total_specs.txt').each do |line|
-      total_expected_examples += line.to_i
-    end
     #report total time taken
     puts ""
     puts "Took #{Time.now - start} seconds"
 
+    Dir.glob('tmp/parallel_log/spec_count/{*,.*}').empty? ? puts "All threads completed" : abort "One or more threads have failed"
+
     #exit with correct status code so rake parallel:test && echo 123 works
-    failed = test_results.any? { |result| result[:exit_status] != 0 }
-    puts "entire failed object #{test_results}.to_s"
-    puts "this is the exit status of the threads #{failed}"
 
-    if failed && FileTest.exist?("#{RAILS_ROOT}/tmp/parallel_log/rspec.failures") && total_ran_examples == total_expected_examples
-      puts "this is inside rerun condition"
+    if !Dir.glob('tmp/parallel_log/failed_specs/{*,.*}').empty? && FileTest.exist?("#{RAILS_ROOT}/tmp/parallel_log/rspec.failures")
       puts "some specs failed, about to start the rerun process\n no more than 9 specs may be rerun and shared specs are not allowed\n...\n..\n."
       ParallelizedSpecs.rerun()
     else
-      abort "#{name.capitalize}s Failed" if failed
+      abort "#{name.capitalize}s Failed" if !Dir.glob('tmp/parallel_log/failed_specs/{*,.*}').empty?
     end
-     puts "marking build as PASSED"
+    puts "marking build as PASSED"
   end
 
 # parallel:spec[:count, :pattern, :options]

data/lib/parallelized_specs/failures_rerun_logger.rb

@@ -4,13 +4,35 @@ require 'parallelized_specs/spec_logger_base'
 module RSpec
   class ParallelizedSpecs::FailuresFormatter < ParallelizedSpecs::SpecLoggerBase
 
+    def start(example_count)
+      @example_count = example_count
+      env_test_number = ENV['TEST_ENV_NUMBER']
+      env_test_number = 1 if ENV['TEST_ENV_NUMBER'].blank?
+      puts "Thread #{env_test_number.to_s} has #{@example_count} specs"
+      File.open("tmp/parallel_log/spec_count/total_specs#{env_test_number}.txt", 'a+') { |f| f.puts(@example_count) }
+      super
+    end
+
     def example_failed(example, counter, failure)
       lock_output do
         @output.puts retry_command(example)
       end
     end
 
-    def dump_summary(*args)
+    def dump_summary(duration, example_count, failure_count, pending_count)
+      env_test_number = ENV['TEST_ENV_NUMBER']
+      env_test_number = 1 if ENV['TEST_ENV_NUMBER'].blank?
+
+      File.open("tmp/parallel_log/spec_count/total_specs#{env_test_number}.txt").each do |line|
+        puts "this is thread #{env_test_number} with #{line} expected examples and #{example} actual examples"
+        if line == example_count
+          all_specs_ran = true
+        end
+      end
+
+      all_specs_ran == true ? File.delete("tmp/parallel_log/spec_count/total_specs#{env_test_number}.txt") : env_test_number
+
+      failure_count > 0 ? File.open("tmp/parallel_log/failed_specs/failed_specs#{env_test_number}.txt", 'a+') { |f| f.puts(failure_count) } : puts "All specs in Thread #{env_test_number} passed"
     end
 
     def dump_failures(*args)

data/lib/parallelized_specs/spec_error_logger.rb

@@ -9,16 +9,6 @@ class ParallelizedSpecs::SpecErrorLogger < ParallelizedSpecs::SpecLoggerBase
     @failed_examples = []
   end
 
-  def start(example_count)
-    @example_count = example_count
-    env_test_number = ENV['TEST_ENV_NUMBER']
-    env_test_number = 1 if ENV['TEST_ENV_NUMBER'].blank?
-    puts "Thread #{env_test_number.to_s} has #{@example_count} specs"
-    File.open("tmp/parallel_log/total_specs.txt", 'a+') {|f| f.puts(@example_count)}
-    super
-  end
-
-
   def example_passed(example)
     @passed_examples << example
   end

data/parallelized_specs.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "parallelized_specs"
-  s.version = "0.3.59"
+  s.version = "0.3.60"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jake Sorce, Bryan Madsen, Shawn Meredith"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: parallelized_specs
 version: !ruby/object:Gem::Version 
-  hash: 101
+  hash: 107
   prerelease: 
   segments: 
   - 0
   - 3
-  - 59
-  version: 0.3.59
+  - 60
+  version: 0.3.60
 platform: ruby
 authors: 
 - Jake Sorce, Bryan Madsen, Shawn Meredith