Skip to content

Refactor verbosity checks #215

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
brienw merged 2 commits into from
Feb 12, 2018
Merged

Refactor verbosity checks #215

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5b536c6
Refactor verbosity checks
pmeinhardt Feb 11, 2018
6a3a4fe
Replace `x not in y` with `not(x in y)`
pmeinhardt Feb 11, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 9 additions & 16 deletions lib/ui.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ defmodule Bootleg.UI do
a configured verbosity level.
"""

@verbosities [:error, :warning, :info, :debug]

@doc """
Simple wrapper around IO.puts
"""
Expand Down Expand Up @@ -67,24 +69,15 @@ defmodule Bootleg.UI do
validate_verbosity setting || Application.get_env(:bootleg, :verbosity, :info)
end

defp validate_verbosity(verbosity)
defp validate_verbosity(:warning), do: :warning
defp validate_verbosity(:debug), do: :debug
defp validate_verbosity(:silent), do: :silent
defp validate_verbosity(verbosity) when verbosity in @verbosities, do: verbosity
defp validate_verbosity(_), do: :info

defp verbosity_includes(setting, level)
defp verbosity_includes(:info, :info), do: true
defp verbosity_includes(:info, :warning), do: true
defp verbosity_includes(:info, :error), do: true
defp verbosity_includes(:warning, :warning), do: true
defp verbosity_includes(:warning, :error), do: true
defp verbosity_includes(:error, :error), do: true
defp verbosity_includes(:debug, :info), do: true
defp verbosity_includes(:debug, :warning), do: true
defp verbosity_includes(:debug, :debug), do: true
defp verbosity_includes(:debug, :error), do: true
defp verbosity_includes(_, _), do: false
defp verbosity_includes(setting, _) when not(setting in @verbosities), do: false
defp verbosity_includes(_, level) when not(level in @verbosities), do: false
defp verbosity_includes(setting, level) do
index = fn value -> Enum.find_index(@verbosities, &(&1 == value)) end
index.(setting) >= index.(level)
end

### SSH formatting functions

Expand Down