phoenix/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2024-07-05 08:42:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

More expressive --check output

Browse source
This commit is contained in:
Noah Campbell 2013-09-18 11:52:30 -07:00
parent c510140c0c
commit 5374242ff7
2 changed files with 21 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
hugolib/planner.go
View file

@ -14,11 +14,16 @@ func (s *Site) ShowPlan(out io.Writer) (err error) {
fmt.Fprintf(out, "%s", p.FileName) fmt.Fprintf(out, "%s", p.FileName)
if p.IsRenderable() { if p.IsRenderable() {
fmt.Fprintf(out, " (renderer: markdown)") fmt.Fprintf(out, " (renderer: markdown)")
} else {
fmt.Fprintf(out, " (renderer: n/a)")
} }
if s.Tmpl != nil {
fmt.Fprintf(out, " (layout: %s, exists: %t)", p.Layout(), s.Tmpl.Lookup(p.Layout()) != nil)
}
fmt.Fprintf(out, "\n") fmt.Fprintf(out, "\n")
fmt.Fprintf(out, " canonical => ") fmt.Fprintf(out, " canonical => ")
if s.Target == nil { if s.Target == nil {
fmt.Fprintf(out, "%s\n", "!no target specified!") fmt.Fprintf(out, "%s\n\n", "!no target specified!")
continue continue
} }
@ -39,6 +44,7 @@ func (s *Site) ShowPlan(out io.Writer) (err error) {
} }
fmt.Fprintf(out, " %s => %s\n", alias, aliasTrans) fmt.Fprintf(out, " %s => %s\n", alias, aliasTrans)
} }
fmt.Fprintln(out)
} }
return return
} }

22
hugolib/site_show_plan_test.go
View file

@ -17,6 +17,7 @@ type byteSource struct {
var fakeSource = []byteSource{ var fakeSource = []byteSource{
{"foo/bar/file.md", []byte(SIMPLE_PAGE)}, {"foo/bar/file.md", []byte(SIMPLE_PAGE)},
{"alias/test/file1.md", []byte(ALIAS_DOC_1)}, {"alias/test/file1.md", []byte(ALIAS_DOC_1)},
{"section/somecontent.html", []byte(RENDER_NO_FRONT_MATTER)},
} }
type inMemorySource struct { type inMemorySource struct {
@ -54,8 +55,9 @@ func TestDegenerateNoTarget(t *testing.T) {
Source: &inMemorySource{fakeSource}, Source: &inMemorySource{fakeSource},
} }
must(s.CreatePages()) must(s.CreatePages())
expected := "foo/bar/file.md (renderer: markdown)\n canonical => !no target specified!\n" + expected := "foo/bar/file.md (renderer: markdown)\n canonical => !no target specified!\n\n" +
"alias/test/file1.md (renderer: markdown)\n canonical => !no target specified!\n" "alias/test/file1.md (renderer: markdown)\n canonical => !no target specified!\n\n" +
"section/somecontent.html (renderer: n/a)\n canonical => !no target specified!\n\n"
checkShowPlanExpected(t, s, expected) checkShowPlanExpected(t, s, expected)
} }
@ -66,11 +68,13 @@ func TestFileTarget(t *testing.T) {
Alias: new(target.HTMLRedirectAlias), Alias: new(target.HTMLRedirectAlias),
} }
must(s.CreatePages()) must(s.CreatePages())
expected := "foo/bar/file.md (renderer: markdown)\n canonical => foo/bar/file/index.html\n" + expected := "foo/bar/file.md (renderer: markdown)\n canonical => foo/bar/file/index.html\n\n" +
"alias/test/file1.md (renderer: markdown)\n" + "alias/test/file1.md (renderer: markdown)\n" +
" canonical => alias/test/file1/index.html\n" + " canonical => alias/test/file1/index.html\n" +
" alias1/ => alias1/index.html\n" + " alias1/ => alias1/index.html\n" +
" alias-2/ => alias-2/index.html\n" " alias-2/ => alias-2/index.html\n\n" +
"section/somecontent.html (renderer: n/a)\n canonical => section/somecontent/index.html\n\n"
checkShowPlanExpected(t, s, expected) checkShowPlanExpected(t, s, expected)
} }
@ -81,11 +85,12 @@ func TestFileTargetUgly(t *testing.T) {
Alias: new(target.HTMLRedirectAlias), Alias: new(target.HTMLRedirectAlias),
} }
s.CreatePages() s.CreatePages()
expected := "foo/bar/file.md (renderer: markdown)\n canonical => foo/bar/file.html\n" + expected := "foo/bar/file.md (renderer: markdown)\n canonical => foo/bar/file.html\n\n" +
"alias/test/file1.md (renderer: markdown)\n" + "alias/test/file1.md (renderer: markdown)\n" +
" canonical => alias/test/file1.html\n" + " canonical => alias/test/file1.html\n" +
" alias1/ => alias1/index.html\n" + " alias1/ => alias1/index.html\n" +
" alias-2/ => alias-2/index.html\n" " alias-2/ => alias-2/index.html\n\n" +
"section/somecontent.html (renderer: n/a)\n canonical => section/somecontent.html\n\n"
checkShowPlanExpected(t, s, expected) checkShowPlanExpected(t, s, expected)
} }
@ -97,10 +102,11 @@ func TestFileTargetPublishDir(t *testing.T) {
} }
must(s.CreatePages()) must(s.CreatePages())
expected := "foo/bar/file.md (renderer: markdown)\n canonical => ../public/foo/bar/file/index.html\n" + expected := "foo/bar/file.md (renderer: markdown)\n canonical => ../public/foo/bar/file/index.html\n\n" +
"alias/test/file1.md (renderer: markdown)\n" + "alias/test/file1.md (renderer: markdown)\n" +
" canonical => ../public/alias/test/file1/index.html\n" + " canonical => ../public/alias/test/file1/index.html\n" +
" alias1/ => ../public/alias1/index.html\n" + " alias1/ => ../public/alias1/index.html\n" +
" alias-2/ => ../public/alias-2/index.html\n" " alias-2/ => ../public/alias-2/index.html\n\n" +
"section/somecontent.html (renderer: n/a)\n canonical => ../public/section/somecontent/index.html\n\n"
checkShowPlanExpected(t, s, expected) checkShowPlanExpected(t, s, expected)
} }