ml - add finer-grained aggregate stats

Author: magneland

lib/rails_stats/code_statistics.rb

@@ -15,18 +15,18 @@ def initialize(root_directory)
       @key_concepts   = calculate_key_concepts
       @projects       = calculate_projects
       @statistics     = calculate_statistics
-      @total          = calculate_total
+      @code_total, @tests_total, @grand_total = calculate_totals
     end
 
     def to_s
       print_header
       @statistics.each { |key, stats| print_line(key, stats) }
       print_splitter
 
-      if @total
-        print_line("Total", @total)
-        print_splitter
-      end
+      print_line("Code", @code_total)
+      print_line("Tests", @tests_total)
+      print_line("Total", @grand_total)
+      print_splitter
 
       print_code_test_stats
     end
@@ -111,22 +111,21 @@ def calculate_statistics
         out
       end
 
-      def calculate_total
-        @statistics.each_with_object(CodeStatisticsCalculator.new) do |pair, total|
-          total.add(pair.last)
+      def calculate_totals
+        # TODO: make this a single loop
+        code_total = @statistics.each_with_object(CodeStatisticsCalculator.new) do |pair, code_total|
+          code_total.add(pair.last) unless pair.last.test
         end
-      end
 
-      def calculate_code
-        code_loc = 0
-        @statistics.each { |k, v| code_loc += v.code_lines unless v.test }
-        code_loc
-      end
+        tests_total = @statistics.each_with_object(CodeStatisticsCalculator.new) do |pair, tests_total|
+          tests_total.add(pair.last) if pair.last.test
+        end
 
-      def calculate_tests
-        test_loc = 0
-        @statistics.each { |k, v| test_loc += v.code_lines if v.test }
-        test_loc
+        grand_total = @statistics.each_with_object(CodeStatisticsCalculator.new) do |pair, total|
+          total.add(pair.last)
+        end
+
+        [code_total, tests_total, grand_total]
       end
 
       def print_header
@@ -153,10 +152,8 @@ def print_line(name, statistics)
       end
 
       def print_code_test_stats
-        code  = calculate_code
-        tests = calculate_tests
-
-        puts "  Code LOC: #{code}     Test LOC: #{tests}     Code to Test Ratio: 1:#{sprintf("%.1f", tests.to_f/code)}"
+        code_to_test_ratio = @tests_total.code_lines.to_f / @code_total.code_lines
+        puts "  Code LOC: #{@code_total.code_lines}     Test LOC: #{@tests_total.code_lines}     Code to Test Ratio: 1:#{sprintf("%.1f", code_to_test_ratio)}"
         puts ""
       end
   end