parallelized_specs 0.3.30 → 0.3.31

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.30"
+    gem.version = "0.3.31"
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/lib/parallelized_specs.rb

@@ -269,49 +269,61 @@ class ParallelizedSpecs
 
   def self.rerun()
     rerun_failed_examples = false
-    filename = "tmp/parallel_log/rspec.failures"
+    rerun_specs = []
+    filename = "#{RAILS_ROOT}/tmp/parallel_log/rspec.failures"
 
-    if FileTest.exist?("#{RAILS_ROOT}/#{filename}")
-      @error_count = %x{wc -l "#{RAILS_ROOT}/#{filename}"}.match(/\d/).to_s #counts the number of lines in the file
+    @error_count = %x{wc -l "#{filename}"}.match(/\d/).to_s #counts the number of lines in the file
+    if @error_count.to_i > 1 && @error_count.to_i < 10
 
-      if @error_count.to_i > 1 && @error_count.to_i < 10
-        puts "rerunning #{@error_count} examples again"
-        @rerun_failures ||= []
-        @rerun_passes ||= []
-
-        File.open("#{RAILS_ROOT}/#{filename}").each_line do |l|
-          rerun_failed_examples = true
-          puts "#{l} will be ran and marked as a success if it passes"
-          result = %x[bundle exec rake spec #{l}]
-          rerun_status = result.match(/FAILED/).to_s
+      File.open(filename).each_line do |line|
+        if line =~ /spec\/selenium\/helpers/ || line =~ /spec\/selenium\/shared/
+          abort "shared specs currently are not eligiable for reruns, marking build as a failure"
+        else
+          rerun_specs.push line
+        end
+      end
 
-          if rerun_status == "FAILED"
+      puts "rerunning #{@error_count} examples again"
+      @rerun_failures ||= []
+      @rerun_passes ||= []
+
+      rerun_specs.each do |l|
+        rerun_failed_examples = true
+        puts "#{l} will be ran and marked as a success if it passes"
+        result = %x[bundle exec rake spec #{l}]
+        #can't just use exit code, if specs fail to start it will pass or if a spec isn't found, and sometimes rspec 1 exit codes aren't right
+        rerun_status = result.match(/1 example, \d failure/).to_s
+
+        case rerun_status
+          when ""
+            abort "the spec failed to run on the rerun try, marking build as failed"
+          when "1 example, 1 failure"
             puts "the example failed again"
             @rerun_failures << l
-            rerun_status = ""
-          else
+          when "1 example, 0 failure"
             puts "the example passed and is being marked as a success"
             @rerun_passes << l
-            rerun_status = ""
-          end
-        end #end file loop
-      else
-        puts "#{@error_count} is to many errors to rerun the build will be marked as a failure"
+          else
+            abort "unexpected outcome on the rerun, marking build as a failure"
+        end
+        rerun_status = ""
+      end #end file loop
+    else
+      if @error_count == 0
+        abort "#{@error_count} errors, but the build failed, errors were not written to the file or there is something else wrong, marking build as a failure"
+      elsif @error_count > 10
+        abort "#{error_count} errors are to many to rerun, marking the build as a failure"
       end
+    end
 
-      if rerun_failed_examples
-        if @rerun_failures.count > 0
-          puts "1 or more examples failed on rerun, rspec will mark this build as a failure"
-          abort "some specs failed on rerun"
-        elsif @rerun_passes.count >= @error_count.to_i
-          puts "all rerun examples passed, rspec will mark this build as passed"
-        else
-          puts "something unexpected happened not safe to mark the build as passed."
-          abort "unexpected situation on rerun, marking build as failure"
-        end
+    if rerun_failed_examples
+      if @rerun_failures.count > 0
+        abort "some specs failed on rerun, the build will be marked as failed"
+      elsif @rerun_passes.count >= @error_count.to_i
+        puts "all rerun examples passed, rspec will mark this build as passed"
+      else
+        abort "unexpected situation on rerun, marking build as failure"
       end
-    else
-      "No errors file was found, marking build as a success"
     end
   end
 end

data/lib/parallelized_specs/failures_rerun_logger.rb

@@ -6,8 +6,6 @@ module RSpec
     FILENAME = "#{RAILS_ROOT}/tmp/parallel_log/rspec.failures"
 
     def example_failed(example, counter, failure)
-      @rerun_examples ||= []
-      @rerun_examples << failure
       f = File.new(FILENAME, "a+")
       f.puts retry_command(example)
     end
@@ -32,9 +30,5 @@ module RSpec
       spec_name = example.description
       "SPEC=#{Dir.pwd}/#{spec_file} SPEC_OPTS='-e \"#{spec_name}\"'"
     end
-
-    def close()
-      @output.close if (IO === @output) & (@output != $stdout)
-    end
   end
 end

data/parallelized_specs.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "parallelized_specs"
-  s.version = "0.3.30"
+  s.version = "0.3.31"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jake Sorce, Bryan Madsen, Shawn Meredith"]
-  s.date = "2012-11-02"
+  s.date = "2012-11-05"
   s.email = "jake@instructure.com"
   s.files = [
     "Gemfile",

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: parallelized_specs
 version: !ruby/object:Gem::Version 
-  hash: 47
+  hash: 45
   prerelease: 
   segments: 
   - 0
   - 3
-  - 30
-  version: 0.3.30
+  - 31
+  version: 0.3.31
 platform: ruby
 authors: 
 - Jake Sorce, Bryan Madsen, Shawn Meredith
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-11-02 00:00:00 Z
+date: 2012-11-05 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: parallel