From b185a34ef4bc2f35aa90762eca1a61b31c0a01e7 Mon Sep 17 00:00:00 2001
From: devdanzin <74280297+devdanzin@users.noreply.github.com>
Date: Sun, 9 Jul 2023 00:03:56 -0300
Subject: [PATCH 01/25] Add --json option for diff, index, rank and report,
 allowing to generate output in JSON format.

---
 src/wily/__main__.py        | 33 ++++++++++++++++++++++++++++-----
 src/wily/commands/diff.py   | 21 +++++++++++++++------
 src/wily/commands/index.py  | 16 +++++++++++-----
 src/wily/commands/rank.py   | 15 ++++++++++-----
 src/wily/commands/report.py | 15 +++++++++++----
 5 files changed, 75 insertions(+), 25 deletions(-)

diff --git a/src/wily/__main__.py b/src/wily/__main__.py
index 6f088501..70662aad 100644
--- a/src/wily/__main__.py
+++ b/src/wily/__main__.py
@@ -152,7 +152,12 @@ def build(ctx, max_revisions, targets, operators, archiver):
 @click.option(
     "-m", "--message/--no-message", default=False, help=_("Include revision message")
 )
-def index(ctx, message):
+@click.option(
+    "--json/--table",
+    help=_("Display results as JSON"),
+    default=False,
+)
+def index(ctx, message, json):
     """Show the history archive in the .wily/ folder."""
     config = ctx.obj["CONFIG"]
 
@@ -161,7 +166,7 @@ def index(ctx, message):
 
     from wily.commands.index import index
 
-    index(config=config, include_message=message)
+    index(config=config, include_message=message, as_json=json)
 
 
 @cli.command(
@@ -204,8 +209,13 @@ def index(ctx, message):
     help=_("Return a non-zero exit code under the specified threshold"),
     type=click.INT,
 )
+@click.option(
+    "--json/--table",
+    help=_("Display results as JSON"),
+    default=False,
+)
 @click.pass_context
-def rank(ctx, path, metric, revision, limit, desc, threshold):
+def rank(ctx, path, metric, revision, limit, desc, threshold, json):
     """Rank files, methods and functions in order of any metrics, e.g. complexity."""
     config = ctx.obj["CONFIG"]
 
@@ -223,6 +233,7 @@ def rank(ctx, path, metric, revision, limit, desc, threshold):
         limit=limit,
         threshold=threshold,
         descending=desc,
+        as_json=json,
     )
 
 
@@ -252,8 +263,13 @@ def rank(ctx, path, metric, revision, limit, desc, threshold):
     "--output",
     help=_("Output report to specified HTML path, e.g. reports/out.html"),
 )
+@click.option(
+    "--json/--table",
+    help=_("Display results as JSON"),
+    default=False,
+)
 @click.pass_context
-def report(ctx, file, metrics, number, message, format, console_format, output):
+def report(ctx, file, metrics, number, message, format, console_format, output, json):
     """Show metrics for a given file."""
     config = ctx.obj["CONFIG"]
 
@@ -284,6 +300,7 @@ def report(ctx, file, metrics, number, message, format, console_format, output):
         include_message=message,
         format=ReportFormat[format],
         console_format=console_format,
+        as_json=json,
     )
 
 
@@ -309,8 +326,13 @@ def report(ctx, file, metrics, number, message, format, console_format, output):
 @click.option(
     "-r", "--revision", help=_("Compare against specific revision"), type=click.STRING
 )
+@click.option(
+    "--json/--table",
+    help=_("Display results as JSON"),
+    default=False,
+)
 @click.pass_context
-def diff(ctx, files, metrics, all, detail, revision):
+def diff(ctx, files, metrics, all, detail, revision, json):
     """Show the differences in metrics for each file."""
     config = ctx.obj["CONFIG"]
 
@@ -334,6 +356,7 @@ def diff(ctx, files, metrics, all, detail, revision):
         changes_only=not all,
         detail=detail,
         revision=revision,
+        as_json=json,
     )
 
 
diff --git a/src/wily/commands/diff.py b/src/wily/commands/diff.py
index 3c8766d0..2420f73d 100644
--- a/src/wily/commands/diff.py
+++ b/src/wily/commands/diff.py
@@ -3,6 +3,7 @@
 
 Compares metrics between uncommitted files and indexed files.
 """
+import json
 import multiprocessing
 import os
 from pathlib import Path
@@ -25,7 +26,9 @@
 from wily.state import State
 
 
-def diff(config, files, metrics, changes_only=True, detail=True, revision=None):
+def diff(
+    config, files, metrics, changes_only=True, detail=True, revision=None, as_json=False
+):
     """
     Show the differences in metrics for each of the files.
 
@@ -159,9 +162,15 @@ def diff(config, files, metrics, changes_only=True, detail=True, revision=None):
     descriptions = [metric.description for operator, metric in metrics]
     headers = ("File", *descriptions)
     if len(results) > 0:
-        print(
-            # But it still makes more sense to show the newest at the top, so reverse again
-            tabulate.tabulate(
-                headers=headers, tabular_data=results, tablefmt=DEFAULT_GRID_STYLE
+        if as_json:
+            json_data = [
+                {headers[x]: d[x] for x in range(len(headers))} for d in results
+            ]
+            print(json.dumps(json_data, indent=2))
+        else:
+            print(
+                # But it still makes more sense to show the newest at the top, so reverse again
+                tabulate.tabulate(
+                    headers=headers, tabular_data=results, tablefmt=DEFAULT_GRID_STYLE
+                )
             )
-        )
diff --git a/src/wily/commands/index.py b/src/wily/commands/index.py
index 8150bdf2..88dbb9cf 100644
--- a/src/wily/commands/index.py
+++ b/src/wily/commands/index.py
@@ -3,6 +3,8 @@
 
 Print information about the wily cache and what is in the index.
 """
+import json
+
 import tabulate
 
 from wily import MAX_MESSAGE_WIDTH, format_date, format_revision, logger
@@ -10,7 +12,7 @@
 from wily.state import State
 
 
-def index(config, include_message=False):
+def index(config, include_message=False, as_json=False):
     """
     Show information about the cache and runtime.
 
@@ -54,8 +56,12 @@ def index(config, include_message=False):
         headers = ("Revision", "Author", "Message", "Date")
     else:
         headers = ("Revision", "Author", "Date")
-    print(
-        tabulate.tabulate(
-            headers=headers, tabular_data=data, tablefmt=DEFAULT_GRID_STYLE
+    if as_json:
+        json_data = [{headers[x]: d[x] for x in range(len(headers))} for d in data]
+        print(json.dumps(json_data, indent=2))
+    else:
+        print(
+            tabulate.tabulate(
+                headers=headers, tabular_data=data, tablefmt=DEFAULT_GRID_STYLE
+            )
         )
-    )
diff --git a/src/wily/commands/rank.py b/src/wily/commands/rank.py
index 192f7990..978a6d27 100644
--- a/src/wily/commands/rank.py
+++ b/src/wily/commands/rank.py
@@ -7,6 +7,7 @@
 
 TODO: Layer on Click invocation in operators section, __main__.py file
 """
+import json
 import operator as op
 import os
 from pathlib import Path
@@ -21,7 +22,7 @@
 from wily.state import State
 
 
-def rank(config, path, metric, revision_index, limit, threshold, descending):
+def rank(config, path, metric, revision_index, limit, threshold, descending, as_json):
     """
     Rank command ordering files, methods or functions using metrics.
 
@@ -113,11 +114,15 @@ def rank(config, path, metric, revision_index, limit, threshold, descending):
     data.append(["Total", total])
 
     headers = ("File", metric.description)
-    print(
-        tabulate.tabulate(
-            headers=headers, tabular_data=data, tablefmt=DEFAULT_GRID_STYLE
+    if as_json:
+        json_data = [{headers[x]: d[x] for x in range(len(headers))} for d in data]
+        print(json.dumps(json_data, indent=2))
+    else:
+        print(
+            tabulate.tabulate(
+                headers=headers, tabular_data=data, tablefmt=DEFAULT_GRID_STYLE
+            )
         )
-    )
 
     if threshold and total < threshold:
         logger.error(
diff --git a/src/wily/commands/report.py b/src/wily/commands/report.py
index 28fd47a0..d4c3caca 100644
--- a/src/wily/commands/report.py
+++ b/src/wily/commands/report.py
@@ -4,6 +4,7 @@
 The report command gives a table of metrics for a specified list of files.
 Will compare the values between revisions and highlight changes in green/red.
 """
+import json
 from pathlib import Path
 from shutil import copytree
 from string import Template
@@ -30,6 +31,7 @@ def report(
     include_message=False,
     format=ReportFormat.CONSOLE,
     console_format=None,
+    as_json=False,
 ):
     """
     Show information about the cache and runtime.
@@ -199,8 +201,13 @@ def report(
 
         logger.info(f"wily report was saved to {report_path}")
     else:
-        print(
-            tabulate.tabulate(
-                headers=headers, tabular_data=data[::-1], tablefmt=console_format
+        data = data[::-1]
+        if as_json:
+            json_data = [{headers[x]: d[x] for x in range(len(headers))} for d in data]
+            print(json.dumps(json_data, indent=2))
+        else:
+            print(
+                tabulate.tabulate(
+                    headers=headers, tabular_data=data, tablefmt=console_format
+                )
             )
-        )

From 431e3320e8596bd4be02d9f9c818185e7132cfd5 Mon Sep 17 00:00:00 2001
From: devdanzin <74280297+devdanzin@users.noreply.github.com>
Date: Sun, 9 Jul 2023 00:21:58 -0300
Subject: [PATCH 02/25] Add filename to JSON entries in report().

---
 src/wily/commands/report.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/wily/commands/report.py b/src/wily/commands/report.py
index d4c3caca..570cdef5 100644
--- a/src/wily/commands/report.py
+++ b/src/wily/commands/report.py
@@ -204,6 +204,8 @@ def report(
         data = data[::-1]
         if as_json:
             json_data = [{headers[x]: d[x] for x in range(len(headers))} for d in data]
+            for entry in json_data:
+                entry["Filename"] = path
             print(json.dumps(json_data, indent=2))
         else:
             print(

From 14819538f9da102a65acb7815f0f46f95c785590 Mon Sep 17 00:00:00 2001
From: devdanzin <74280297+devdanzin@users.noreply.github.com>
Date: Sun, 9 Jul 2023 10:05:24 -0300
Subject: [PATCH 03/25] Move printing logic of commands to
 wily.helper.output.print_result().

---
 src/wily/commands/diff.py   | 16 ++--------------
 src/wily/commands/index.py  | 15 +++------------
 src/wily/commands/rank.py   | 14 +++-----------
 src/wily/commands/report.py | 17 +++--------------
 src/wily/helper/output.py   | 35 +++++++++++++++++++++++++++++++++++
 5 files changed, 46 insertions(+), 51 deletions(-)
 create mode 100644 src/wily/helper/output.py

diff --git a/src/wily/commands/diff.py b/src/wily/commands/diff.py
index 2420f73d..b5a3dc52 100644
--- a/src/wily/commands/diff.py
+++ b/src/wily/commands/diff.py
@@ -3,18 +3,17 @@
 
 Compares metrics between uncommitted files and indexed files.
 """
-import json
 import multiprocessing
 import os
 from pathlib import Path
 
 import radon.cli.harvest
-import tabulate
 
 from wily import format_date, format_revision, logger
 from wily.archivers import resolve_archiver
 from wily.commands.build import run_operator
 from wily.config import DEFAULT_GRID_STYLE, DEFAULT_PATH
+from wily.helper.output import print_result
 from wily.operators import (
     BAD_COLORS,
     GOOD_COLORS,
@@ -162,15 +161,4 @@ def diff(
     descriptions = [metric.description for operator, metric in metrics]
     headers = ("File", *descriptions)
     if len(results) > 0:
-        if as_json:
-            json_data = [
-                {headers[x]: d[x] for x in range(len(headers))} for d in results
-            ]
-            print(json.dumps(json_data, indent=2))
-        else:
-            print(
-                # But it still makes more sense to show the newest at the top, so reverse again
-                tabulate.tabulate(
-                    headers=headers, tabular_data=results, tablefmt=DEFAULT_GRID_STYLE
-                )
-            )
+        print_result(as_json, results, headers, DEFAULT_GRID_STYLE)
diff --git a/src/wily/commands/index.py b/src/wily/commands/index.py
index 88dbb9cf..b73834bc 100644
--- a/src/wily/commands/index.py
+++ b/src/wily/commands/index.py
@@ -3,12 +3,10 @@
 
 Print information about the wily cache and what is in the index.
 """
-import json
-
-import tabulate
 
 from wily import MAX_MESSAGE_WIDTH, format_date, format_revision, logger
 from wily.config import DEFAULT_GRID_STYLE
+from wily.helper.output import print_result
 from wily.state import State
 
 
@@ -56,12 +54,5 @@ def index(config, include_message=False, as_json=False):
         headers = ("Revision", "Author", "Message", "Date")
     else:
         headers = ("Revision", "Author", "Date")
-    if as_json:
-        json_data = [{headers[x]: d[x] for x in range(len(headers))} for d in data]
-        print(json.dumps(json_data, indent=2))
-    else:
-        print(
-            tabulate.tabulate(
-                headers=headers, tabular_data=data, tablefmt=DEFAULT_GRID_STYLE
-            )
-        )
+
+    print_result(as_json, data, headers, DEFAULT_GRID_STYLE)
diff --git a/src/wily/commands/rank.py b/src/wily/commands/rank.py
index 978a6d27..20a399bc 100644
--- a/src/wily/commands/rank.py
+++ b/src/wily/commands/rank.py
@@ -7,17 +7,16 @@
 
 TODO: Layer on Click invocation in operators section, __main__.py file
 """
-import json
 import operator as op
 import os
 from pathlib import Path
 
 import radon.cli.harvest
-import tabulate
 
 from wily import format_date, format_revision, logger
 from wily.archivers import resolve_archiver
 from wily.config import DEFAULT_GRID_STYLE, DEFAULT_PATH
+from wily.helper.output import print_result
 from wily.operators import resolve_metric_as_tuple
 from wily.state import State
 
@@ -114,15 +113,8 @@ def rank(config, path, metric, revision_index, limit, threshold, descending, as_
     data.append(["Total", total])
 
     headers = ("File", metric.description)
-    if as_json:
-        json_data = [{headers[x]: d[x] for x in range(len(headers))} for d in data]
-        print(json.dumps(json_data, indent=2))
-    else:
-        print(
-            tabulate.tabulate(
-                headers=headers, tabular_data=data, tablefmt=DEFAULT_GRID_STYLE
-            )
-        )
+
+    print_result(as_json, data, headers, DEFAULT_GRID_STYLE)
 
     if threshold and total < threshold:
         logger.error(
diff --git a/src/wily/commands/report.py b/src/wily/commands/report.py
index 570cdef5..544ab186 100644
--- a/src/wily/commands/report.py
+++ b/src/wily/commands/report.py
@@ -4,15 +4,13 @@
 The report command gives a table of metrics for a specified list of files.
 Will compare the values between revisions and highlight changes in green/red.
 """
-import json
 from pathlib import Path
 from shutil import copytree
 from string import Template
 
-import tabulate
-
 from wily import MAX_MESSAGE_WIDTH, format_date, format_revision, logger
 from wily.helper.custom_enums import ReportFormat
+from wily.helper.output import print_result
 from wily.lang import _
 from wily.operators import MetricType, resolve_metric_as_tuple
 from wily.state import State
@@ -202,14 +200,5 @@ def report(
         logger.info(f"wily report was saved to {report_path}")
     else:
         data = data[::-1]
-        if as_json:
-            json_data = [{headers[x]: d[x] for x in range(len(headers))} for d in data]
-            for entry in json_data:
-                entry["Filename"] = path
-            print(json.dumps(json_data, indent=2))
-        else:
-            print(
-                tabulate.tabulate(
-                    headers=headers, tabular_data=data, tablefmt=console_format
-                )
-            )
+
+        print_result(as_json, data, headers, console_format, path)
diff --git a/src/wily/helper/output.py b/src/wily/helper/output.py
new file mode 100644
index 00000000..906e4e4f
--- /dev/null
+++ b/src/wily/helper/output.py
@@ -0,0 +1,35 @@
+"""Output helpers for wily."""
+import json
+
+import tabulate
+
+
+def print_result(as_json, data, headers, table_format, path=""):
+    """
+    Print data as tabulate table or JSON.
+
+    :param as_json: Whether to print as JSON
+    :type as_json: ``bool``
+
+    :param data: Rows of data to print
+    :type data: ``list``
+
+    :param headers: Headers of data to print
+    :type headers: ``tuple``
+
+    :param table_format: Grid format style for tabulate
+    :type table_format: ``str``
+
+    :param path: The path to the file
+    :type  path: ``str``
+    """
+    if as_json:
+        json_data = [{headers[x]: d[x] for x in range(len(headers))} for d in data]
+        if path:
+            for entry in json_data:
+                entry["Filename"] = path
+        print(json.dumps(json_data, indent=2))
+    else:
+        print(
+            tabulate.tabulate(headers=headers, tabular_data=data, tablefmt=table_format)
+        )

From 6d793af74efe49ec65d981effa39cc5389f81215 Mon Sep 17 00:00:00 2001
From: devdanzin <74280297+devdanzin@users.noreply.github.com>
Date: Sun, 9 Jul 2023 10:48:14 -0300
Subject: [PATCH 04/25] Add tests for JSON output support.

---
 test/integration/test_diff.py   | 20 +++++++
 test/integration/test_index.py  | 20 +++++++
 test/integration/test_rank.py   | 14 +++++
 test/integration/test_report.py | 24 +++++++++
 test/unit/test_helper.py        | 96 +++++++++++++++++++++++++++++++++
 5 files changed, 174 insertions(+)
 create mode 100644 test/unit/test_helper.py

diff --git a/test/integration/test_diff.py b/test/integration/test_diff.py
index 102d31ad..4d1ace04 100644
--- a/test/integration/test_diff.py
+++ b/test/integration/test_diff.py
@@ -33,6 +33,26 @@ def test_diff_output(builddir):
     assert "test.py" not in result.stdout
 
 
+def test_diff_output_json(builddir):
+    """Test the diff feature with JSON output"""
+    runner = CliRunner()
+    result = runner.invoke(
+        main.cli, ["--debug", "--path", builddir, "diff", _path, "--json"], catch_exceptions=False
+    )
+    assert result.exit_code == 0, result.stdout
+    assert "test.py" not in result.stdout
+
+
+def test_diff_output_table(builddir):
+    """Test the diff feature with table output"""
+    runner = CliRunner()
+    result = runner.invoke(
+        main.cli, ["--debug", "--path", builddir, "diff", _path, "--table"], catch_exceptions=False
+    )
+    assert result.exit_code == 0, result.stdout
+    assert "test.py" not in result.stdout
+
+
 def test_diff_output_all(builddir):
     """Test the diff feature with no changes and the --all flag"""
     runner = CliRunner()
diff --git a/test/integration/test_index.py b/test/integration/test_index.py
index 2d9cad81..dd9cf98f 100644
--- a/test/integration/test_index.py
+++ b/test/integration/test_index.py
@@ -34,3 +34,23 @@ def test_index_with_messages(builddir):
     assert "add line" in result.stdout
     assert "remove line" in result.stdout
     assert result.exit_code == 0, result.stdout
+
+
+def test_index_json(builddir):
+    """
+    Test that index works with JSON output
+    """
+    runner = CliRunner()
+    result = runner.invoke(main.cli, ["--path", builddir, "index", "--json"])
+    assert result.stdout.count("An author") >= 3
+    assert result.exit_code == 0, result.stdout
+
+
+def test_index_table(builddir):
+    """
+    Test that index works with table output
+    """
+    runner = CliRunner()
+    result = runner.invoke(main.cli, ["--path", builddir, "index", "--table"])
+    assert result.stdout.count("An author") >= 3
+    assert result.exit_code == 0, result.stdout
diff --git a/test/integration/test_rank.py b/test/integration/test_rank.py
index fe62e133..58ff0f29 100644
--- a/test/integration/test_rank.py
+++ b/test/integration/test_rank.py
@@ -143,3 +143,17 @@ def test_rank_total_below_threshold(builddir):
     runner = CliRunner()
     result = runner.invoke(main.cli, ["--path", builddir, "rank", "--threshold=100"])
     assert result.exit_code == 1, result.stdout
+
+
+def test_rank_json(builddir):
+    """Test the rank feature json"""
+    runner = CliRunner()
+    result = runner.invoke(main.cli, ["--path", builddir, "rank", "--json"])
+    assert result.exit_code == 0, result.stdout
+
+
+def test_rank_table(builddir):
+    """Test the rank feature json"""
+    runner = CliRunner()
+    result = runner.invoke(main.cli, ["--path", builddir, "rank", "--table"])
+    assert result.exit_code == 0, result.stdout
diff --git a/test/integration/test_report.py b/test/integration/test_report.py
index 571c1b43..3f6f4e54 100644
--- a/test/integration/test_report.py
+++ b/test/integration/test_report.py
@@ -220,3 +220,27 @@ def test_report_not_existing_format(builddir):
     )
     assert result.exit_code == 2, result.stdout
     assert "Not found" not in result.stdout
+
+
+def test_report_json(builddir):
+    """
+    Test that report works with JSON output
+    """
+    runner = CliRunner()
+    result = runner.invoke(
+        main.cli, ["--path", builddir, "report", _path, "--json"]
+    )
+    assert result.exit_code == 0, result.stdout
+    assert "Not found" not in result.stdout
+
+
+def test_report_table(builddir):
+    """
+    Test that report works with table output
+    """
+    runner = CliRunner()
+    result = runner.invoke(
+        main.cli, ["--path", builddir, "report", _path, "--table"]
+    )
+    assert result.exit_code == 0, result.stdout
+    assert "Not found" not in result.stdout
diff --git a/test/unit/test_helper.py b/test/unit/test_helper.py
new file mode 100644
index 00000000..11b2170e
--- /dev/null
+++ b/test/unit/test_helper.py
@@ -0,0 +1,96 @@
+from io import StringIO
+from unittest import mock
+
+from wily.config import DEFAULT_GRID_STYLE
+from wily.helper.output import print_result
+
+HEADERS = ("header1", "header2", "header3")
+DATA = [
+    ("data1_1", "data1_2", "data1_3"),
+    ("data2_1", "data2_2", "data2_3"),
+]
+
+
+def test_print_result_empty_json():
+    stdout = StringIO()
+    with mock.patch("sys.stdout", stdout):
+        print_result(True, [], (), DEFAULT_GRID_STYLE)
+    assert stdout.getvalue() == "[]\n"
+
+
+def test_print_result_empty_table():
+    stdout = StringIO()
+    with mock.patch("sys.stdout", stdout):
+        print_result(False, [], (), DEFAULT_GRID_STYLE)
+    assert stdout.getvalue() == "\n"
+
+
+def test_print_result_data_json():
+    stdout = StringIO()
+    with mock.patch("sys.stdout", stdout):
+        print_result(True, DATA, HEADERS, DEFAULT_GRID_STYLE)
+    assert stdout.getvalue() == """[
+  {
+    "header1": "data1_1",
+    "header2": "data1_2",
+    "header3": "data1_3"
+  },
+  {
+    "header1": "data2_1",
+    "header2": "data2_2",
+    "header3": "data2_3"
+  }
+]
+"""
+
+
+def test_print_result_data_table():
+    stdout = StringIO()
+    with mock.patch("sys.stdout", stdout):
+        print_result(False, DATA, HEADERS, DEFAULT_GRID_STYLE)
+    assert stdout.getvalue() == """
+╒═══════════╤═══════════╤═══════════╕
+│ header1   │ header2   │ header3   │
+╞═══════════╪═══════════╪═══════════╡
+│ data1_1   │ data1_2   │ data1_3   │
+├───────────┼───────────┼───────────┤
+│ data2_1   │ data2_2   │ data2_3   │
+╘═══════════╧═══════════╧═══════════╛
+"""[1:]
+
+
+def test_print_result_data_json_path():
+    stdout = StringIO()
+    with mock.patch("sys.stdout", stdout):
+        print_result(True, DATA, HEADERS, DEFAULT_GRID_STYLE, "some_path")
+    assert stdout.getvalue() == """[
+  {
+    "header1": "data1_1",
+    "header2": "data1_2",
+    "header3": "data1_3",
+    "Filename": "some_path"
+  },
+  {
+    "header1": "data2_1",
+    "header2": "data2_2",
+    "header3": "data2_3",
+    "Filename": "some_path"
+  }
+]
+"""
+
+
+def test_print_result_data_table_path():
+    stdout = StringIO()
+    with mock.patch("sys.stdout", stdout):
+        print_result(False, DATA, HEADERS, DEFAULT_GRID_STYLE, "some_path")
+    assert stdout.getvalue() == """
+╒═══════════╤═══════════╤═══════════╕
+│ header1   │ header2   │ header3   │
+╞═══════════╪═══════════╪═══════════╡
+│ data1_1   │ data1_2   │ data1_3   │
+├───────────┼───────────┼───────────┤
+│ data2_1   │ data2_2   │ data2_3   │
+╘═══════════╧═══════════╧═══════════╛
+"""[1:]
+

From fbc1cd3f3b234070402cd3b9930bb3e30e453882 Mon Sep 17 00:00:00 2001
From: devdanzin <74280297+devdanzin@users.noreply.github.com>
Date: Sun, 9 Jul 2023 10:50:50 -0300
Subject: [PATCH 05/25] Remove blank line.

---
 test/unit/test_helper.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/unit/test_helper.py b/test/unit/test_helper.py
index 11b2170e..0e73ed13 100644
--- a/test/unit/test_helper.py
+++ b/test/unit/test_helper.py
@@ -93,4 +93,3 @@ def test_print_result_data_table_path():
 │ data2_1   │ data2_2   │ data2_3   │
 ╘═══════════╧═══════════╧═══════════╛
 """[1:]
-

From 33dbd3fccddd7f5610661069f2123a5d2f74b61b Mon Sep 17 00:00:00 2001
From: devdanzin <74280297+devdanzin@users.noreply.github.com>
Date: Sun, 9 Jul 2023 10:54:30 -0300
Subject: [PATCH 06/25] black fixes, even though one of them is clearly wrong.

---
 test/integration/test_diff.py   |  8 ++++++--
 test/integration/test_report.py |  8 ++------
 test/unit/test_helper.py        | 28 ++++++++++++++++++++++------
 3 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/test/integration/test_diff.py b/test/integration/test_diff.py
index 4d1ace04..6faf702c 100644
--- a/test/integration/test_diff.py
+++ b/test/integration/test_diff.py
@@ -37,7 +37,9 @@ def test_diff_output_json(builddir):
     """Test the diff feature with JSON output"""
     runner = CliRunner()
     result = runner.invoke(
-        main.cli, ["--debug", "--path", builddir, "diff", _path, "--json"], catch_exceptions=False
+        main.cli,
+        ["--debug", "--path", builddir, "diff", _path, "--json"],
+        catch_exceptions=False,
     )
     assert result.exit_code == 0, result.stdout
     assert "test.py" not in result.stdout
@@ -47,7 +49,9 @@ def test_diff_output_table(builddir):
     """Test the diff feature with table output"""
     runner = CliRunner()
     result = runner.invoke(
-        main.cli, ["--debug", "--path", builddir, "diff", _path, "--table"], catch_exceptions=False
+        main.cli,
+        ["--debug", "--path", builddir, "diff", _path, "--table"],
+        catch_exceptions=False,
     )
     assert result.exit_code == 0, result.stdout
     assert "test.py" not in result.stdout
diff --git a/test/integration/test_report.py b/test/integration/test_report.py
index 3f6f4e54..85f549ca 100644
--- a/test/integration/test_report.py
+++ b/test/integration/test_report.py
@@ -227,9 +227,7 @@ def test_report_json(builddir):
     Test that report works with JSON output
     """
     runner = CliRunner()
-    result = runner.invoke(
-        main.cli, ["--path", builddir, "report", _path, "--json"]
-    )
+    result = runner.invoke(main.cli, ["--path", builddir, "report", _path, "--json"])
     assert result.exit_code == 0, result.stdout
     assert "Not found" not in result.stdout
 
@@ -239,8 +237,6 @@ def test_report_table(builddir):
     Test that report works with table output
     """
     runner = CliRunner()
-    result = runner.invoke(
-        main.cli, ["--path", builddir, "report", _path, "--table"]
-    )
+    result = runner.invoke(main.cli, ["--path", builddir, "report", _path, "--table"])
     assert result.exit_code == 0, result.stdout
     assert "Not found" not in result.stdout
diff --git a/test/unit/test_helper.py b/test/unit/test_helper.py
index 0e73ed13..cb585ce5 100644
--- a/test/unit/test_helper.py
+++ b/test/unit/test_helper.py
@@ -29,7 +29,9 @@ def test_print_result_data_json():
     stdout = StringIO()
     with mock.patch("sys.stdout", stdout):
         print_result(True, DATA, HEADERS, DEFAULT_GRID_STYLE)
-    assert stdout.getvalue() == """[
+    assert (
+        stdout.getvalue()
+        == """[
   {
     "header1": "data1_1",
     "header2": "data1_2",
@@ -42,13 +44,16 @@ def test_print_result_data_json():
   }
 ]
 """
+    )
 
 
 def test_print_result_data_table():
     stdout = StringIO()
     with mock.patch("sys.stdout", stdout):
         print_result(False, DATA, HEADERS, DEFAULT_GRID_STYLE)
-    assert stdout.getvalue() == """
+    assert (
+        stdout.getvalue()
+        == """
 ╒═══════════╤═══════════╤═══════════╕
 │ header1   │ header2   │ header3   │
 ╞═══════════╪═══════════╪═══════════╡
@@ -56,14 +61,19 @@ def test_print_result_data_table():
 ├───────────┼───────────┼───────────┤
 │ data2_1   │ data2_2   │ data2_3   │
 ╘═══════════╧═══════════╧═══════════╛
-"""[1:]
+"""[
+            1:
+        ]
+    )
 
 
 def test_print_result_data_json_path():
     stdout = StringIO()
     with mock.patch("sys.stdout", stdout):
         print_result(True, DATA, HEADERS, DEFAULT_GRID_STYLE, "some_path")
-    assert stdout.getvalue() == """[
+    assert (
+        stdout.getvalue()
+        == """[
   {
     "header1": "data1_1",
     "header2": "data1_2",
@@ -78,13 +88,16 @@ def test_print_result_data_json_path():
   }
 ]
 """
+    )
 
 
 def test_print_result_data_table_path():
     stdout = StringIO()
     with mock.patch("sys.stdout", stdout):
         print_result(False, DATA, HEADERS, DEFAULT_GRID_STYLE, "some_path")
-    assert stdout.getvalue() == """
+    assert (
+        stdout.getvalue()
+        == """
 ╒═══════════╤═══════════╤═══════════╕
 │ header1   │ header2   │ header3   │
 ╞═══════════╪═══════════╪═══════════╡
@@ -92,4 +105,7 @@ def test_print_result_data_table_path():
 ├───────────┼───────────┼───────────┤
 │ data2_1   │ data2_2   │ data2_3   │
 ╘═══════════╧═══════════╧═══════════╛
-"""[1:]
+"""[
+            1:
+        ]
+    )

From b9f6cbdad214e8efc6e235d60023bb9c8b59db8a Mon Sep 17 00:00:00 2001
From: devdanzin <74280297+devdanzin@users.noreply.github.com>
Date: Sun, 9 Jul 2023 11:14:00 -0300
Subject: [PATCH 07/25] Move expected data out of test functions so black
 doesn't create ugly code.

---
 test/unit/test_helper.py | 106 ++++++++++++++++-----------------------
 1 file changed, 44 insertions(+), 62 deletions(-)

diff --git a/test/unit/test_helper.py b/test/unit/test_helper.py
index cb585ce5..2beb81ee 100644
--- a/test/unit/test_helper.py
+++ b/test/unit/test_helper.py
@@ -10,6 +10,46 @@
     ("data2_1", "data2_2", "data2_3"),
 ]
 
+TABLE_DATA = """
+╒═══════════╤═══════════╤═══════════╕
+│ header1   │ header2   │ header3   │
+╞═══════════╪═══════════╪═══════════╡
+│ data1_1   │ data1_2   │ data1_3   │
+├───────────┼───────────┼───────────┤
+│ data2_1   │ data2_2   │ data2_3   │
+╘═══════════╧═══════════╧═══════════╛
+"""[1:]
+
+JSON_DATA = """[
+  {
+    "header1": "data1_1",
+    "header2": "data1_2",
+    "header3": "data1_3"
+  },
+  {
+    "header1": "data2_1",
+    "header2": "data2_2",
+    "header3": "data2_3"
+  }
+]
+"""
+
+JSON_DATA_WITH_PATH = """[
+  {
+    "header1": "data1_1",
+    "header2": "data1_2",
+    "header3": "data1_3",
+    "Filename": "some_path"
+  },
+  {
+    "header1": "data2_1",
+    "header2": "data2_2",
+    "header3": "data2_3",
+    "Filename": "some_path"
+  }
+]
+"""
+
 
 def test_print_result_empty_json():
     stdout = StringIO()
@@ -29,83 +69,25 @@ def test_print_result_data_json():
     stdout = StringIO()
     with mock.patch("sys.stdout", stdout):
         print_result(True, DATA, HEADERS, DEFAULT_GRID_STYLE)
-    assert (
-        stdout.getvalue()
-        == """[
-  {
-    "header1": "data1_1",
-    "header2": "data1_2",
-    "header3": "data1_3"
-  },
-  {
-    "header1": "data2_1",
-    "header2": "data2_2",
-    "header3": "data2_3"
-  }
-]
-"""
-    )
+    assert stdout.getvalue() == JSON_DATA
 
 
 def test_print_result_data_table():
     stdout = StringIO()
     with mock.patch("sys.stdout", stdout):
         print_result(False, DATA, HEADERS, DEFAULT_GRID_STYLE)
-    assert (
-        stdout.getvalue()
-        == """
-╒═══════════╤═══════════╤═══════════╕
-│ header1   │ header2   │ header3   │
-╞═══════════╪═══════════╪═══════════╡
-│ data1_1   │ data1_2   │ data1_3   │
-├───────────┼───────────┼───────────┤
-│ data2_1   │ data2_2   │ data2_3   │
-╘═══════════╧═══════════╧═══════════╛
-"""[
-            1:
-        ]
-    )
+    assert stdout.getvalue() == TABLE_DATA
 
 
 def test_print_result_data_json_path():
     stdout = StringIO()
     with mock.patch("sys.stdout", stdout):
         print_result(True, DATA, HEADERS, DEFAULT_GRID_STYLE, "some_path")
-    assert (
-        stdout.getvalue()
-        == """[
-  {
-    "header1": "data1_1",
-    "header2": "data1_2",
-    "header3": "data1_3",
-    "Filename": "some_path"
-  },
-  {
-    "header1": "data2_1",
-    "header2": "data2_2",
-    "header3": "data2_3",
-    "Filename": "some_path"
-  }
-]
-"""
-    )
+    assert stdout.getvalue() == JSON_DATA_WITH_PATH
 
 
 def test_print_result_data_table_path():
     stdout = StringIO()
     with mock.patch("sys.stdout", stdout):
         print_result(False, DATA, HEADERS, DEFAULT_GRID_STYLE, "some_path")
-    assert (
-        stdout.getvalue()
-        == """
-╒═══════════╤═══════════╤═══════════╕
-│ header1   │ header2   │ header3   │
-╞═══════════╪═══════════╪═══════════╡
-│ data1_1   │ data1_2   │ data1_3   │
-├───────────┼───────────┼───────────┤
-│ data2_1   │ data2_2   │ data2_3   │
-╘═══════════╧═══════════╧═══════════╛
-"""[
-            1:
-        ]
-    )
+    assert stdout.getvalue() == TABLE_DATA

From 89075f56d0010851126279f6f168a65f32abf52d Mon Sep 17 00:00:00 2001
From: devdanzin <74280297+devdanzin@users.noreply.github.com>
Date: Sun, 9 Jul 2023 11:16:22 -0300
Subject: [PATCH 08/25] Avoid black weirdness.

---
 test/unit/test_helper.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/test/unit/test_helper.py b/test/unit/test_helper.py
index 2beb81ee..8c27e3f0 100644
--- a/test/unit/test_helper.py
+++ b/test/unit/test_helper.py
@@ -10,7 +10,7 @@
     ("data2_1", "data2_2", "data2_3"),
 ]
 
-TABLE_DATA = """
+_TABLE_DATA = """
 ╒═══════════╤═══════════╤═══════════╕
 │ header1   │ header2   │ header3   │
 ╞═══════════╪═══════════╪═══════════╡
@@ -18,7 +18,9 @@
 ├───────────┼───────────┼───────────┤
 │ data2_1   │ data2_2   │ data2_3   │
 ╘═══════════╧═══════════╧═══════════╛
-"""[1:]
+"""
+
+TABLE_DATA = _TABLE_DATA[1:]
 
 JSON_DATA = """[
   {

From e4fdec936cf8757063d2d548e6fb626cee5e67fe Mon Sep 17 00:00:00 2001
From: devdanzin <74280297+devdanzin@users.noreply.github.com>
Date: Fri, 27 Oct 2023 08:54:49 -0300
Subject: [PATCH 09/25] Change print_result() into print_json(), restore
 printing tabulated data in commands.

---
 src/wily/commands/diff.py   | 12 +++++++++--
 src/wily/commands/index.py  |  8 ++++++--
 src/wily/commands/rank.py   |  8 ++++++--
 src/wily/commands/report.py | 14 ++++++++++---
 src/wily/helper/output.py   | 31 ++++++++--------------------
 test/unit/test_helper.py    | 41 ++++---------------------------------
 6 files changed, 45 insertions(+), 69 deletions(-)

diff --git a/src/wily/commands/diff.py b/src/wily/commands/diff.py
index 980e8041..a978ac44 100644
--- a/src/wily/commands/diff.py
+++ b/src/wily/commands/diff.py
@@ -9,13 +9,14 @@
 from sys import exit
 
 import radon.cli.harvest
+import tabulate
 
 from wily import format_date, format_revision, logger
 from wily.archivers import resolve_archiver
 from wily.commands.build import run_operator
 from wily.config import DEFAULT_PATH
 from wily.helper import get_style
-from wily.helper.output import print_result
+from wily.helper.output import print_json
 from wily.operators import (
     BAD_COLORS,
     GOOD_COLORS,
@@ -164,4 +165,11 @@ def diff(
     headers = ("File", *descriptions)
     if len(results) > 0:
         style = get_style()
-        print_result(as_json, results, headers, style)
+        if as_json:
+            print_json(results, headers)
+        else:
+            print(
+                tabulate.tabulate(
+                    headers=headers, tabular_data=results, tablefmt=style
+                )
+            )
diff --git a/src/wily/commands/index.py b/src/wily/commands/index.py
index 3ed43165..7745e5e7 100644
--- a/src/wily/commands/index.py
+++ b/src/wily/commands/index.py
@@ -3,10 +3,11 @@
 
 Print information about the wily cache and what is in the index.
 """
+import tabulate
 
 from wily import MAX_MESSAGE_WIDTH, format_date, format_revision, logger
 from wily.helper import get_style
-from wily.helper.output import print_result
+from wily.helper.output import print_json
 from wily.state import State
 
 
@@ -56,4 +57,7 @@ def index(config, include_message=False, as_json=False):
         headers = ("Revision", "Author", "Date")
 
     style = get_style()
-    print_result(as_json, data, headers, style)
+    if as_json:
+        print_json(data, headers)
+    else:
+        print(tabulate.tabulate(headers=headers, tabular_data=data, tablefmt=style))
diff --git a/src/wily/commands/rank.py b/src/wily/commands/rank.py
index 1592379e..2ef4f91c 100644
--- a/src/wily/commands/rank.py
+++ b/src/wily/commands/rank.py
@@ -13,12 +13,13 @@
 from sys import exit
 
 import radon.cli.harvest
+import tabulate
 
 from wily import format_date, format_revision, logger
 from wily.archivers import resolve_archiver
 from wily.config import DEFAULT_PATH
 from wily.helper import get_style
-from wily.helper.output import print_result
+from wily.helper.output import print_json
 from wily.operators import resolve_metric_as_tuple
 from wily.state import State
 
@@ -122,7 +123,10 @@ def rank(config, path, metric, revision_index, limit, threshold, descending, as_
 
     headers = ("File", metric.description)
     style = get_style()
-    print_result(as_json, data, headers, style)
+    if as_json:
+        print_json(data, headers)
+    else:
+        print(tabulate.tabulate(headers=headers, tabular_data=data, tablefmt=style))
 
     if threshold and total < threshold:
         logger.error(
diff --git a/src/wily/commands/report.py b/src/wily/commands/report.py
index 3ae69f84..d53edc03 100644
--- a/src/wily/commands/report.py
+++ b/src/wily/commands/report.py
@@ -8,9 +8,11 @@
 from shutil import copytree
 from string import Template
 
+import tabulate
+
 from wily import MAX_MESSAGE_WIDTH, format_date, format_revision, logger
 from wily.helper.custom_enums import ReportFormat
-from wily.helper.output import print_result
+from wily.helper.output import print_json
 from wily.lang import _
 from wily.operators import MetricType, resolve_metric_as_tuple
 from wily.state import State
@@ -208,5 +210,11 @@ def report(
         logger.info(f"wily report was saved to {report_path}")
     else:
         data = data[::-1]
-
-        print_result(as_json, data, headers, console_format, path)
+        if as_json:
+            print_json(data, headers, path)
+        else:
+            print(
+                tabulate.tabulate(
+                    headers=headers, tabular_data=data, tablefmt=console_format
+                )
+            )
diff --git a/src/wily/helper/output.py b/src/wily/helper/output.py
index 906e4e4f..26af24db 100644
--- a/src/wily/helper/output.py
+++ b/src/wily/helper/output.py
@@ -1,35 +1,20 @@
 """Output helpers for wily."""
 import json
+from collections.abc import Sequence
 
-import tabulate
 
-
-def print_result(as_json, data, headers, table_format, path=""):
+def print_json(data: Sequence, headers: Sequence, path: str = ""):
     """
-    Print data as tabulate table or JSON.
-
-    :param as_json: Whether to print as JSON
-    :type as_json: ``bool``
+    Print data as JSON.
 
     :param data: Rows of data to print
-    :type data: ``list``
 
     :param headers: Headers of data to print
-    :type headers: ``tuple``
-
-    :param table_format: Grid format style for tabulate
-    :type table_format: ``str``
 
     :param path: The path to the file
-    :type  path: ``str``
     """
-    if as_json:
-        json_data = [{headers[x]: d[x] for x in range(len(headers))} for d in data]
-        if path:
-            for entry in json_data:
-                entry["Filename"] = path
-        print(json.dumps(json_data, indent=2))
-    else:
-        print(
-            tabulate.tabulate(headers=headers, tabular_data=data, tablefmt=table_format)
-        )
+    json_data = [{headers[x]: d[x] for x in range(len(headers))} for d in data]
+    if path:
+        for entry in json_data:
+            entry["Filename"] = path
+    print(json.dumps(json_data, indent=2))
diff --git a/test/unit/test_helper.py b/test/unit/test_helper.py
index e17d5ade..c0fc0539 100644
--- a/test/unit/test_helper.py
+++ b/test/unit/test_helper.py
@@ -3,7 +3,7 @@
 
 from wily.config import DEFAULT_GRID_STYLE
 from wily.helper import get_style
-from wily.helper.output import print_result
+from wily.helper.output import print_json
 
 HEADERS = ("header1", "header2", "header3")
 DATA = [
@@ -11,18 +11,6 @@
     ("data2_1", "data2_2", "data2_3"),
 ]
 
-_TABLE_DATA = """
-╒═══════════╤═══════════╤═══════════╕
-│ header1   │ header2   │ header3   │
-╞═══════════╪═══════════╪═══════════╡
-│ data1_1   │ data1_2   │ data1_3   │
-├───────────┼───────────┼───────────┤
-│ data2_1   │ data2_2   │ data2_3   │
-╘═══════════╧═══════════╧═══════════╛
-"""
-
-TABLE_DATA = _TABLE_DATA[1:]
-
 JSON_DATA = """[
   {
     "header1": "data1_1",
@@ -57,45 +45,24 @@
 def test_print_result_empty_json():
     stdout = StringIO()
     with mock.patch("sys.stdout", stdout):
-        print_result(True, [], (), DEFAULT_GRID_STYLE)
+        print_json([], ())
     assert stdout.getvalue() == "[]\n"
 
 
-def test_print_result_empty_table():
-    stdout = StringIO()
-    with mock.patch("sys.stdout", stdout):
-        print_result(False, [], (), DEFAULT_GRID_STYLE)
-    assert stdout.getvalue() == "\n"
-
-
 def test_print_result_data_json():
     stdout = StringIO()
     with mock.patch("sys.stdout", stdout):
-        print_result(True, DATA, HEADERS, DEFAULT_GRID_STYLE)
+        print_json(DATA, HEADERS)
     assert stdout.getvalue() == JSON_DATA
 
 
-def test_print_result_data_table():
-    stdout = StringIO()
-    with mock.patch("sys.stdout", stdout):
-        print_result(False, DATA, HEADERS, DEFAULT_GRID_STYLE)
-    assert stdout.getvalue() == TABLE_DATA
-
-
 def test_print_result_data_json_path():
     stdout = StringIO()
     with mock.patch("sys.stdout", stdout):
-        print_result(True, DATA, HEADERS, DEFAULT_GRID_STYLE, "some_path")
+        print_json(DATA, HEADERS, "some_path")
     assert stdout.getvalue() == JSON_DATA_WITH_PATH
 
 
-def test_print_result_data_table_path():
-    stdout = StringIO()
-    with mock.patch("sys.stdout", stdout):
-        print_result(False, DATA, HEADERS, DEFAULT_GRID_STYLE, "some_path")
-    assert stdout.getvalue() == TABLE_DATA
-
-
 def test_get_style():
     output = TextIOWrapper(BytesIO(), encoding="utf-8")
     with mock.patch("sys.stdout", output):

From 3ef298580d124062bc240277bc4775f287c37d81 Mon Sep 17 00:00:00 2001
From: devdanzin <74280297+devdanzin@users.noreply.github.com>
Date: Fri, 27 Oct 2023 09:28:45 -0300
Subject: [PATCH 10/25] Make as_json in rank() a keyword argument defaulting to
 False.

---
 src/wily/commands/rank.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wily/commands/rank.py b/src/wily/commands/rank.py
index 094f4b12..6a84db19 100644
--- a/src/wily/commands/rank.py
+++ b/src/wily/commands/rank.py
@@ -34,7 +34,7 @@ def rank(
     threshold: int,
     descending: bool,
     wrap: bool,
-    as_json: bool,
+    as_json: bool = False,
 ) -> None:
     """
     Rank command ordering files, methods or functions using metrics.

From be1fb287fbbe18f868a275d33b0e149b0abb4136 Mon Sep 17 00:00:00 2001
From: devdanzin <74280297+devdanzin@users.noreply.github.com>
Date: Fri, 27 Oct 2023 09:32:51 -0300
Subject: [PATCH 11/25] Add as_json to command docstrings, fix docstring
 punctuation.

---
 src/wily/commands/diff.py   | 10 ++++++----
 src/wily/commands/index.py  |  7 ++++---
 src/wily/commands/rank.py   |  5 +++--
 src/wily/commands/report.py | 21 +++++++++++----------
 4 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/src/wily/commands/diff.py b/src/wily/commands/diff.py
index 3b1891d3..63f49459 100644
--- a/src/wily/commands/diff.py
+++ b/src/wily/commands/diff.py
@@ -43,13 +43,15 @@ def diff(
     """
     Show the differences in metrics for each of the files.
 
-    :param config: The wily configuration
+    :param config: The wily configuration.
     :param files: The files to compare.
     :param metrics: The metrics to measure.
     :param changes_only: Only include changes files in output.
-    :param detail: Show details (function-level)
-    :param revision: Compare with specific revision
-    :param wrap: Wrap output
+    :param detail: Show details (function-level).
+    :param revision: Compare with specific revision.
+    :param wrap: Wrap output.
+    :param as_json: Output results as JSON.
+
     """
     config.targets = files
     files = list(files)
diff --git a/src/wily/commands/index.py b/src/wily/commands/index.py
index 03f90677..f562b944 100644
--- a/src/wily/commands/index.py
+++ b/src/wily/commands/index.py
@@ -23,9 +23,10 @@ def index(
     """
     Show information about the cache and runtime.
 
-    :param config: The wily configuration
-    :param include_message: Include revision messages
-    :param wrap: Wrap long lines
+    :param config: The wily configuration.
+    :param include_message: Include revision messages.
+    :param wrap: Wrap long lines.
+    :param as_json: Output results as JSON.
     """
     state = State(config=config)
     logger.debug("Running show command")
diff --git a/src/wily/commands/rank.py b/src/wily/commands/rank.py
index 6a84db19..70d6f3a8 100644
--- a/src/wily/commands/rank.py
+++ b/src/wily/commands/rank.py
@@ -45,8 +45,9 @@ def rank(
     :param revision_index: Version of git repository to revert to.
     :param limit: Limit the number of items in the table.
     :param threshold: For total values beneath the threshold return a non-zero exit code.
-    :param descending: Rank in descending order
-    :param wrap: Wrap output
+    :param descending: Rank in descending order.
+    :param wrap: Wrap output.
+    :param as_json: Output results as JSON.
 
     :return: Sorted table of all files in path, sorted in order of metric.
     """
diff --git a/src/wily/commands/report.py b/src/wily/commands/report.py
index be380283..806c8958 100644
--- a/src/wily/commands/report.py
+++ b/src/wily/commands/report.py
@@ -41,16 +41,17 @@ def report(
     """
     Show metrics for a given file.
 
-    :param config: The configuration
-    :param path: The path to the file
-    :param metrics: List of metrics to report on
-    :param n: Number of items to list
-    :param output: Output path
-    :param include_message: Include revision messages
-    :param format: Output format
-    :param console_format: Grid format style for tabulate
-    :param changes_only: Only report revisions where delta != 0
-    :param wrap: Wrap output
+    :param config: The configuration.
+    :param path: The path to the file.
+    :param metrics: List of metrics to report on.
+    :param n: Number of items to list.
+    :param output: Output path.
+    :param include_message: Include revision messages.
+    :param format: Output format.
+    :param console_format: Grid format style for tabulate.
+    :param changes_only: Only report revisions where delta != 0.
+    :param wrap: Wrap output.
+    :param as_json: Output results as JSON.
     """
     metrics = sorted(metrics)
     logger.debug("Running report command")

From 7ba3429c3e60b53cd7c8347de25927a01aad2348 Mon Sep 17 00:00:00 2001
From: devdanzin <74280297+devdanzin@users.noreply.github.com>
Date: Fri, 27 Oct 2023 09:45:17 -0300
Subject: [PATCH 12/25] Raise ruff's allowed number of function arguments.

---
 pyproject.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index 5ae1da26..beb07c63 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -153,6 +153,6 @@ max-complexity = 24
 "test/*" = ["D"]
 
 [tool.ruff.pylint]
-max-args = 10
+max-args = 12
 max-branches = 35
 max-statements = 100

From b95a7e6bba5127f6b073990f96693a6c5cc1374f Mon Sep 17 00:00:00 2001
From: devdanzin <74280297+devdanzin@users.noreply.github.com>
Date: Fri, 27 Oct 2023 10:14:33 -0300
Subject: [PATCH 13/25] Format __main__.py.

---
 src/wily/__main__.py | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/wily/__main__.py b/src/wily/__main__.py
index 14157c4f..a3cc9c1e 100644
--- a/src/wily/__main__.py
+++ b/src/wily/__main__.py
@@ -293,13 +293,23 @@ def rank(ctx, path, metric, revision, limit, desc, threshold, wrap, json):
     help=_("Wrap report text to fit in terminal"),
 )
 @click.option(
-   "--json/--table",
+    "--json/--table",
     help=_("Display results as JSON"),
     default=False,
 )
 @click.pass_context
 def report(
-    ctx, file, metrics, number, message, format, console_format, output, changes, wrap, json
+    ctx,
+    file,
+    metrics,
+    number,
+    message,
+    format,
+    console_format,
+    output,
+    changes,
+    wrap,
+    json,
 ):
     """Show metrics for a given file."""
     config = ctx.obj["CONFIG"]

From 0d94aa8a4e9572d59a9bd0f5be07f565b711566a Mon Sep 17 00:00:00 2001
From: devdanzin <74280297+devdanzin@users.noreply.github.com>
Date: Sat, 28 Oct 2023 10:44:21 -0300
Subject: [PATCH 14/25] Change ruff option '--format' to '--output-format'.

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 679fbb4d..1cd8e826 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -55,7 +55,7 @@ jobs:
     steps:
     - uses: actions/checkout@v3
     - run: pip install --user ruff
-    - run: ruff --format=github .
+    - run: ruff --output-format=github .
 
   pyright:
     runs-on: ubuntu-latest

From 7c89f4e562e30a7a36b3bb2b236c9b621a4c65e9 Mon Sep 17 00:00:00 2001
From: devdanzin <74280297+devdanzin@users.noreply.github.com>
Date: Sat, 28 Oct 2023 10:53:54 -0300
Subject: [PATCH 15/25] Don't use terminal colors for JSON output.

---
 src/wily/commands/diff.py   | 4 ++--
 src/wily/commands/report.py | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/wily/commands/diff.py b/src/wily/commands/diff.py
index 63f49459..cbe442b1 100644
--- a/src/wily/commands/diff.py
+++ b/src/wily/commands/diff.py
@@ -146,11 +146,11 @@ def diff(
             if new != current:
                 has_changes = True
             if metric.metric_type in (int, float) and new != "-" and current != "-":
-                if current > new:  # type: ignore
+                if current > new and not as_json:  # type: ignore
                     metrics_data.append(
                         f"{current:n} -> \u001b[{BAD_COLORS[metric.measure]}m{new:n}\u001b[0m"
                     )
-                elif current < new:  # type: ignore
+                elif current < new and not as_json:  # type: ignore
                     metrics_data.append(
                         f"{current:n} -> \u001b[{GOOD_COLORS[metric.measure]}m{new:n}\u001b[0m"
                     )
diff --git a/src/wily/commands/report.py b/src/wily/commands/report.py
index 806c8958..5acfa3bb 100644
--- a/src/wily/commands/report.py
+++ b/src/wily/commands/report.py
@@ -117,6 +117,8 @@ def report(
 
                     if delta == 0:
                         delta_col = delta
+                    elif as_json:
+                        delta_col = f"{delta:n}"
                     elif delta < 0:
                         delta_col = (
                             f"\u001b[{meta['decrease_color']}m{delta:n}\u001b[0m"

From 467c87c28629cea88a159f7ac1bc8e95623d473e Mon Sep 17 00:00:00 2001
From: devdanzin <74280297+devdanzin@users.noreply.github.com>
Date: Sat, 28 Oct 2023 11:00:32 -0300
Subject: [PATCH 16/25] Only strip colors in report() if format isn't HTML, so
 HTML colors work.

---
 src/wily/commands/report.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/wily/commands/report.py b/src/wily/commands/report.py
index 5acfa3bb..3dc5f93a 100644
--- a/src/wily/commands/report.py
+++ b/src/wily/commands/report.py
@@ -117,7 +117,8 @@ def report(
 
                     if delta == 0:
                         delta_col = delta
-                    elif as_json:
+                    elif as_json and not format == ReportFormat.HTML:
+                        # Only strip colors if format isn't HTML, so HTML colors work
                         delta_col = f"{delta:n}"
                     elif delta < 0:
                         delta_col = (

From 5cfcc75fec32c2e1f50d613e9a95b3134194871c Mon Sep 17 00:00:00 2001
From: devdanzin <74280297+devdanzin@users.noreply.github.com>
Date: Sat, 28 Oct 2023 11:45:10 -0300
Subject: [PATCH 17/25] Add unit tests for JSON output in index(), rank() and
 report().

---
 test/unit/test_index_unit.py  |  86 ++++++++++
 test/unit/test_rank_unit.py   |  48 ++++++
 test/unit/test_report_unit.py | 313 ++++++++++++++++++++++++++++++++++
 3 files changed, 447 insertions(+)

diff --git a/test/unit/test_index_unit.py b/test/unit/test_index_unit.py
index b81140d3..c874c834 100644
--- a/test/unit/test_index_unit.py
+++ b/test/unit/test_index_unit.py
@@ -181,3 +181,89 @@ def test_empty_index_with_message(capsys):
     captured = capsys.readouterr()
     assert captured.out == EXPECTED_EMPTY_WITH_MESSAGE
     mock_State.assert_called_once_with(config=mock_config)
+
+
+EXPECTED_JSON = f"""
+[
+  {{
+    "Revision": "abcdef0",
+    "Author": "Author 0",
+    "Date": "{fd(0)}"
+  }},
+  {{
+    "Revision": "abcdef1",
+    "Author": "Author 1",
+    "Date": "{fd(0)}"
+  }},
+  {{
+    "Revision": "abcdef2",
+    "Author": "Author 2",
+    "Date": "{fd(0)}"
+  }}
+]
+"""
+EXPECTED_JSON = EXPECTED_JSON[1:]
+
+
+def test_index_json_without_message(capsys):
+    mock_State, mock_config = get_mock_State_and_config(3)
+
+    with mock.patch("wily.commands.index.State", mock_State):
+        index(mock_config, include_message=False, as_json=True)
+
+    captured = capsys.readouterr()
+    assert captured.out == EXPECTED_JSON
+    mock_State.assert_called_once_with(config=mock_config)
+
+
+EXPECTED_JSON_WITH_MESSAGE = f"""
+[
+  {{
+    "Revision": "abcdef0",
+    "Author": "Author 0",
+    "Message": "Message 0",
+    "Date": "{fd(0)}"
+  }},
+  {{
+    "Revision": "abcdef1",
+    "Author": "Author 1",
+    "Message": "Message 1",
+    "Date": "{fd(0)}"
+  }},
+  {{
+    "Revision": "abcdef2",
+    "Author": "Author 2",
+    "Message": "Message 2",
+    "Date": "{fd(0)}"
+  }}
+]
+"""
+EXPECTED_JSON_WITH_MESSAGE = EXPECTED_JSON_WITH_MESSAGE[1:]
+
+
+def test_index_json_with_message(capsys):
+    mock_State, mock_config = get_mock_State_and_config(3)
+
+    with mock.patch("wily.commands.index.State", mock_State):
+        index(mock_config, include_message=True, as_json=True)
+
+    captured = capsys.readouterr()
+    assert captured.out == EXPECTED_JSON_WITH_MESSAGE
+    mock_State.assert_called_once_with(config=mock_config)
+
+
+EXPECTED_EMPTY_JSON = """
+[]
+"""
+EXPECTED_EMPTY_JSON = EXPECTED_EMPTY_JSON[1:]
+
+
+def test_empty_index_json_without_message(capsys):
+    mock_State, mock_config = get_mock_State_and_config(0)
+
+    with mock.patch("wily.commands.index.State", mock_State):
+        index(mock_config, include_message=False, as_json=True)
+
+    captured = capsys.readouterr()
+    assert captured.out == EXPECTED_EMPTY_JSON
+    mock_State.assert_called_once_with(config=mock_config)
diff --git a/test/unit/test_rank_unit.py b/test/unit/test_rank_unit.py
index 74b4c8e0..c703b958 100644
--- a/test/unit/test_rank_unit.py
+++ b/test/unit/test_rank_unit.py
@@ -295,3 +295,51 @@ def test_threshold(capsys):
     assert captured.out == EXPECTED
     mock_State.assert_called_once_with(mock_config)
     mock_resolve.assert_called_once()
+
+
+EXPECTED_JSON = """
+[
+  {
+    "File": "file1",
+    "Lines of Code": 0
+  },
+  {
+    "File": "file2",
+    "Lines of Code": 1
+  },
+  {
+    "File": "Total",
+    "Lines of Code": 1
+  }
+]
+"""
+EXPECTED_JSON = EXPECTED_JSON[1:]
+
+
+def test_rank_json(capsys):
+    metric = "raw.loc"
+    revision_id = "abcdeff"
+    mock_State, mock_config = get_mock_state_and_config(3, ascending=True)
+    mock_revision = mock.MagicMock(key="abcdeff123123", message="Nothing.")
+    mock_resolve = mock.MagicMock()
+    mock_resolve.cls.find = mock.Mock(return_value=mock_revision)
+
+    with mock.patch("wily.commands.rank.State", mock_State), mock.patch(
+        "wily.commands.rank.resolve_archiver", mock_resolve
+    ):
+        rank(
+            config=mock_config,
+            path=None,
+            metric=metric,
+            revision_index=revision_id,
+            limit=0,
+            threshold=0,
+            descending=False,
+            wrap=False,
+            as_json=True,
+        )
+
+    captured = capsys.readouterr()
+    assert captured.out == EXPECTED_JSON
+    mock_State.assert_called_once_with(mock_config)
+    mock_resolve.assert_called_once()
diff --git a/test/unit/test_report_unit.py b/test/unit/test_report_unit.py
index 9cc86130..ebb59a12 100644
--- a/test/unit/test_report_unit.py
+++ b/test/unit/test_report_unit.py
@@ -403,6 +403,319 @@ def test_report_html():
     mock_State.assert_called_once_with(mock_config)
 
 
+EXPECTED_JSON = f"""
+[
+  {{
+    "Revision": "abcdef0",
+    "Author": "Author 0",
+    "Date": "{fd(0)}",
+    "Lines of Code": "0 (-1)",
+    "Filename": "test.py"
+  }},
+  {{
+    "Revision": "abcdef1",
+    "Author": "Author 1",
+    "Date": "{fd(1)}",
+    "Lines of Code": "1 (-1)",
+    "Filename": "test.py"
+  }},
+  {{
+    "Revision": "abcdef2",
+    "Author": "Author 2",
+    "Date": "{fd(2)}",
+    "Lines of Code": "2 (-1)",
+    "Filename": "test.py"
+  }},
+  {{
+    "Revision": "abcdeff",
+    "Author": "Author Someone",
+    "Date": "{fd(3)}",
+    "Lines of Code": "3 (-1)",
+    "Filename": "test.py"
+  }},
+  {{
+    "Revision": "abcdeff",
+    "Author": "Author Someone",
+    "Date": "{fd(10)}",
+    "Lines of Code": "4 (1)",
+    "Filename": "test.py"
+  }},
+  {{
+    "Revision": "abcdeff",
+    "Author": "Author Someone",
+    "Date": "{fd(10)}",
+    "Lines of Code": "3 (0)",
+    "Filename": "test.py"
+  }},
+  {{
+    "Revision": "abcdeff",
+    "Author": "Author Someone",
+    "Date": "{fd(10)}",
+    "Lines of Code": "3 (0)",
+    "Filename": "test.py"
+  }}
+]
+"""
+EXPECTED_JSON = EXPECTED_JSON[1:]
+
+
+def test_report_json(capsys):
+    path = "test.py"
+    metrics = ("raw.loc",)
+    format_ = "CONSOLE"
+    mock_State, mock_config = get_mock_state_and_config(3)
+
+    with mock.patch("wily.commands.report.State", mock_State):
+        report(
+            config=mock_config,
+            path=path,
+            metrics=metrics,
+            n=10,
+            output=Path(),
+            include_message=False,
+            format=ReportFormat[format_],
+            console_format=DEFAULT_GRID_STYLE,
+            changes_only=False,
+            as_json=True,
+        )
+    captured = capsys.readouterr()
+    assert captured.out == EXPECTED_JSON
+    mock_State.assert_called_once_with(mock_config)
+
+
+EXPECTED_JSON_WITH_MESSAGE = f"""
+[
+  {{
+    "Revision": "abcdef0",
+    "Message": "Message 0",
+    "Author": "Author 0",
+    "Date": "{fd(0)}",
+    "Lines of Code": "0 (-1)",
+    "Filename": "test.py"
+  }},
+  {{
+    "Revision": "abcdef1",
+    "Message": "Message 1",
+    "Author": "Author 1",
+    "Date": "{fd(1)}",
+    "Lines of Code": "1 (-1)",
+    "Filename": "test.py"
+  }},
+  {{
+    "Revision": "abcdef2",
+    "Message": "Message 2",
+    "Author": "Author 2",
+    "Date": "{fd(2)}",
+    "Lines of Code": "2 (-1)",
+    "Filename": "test.py"
+  }},
+  {{
+    "Revision": "abcdeff",
+    "Message": "Message here.",
+    "Author": "Author Someone",
+    "Date": "{fd(3)}",
+    "Lines of Code": "3 (-1)",
+    "Filename": "test.py"
+  }},
+  {{
+    "Revision": "abcdeff",
+    "Message": "Message here.",
+    "Author": "Author Someone",
+    "Date": "{fd(10)}",
+    "Lines of Code": "4 (1)",
+    "Filename": "test.py"
+  }},
+  {{
+    "Revision": "abcdeff",
+    "Message": "Message here.",
+    "Author": "Author Someone",
+    "Date": "{fd(10)}",
+    "Lines of Code": "3 (0)",
+    "Filename": "test.py"
+  }},
+  {{
+    "Revision": "abcdeff",
+    "Message": "Message here.",
+    "Author": "Author Someone",
+    "Date": "{fd(10)}",
+    "Lines of Code": "3 (0)",
+    "Filename": "test.py"
+  }}
+]
+"""
+EXPECTED_JSON_WITH_MESSAGE = EXPECTED_JSON_WITH_MESSAGE[1:]
+
+
+def test_report_json_with_message(capsys):
+    path = "test.py"
+    metrics = ("raw.loc",)
+    format_ = "CONSOLE"
+    mock_State, mock_config = get_mock_state_and_config(3)
+
+    with mock.patch("wily.commands.report.State", mock_State):
+        report(
+            config=mock_config,
+            path=path,
+            metrics=metrics,
+            n=10,
+            output=Path(),
+            include_message=True,
+            format=ReportFormat[format_],
+            console_format=DEFAULT_GRID_STYLE,
+            changes_only=False,
+            as_json=True,
+        )
+    captured = capsys.readouterr()
+    assert captured.out == EXPECTED_JSON_WITH_MESSAGE
+    mock_State.assert_called_once_with(mock_config)
+
+
+EXPECTED_JSON_CHANGES_ONLY = f"""
+[
+  {{
+    "Revision": "abcdef0",
+    "Author": "Author 0",
+    "Date": "{fd(0)}",
+    "Lines of Code": "0 (-1)",
+    "Filename": "test.py"
+  }},
+  {{
+    "Revision": "abcdef1",
+    "Author": "Author 1",
+    "Date": "{fd(1)}",
+    "Lines of Code": "1 (-1)",
+    "Filename": "test.py"
+  }},
+  {{
+    "Revision": "abcdef2",
+    "Author": "Author 2",
+    "Date": "{fd(2)}",
+    "Lines of Code": "2 (-1)",
+    "Filename": "test.py"
+  }},
+  {{
+    "Revision": "abcdeff",
+    "Author": "Author Someone",
+    "Date": "{fd(3)}",
+    "Lines of Code": "3 (-1)",
+    "Filename": "test.py"
+  }},
+  {{
+    "Revision": "abcdeff",
+    "Author": "Author Someone",
+    "Date": "{fd(10)}",
+    "Lines of Code": "4 (1)",
+    "Filename": "test.py"
+  }}
+]
+"""
+EXPECTED_JSON_CHANGES_ONLY = EXPECTED_JSON_CHANGES_ONLY[1:]
+
+
+def test_report_json_changes_only(capsys):
+    path = "test.py"
+    metrics = ("raw.loc",)
+    format_ = "CONSOLE"
+    mock_State, mock_config = get_mock_state_and_config(3)
+
+    with mock.patch("wily.commands.report.State", mock_State):
+        report(
+            config=mock_config,
+            path=path,
+            metrics=metrics,
+            n=10,
+            output=Path(),
+            include_message=False,
+            format=ReportFormat[format_],
+            console_format=DEFAULT_GRID_STYLE,
+            changes_only=True,
+            as_json=True,
+        )
+    captured = capsys.readouterr()
+    assert captured.out == EXPECTED_JSON_CHANGES_ONLY
+    mock_State.assert_called_once_with(mock_config)
+
+
+EXPECTED_JSON_WITH_KEYERROR = f"""
+[
+  {{
+    "Revision": "abcdef0",
+    "Author": "Author 0",
+    "Date": "{fd(0)}",
+    "Lines of Code": "0 (-1)",
+    "Filename": "test.py"
+  }},
+  {{
+    "Revision": "abcdef1",
+    "Author": "Author 1",
+    "Date": "{fd(1)}",
+    "Lines of Code": "1 (-1)",
+    "Filename": "test.py"
+  }},
+  {{
+    "Revision": "abcdef2",
+    "Author": "Author 2",
+    "Date": "{fd(2)}",
+    "Lines of Code": "2 (-1)",
+    "Filename": "test.py"
+  }},
+  {{
+    "Revision": "abcdeff",
+    "Author": "Author Someone",
+    "Date": "{fd(3)}",
+    "Lines of Code": "3 (-1)",
+    "Filename": "test.py"
+  }},
+  {{
+    "Revision": "abcdeff",
+    "Author": "Author Someone",
+    "Date": "{fd(10)}",
+    "Lines of Code": "4 (1)",
+    "Filename": "test.py"
+  }},
+  {{
+    "Revision": "abcdeff",
+    "Author": "Author Someone",
+    "Date": "{fd(10)}",
+    "Lines of Code": "3 (0)",
+    "Filename": "test.py"
+  }},
+  {{
+    "Revision": "abcdeff",
+    "Author": "Author Someone",
+    "Date": "{fd(10)}",
+    "Lines of Code": "Not found 'some_path.py'",
+    "Filename": "test.py"
+  }}
+]
+"""
+EXPECTED_JSON_WITH_KEYERROR = EXPECTED_JSON_WITH_KEYERROR[1:]
+
+
+def test_report_json_with_keyerror(capsys):
+    path = "test.py"
+    metrics = ("raw.loc",)
+    format_ = "CONSOLE"
+    mock_State, mock_config = get_mock_state_and_config(3, with_keyerror=True)
+
+    with mock.patch("wily.commands.report.State", mock_State):
+        report(
+            config=mock_config,
+            path=path,
+            metrics=metrics,
+            n=10,
+            output=Path(),
+            include_message=False,
+            format=ReportFormat[format_],
+            console_format=DEFAULT_GRID_STYLE,
+            changes_only=False,
+            as_json=True,
+        )
+    captured = capsys.readouterr()
+    assert captured.out == EXPECTED_JSON_WITH_KEYERROR
+    mock_State.assert_called_once_with(mock_config)
+
+
 def get_outputs():
     output = StringIO()
     enter = mock.MagicMock(return_value=output)

From f57006ed50ad9e7fe9a5d4cb449a9e09394b57b4 Mon Sep 17 00:00:00 2001
From: devdanzin <74280297+devdanzin@users.noreply.github.com>
Date: Sat, 28 Oct 2023 11:48:34 -0300
Subject: [PATCH 18/25] Increase ruff max branches, statements and complexity
 for report().

---
 pyproject.toml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index beb07c63..ac3867db 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -147,12 +147,12 @@ target-version = "py37"
 known-local-folder = ["wily"]
 
 [tool.ruff.mccabe]
-max-complexity = 24
+max-complexity = 26
 
 [tool.ruff.per-file-ignores]
 "test/*" = ["D"]
 
 [tool.ruff.pylint]
 max-args = 12
-max-branches = 35
-max-statements = 100
+max-branches = 37
+max-statements = 105

From a2268c4002ce22b957eff832d7c0130ec3cb72cd Mon Sep 17 00:00:00 2001
From: devdanzin <74280297+devdanzin@users.noreply.github.com>
Date: Thu, 2 Nov 2023 10:07:13 -0300
Subject: [PATCH 19/25] Tighten typing info in print_json().

---
 src/wily/helper/output.py | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/wily/helper/output.py b/src/wily/helper/output.py
index 26af24db..03ec899c 100644
--- a/src/wily/helper/output.py
+++ b/src/wily/helper/output.py
@@ -1,17 +1,15 @@
 """Output helpers for wily."""
 import json
-from collections.abc import Sequence
+from typing import List, Tuple
 
 
-def print_json(data: Sequence, headers: Sequence, path: str = ""):
+def print_json(data: List, headers: Tuple, path: str = "") -> None:
     """
     Print data as JSON.
 
-    :param data: Rows of data to print
-
-    :param headers: Headers of data to print
-
-    :param path: The path to the file
+    :param data: Rows of data to print.
+    :param headers: Headers of data to print.
+    :param path: The path to the file.
     """
     json_data = [{headers[x]: d[x] for x in range(len(headers))} for d in data]
     if path:

From c4cbc86699613f234ee7de4ae499371be5c613b3 Mon Sep 17 00:00:00 2001
From: devdanzin <74280297+devdanzin@users.noreply.github.com>
Date: Thu, 2 Nov 2023 10:13:07 -0300
Subject: [PATCH 20/25] Rename test_print_result_* to test_print_json_*.

---
 test/unit/test_helper.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/unit/test_helper.py b/test/unit/test_helper.py
index 0c890af1..07b6cf17 100644
--- a/test/unit/test_helper.py
+++ b/test/unit/test_helper.py
@@ -57,21 +57,21 @@
 """
 
 
-def test_print_result_empty_json():
+def test_print_json_empty_json():
     stdout = StringIO()
     with mock.patch("sys.stdout", stdout):
         print_json([], ())
     assert stdout.getvalue() == "[]\n"
 
 
-def test_print_result_data_json():
+def test_print_json_data_json():
     stdout = StringIO()
     with mock.patch("sys.stdout", stdout):
         print_json(DATA, HEADERS)
     assert stdout.getvalue() == JSON_DATA
 
 
-def test_print_result_data_json_path():
+def test_print_json_data_json_path():
     stdout = StringIO()
     with mock.patch("sys.stdout", stdout):
         print_json(DATA, HEADERS, "some_path")

From 180436beaeb8e3beaab8ce1e2d61c26f583178d4 Mon Sep 17 00:00:00 2001
From: devdanzin <74280297+devdanzin@users.noreply.github.com>
Date: Fri, 3 Nov 2023 00:23:38 -0300
Subject: [PATCH 21/25] Make deltas  separated columns in report() JSON output.

---
 src/wily/commands/report.py   | 12 +++++-
 test/unit/test_report_unit.py | 76 +++++++++++++++++++++++------------
 2 files changed, 61 insertions(+), 27 deletions(-)

diff --git a/src/wily/commands/report.py b/src/wily/commands/report.py
index 3dc5f93a..54418448 100644
--- a/src/wily/commands/report.py
+++ b/src/wily/commands/report.py
@@ -134,10 +134,15 @@ def report(
                     else:
                         k = f"{val}"
                 except KeyError as e:
-                    k = f"Not found {e}"
+                    k = val = f"Not found {e}"
                     delta = 0
                 deltas.append(delta)
-                vals.append(k)
+                if as_json:
+                    vals.append(val)
+                else:
+                    vals.append(k)
+            if as_json and format != ReportFormat.HTML:
+                vals += deltas
             if not changes_only or any(deltas):
                 if include_message:
                     data.append(
@@ -163,6 +168,9 @@ def report(
         return
 
     descriptions = [meta["title"] for meta in metric_metas]
+    if as_json and format != ReportFormat.HTML:
+        descriptions += [f"{meta['title']} Delta" for meta in metric_metas]
+
     if include_message:
         headers = (_("Revision"), _("Message"), _("Author"), _("Date"), *descriptions)
     else:
diff --git a/test/unit/test_report_unit.py b/test/unit/test_report_unit.py
index ebb59a12..e3e944ed 100644
--- a/test/unit/test_report_unit.py
+++ b/test/unit/test_report_unit.py
@@ -409,49 +409,56 @@ def test_report_html():
     "Revision": "abcdef0",
     "Author": "Author 0",
     "Date": "{fd(0)}",
-    "Lines of Code": "0 (-1)",
+    "Lines of Code": 0,
+    "Lines of Code Delta": -1,
     "Filename": "test.py"
   }},
   {{
     "Revision": "abcdef1",
     "Author": "Author 1",
     "Date": "{fd(1)}",
-    "Lines of Code": "1 (-1)",
+    "Lines of Code": 1,
+    "Lines of Code Delta": -1,
     "Filename": "test.py"
   }},
   {{
     "Revision": "abcdef2",
     "Author": "Author 2",
     "Date": "{fd(2)}",
-    "Lines of Code": "2 (-1)",
+    "Lines of Code": 2,
+    "Lines of Code Delta": -1,
     "Filename": "test.py"
   }},
   {{
     "Revision": "abcdeff",
     "Author": "Author Someone",
     "Date": "{fd(3)}",
-    "Lines of Code": "3 (-1)",
+    "Lines of Code": 3,
+    "Lines of Code Delta": -1,
     "Filename": "test.py"
   }},
   {{
     "Revision": "abcdeff",
     "Author": "Author Someone",
     "Date": "{fd(10)}",
-    "Lines of Code": "4 (1)",
+    "Lines of Code": 4,
+    "Lines of Code Delta": 1,
     "Filename": "test.py"
   }},
   {{
     "Revision": "abcdeff",
     "Author": "Author Someone",
     "Date": "{fd(10)}",
-    "Lines of Code": "3 (0)",
+    "Lines of Code": 3,
+    "Lines of Code Delta": 0,
     "Filename": "test.py"
   }},
   {{
     "Revision": "abcdeff",
     "Author": "Author Someone",
     "Date": "{fd(10)}",
-    "Lines of Code": "3 (0)",
+    "Lines of Code": 3,
+    "Lines of Code Delta": 0,
     "Filename": "test.py"
   }}
 ]
@@ -490,7 +497,8 @@ def test_report_json(capsys):
     "Message": "Message 0",
     "Author": "Author 0",
     "Date": "{fd(0)}",
-    "Lines of Code": "0 (-1)",
+    "Lines of Code": 0,
+    "Lines of Code Delta": -1,
     "Filename": "test.py"
   }},
   {{
@@ -498,7 +506,8 @@ def test_report_json(capsys):
     "Message": "Message 1",
     "Author": "Author 1",
     "Date": "{fd(1)}",
-    "Lines of Code": "1 (-1)",
+    "Lines of Code": 1,
+    "Lines of Code Delta": -1,
     "Filename": "test.py"
   }},
   {{
@@ -506,7 +515,8 @@ def test_report_json(capsys):
     "Message": "Message 2",
     "Author": "Author 2",
     "Date": "{fd(2)}",
-    "Lines of Code": "2 (-1)",
+    "Lines of Code": 2,
+    "Lines of Code Delta": -1,
     "Filename": "test.py"
   }},
   {{
@@ -514,7 +524,8 @@ def test_report_json(capsys):
     "Message": "Message here.",
     "Author": "Author Someone",
     "Date": "{fd(3)}",
-    "Lines of Code": "3 (-1)",
+    "Lines of Code": 3,
+    "Lines of Code Delta": -1,
     "Filename": "test.py"
   }},
   {{
@@ -522,7 +533,8 @@ def test_report_json(capsys):
     "Message": "Message here.",
     "Author": "Author Someone",
     "Date": "{fd(10)}",
-    "Lines of Code": "4 (1)",
+    "Lines of Code": 4,
+    "Lines of Code Delta": 1,
     "Filename": "test.py"
   }},
   {{
@@ -530,7 +542,8 @@ def test_report_json(capsys):
     "Message": "Message here.",
     "Author": "Author Someone",
     "Date": "{fd(10)}",
-    "Lines of Code": "3 (0)",
+    "Lines of Code": 3,
+    "Lines of Code Delta": 0,
     "Filename": "test.py"
   }},
   {{
@@ -538,7 +551,8 @@ def test_report_json(capsys):
     "Message": "Message here.",
     "Author": "Author Someone",
     "Date": "{fd(10)}",
-    "Lines of Code": "3 (0)",
+    "Lines of Code": 3,
+    "Lines of Code Delta": 0,
     "Filename": "test.py"
   }}
 ]
@@ -576,35 +590,40 @@ def test_report_json_with_message(capsys):
     "Revision": "abcdef0",
     "Author": "Author 0",
     "Date": "{fd(0)}",
-    "Lines of Code": "0 (-1)",
+    "Lines of Code": 0,
+    "Lines of Code Delta": -1,
     "Filename": "test.py"
   }},
   {{
     "Revision": "abcdef1",
     "Author": "Author 1",
     "Date": "{fd(1)}",
-    "Lines of Code": "1 (-1)",
+    "Lines of Code": 1,
+    "Lines of Code Delta": -1,
     "Filename": "test.py"
   }},
   {{
     "Revision": "abcdef2",
     "Author": "Author 2",
     "Date": "{fd(2)}",
-    "Lines of Code": "2 (-1)",
+    "Lines of Code": 2,
+    "Lines of Code Delta": -1,
     "Filename": "test.py"
   }},
   {{
     "Revision": "abcdeff",
     "Author": "Author Someone",
     "Date": "{fd(3)}",
-    "Lines of Code": "3 (-1)",
+    "Lines of Code": 3,
+    "Lines of Code Delta": -1,
     "Filename": "test.py"
   }},
   {{
     "Revision": "abcdeff",
     "Author": "Author Someone",
     "Date": "{fd(10)}",
-    "Lines of Code": "4 (1)",
+    "Lines of Code": 4,
+    "Lines of Code Delta": 1,
     "Filename": "test.py"
   }}
 ]
@@ -642,42 +661,48 @@ def test_report_json_changes_only(capsys):
     "Revision": "abcdef0",
     "Author": "Author 0",
     "Date": "{fd(0)}",
-    "Lines of Code": "0 (-1)",
+    "Lines of Code": 0,
+    "Lines of Code Delta": -1,
     "Filename": "test.py"
   }},
   {{
     "Revision": "abcdef1",
     "Author": "Author 1",
     "Date": "{fd(1)}",
-    "Lines of Code": "1 (-1)",
+    "Lines of Code": 1,
+    "Lines of Code Delta": -1,
     "Filename": "test.py"
   }},
   {{
     "Revision": "abcdef2",
     "Author": "Author 2",
     "Date": "{fd(2)}",
-    "Lines of Code": "2 (-1)",
+    "Lines of Code": 2,
+    "Lines of Code Delta": -1,
     "Filename": "test.py"
   }},
   {{
     "Revision": "abcdeff",
     "Author": "Author Someone",
     "Date": "{fd(3)}",
-    "Lines of Code": "3 (-1)",
+    "Lines of Code": 3,
+    "Lines of Code Delta": -1,
     "Filename": "test.py"
   }},
   {{
     "Revision": "abcdeff",
     "Author": "Author Someone",
     "Date": "{fd(10)}",
-    "Lines of Code": "4 (1)",
+    "Lines of Code": 4,
+    "Lines of Code Delta": 1,
     "Filename": "test.py"
   }},
   {{
     "Revision": "abcdeff",
     "Author": "Author Someone",
     "Date": "{fd(10)}",
-    "Lines of Code": "3 (0)",
+    "Lines of Code": 3,
+    "Lines of Code Delta": 0,
     "Filename": "test.py"
   }},
   {{
@@ -685,6 +710,7 @@ def test_report_json_changes_only(capsys):
     "Author": "Author Someone",
     "Date": "{fd(10)}",
     "Lines of Code": "Not found 'some_path.py'",
+    "Lines of Code Delta": 0,
     "Filename": "test.py"
   }}
 ]

From 64b74482e23dc1b65911dc7d963c0c6c409997b6 Mon Sep 17 00:00:00 2001
From: devdanzin <74280297+devdanzin@users.noreply.github.com>
Date: Fri, 3 Nov 2023 00:54:37 -0300
Subject: [PATCH 22/25] Remove unused branch in report().

---
 src/wily/commands/report.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/wily/commands/report.py b/src/wily/commands/report.py
index 54418448..5ea8ddc5 100644
--- a/src/wily/commands/report.py
+++ b/src/wily/commands/report.py
@@ -117,9 +117,6 @@ def report(
 
                     if delta == 0:
                         delta_col = delta
-                    elif as_json and not format == ReportFormat.HTML:
-                        # Only strip colors if format isn't HTML, so HTML colors work
-                        delta_col = f"{delta:n}"
                     elif delta < 0:
                         delta_col = (
                             f"\u001b[{meta['decrease_color']}m{delta:n}\u001b[0m"
@@ -138,10 +135,12 @@ def report(
                     delta = 0
                 deltas.append(delta)
                 if as_json:
+                    # Output unformatted, raw values in JSON
                     vals.append(val)
                 else:
                     vals.append(k)
             if as_json and format != ReportFormat.HTML:
+                # Output deltas as their own columns in JSON output
                 vals += deltas
             if not changes_only or any(deltas):
                 if include_message:

From 7a05c0658eb1ed689478a4e676e107180f982e69 Mon Sep 17 00:00:00 2001
From: devdanzin <74280297+devdanzin@users.noreply.github.com>
Date: Fri, 3 Nov 2023 08:48:52 -0300
Subject: [PATCH 23/25] Add more typing info to print_json().

---
 src/wily/helper/output.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wily/helper/output.py b/src/wily/helper/output.py
index 03ec899c..5f4e9c81 100644
--- a/src/wily/helper/output.py
+++ b/src/wily/helper/output.py
@@ -3,7 +3,7 @@
 from typing import List, Tuple
 
 
-def print_json(data: List, headers: Tuple, path: str = "") -> None:
+def print_json(data: List, headers: Tuple[str, ...], path: str = "") -> None:
     """
     Print data as JSON.
 

From af81cfaf769ff6036e4c97904bc0ab5799538fd5 Mon Sep 17 00:00:00 2001
From: devdanzin <74280297+devdanzin@users.noreply.github.com>
Date: Sun, 5 Nov 2023 08:34:58 -0300
Subject: [PATCH 24/25] Output current and new values as separate columns in
 diff() when generating JSON.

---
 src/wily/commands/diff.py | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/wily/commands/diff.py b/src/wily/commands/diff.py
index cbe442b1..7fc638b8 100644
--- a/src/wily/commands/diff.py
+++ b/src/wily/commands/diff.py
@@ -146,18 +146,22 @@ def diff(
             if new != current:
                 has_changes = True
             if metric.metric_type in (int, float) and new != "-" and current != "-":
-                if current > new and not as_json:  # type: ignore
+                if as_json:
+                    metrics_data.extend([current, new])
+                elif current > new:  # type: ignore
                     metrics_data.append(
                         f"{current:n} -> \u001b[{BAD_COLORS[metric.measure]}m{new:n}\u001b[0m"
                     )
-                elif current < new and not as_json:  # type: ignore
+                elif current < new:  # type: ignore
                     metrics_data.append(
                         f"{current:n} -> \u001b[{GOOD_COLORS[metric.measure]}m{new:n}\u001b[0m"
                     )
                 else:
                     metrics_data.append(f"{current:n} -> {new:n}")
             else:
-                if current == "-" and new == "-":
+                if as_json:
+                    metrics_data.extend([current, new])
+                elif current == "-" and new == "-":
                     metrics_data.append("-")
                 else:
                     metrics_data.append(f"{current} -> {new}")
@@ -165,8 +169,13 @@ def diff(
             results.append((file, *metrics_data))
         else:
             logger.debug(metrics_data)
-
-    descriptions = [metric.description for _, metric in resolved_metrics]
+    if as_json:
+        descriptions = []
+        for _, metric in resolved_metrics:
+            desc = [f"{metric.description} Current", f"{metric.description} New"]
+            descriptions.extend(desc)
+    else:
+        descriptions = [metric.description for _, metric in resolved_metrics]
     headers = ("File", *descriptions)
     if len(results) > 0:
         if as_json:

From 74d2813f06b3b5249a300c28968ab9f095844de5 Mon Sep 17 00:00:00 2001
From: devdanzin <74280297+devdanzin@users.noreply.github.com>
Date: Sun, 5 Nov 2023 08:37:13 -0300
Subject: [PATCH 25/25] Increase ruff's max values for complexity, branches and
 statements again to allow report() to pass.

---
 pyproject.toml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index ac3867db..87cbc3fd 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -147,12 +147,12 @@ target-version = "py37"
 known-local-folder = ["wily"]
 
 [tool.ruff.mccabe]
-max-complexity = 26
+max-complexity = 28
 
 [tool.ruff.per-file-ignores]
 "test/*" = ["D"]
 
 [tool.ruff.pylint]
 max-args = 12
-max-branches = 37
-max-statements = 105
+max-branches = 40
+max-statements = 107