add @code_total and @tests_total to output in json

adjust labels

adjust order

fix console output to fix tests

adjust json tests

fix tests from console output

Add change to CHANGELOG.md

Author: hmdros

CHANGELOG.md

@@ -1,6 +1,6 @@
 # main ([unreleased](https://github.com/fastruby/rails_stats/compare/v1.0.2...main))
 
-*
+* [BUGFIX: Fix JSON output missing Code and Tests total count](https://github.com/fastruby/rails_stats/pull/40)
 
 # v2.0.1 ([commits](https://github.com/fastruby/rails_stats/compare/v2.0.0...v2.0.1))
 

lib/rails_stats/json_formatter.rb

@@ -5,9 +5,9 @@ class JSONFormatter < StatsFormatter
     def result
       @result = @statistics.map { |key, stats| stat_hash(key, stats) }
 
-      if @grand_total
-        @result << stat_hash("Total", @grand_total).merge(code_test_hash)
-      end
+      @result << stat_hash("Code", @code_total).merge(code_test_hash) if @code_total
+      @result << stat_hash("Tests", @tests_total).merge(code_test_hash) if @tests_total
+      @result << stat_hash("Total", @grand_total).merge(code_test_hash) if @grand_total
 
       @result
     end

test/fixtures/console-output.txt

@@ -1,8 +1,8 @@
 +-----------------------|------------|----------------+
 |                  Name | Total Deps | 1st Level Deps |
 +-----------------------|------------|----------------+
-|     simplecov-console | 7          | 3              |
-|               codecov | 5          | 2              |
+|     simplecov-console | 8          | 3              |
+|               codecov | 4          | 1              |
 |           rails_stats | 4          | 2              |
 |             simplecov | 3          | 3              |
 |       minitest-around | 1          | 1              |
@@ -21,7 +21,7 @@
 | Name                 | Files   | Lines   |     LOC | Classes | Methods | M/C | LOC/M |
 +----------------------+---------+---------+---------+---------+---------+-----+-------+
 | Channels             |       2 |       8 |       8 |       2 |       0 |   0 |     0 |
-| Configuration        |      19 |     417 |     111 |       1 |       0 |   0 |     0 |
+| Configuration         |      19 |     417 |     111 |       1 |       0 |   0 |     0 |
 | Controllers          |       1 |       7 |       6 |       1 |       1 |   1 |     4 |
 | Helpers              |       1 |       3 |       3 |       0 |       0 |   0 |     0 |
 | Javascripts          |       3 |      27 |       7 |       0 |       0 |   0 |     0 |

test/lib/rails_stats/json_formatter_test.rb

@@ -113,6 +113,28 @@
       "methods": "0",
       "m_over_c": "0",
       "loc_over_m": "0"
+    },{
+      "name": "Code",
+      "files": "30",
+      "lines": "477",
+      "loc": "145",
+      "classes": "7",
+      "methods": "1",
+      "m_over_c": "0",
+      "loc_over_m": "143",
+      "code_to_test_ratio": "0.0",
+      "total": true
+    },{
+      "name": "Tests",
+      "files": "4",
+      "lines": "7",
+      "loc": "6",
+      "classes": "2",
+      "methods": "0",
+      "m_over_c": "0",
+      "loc_over_m": "0",
+      "code_to_test_ratio": "0.0",
+      "total": true
     }, {
       "name": "Total",
       "files": "34",