simplecov-console 0.7.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 598ac9ff4a2aab65354e06424d3e33647cb2ffc94acef55e41c06dacc770b4cc
-  data.tar.gz: de3d31bc67c9e295710911f0c8d0fdc1edd23c1784c48416bcaf481c3b58095b
+  metadata.gz: 5bb7e11c42fb65f0946870622b11a55ab39bb0eba3aa8cfc16da3d18be8fa48e
+  data.tar.gz: 433b3c37567470bb280384d28c48a6e9fc04916fb9f74ce451c3f77316d4b130
 SHA512:
-  metadata.gz: 404d96b20f0dfb5abf1b1004738fdaa1675514f780f5bca0e89396feecdd9a2c1ed8032cecf2810b15ed3abc442a75b617f9c476c4bd8831bf32e7d725169c42
-  data.tar.gz: 57d40a7ddb72a87e1f561209f67021cf49f5bd4ed016da026c15ebae43aaea16594a3e21069cc894a4fd3f36066380e55fe42096d41b56743b1f69dc28174a88
+  metadata.gz: 837d50087a4744ecfcbfb1086ad425573a2ba151da649c529ed379340cb0720ad27824b3c26d4a9fdfadb91bfa464e9c8036029ca62991919019a9dc658b4702
+  data.tar.gz: 7f104c87f947046cf75996ceec687684aee3466c0eb8c86074b7a18185142a14bcff96d7565bec1987f5ad75e3425923507c0fbf4ff0ff1e7d7766ec47f179cc

data/CHANGELOG.md

@@ -0,0 +1,26 @@
+# Changelog
+
+## 0.8 (2020.11.11)
+
+- Added support for branch coverage - thanks [@robotdana!](https://github.com/robotdana) ([#19](https://github.com/chetan/simplecov-console/pull/19))
+
+## 0.7.2 (2020.03.05)
+
+- Fix: table output include ([#17](https://github.com/chetan/simplecov-console/issues/17))
+
+## 0.7.1 (2020.03.05)
+
+- Fix: block output doesn't work with frozen string literal ([#16](https://github.com/chetan/simplecov-console/issues/16))
+
+## 0.7 (2020.03.04)
+
+- Added new 'block' style output option - thanks [@hpainter](https://github.com/hpainter)! ([#15](https://github.com/chetan/simplecov-console/issues/15))
+
+## 0.6 (2019.11.08)
+
+- Added new config options: `sort`, `show_covered`, and `max_rows`
+
+## 0.5 (2019.05.24)
+
+- Replaced `hirb` gem with `terminal-table` due to multiple warnings thrown ([#11](https://github.com/chetan/simplecov-console/issues/11))
+- Support [disabling colorized](https://no-color.org/) output via `NO_COLOR` env var

data/Gemfile

@@ -7,6 +7,6 @@ gem "ansi"
 group :development do
   gem "minitest"
   gem "yard"
-  gem "bundler", "~> 1.2"
+  gem "bundler", "~> 2.1"
   gem "juwelier"
 end

data/README.md

@@ -47,58 +47,96 @@ showing bottom (worst) 15 of 69 files
 
 ## Configuration
 
-### Disabling colorized output
+simplecov-console is configurable through environment variables and/or via Ruby
+code, generally in your test helper or setup file.
 
-Simply export `NO_COLOR=1` and colors will be disabled.
+### Options
+
+```ruby
+SimpleCov::Formatter::Console.sort = 'path' # sort by file path
+SimpleCov::Formatter::Console.show_covered = true # show all files in coverage report
+SimpleCov::Formatter::Console.max_rows = 15 # integer
+SimpleCov::Formatter::Console.max_lines = 5 # integer
+SimpleCov::Formatter::Console.missing_len = 20 # integer
+SimpleCov::Formatter::Console.output_style = 'block' # 'table' (default) or 'block'
+SimpleCov::Formatter::Console.table_options = {:style => {:width => 200}}
+```
+
+Note that all options except `table_options` can also be set via env var using
+the uppercase name, e.g., `MAX_ROWS`.
+
+#### Disabling colorized output
+
+Color support is active by default. To disable, export `NO_COLOR=1`:
 
 ```sh
 NO_COLOR=1 rake test
 ```
 
-### Sorting the output
+#### Sorting the output
 
-By default the coverage report is sorted by coverage % in descending order.  To sort alphabetically by path, set the `SORT` environment variable to "path", or add the following to your test helper:
+By default the coverage report sorts by coverage % in descending order.  To
+sort alphabetically by path:
 
 ```ruby
 SimpleCov::Formatter::Console.sort = 'path' # sort by file path
 ```
 
-### Showing covered files
+#### Showing covered files
 
-By default, fully covered files are excluded from the report.  To show them, set the `SHOW_COVERED` environment variable to `true` or add the following to your test helper:
+By default, fully covered files are excluded from the report. To include them:
 
 ```ruby
 SimpleCov::Formatter::Console.show_covered = true # show all files in coverage report
 ```
 
-### Maximum rows displayed
+#### Maximum rows displayed
 
-By default, a maximum of 15 files with the worst coverage are displayed in the report.  You can override this limit by setting the `MAX_ROWS` environment variable, or adding the following to your test helper:
+By default, a maximum of 15 files with the worst coverage are displayed in the
+report. To override this limit:
 
 ```ruby
-SimpleCov::Formatter::Console.max_rows = # some number
+SimpleCov::Formatter::Console.max_rows = 20 # integer
 ```
 
-Setting a value of `-1` or `nil` will show all of the files.
+Setting a value of `-1` or `nil` (in Ruby) will show all files.
+
+#### Maximum lines displayed
+
+By default, all missing lines will be included for each displayed file. For
+large source files with poor coverage, this may become unwieldy. To show fewer
+groups of lines:
+
+```ruby
+SimpleCov::Formatter::Console.max_lines = 5 # integer
+```
+
+#### Maximum length of missing lines
+
+As an alternative to the above `max_lines` option, you may limit the missing
+lines output by number of characters:
+
+```ruby
+SimpleCov::Formatter::Console.missing_len = 20 # integer
+```
 
-### Table options
+#### Table options
 
-In some cases, you may need to pass some options to `TerminalTable.new`. For example, if the filenames are
-truncated so much that you can't read them. In that case, you can add a line like this when setting the formatter:
+In some cases, you may need to pass some options to `TerminalTable.new`. For
+example, if the filenames truncate so much that you can't read them, try
+increasing the table width:
 
 ```ruby
 SimpleCov::Formatter::Console.table_options = {:style => {:width => 200}}
-SimpleCov.formatter = SimpleCov::Formatter::Console
 ```
 
-### Block output style
+#### Block output style
 
-As an alternative to the default table output format, results can be printed as plain text blocks instead by setting
-the formatter `output_style` to 'block':
+As an alternative to the default table output format, a simpler block format is
+also available:
 
 ```ruby
 SimpleCov::Formatter::Console.output_style = 'block'
-SimpleCov.formatter = SimpleCov::Formatter::Console
 ```
 
 Example output:
@@ -131,8 +169,41 @@ coverage: 44.00% (28/50 lines)
 42 file(s) with 100% coverage not shown
 ```
 
+### Branch Coverage Support
+
+When branch coverage is [enabled in
+simplecov](https://github.com/simplecov-ruby/simplecov/tree/818bc2547842a90c607b4fec834320766a8686de#branch-coverage-ruby--25),
+branch info will automatically be displayed in the output:
+
+```text
+COVERAGE:  78.26% -- 18/23 lines in 2 files
+BRANCH COVERAGE:  83.33% -- 5/6 branches in 2 branches
+
++----------+-------------------------------+-------+--------+---------------+-----------------+----------+-----------------+------------------+
+| coverage | file                          | lines | missed | missing       | branch coverage | branches | branches missed | branches missing |
++----------+-------------------------------+-------+--------+---------------+-----------------+----------+-----------------+------------------+
+|  72.22%  | lib/simplecov-console-test.rb | 18    | 5      | 10-12, 16, 25 |  83.33%         | 6        | 1               | 25[then]         |
++----------+-------------------------------+-------+--------+---------------+-----------------+----------+-----------------+------------------+
+```
+
 ## History
 
+### 0.9 (2021.01.21)
+
+- Added support for limiting number of lines shown
+
+### 0.8 (2020.11.11)
+
+- Added support for branch coverage - thanks [@robotdana!](https://github.com/robotdana) ([#19](https://github.com/chetan/simplecov-console/pull/19))
+
+### 0.7.2 (2020.03.05)
+
+- Fix: table output include ([#17](https://github.com/chetan/simplecov-console/issues/17))
+
+### 0.7.1 (2020.03.05)
+
+- Fix: block output doesn't work with frozen string literal ([#16](https://github.com/chetan/simplecov-console/issues/16))
+
 ### 0.7 (2020.03.04)
 
 - Added new 'block' style output option - thanks [@hpainter](https://github.com/hpainter)! ([#15](https://github.com/chetan/simplecov-console/issues/15))

data/VERSION

@@ -1 +1 @@
-0.7.0
+0.9.1

data/lib/simplecov-console.rb

@@ -1,11 +1,12 @@
-require 'terminal-table'
 require 'ansi/code'
 
 class SimpleCov::Formatter::Console
 
   VERSION = IO.read(File.expand_path("../../VERSION", __FILE__)).strip
 
-  ATTRIBUTES = [:table_options, :use_colors, :max_rows, :show_covered, :sort, :output_style]
+  ATTRIBUTES = [:table_options, :use_colors, :max_rows, :max_lines,
+    :missing_len, :show_covered, :sort, :output_style]
+
   class << self
     attr_accessor(*ATTRIBUTES)
   end
@@ -17,6 +18,10 @@ class SimpleCov::Formatter::Console
   # configure max rows from MAX_ROWS env var
   SimpleCov::Formatter::Console.max_rows = ENV.fetch('MAX_ROWS', 15).to_i
 
+  # configure max lines per row and missing len
+  SimpleCov::Formatter::Console.max_lines = ENV.fetch('MAX_LINES', 0).to_i
+  SimpleCov::Formatter::Console.missing_len = ENV.fetch('MISSING_LEN', 0).to_i
+
   # configure show_covered from SHOW_COVERED env var
   SimpleCov::Formatter::Console.show_covered = ENV.fetch('SHOW_COVERED', 'false') == 'true'
 
@@ -26,7 +31,24 @@ class SimpleCov::Formatter::Console
   # configure output format ('table', 'block')
   SimpleCov::Formatter::Console.output_style = ENV.fetch('OUTPUT_STYLE', 'table')
 
+  def include_output_style
+    if SimpleCov::Formatter::Console.output_style == 'block' then
+      require 'simplecov-console/output/block'
+      extend BlockOutput
+    else
+      # default to table
+      require 'simplecov-console/output/table'
+      extend TableOutput
+    end
+  end
+
+  def show_branch_coverage?(result)
+    Gem::Version.new(SimpleCov::VERSION) >= Gem::Version.new('0.18.5') &&
+      result.coverage_statistics[:branch]
+  end
+
   def format(result)
+    include_output_style
 
     root = nil
     if Module.const_defined? :ROOT then
@@ -40,7 +62,11 @@ class SimpleCov::Formatter::Console
     end
 
     puts
-    puts "COVERAGE: #{colorize(pct(result))} -- #{result.covered_lines}/#{result.total_lines} lines in #{result.files.size} files"
+    puts "COVERAGE: #{colorize(pct(result.covered_percent))} -- #{result.covered_lines}/#{result.total_lines} lines in #{result.files.size} files"
+    show_branch_coverage = show_branch_coverage?(result)
+    if show_branch_coverage
+      puts "BRANCH COVERAGE: #{colorize(pct(result.coverage_statistics[:branch].percent))} -- #{result.covered_branches}/#{result.total_branches} branches in #{result.files.size} branches"
+    end
     puts
 
     if root.nil? then
@@ -48,16 +74,23 @@ class SimpleCov::Formatter::Console
     end
 
     if SimpleCov::Formatter::Console.sort == 'coverage'
-      files = result.files.sort{ |a,b| a.covered_percent <=> b.covered_percent }
+      if show_branch_coverage
+        files = result.files.sort do |a,b|
+          (a.covered_percent <=> b.covered_percent).nonzero? ||
+            (a.coverage_statistics[:branch].percent <=> b.coverage_statistics[:branch].percent)
+        end
+      else
+        files = result.files.sort_by(&:covered_percent)
+      end
     else
-      files = result.files
+      files = result.files.to_a
     end
 
     covered_files = 0
 
     unless SimpleCov::Formatter::Console.show_covered
       files.select!{ |file|
-        if file.covered_percent == 100 then
+        if file.covered_percent == 100 && (!show_branch_coverage || file.coverage_statistics[:branch].percent == 100) then
           covered_files += 1
           false
         else
@@ -76,14 +109,25 @@ class SimpleCov::Formatter::Console
       files = files.slice(0, max_rows)
     end
 
-    puts send(SimpleCov::Formatter::Console.output_style << "_output",files,root)
-    
+    puts output(files, root, show_branch_coverage)
+
     if covered_files > 0 then
       puts "#{covered_files} file(s) with 100% coverage not shown"
     end
 
   end
 
+  def branches_missed(missed_branches)
+    missed_branches.group_by(&:start_line).map do |line_number, branches|
+      "#{line_number}[#{branches.map(&:type).join(',')}]"
+    end
+  end
+
+  # Group missed lines for better display
+  #
+  # @param [Array<SimpleCov::SourceFile::Line>] missed    array of missed lines reported by SimpleCov
+  #
+  # @return [Array<String>] Missing groups of lines
   def missed(missed_lines)
     groups = {}
     base = nil
@@ -109,11 +153,28 @@ class SimpleCov::Formatter::Console
       end
     end
 
+    max_lines = SimpleCov::Formatter::Console.max_lines
+    if max_lines > 0 && group_str.size > max_lines then
+      # Show at most N missing groups of lines
+      group_str = group_str[0, SimpleCov::Formatter::Console.max_lines] << "..."
+    end
+
     group_str
   end
 
-  def pct(obj)
-    sprintf("%6.2f%%", obj.covered_percent)
+  # Truncate string to at most N chars (as defined by missing_len)
+  def trunc(str)
+    return str if str.include?("...") # already truncated, skip
+
+    len = SimpleCov::Formatter::Console.missing_len
+    if len > 0 && str.size > len then
+      str = str[0, len].gsub(/,(\s+)?$/, '') + ' ...'
+    end
+    str
+  end
+
+  def pct(number)
+    sprintf("%6.2f%%", number)
   end
 
   def use_colors?
@@ -133,43 +194,4 @@ class SimpleCov::Formatter::Console
       ANSI.red { s }
     end
   end
-
-  # format per-file results output using Terminal::Table
-  def table_output(files, root)
-    table = files.map do |f|
-      [
-        colorize(pct(f)),
-        f.filename.gsub(root + "/", ''),
-        f.lines_of_code,
-        f.missed_lines.count,
-        missed(f.missed_lines).join(", ")
-      ]
-    end
-
-    table_options = SimpleCov::Formatter::Console.table_options || {}
-    if !table_options.kind_of?(Hash) then
-      raise ArgumentError.new("SimpleCov::Formatter::Console.table_options must be a Hash")
-    end
-
-    headings = %w{ coverage file lines missed missing }
-
-    opts = table_options.merge({:headings => headings, :rows => table})
-    Terminal::Table.new(opts)
-  end
-
-  # format per-file results output as plain text blocks
-  def block_output(files, root)
-    blocks = []
-    files.each do |f|
-      block = []
-      block << sprintf("%8.8s: %s", 'file', f.filename.gsub(root + "/", ''))
-      block << sprintf("%8.8s: %s (%d/%d lines)", 'coverage', 
-                   colorize(sprintf("%.2f%%", f.covered_percent)), 
-                   f.covered_lines.count, f.lines_of_code)
-      block << sprintf("%8.8s: %s", 'missed', missed(f.missed_lines).join(", "))
-      blocks << block.join("\n")
-    end
-    "\n" << blocks.join("\n\n") << "\n\n"
-  end
-
 end

data/lib/simplecov-console/output/block.rb

@@ -0,0 +1,28 @@
+
+class SimpleCov::Formatter::Console
+  module BlockOutput
+
+    # format per-file results output as plain text blocks
+    def output(files, root, show_branch)
+      blocks = []
+      files.each do |f|
+        block = []
+        block << sprintf("%8.8s: %s", 'file', f.filename.gsub(root + "/", ''))
+        block << sprintf("%8.8s: %s (%d/%d lines)", 'coverage',
+                    colorize(sprintf("%.2f%%", f.covered_percent)),
+                    f.covered_lines.count, f.lines_of_code)
+        block << sprintf("%8.8s: %s", 'missed', trunc(missed(f.missed_lines).join(", ")))
+        if show_branch
+          block << sprintf("%8.8s: %s (%d/%d branches)", 'branches',
+                    colorize(sprintf("%.2f%%", f.coverage_statistics[:branch].percent)),
+                    (f.total_branches.count - f.missed_branches.count), f.total_branches.count)
+          block << sprintf("%8.8s: %s", 'missed', branches_missed(f.missed_branches).join(", "))
+        end
+        blocks << block.join("\n")
+      end
+
+      "\n" + blocks.join("\n\n") + "\n\n"
+    end
+
+  end
+end

data/lib/simplecov-console/output/table.rb

@@ -0,0 +1,48 @@
+require 'terminal-table'
+
+class SimpleCov::Formatter::Console
+  module TableOutput
+
+    # format per-file results output using Terminal::Table
+    def output(files, root,show_branch)
+      table = files.map do |f|
+        row = [
+          colorize(pct(f.covered_percent)),
+          f.filename.gsub(root + "/", ''),
+          f.lines_of_code,
+          f.missed_lines.count,
+          trunc(missed(f.missed_lines).join(", ")),
+        ]
+        if show_branch
+          row += [
+            colorize(pct(f.coverage_statistics[:branch].percent)),
+            f.total_branches.count,
+            f.missed_branches.count,
+            branches_missed(f.missed_branches).join(", ")
+          ]
+        end
+
+        row
+      end
+
+      table_options = SimpleCov::Formatter::Console.table_options || {}
+      if !table_options.kind_of?(Hash) then
+        raise ArgumentError.new("SimpleCov::Formatter::Console.table_options must be a Hash")
+      end
+
+      headings = %w{ coverage file lines missed missing }
+      if show_branch
+        headings += [
+          'branch coverage',
+          'branches',
+          'branches missed',
+          'branches missing'
+        ]
+      end
+
+      opts = table_options.merge({:headings => headings, :rows => table})
+      Terminal::Table.new(opts)
+    end
+
+  end
+end

data/simplecov-console.gemspec

@@ -2,66 +2,62 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: simplecov-console 0.7.0 ruby lib
+# stub: simplecov-console 0.9.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "simplecov-console".freeze
-  s.version = "0.7.0"
+  s.version = "0.9.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Chetan Sarva".freeze]
-  s.date = "2020-03-03"
+  s.date = "2021-02-01"
   s.description = "Simple console output formatter for SimpleCov".freeze
   s.email = "chetan@pixelcop.net".freeze
   s.extra_rdoc_files = [
+    "CHANGELOG.md",
     "LICENSE.txt",
     "README.md"
   ]
   s.files = [
     ".document",
+    "CHANGELOG.md",
     "Gemfile",
     "LICENSE.txt",
     "README.md",
     "Rakefile",
     "VERSION",
     "lib/simplecov-console.rb",
+    "lib/simplecov-console/output/block.rb",
+    "lib/simplecov-console/output/table.rb",
     "simplecov-console.gemspec",
     "test/helper.rb",
     "test/test_simplecov-console.rb"
   ]
   s.homepage = "http://github.com/chetan/simplecov-console".freeze
   s.licenses = ["MIT".freeze]
-  s.rubygems_version = "3.0.2".freeze
+  s.rubygems_version = "3.1.4".freeze
   s.summary = "Simple console output formatter".freeze
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
+  end
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<simplecov>.freeze, [">= 0"])
-      s.add_runtime_dependency(%q<terminal-table>.freeze, [">= 0"])
-      s.add_runtime_dependency(%q<ansi>.freeze, [">= 0"])
-      s.add_development_dependency(%q<minitest>.freeze, [">= 0"])
-      s.add_development_dependency(%q<yard>.freeze, [">= 0"])
-      s.add_development_dependency(%q<bundler>.freeze, ["~> 1.2"])
-      s.add_development_dependency(%q<juwelier>.freeze, [">= 0"])
-    else
-      s.add_dependency(%q<simplecov>.freeze, [">= 0"])
-      s.add_dependency(%q<terminal-table>.freeze, [">= 0"])
-      s.add_dependency(%q<ansi>.freeze, [">= 0"])
-      s.add_dependency(%q<minitest>.freeze, [">= 0"])
-      s.add_dependency(%q<yard>.freeze, [">= 0"])
-      s.add_dependency(%q<bundler>.freeze, ["~> 1.2"])
-      s.add_dependency(%q<juwelier>.freeze, [">= 0"])
-    end
+  if s.respond_to? :add_runtime_dependency then
+    s.add_runtime_dependency(%q<simplecov>.freeze, [">= 0"])
+    s.add_runtime_dependency(%q<terminal-table>.freeze, [">= 0"])
+    s.add_runtime_dependency(%q<ansi>.freeze, [">= 0"])
+    s.add_development_dependency(%q<minitest>.freeze, [">= 0"])
+    s.add_development_dependency(%q<yard>.freeze, [">= 0"])
+    s.add_development_dependency(%q<bundler>.freeze, ["~> 2.1"])
+    s.add_development_dependency(%q<juwelier>.freeze, [">= 0"])
   else
     s.add_dependency(%q<simplecov>.freeze, [">= 0"])
     s.add_dependency(%q<terminal-table>.freeze, [">= 0"])
     s.add_dependency(%q<ansi>.freeze, [">= 0"])
     s.add_dependency(%q<minitest>.freeze, [">= 0"])
     s.add_dependency(%q<yard>.freeze, [">= 0"])
-    s.add_dependency(%q<bundler>.freeze, ["~> 1.2"])
+    s.add_dependency(%q<bundler>.freeze, ["~> 2.1"])
     s.add_dependency(%q<juwelier>.freeze, [">= 0"])
   end
 end

data/test/test_simplecov-console.rb

@@ -14,10 +14,35 @@ class TestSimplecovConsole < MiniTest::Test
     :covered_percent
   )
 
+  CoverageStatistics = Struct.new(
+    :percent
+  )
+
+  Branch = Struct.new(
+    :start_line,
+    :type
+  )
+
+  SourceFileWithBranches = Struct.new(
+    :filename,
+    :lines_of_code,
+    :covered_lines,
+    :missed_lines,
+    :covered_percent,
+    :coverage_statistics,
+    :total_branches,
+    :missed_branches
+  )
+
   def setup
     @console = SimpleCov::Formatter::Console.new
   end
 
+  def teardown
+    SimpleCov::Formatter::Console.output_style = 'table'
+    SimpleCov::Formatter::Console.max_lines = 0
+  end
+
   def test_defined
     assert defined?(SimpleCov::Formatter::Console)
     assert defined?(SimpleCov::Formatter::Console::VERSION)
@@ -27,26 +52,71 @@ class TestSimplecovConsole < MiniTest::Test
     missed_lines = [Line.new(1), Line.new(2),
                     Line.new(3), Line.new(5)]
     expected_result = ["1-3", "5"]
-    assert_equal @console.missed(missed_lines), expected_result
+    assert_equal expected_result, @console.missed(missed_lines)
+  end
+
+  def test_max_missed
+    SimpleCov::Formatter::Console.max_lines = 1
+    missed_lines = [Line.new(1), Line.new(2),
+                    Line.new(3), Line.new(5)]
+    expected_result = ["1-3", "..."]
+    assert_equal expected_result, @console.missed(missed_lines)
+
+    SimpleCov::Formatter::Console.max_lines = 3
+    expected_result = ["1-3", "5"]
+    assert_equal expected_result, @console.missed(missed_lines)
   end
 
   def test_table_output
     SimpleCov::Formatter::Console.output_style = 'table'
+    @console.include_output_style
     files = [
       SourceFile.new('foo.rb',5,[2,3],[Line.new(1), Line.new(4), Line.new(5)],40.0)
     ]
-    actual = @console.table_output(files,'/')
+    actual = @console.output(files,'/',false)
+    assert actual.is_a? Terminal::Table
+    assert_equal 1, actual.rows.count
+  end
+
+  def test_table_output_with_branches
+    SimpleCov::Formatter::Console.output_style = 'table'
+    @console.include_output_style
+    files = [
+      SourceFileWithBranches.new(
+        'foo.rb',5,[2,3],[Line.new(1), Line.new(4), Line.new(5)],40.0,
+        {branch: CoverageStatistics.new(50.0)}, [1,2],
+        [Branch.new(2, :then)]
+      )
+    ]
+    actual = @console.output(files,'/',true)
     assert actual.is_a? Terminal::Table
-    assert_equal 1, actual.rows.count 
+    assert_equal 1, actual.rows.count
   end
 
   def test_block_output
     SimpleCov::Formatter::Console.use_colors = false
     SimpleCov::Formatter::Console.output_style = 'block'
+    @console.include_output_style
+
     files = [
       SourceFile.new('foo.rb',5,[2,3],[Line.new(1), Line.new(4), Line.new(5)],40.0)
     ]
     expected = "\n    file: foo.rb\ncoverage: 40.00% (2/5 lines)\n  missed: 1, 4-5\n\n"
-    assert_equal expected, @console.block_output(files,'/')
+    assert_equal expected, @console.output(files,'/',false)
+  end
+
+  def test_block_output_with_branches
+    SimpleCov::Formatter::Console.use_colors = false
+    SimpleCov::Formatter::Console.output_style = 'block'
+    @console.include_output_style
+    files = [
+      SourceFileWithBranches.new(
+        'foo.rb',5,[2,3],[Line.new(1), Line.new(4), Line.new(5)],40.0,
+        {branch: CoverageStatistics.new(50.0)}, [1,2],
+        [Branch.new(2, :then)]
+      )
+    ]
+    expected = "\n    file: foo.rb\ncoverage: 40.00% (2/5 lines)\n  missed: 1, 4-5\nbranches: 50.00% (1/2 branches)\n  missed: 2[then]\n\n"
+    assert_equal expected, @console.output(files,'/',true)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simplecov-console
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Chetan Sarva
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-03-03 00:00:00.000000000 Z
+date: 2021-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: juwelier
   requirement: !ruby/object:Gem::Requirement
@@ -113,16 +113,20 @@ email: chetan@pixelcop.net
 executables: []
 extensions: []
 extra_rdoc_files:
+- CHANGELOG.md
 - LICENSE.txt
 - README.md
 files:
 - ".document"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - VERSION
 - lib/simplecov-console.rb
+- lib/simplecov-console/output/block.rb
+- lib/simplecov-console/output/table.rb
 - simplecov-console.gemspec
 - test/helper.rb
 - test/test_simplecov-console.rb
@@ -130,7 +134,7 @@ homepage: http://github.com/chetan/simplecov-console
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -145,8 +149,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Simple console output formatter
 test_files: []