Minor cleanup
This commit is contained in:
@@ -33,6 +33,7 @@ defmodule Display do
|
||||
|
||||
def considering(module) do
|
||||
IO.puts("Considering #{format_module(module)}...")
|
||||
module
|
||||
end
|
||||
|
||||
def clear_screen do
|
||||
|
||||
@@ -1,36 +1,32 @@
|
||||
defmodule Execute do
|
||||
def run_module(module) do
|
||||
run_until_failure(module, &run_koan/2)
|
||||
end
|
||||
|
||||
def run_until_failure(module, callback) do
|
||||
Enum.reduce_while(module.all_koans, :passed, fn(it, _acc) ->
|
||||
result = callback.(module, it)
|
||||
if result == :passed do
|
||||
{:cont, :passed}
|
||||
else
|
||||
{:halt, result}
|
||||
end
|
||||
Enum.reduce_while(module.all_koans, :passed, fn(koan, _) ->
|
||||
module
|
||||
|> run_koan(koan)
|
||||
|> continue?
|
||||
end)
|
||||
end
|
||||
|
||||
defp continue?(:passed), do: {:cont, :passed}
|
||||
defp continue?(result), do: {:halt, result}
|
||||
|
||||
def run_koan(module, name, args \\ []) do
|
||||
parent = self()
|
||||
spawn fn -> exec(module, name, args, parent) end
|
||||
spawn(fn -> exec(module, name, args, parent) end)
|
||||
receive do
|
||||
:ok -> :passed
|
||||
error -> {:failed, error, module, name}
|
||||
end
|
||||
end
|
||||
|
||||
def exec(module, name, args, parent) do
|
||||
defp exec(module, name, args, parent) do
|
||||
result = apply(module, name, args)
|
||||
send parent, expand(result)
|
||||
Process.exit(self(), :kill)
|
||||
end
|
||||
|
||||
def expand(:ok), do: :ok
|
||||
def expand(error) do
|
||||
defp expand(:ok), do: :ok
|
||||
defp expand(error) do
|
||||
{file, line} = System.stacktrace
|
||||
|> Enum.drop_while(&in_ex_unit?/1)
|
||||
|> List.first
|
||||
|
||||
@@ -33,11 +33,16 @@ defmodule Runner do
|
||||
end
|
||||
|
||||
def run_module(module) do
|
||||
Display.considering(module)
|
||||
case Execute.run_module(module) do
|
||||
{:failed, error, module, name} -> Display.show_failure(error, module, name)
|
||||
:failed
|
||||
_ -> :passed
|
||||
end
|
||||
module
|
||||
|> Display.considering
|
||||
|> Execute.run_module
|
||||
|> display
|
||||
|
||||
end
|
||||
|
||||
defp display({:failed, error, module, name}) do
|
||||
Display.show_failure(error, module, name)
|
||||
:failed
|
||||
end
|
||||
defp display(_), do: :passed
|
||||
end
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
defmodule RunnerTest do
|
||||
defmodule ExecuteTest do
|
||||
use ExUnit.Case
|
||||
|
||||
test "passes a koan" do
|
||||
|
||||
Reference in New Issue
Block a user