TastyPancakes/PkgTemplates.jl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean up prints

Browse Source 
Your syntax highlighter will thank me later.
This commit is contained in:
Chris de Graaf 2018-12-20 14:21:12 -06:00
parent bff5a22c7a
commit 344ef077a5
4 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugin.jl
View File

@ -69,19 +69,19 @@ abstract type GenericPlugin <: Plugin end
function Base.show(io::IO, p::GenericPlugin)
spc = " "
println(io, "$(nameof(typeof(p))):")
println(io, nameof(typeof(p)), ":")
cfg = if p.src === nothing
"None"
else
dirname(p.src) == DEFAULTS_DIR ? "Default" : p.src
end
println(io, "$spc→ Config file: $cfg")
println(io, spc, "→ Config file: ", cfg)
n = length(p.gitignore)
s = n == 1 ? "" : "s"
print(io, "$spc→ $n gitignore entrie$s")
n > 0 && print(io, ": $(join(map(g -> "\"$g\"", p.gitignore), ", "))")
print(io, spc, "→ $n gitignore entrie$s")
n > 0 && print(io, ": ", join(map(repr, p.gitignore), ", "))
end
"""
@ -230,7 +230,7 @@ function interactive(T::Type{<:GenericPlugin}; file::Union{AbstractString, Nothi
if default_config_file == nothing
print("[None]: ")
else
print("[$(replace(default_config_file, homedir() => "~"))]: ")
print("[", replace(default_config_file, homedir() => "~"), "]: ")
end
config_file = readline()

8
src/plugins/documenter.jl
View File

@ -109,19 +109,19 @@ end
function Base.show(io::IO, p::Documenter)
spc = " "
println(io, "$(nameof(typeof(p))):")
println(io, nameof(typeof(p)), ":")
n = length(p.assets)
s = n == 1 ? "" : "s"
print(io, "$spc→ $n asset file$s")
print(io, spc, "→ $n asset file$s")
if n == 0
println(io)
else
println(io, ": $(join(map(a -> replace(a, homedir() => "~"), p.assets), ", "))")
println(io, ": ", join(map(a -> replace(a, homedir() => "~"), p.assets), ", "))
end
n = length(p.gitignore)
s = n == 1 ? "" : "s"
print(io, "$spc→ $n gitignore entrie$s")
n > 0 && print(io, ": $(join(map(g -> "\"$g\"", p.gitignore), ", "))")
n > 0 && print(io, ": ", join(map(repr, p.gitignore), ", "))
end

2
src/plugins/gitlabci.jl
View File

@ -61,7 +61,7 @@ function interactive(::Type{GitLabCI})
default_config_file = joinpath(DEFAULTS_DIR, "gitlab-ci.yml")
print("$name: Enter the config template filename (\"None\" for no file) ")
print("[$default_config_file]: ")
print("[", replace(default_config_file, homedir() => "~"), "]: ")
config_file = readline()
kwargs[:config_file] = if uppercase(config_file) == "NONE"
nothing

26
src/template.jl
View File

@ -88,26 +88,26 @@ struct Template
end
function Base.show(io::IO, t::Template)
maybe(s::AbstractString) = isempty(string(s)) ? "None" : string(s)
maybe(s::String) = isempty(s) ? "None" : s
spc = " "
println(io, "Template:")
println(io, "$spc→ User: $(maybe(t.user))")
println(io, "$spc→ Host: $(maybe(t.host))")
println(io, spc, "→ User: ", maybe(t.user))
println(io, spc, "→ Host: ", maybe(t.host))
print(io, "$spc→ License: ")
print(io, spc, "→ License: ")
if isempty(t.license)
println(io, "None")
else
println(io, "$(t.license) ($(t.authors) $(year(today())))")
println(io, t.license, " ($(t.authors) ", year(today()), ")")
end
println(io, "$spc→ Package directory: $(replace(maybe(t.dir), homedir() => "~"))")
println(io, "$spc→ Minimum Julia version: v$(version_floor(t.julia_version))")
println(io, "$spc→ SSH remote: $(t.ssh ? "Yes" : "No")")
println(io, "$spc→ Commit Manifest.toml: $(t.manifest ? "Yes" : "No")")
println(io, spc, "→ Package directory: ", replace(maybe(t.dir), homedir() => "~"))
println(io, spc, "→ Minimum Julia version: v", version_floor(t.julia_version))
println(io, spc, "→ SSH remote: ", t.ssh ? "Yes" : "No")
println(io, spc, "→ Commit Manifest.toml: ", t.manifest ? "Yes" : "No")
print(io, "$spc→ Plugins:")
print(io, spc, "→ Plugins:")
if isempty(t.plugins)
print(io, " None")
else
@ -115,7 +115,7 @@ function Base.show(io::IO, t::Template)
println(io)
buf = IOBuffer()
show(buf, plugin)
print(io, "$(spc^2)• ")
print(io, spc^2, "• ")
print(io, join(split(String(take!(buf)), "\n"), "\n$(spc^2)"))
end
end
@ -135,7 +135,7 @@ function interactive_template(; git::Bool=true, fast::Bool=false)
kwargs = Dict{Symbol, Any}()
default_user = LibGit2.getconfig("github.user", "")
print("Username [$(isempty(default_user) ? "REQUIRED" : default_user)]: ")
print("Username [", isempty(default_user) ? "REQUIRED" : default_user, "]: ")
user = readline()
kwargs[:user] = if !isempty(user)
user
@ -192,7 +192,7 @@ function interactive_template(; git::Bool=true, fast::Bool=false)
VERSION
else
default_julia_version = VERSION
print("Mminimum Julia version [$(version_floor(default_julia_version))]: ")
print("Minimum Julia version [", version_floor(default_julia_version), "]: ")
julia_version = readline()
isempty(julia_version) ? default_julia_version : VersionNumber(julia_version)
end