add .formatter.exs + format
This commit is contained in:
@@ -5,7 +5,7 @@ defmodule Display.Paint do
|
||||
def yellow(str), do: painter().yellow(str)
|
||||
|
||||
defp painter do
|
||||
case Mix.env do
|
||||
case Mix.env() do
|
||||
:test -> Display.Uncoloured
|
||||
_ -> Display.Colours
|
||||
end
|
||||
@@ -15,13 +15,13 @@ end
|
||||
defmodule Display.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)
|
||||
def yellow(str), do: colourize(ANSI.yellow, str)
|
||||
def red(str), do: colourize(ANSI.red(), str)
|
||||
def cyan(str), do: colourize(ANSI.cyan(), str)
|
||||
def green(str), do: colourize(ANSI.green(), str)
|
||||
def yellow(str), do: colourize(ANSI.yellow(), str)
|
||||
|
||||
defp colourize(color, message) do
|
||||
Enum.join([color, message, ANSI.reset], "")
|
||||
Enum.join([color, message, ANSI.reset()], "")
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
@@ -3,12 +3,17 @@ defmodule Display.Failure do
|
||||
|
||||
@no_value :ex_unit_no_meaningful_value
|
||||
|
||||
def format_failure(%{error: %ExUnit.AssertionError{expr: @no_value, message: message}, file: file, line: line}) do
|
||||
def format_failure(%{
|
||||
error: %ExUnit.AssertionError{expr: @no_value, message: message},
|
||||
file: file,
|
||||
line: line
|
||||
}) do
|
||||
"""
|
||||
#{Paint.cyan("Assertion failed in #{file}:#{line}")}
|
||||
#{Paint.red(message)}
|
||||
"""
|
||||
end
|
||||
|
||||
def format_failure(%{error: %ExUnit.AssertionError{expr: expr} = error, file: file, line: line}) do
|
||||
"""
|
||||
#{Paint.cyan("Assertion failed in #{file}:#{line}")}
|
||||
@@ -16,6 +21,7 @@ defmodule Display.Failure do
|
||||
"""
|
||||
|> format_inequality(error)
|
||||
end
|
||||
|
||||
def format_failure(%{error: error, file: file, line: line}) do
|
||||
"""
|
||||
#{Paint.cyan("Error in #{file}:#{line}")}
|
||||
@@ -26,22 +32,24 @@ defmodule Display.Failure do
|
||||
defp format_inequality(message, %{left: @no_value, right: @no_value}) do
|
||||
message
|
||||
end
|
||||
|
||||
defp format_inequality(message, %{left: @no_value, right: match_value}) do
|
||||
"""
|
||||
#{message}
|
||||
value does not match: #{match_value |> inspect |> Paint.yellow}
|
||||
value does not match: #{match_value |> inspect |> Paint.yellow()}
|
||||
"""
|
||||
end
|
||||
|
||||
defp format_inequality(message, %{left: left, right: right}) do
|
||||
"""
|
||||
#{message}
|
||||
left: #{left |> inspect |> Paint.yellow}
|
||||
right: #{right |> inspect |> Paint.yellow}
|
||||
left: #{left |> inspect |> Paint.yellow()}
|
||||
right: #{right |> inspect |> Paint.yellow()}
|
||||
"""
|
||||
end
|
||||
|
||||
defp format_error(error) do
|
||||
trace = System.stacktrace |> Enum.take(2)
|
||||
trace = System.stacktrace() |> Enum.take(2)
|
||||
Paint.red(Exception.format(:error, error, trace))
|
||||
end
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@ defmodule Display.Intro do
|
||||
alias Display.Paint
|
||||
|
||||
def intro(module, modules) do
|
||||
if not module in modules do
|
||||
if not (module in modules) do
|
||||
show_intro(module.intro)
|
||||
else
|
||||
""
|
||||
@@ -10,7 +10,7 @@ defmodule Display.Intro do
|
||||
end
|
||||
|
||||
def show_intro(message) do
|
||||
message <> "\n"
|
||||
|> Paint.green
|
||||
(message <> "\n")
|
||||
|> Paint.green()
|
||||
end
|
||||
end
|
||||
|
||||
@@ -15,7 +15,7 @@ defmodule Display.Notifications do
|
||||
|> Enum.map(&Atom.to_string/1)
|
||||
|> Enum.map(&name/1)
|
||||
|> Enum.join(", ")
|
||||
|> Paint.red
|
||||
|> Paint.red()
|
||||
end
|
||||
|
||||
defp name("Elixir." <> module), do: module
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
defmodule Display.ProgressBar do
|
||||
|
||||
@progress_bar_length 30
|
||||
|
||||
def progress_bar(%{current: current, total: total}) do
|
||||
@@ -9,11 +8,12 @@ defmodule Display.ProgressBar do
|
||||
end
|
||||
|
||||
defp calculate_progress(current, total) do
|
||||
round( (current/total) * @progress_bar_length)
|
||||
round(current / total * @progress_bar_length)
|
||||
end
|
||||
|
||||
defp build_arrow(0), do: ""
|
||||
|
||||
defp build_arrow(length) do
|
||||
String.duplicate("=", length-1) <> ">"
|
||||
String.duplicate("=", length - 1) <> ">"
|
||||
end
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user