More progress on templated output.

lib/micro_test/formatters/default_async_formatter.rb

@@ -1,9 +1,7 @@
-require File.join(File.dirname(__FILE__), "base_formatter")
-require File.join(File.dirname(__FILE__), "default_printer")
+require_relative "base_formatter"
 
 module MicroTest
   class DefaultAsyncFormatter < MicroTest::BaseFormatter
-    include DefaultPrinter
     set_short_name "default_async"
 
     def after_test(test)

lib/micro_test/formatters/default_formatter.rb

@@ -1,43 +1,25 @@
 require_relative "base_formatter"
-require_relative "default_printer"
 
 module MicroTest
   class DefaultFormatter < MicroTest::BaseFormatter
-    include DefaultPrinter
     set_short_name "default"
 
     def before_class(test_class)
-      puts
-      print_with_line test_class.name
+      print Template.new(test_class, DefaultHelper).render(:_class)
     end
 
     def after_test(test)
       if test.passed?
-        print_test_pass test
+        print Template.new(test, DefaultHelper).render(:_test_pass)
       else
-        print_test_fail test
+        print Template.new(test, DefaultHelper).render(:_test_fail)
       end
 
       puts
     end
 
     def after_suite(test_classes)
-      puts
-      print_line
-      print_totals
-      puts " in #{yellow duration} seconds."
-      print_line
-      puts
-      puts
-    end
-
-    private
-
-    def print_totals
-      totals = []
-      totals << green("#{passed} Passed") if passed > 0
-      totals << red("#{failed} Failed") if failed > 0
-      print totals.join(", ")
+      print Template.new(self, DefaultHelper).render(:suite)
     end
 
   end

lib/micro_test/formatters/views/default/_assert_fail.txt.erb

@@ -1,5 +1,5 @@
 <%= @context[:file_path].strip %>:<%= red @context[:line_num] %>
-  -------------------------------------------------------------
+  ------------------------------------------------------------------------------
   <% assert_lines(@context).each do |line| -%>
   <%= send line[:color], line[:line_num].to_s.rjust(3, "0") -%>| <%= send line[:color], line[:line] -%>
   <% end -%>

lib/micro_test/formatters/views/default/_class.txt.erb

@@ -0,0 +1,2 @@
+
+<%= @context.name.ljust(80, "-") %>

lib/micro_test/formatters/views/default/_test_fail.txt.erb

@@ -1,2 +1,2 @@
-  <%= send duration_color(@context.duration), @context.duration %> <%= red @context.desc %>
+  <%= send duration_color(@context.duration), @context.duration %> <%= red @context.desc -%>
   <%= partial :_assert_fail, *@context.failed_asserts -%>

lib/micro_test/formatters/views/default/suite.txt.erb

@@ -0,0 +1,6 @@
+
+--------------------------------------------------------------------------------
+<%= green "#{@context.passed} Passed" -%>, <%= red "#{@context.failed} Failed" -%>
+ Finished in <%= yellow @context.duration %> seconds.
+--------------------------------------------------------------------------------
+