lib/undercover/result.rb in undercover-0.3.4 vs lib/undercover/result.rb in undercover-0.4.0

@@ -25,32 +25,36 @@
 
     def flagged?
       @flagged
     end
 
-    # TODO: make DRY
-    def non_code?(line_no)
-      line_cov = coverage.find { |ln, _cov| ln == line_no }
-      !line_cov
-    end
+    def uncovered?(line_no)
+      coverage.each do |ln, _block, _branch, cov|
+        return true if ln == line_no && cov && cov.zero?
+      end
 
-    def covered?(line_no)
       line_cov = coverage.find { |ln, _cov| ln == line_no }
-      line_cov && line_cov[1].positive?
-    end
-
-    def uncovered?(line_no)
-      line_cov = coverage.find { |ln, _cov| ln == line_no }
       line_cov && line_cov[1].zero?
     end
 
+    # Method `coverage_f` returns the total coverage of this Undercover::Result
+    # as a % value, taking into account missing branches. Line coverage will be counted
+    # as 0 if any branch is untested.
+    # rubocop:disable Metrics/AbcSize
     def coverage_f
-      covered = coverage.reduce(0) do |sum, (_, cov)|
-        sum + [[0, cov].max, 1].min
+      lines = {}
+      coverage.each do |ln, block_or_line_cov, _, branch_cov|
+        lines[ln] = 1 unless lines.key?(ln)
+        if branch_cov
+          lines[ln] = 0 if branch_cov.zero?
+        elsif block_or_line_cov.zero?
+          lines[ln] = 0
+        end
       end
-      (covered.to_f / coverage.size).round(4)
+      (lines.values.sum.to_f / lines.keys.size).round(4)
     end
+    # rubocop:enable Metrics/AbcSize
 
     # TODO: create a formatter interface instead and add some tests.
     # TODO: re-enable rubocops
     # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
     #
@@ -58,14 +62,14 @@
     # full source for given code fragment (this includes non-code lines!)
     def pretty_print_lines
       cov_enum = coverage.each
       cov_source_lines = (node.first_line..node.last_line).map do |line_no|
         cov_line_no = begin
-                        cov_enum.peek[0]
-                      rescue StopIteration
-                        -1
-                      end
+          cov_enum.peek[0]
+        rescue StopIteration
+          -1
+        end
         cov_enum.next[1] if cov_line_no == line_no
       end
       cov_source_lines.zip(node.source_lines_with_numbers)
     end
 
@@ -79,14 +83,16 @@
         elsif covered.nil?
           Rainbow(formatted_line).darkgray.dark + \
             Rainbow(' hits: n/a').italic.darkgray.dark
         elsif covered.positive?
           Rainbow(formatted_line).green + \
-            Rainbow(" hits: #{covered}").italic.darkgray.dark
+            Rainbow(" hits: #{covered}").italic.darkgray.dark + \
+            count_covered_branches(num)
         elsif covered.zero?
           Rainbow(formatted_line).red + \
-            Rainbow(" hits: #{covered}").italic.darkgray.dark
+            Rainbow(" hits: #{covered}").italic.darkgray.dark + \
+            count_covered_branches(num)
         end
       end.join("\n")
     end
     # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
 
@@ -97,7 +103,25 @@
     def inspect
       "#<Undercover::Report::Result:#{object_id}" \
         " name: #{node.name}, coverage: #{coverage_f}>"
     end
     alias to_s inspect
+
+    private
+
+    # rubocop:disable Metrics/AbcSize
+    def count_covered_branches(line_number)
+      branches = coverage.select { |cov| cov.size == 4 && cov[0] == line_number }
+      count_covered = branches.count { |cov| cov[3].positive? }
+
+      return '' if branches.size.zero?
+
+      if count_covered < branches.size
+        Rainbow(' branches: ').italic.darkgray.dark + \
+          Rainbow("#{count_covered}/#{branches.size}").italic.red
+      else
+        Rainbow(" branches: #{count_covered}/#{branches.size}").italic.darkgray.dark
+      end
+    end
+    # rubocop:enable Metrics/AbcSize
   end
 end