Merge pull request #90 from elixirkoans/cleanup-display

Cleanup display

lib/colours.ex

@@ -0,0 +1,13 @@
+defmodule Colours do
+  alias IO.ANSI
+
+  def red(str), do: colourize(ANSI.red, str)
+
+  def cyan(str), do: colourize(ANSI.cyan, str)
+
+  def green(str), do: colourize(ANSI.green, str)
+
+  defp colourize(color, message) do
+    Enum.join([color, message, ANSI.reset], "")
+  end
+end

lib/display.ex

@@ -1,13 +1,12 @@
 defmodule Display do
   alias IO.ANSI
-  @current_dir File.cwd!
+
   @no_value :ex_unit_no_meaningful_value
   @progress_bar_length 30
 
   def invalid_koan(koan, modules) do
     koans_names = module_names(modules)
     IO.puts("Did not find koan #{name(koan)} in " <> koans_names )
-    exit(:normal)
   end
 
   defp module_names(modules) do
@@ -15,22 +14,24 @@ defmodule Display do
     |> Enum.map(&Atom.to_string/1)
     |> Enum.map(&name/1)
     |> Enum.join(", ")
-    |> format_red
+    |> Colours.red
   end
 
   defp name("Elixir." <> module), do: module
   defp name(module), do: name(Atom.to_string(module))
 
   def show_failure(failure, module, name) do
-    IO.puts("Now meditate upon #{format_module(module)}")
-    IO.puts(progress_bar(Tracker.summarize))
-    IO.puts(bar())
-    IO.puts(name)
-    IO.puts(format_failure(failure))
+    IO.puts(format(failure, module, name))
   end
 
-  defp bar() do
-    "----------------------------------------"
+  def format(failure, module, name) do
+    """
+    Now meditate upon #{format_module(module)}
+    #{progress_bar(Tracker.summarize)}
+    ----------------------------------------
+    #{name}
+    #{format_failure(failure)}
+    """
   end
 
   def progress_bar(%{current: current, total: total}) do
@@ -54,8 +55,7 @@ defmodule Display do
   end
 
   def congratulate do
-    format_green("\nYou have learned much. You must find your own path now.")
-    |> IO.puts
+    IO.puts(Colours.green("\nYou have learned much. You must find your own path now."))
   end
 
   def clear_screen do
@@ -67,8 +67,8 @@ defmodule Display do
 
   defp format_failure(%{error: %ExUnit.AssertionError{expr: @no_value, message: message}, file: file, line: line}) do
     """
-    #{format_cyan("Assertion failed in #{file}:#{line}")}
-    #{format_red(message)}
+    #{Colours.cyan("Assertion failed in #{file}:#{line}")}
+    #{Colours.red(message)}
     """
   end
   defp format_failure(%{error: %ExUnit.AssertionError{expr: expr}, file: file, line: line}) do
@@ -76,34 +76,21 @@ defmodule Display do
   end
   defp format_failure(%{error: error, file: file, line: line}) do
     """
-    #{format_cyan("Error in #{file}:#{line}")}
+    #{Colours.cyan("Error in #{file}:#{line}")}
     #{format_error(error)}
     """
   end
 
   defp format_assertion_error(error, file, line) do
     """
-    #{format_cyan("Assertion failed in #{file}:#{line}")}
-    #{format_red(Macro.to_string(error))}
+    #{Colours.cyan("Assertion failed in #{file}:#{line}")}
+    #{Colours.red(Macro.to_string(error))}
     """
   end
 
-
   defp format_error(error) do
     trace = System.stacktrace |> Enum.take(2)
-    format_red(Exception.format(:error, error, trace))
-  end
-
-  defp format_red(str) do
-    Enum.join([ANSI.red, str, ANSI.reset], "")
-  end
-
-  defp format_cyan(str) do
-    Enum.join([ANSI.cyan, str, ANSI.reset], "")
-  end
-
-  defp format_green(str) do
-    Enum.join([ANSI.green, str, ANSI.reset], "")
+    Colours.red(Exception.format(:error, error, trace))
   end
 
   defp format_module(module) do

lib/meditate.ex

@@ -31,6 +31,7 @@ defmodule Mix.Tasks.Meditate do
       koan
     else
       Display.invalid_koan(koan, Runner.modules)
+      exit(:normal)
     end
   end
 end