Restore round counting to bisect progress formatter

Counting rounds in the formatter eliminates the need to track this state in
the example minimizer, while preserving the numbered rounds output.

Author: urbanautomaton

features/command_line/bisect.feature

@@ -56,10 +56,10 @@ Feature: Bisect
       Starting bisect with 1 failing example and 9 non-failing examples.
       Checking that failure(s) are order-dependent... failure appears to be order-dependent
 
-      Bisecting over non-failing examples 1-9 .. ignoring examples 6-9 (0.30166 seconds)
-      Bisecting over non-failing examples 1-5 .. ignoring examples 4-5 (0.30306 seconds)
-      Bisecting over non-failing examples 1-3 .. ignoring example 3 (0.33292 seconds)
-      Bisecting over non-failing examples 1-2 . ignoring example 1 (0.16476 seconds)
+      Round 1: bisecting over non-failing examples 1-9 .. ignoring examples 6-9 (0.30166 seconds)
+      Round 2: bisecting over non-failing examples 1-5 .. ignoring examples 4-5 (0.30306 seconds)
+      Round 3: bisecting over non-failing examples 1-3 .. ignoring example 3 (0.33292 seconds)
+      Round 4: bisecting over non-failing examples 1-2 . ignoring example 1 (0.16476 seconds)
       Bisect complete! Reduced necessary non-failing examples from 9 to 1 in 1.26 seconds.
 
       The minimal reproduction command is:
@@ -77,9 +77,9 @@ Feature: Bisect
       Starting bisect with 1 failing example and 9 non-failing examples.
       Checking that failure(s) are order-dependent... failure appears to be order-dependent
 
-      Bisecting over non-failing examples 1-9 .. ignoring examples 6-9 (0.32943 seconds)
-      Bisecting over non-failing examples 1-5 .. ignoring examples 4-5 (0.3154 seconds)
-      Bisecting over non-failing examples 1-3 .. ignoring example 3 (0.2175 seconds)
+      Round 1: bisecting over non-failing examples 1-9 .. ignoring examples 6-9 (0.32943 seconds)
+      Round 2: bisecting over non-failing examples 1-5 .. ignoring examples 4-5 (0.3154 seconds)
+      Round 3: bisecting over non-failing examples 1-3 .. ignoring example 3 (0.2175 seconds)
 
       Bisect aborted!
 
@@ -110,7 +110,7 @@ Feature: Bisect
       Checking that failure(s) are order-dependent..
        - Running: rspec ./spec/calculator_1_spec.rb[1:1] --seed 1234 (n.nnnn seconds) failure appears to be order-dependent
 
-      Bisecting over non-failing examples 1-9
+      Round 1: bisecting over non-failing examples 1-9
        - Running: rspec ./spec/calculator_1_spec.rb[1:1] ./spec/calculator_6_spec.rb[1:1] ./spec/calculator_7_spec.rb[1:1] ./spec/calculator_8_spec.rb[1:1] ./spec/calculator_9_spec.rb[1:1] --seed 1234 (0.15302 seconds)
        - Running: rspec ./spec/calculator_10_spec.rb[1:1] ./spec/calculator_1_spec.rb[1:1] ./spec/calculator_2_spec.rb[1:1] ./spec/calculator_3_spec.rb[1:1] ./spec/calculator_4_spec.rb[1:1] ./spec/calculator_5_spec.rb[1:1] --seed 1234 (0.19708 seconds)
        - Examples we can safely ignore (4):
@@ -124,7 +124,7 @@ Feature: Bisect
           - ./spec/calculator_3_spec.rb[1:1]
           - ./spec/calculator_4_spec.rb[1:1]
           - ./spec/calculator_5_spec.rb[1:1]
-      Bisecting over non-failing examples 1-5
+      Round 2: bisecting over non-failing examples 1-5
        - Running: rspec ./spec/calculator_1_spec.rb[1:1] ./spec/calculator_4_spec.rb[1:1] ./spec/calculator_5_spec.rb[1:1] --seed 1234 (0.15836 seconds)
        - Running: rspec ./spec/calculator_10_spec.rb[1:1] ./spec/calculator_1_spec.rb[1:1] ./spec/calculator_2_spec.rb[1:1] ./spec/calculator_3_spec.rb[1:1] --seed 1234 (0.19065 seconds)
        - Examples we can safely ignore (2):
@@ -134,15 +134,15 @@ Feature: Bisect
           - ./spec/calculator_10_spec.rb[1:1]
           - ./spec/calculator_2_spec.rb[1:1]
           - ./spec/calculator_3_spec.rb[1:1]
-      Bisecting over non-failing examples 1-3
+      Round 3: bisecting over non-failing examples 1-3
        - Running: rspec ./spec/calculator_1_spec.rb[1:1] ./spec/calculator_2_spec.rb[1:1] --seed 1234 (0.21028 seconds)
        - Running: rspec ./spec/calculator_10_spec.rb[1:1] ./spec/calculator_1_spec.rb[1:1] ./spec/calculator_3_spec.rb[1:1] --seed 1234 (0.1975 seconds)
        - Examples we can safely ignore (1):
           - ./spec/calculator_2_spec.rb[1:1]
        - Remaining non-failing examples (2):
           - ./spec/calculator_10_spec.rb[1:1]
           - ./spec/calculator_3_spec.rb[1:1]
-      Bisecting over non-failing examples 1-2
+      Round 4: bisecting over non-failing examples 1-2
        - Running: rspec ./spec/calculator_10_spec.rb[1:1] ./spec/calculator_1_spec.rb[1:1] --seed 1234 (0.17173 seconds)
        - Examples we can safely ignore (1):
           - ./spec/calculator_3_spec.rb[1:1]

lib/rspec/core/formatters/bisect_progress_formatter.rb

@@ -15,6 +15,7 @@ class BisectProgressFormatter < BaseTextFormatter
                             :bisect_dependency_check_failed, :bisect_multiple_culprits_detected
 
         def bisect_starting(notification)
+          self.round_count = 0
           options = notification.original_cli_args.join(' ')
           output.puts "Bisect started using options: #{options.inspect}"
           output.print "Running suite to find failures..."
@@ -41,12 +42,13 @@ def bisect_dependency_check_failed(notification)
         end
 
         def bisect_round_started(notification, include_trailing_space=true)
+          self.round_count = round_count + 1
           range_desc = [
             notification.candidates_range.begin,
             notification.candidates_range.end,
           ].join("-")
 
-          output.print "\nBisecting over non-failing examples #{range_desc}"
+          output.print "\nRound #{round_count}: bisecting over non-failing examples #{range_desc}"
           output.print " " if include_trailing_space
         end
 
@@ -91,6 +93,11 @@ def bisect_aborted(notification)
           output.puts "\n\nBisect aborted!"
           output.puts "\nThe most minimal reproduction command discovered so far is:\n  #{notification.repro}"
         end
+
+      private
+
+        attr_accessor :round_count
+
       end
 
       # @private

spec/rspec/core/bisect/coordinator_spec.rb

@@ -36,9 +36,9 @@ def find_minimal_repro(output, formatter=Formatters::BisectProgressFormatter)
         |Starting bisect with 2 failing examples and 6 non-failing examples.
         |Checking that failure(s) are order-dependent... failure appears to be order-dependent
         |
-        |Bisecting over non-failing examples 1-6 .. ignoring examples 4-6 (n.nnnn seconds)
-        |Bisecting over non-failing examples 1-3 .. multiple culprits detected - splitting candidates (n.nnnn seconds)
-        |Bisecting over non-failing examples 1-2 .. ignoring example 2 (n.nnnn seconds)
+        |Round 1: bisecting over non-failing examples 1-6 .. ignoring examples 4-6 (n.nnnn seconds)
+        |Round 2: bisecting over non-failing examples 1-3 .. multiple culprits detected - splitting candidates (n.nnnn seconds)
+        |Round 3: bisecting over non-failing examples 1-2 .. ignoring example 2 (n.nnnn seconds)
         |Bisect complete! Reduced necessary non-failing examples from 6 to 2 in n.nnnn seconds.
         |
         |The minimal reproduction command is:
@@ -86,7 +86,7 @@ def find_minimal_repro(output, formatter=Formatters::BisectProgressFormatter)
         |Checking that failure(s) are order-dependent..
         | - Running: rspec 2.rb[1:1] 5.rb[1:1] (n.nnnn seconds) failure appears to be order-dependent
         |
-        |Bisecting over non-failing examples 1-6
+        |Round 1: bisecting over non-failing examples 1-6
         | - Running: rspec 2.rb[1:1] 5.rb[1:1] 6.rb[1:1] 7.rb[1:1] 8.rb[1:1] (n.nnnn seconds)
         | - Running: rspec 1.rb[1:1] 2.rb[1:1] 3.rb[1:1] 4.rb[1:1] 5.rb[1:1] (n.nnnn seconds)
         | - Examples we can safely ignore (3):
@@ -97,11 +97,11 @@ def find_minimal_repro(output, formatter=Formatters::BisectProgressFormatter)
         |    - 1.rb[1:1]
         |    - 3.rb[1:1]
         |    - 4.rb[1:1]
-        |Bisecting over non-failing examples 1-3
+        |Round 2: bisecting over non-failing examples 1-3
         | - Running: rspec 2.rb[1:1] 4.rb[1:1] 5.rb[1:1] (n.nnnn seconds)
         | - Running: rspec 1.rb[1:1] 2.rb[1:1] 3.rb[1:1] 5.rb[1:1] (n.nnnn seconds)
         | - Multiple culprits detected - splitting candidates
-        |Bisecting over non-failing examples 1-2
+        |Round 3: bisecting over non-failing examples 1-2
         | - Running: rspec 2.rb[1:1] 3.rb[1:1] 4.rb[1:1] 5.rb[1:1] (n.nnnn seconds)
         | - Running: rspec 1.rb[1:1] 2.rb[1:1] 4.rb[1:1] 5.rb[1:1] (n.nnnn seconds)
         | - Examples we can safely ignore (1):
@@ -152,7 +152,7 @@ def bisect_round_started(notification)
           |Starting bisect with 2 failing examples and 6 non-failing examples.
           |Checking that failure(s) are order-dependent... failure appears to be order-dependent
           |
-          |Bisecting over non-failing examples 1-6 .. ignoring examples 4-6 (n.nnnn seconds)
+          |Round 1: bisecting over non-failing examples 1-6 .. ignoring examples 4-6 (n.nnnn seconds)
           |
           |Bisect aborted!
           |