From 6399f64cc29d5a3fdc9f5765ea7bac3dc9ff1938 Mon Sep 17 00:00:00 2001 From: Paul Snow <2058588+bovinemagnet@users.noreply.github.com> Date: Wed, 18 May 2022 00:18:58 +1000 Subject: [PATCH 1/2] Added asciidoc generation and associated tests. --- doc/README.md | 1 + doc/asciidoc_docs.go | 185 ++++++++++++++++++++++++++++++++++ doc/asciidoc_docs.md | 115 +++++++++++++++++++++ doc/asciidoc_docs_test.go | 205 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 506 insertions(+) create mode 100644 doc/asciidoc_docs.go create mode 100644 doc/asciidoc_docs.md create mode 100644 doc/asciidoc_docs_test.go diff --git a/doc/README.md b/doc/README.md index 6ea4eb662..8c289aa3f 100644 --- a/doc/README.md +++ b/doc/README.md @@ -1,5 +1,6 @@ # Documentation generation +- [Asciidoc docs](./asciidoc_docs.md) - [Man page docs](./man_docs.md) - [Markdown docs](./md_docs.md) - [Rest docs](./rest_docs.md) diff --git a/doc/asciidoc_docs.go b/doc/asciidoc_docs.go new file mode 100644 index 000000000..8c3a76c58 --- /dev/null +++ b/doc/asciidoc_docs.go @@ -0,0 +1,185 @@ +//Copyright 2015 Red Hat Inc. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package doc + +import ( + "bytes" + "fmt" + "io" + "os" + "path/filepath" + "sort" + "strings" + "time" + + "github.com/spf13/cobra" +) + +func printOptionsAsciidoc(buf *bytes.Buffer, cmd *cobra.Command, name string) error { + flags := cmd.NonInheritedFlags() + flags.SetOutput(buf) + if flags.HasAvailableFlags() { + buf.WriteString("== Options\n") + buf.WriteString("\n") + buf.WriteString(".Options\n") + buf.WriteString("[source,text]\n----\n") + flags.PrintDefaults() + buf.WriteString("----\n\n") + } + + parentFlags := cmd.InheritedFlags() + parentFlags.SetOutput(buf) + if parentFlags.HasAvailableFlags() { + buf.WriteString("== Options inherited from parent commands\n\n") + buf.WriteString(".Parent Options\n") + buf.WriteString("[source,text]\n----\n") + parentFlags.PrintDefaults() + buf.WriteString("----\n\n") + } + return nil +} + +// GenAsciidoc creates Asciidoc output. +func GenAsciidoc(cmd *cobra.Command, w io.Writer) error { + return GenAsciidocCustom(cmd, w, func(s string) string { return s }) +} + +// GenAsciidocCustom creates custom Asciidoc output. +func GenAsciidocCustom(cmd *cobra.Command, w io.Writer, linkHandler func(string) string) error { + cmd.InitDefaultHelpCmd() + cmd.InitDefaultHelpFlag() + + buf := new(bytes.Buffer) + name := cmd.CommandPath() + splitName := strings.Split(cmd.CommandPath(), " ") + + if len(splitName) < 2 { + buf.WriteString("= " + name + "\n\n") + } else { + buf.WriteString("= " + splitName[0] + ":") + for index, cmdName := range splitName { + if index < 1 { + // Skip the root name. + continue + } + buf.WriteString(" " + cmdName) + } + buf.WriteString("\n\n") + } + // No point in printing the description if it's empty. + if len(cmd.Short) > 0 { + buf.WriteString("[.lead]\n") + buf.WriteString(cmd.Short + "\n\n") + } + + if len(cmd.Long) > 0 { + buf.WriteString("== Synopsis\n\n") + buf.WriteString(cmd.Long + "\n\n") + } + + if cmd.Runnable() { + buf.WriteString(fmt.Sprintf("[source,text]\n")) + buf.WriteString(fmt.Sprintf("----\n%s\n----\n\n", cmd.UseLine())) + } + + if len(cmd.Example) > 0 { + buf.WriteString("== Examples\n\n") + buf.WriteString(".Examples Options\n") + buf.WriteString("[source,text]\n") + buf.WriteString(fmt.Sprintf("----\n%s\n----\n\n", cmd.Example)) + } + + if err := printOptionsAsciidoc(buf, cmd, name); err != nil { + return err + } + if hasSeeAlso(cmd) { + buf.WriteString(fmt.Sprintf("== SEE ALSO\n\n")) + if cmd.HasParent() { + parent := cmd.Parent() + pname := parent.CommandPath() + link := pname + ".adoc" + link = strings.ReplaceAll(link, " ", "_") + buf.WriteString(fmt.Sprintf("* xref:%s[%s]\t - %s\n", linkHandler(link), pname, parent.Short)) + cmd.VisitParents(func(c *cobra.Command) { + if c.DisableAutoGenTag { + cmd.DisableAutoGenTag = c.DisableAutoGenTag + } + }) + } + + children := cmd.Commands() + sort.Sort(byName(children)) + + for _, child := range children { + if !child.IsAvailableCommand() || child.IsAdditionalHelpTopicCommand() { + continue + } + cname := name + " " + child.Name() + link := cname + ".adoc" + link = strings.ReplaceAll(link, " ", "_") + buf.WriteString(fmt.Sprintf("* xref:%s[%s]\t - %s\n", linkHandler(link), cname, child.Short)) + } + buf.WriteString("\n") + } + if !cmd.DisableAutoGenTag { + + buf.WriteString("\n.Last Generated\n") + buf.WriteString("****\n") + buf.WriteString("Auto generated by spf13/cobra on " + time.Now().Format("2-Jan-2006") + "\n") + buf.WriteString("****\n") + } + _, err := buf.WriteTo(w) + return err +} + +// GenAsciidocTree will generate a Asciidoc page for this command and all +// descendants in the directory given. The header may be nil. +// This function may not work correctly if your command names have `-` in them. +// If you have `cmd` with two subcmds, `sub` and `sub-third`, +// and `sub` has a subcommand called `third`, it is undefined which +// help output will be in the file `cmd-sub-third.1`. +func GenAsciidocTree(cmd *cobra.Command, dir string) error { + identity := func(s string) string { return s } + emptyStr := func(s string) string { return "" } + return GenAsciidocTreeCustom(cmd, dir, emptyStr, identity) +} + +// GenAsciidocTreeCustom is the the same as GenAsciidocTree, but +// with custom filePrepender and linkHandler. +func GenAsciidocTreeCustom(cmd *cobra.Command, dir string, filePrepender, linkHandler func(string) string) error { + for _, c := range cmd.Commands() { + if !c.IsAvailableCommand() || c.IsAdditionalHelpTopicCommand() { + continue + } + if err := GenAsciidocTreeCustom(c, dir, filePrepender, linkHandler); err != nil { + return err + } + } + + basename := strings.ReplaceAll(cmd.CommandPath(), " ", "_") + ".adoc" + filename := filepath.Join(dir, basename) + f, err := os.Create(filename) + if err != nil { + return err + } + defer f.Close() + + if _, err := io.WriteString(f, filePrepender(filename)); err != nil { + return err + } + if err := GenAsciidocCustom(cmd, f, linkHandler); err != nil { + return err + } + return nil +} diff --git a/doc/asciidoc_docs.md b/doc/asciidoc_docs.md new file mode 100644 index 000000000..611e1a065 --- /dev/null +++ b/doc/asciidoc_docs.md @@ -0,0 +1,115 @@ +# Generating Asciidoc Docs For Your Own cobra.Command + +Generating Asciidoc pages from a cobra command is incredibly easy. An example is as follows: + +```go +package main + +import ( + "log" + + "github.com/spf13/cobra" + "github.com/spf13/cobra/doc" +) + +func main() { + cmd := &cobra.Command{ + Use: "test", + Short: "my test program", + } + err := doc.GenAsciidocTree(cmd, "/tmp") + if err != nil { + log.Fatal(err) + } +} +``` + +That will get you a Asciidoc document `/tmp/test.adoc` + +## Generate Asciidoc docs for the entire command tree + +This program could generate docs for the kubectl command in the kubernetes project + +```go +package main + +import ( + "log" + "io/ioutil" + "os" + + "k8s.io/kubernetes/pkg/kubectl/cmd" + cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" + + "github.com/spf13/cobra/doc" +) + +func main() { + kubectl := cmd.NewKubectlCommand(cmdutil.NewFactory(nil), os.Stdin, ioutil.Discard, ioutil.Discard) + err := doc.GenAsciidocTree(kubectl, "./") + if err != nil { + log.Fatal(err) + } +} +``` + +This will generate a whole series of files, one for each command in the tree, in the directory specified (in this case "./") + +## Generate Asciidoc docs for a single command + +You may wish to have more control over the output, or only generate for a single command, instead of the entire command tree. If this is the case you may prefer to `GenAsciidoc` instead of `GenAsciidocTree` + +```go + out := new(bytes.Buffer) + err := doc.GenAsciidoc(cmd, out) + if err != nil { + log.Fatal(err) + } +``` + +This will write the Asciidoc doc for ONLY "cmd" into the out, buffer. + +## Customize the output + +Both `GenAsciidoc` and `GenAsciidocTree` have alternate versions with callbacks to get some control of the output: + +```go +func GenAsciidocTreeCustom(cmd *Command, dir string, filePrepender, linkHandler func(string) string) error { + //... +} +``` + +```go +func GenAsciidocCustom(cmd *Command, out *bytes.Buffer, linkHandler func(string) string) error { + //... +} +``` + +The `filePrepender` will prepend the return value given the full filepath to the rendered Asciidoc file. A common use case is to add front matter to use the generated documentation with [Hugo](http://gohugo.io/): + +```go +const fmTemplate = `--- +date: %s +title: "%s" +slug: %s +url: %s +--- +` + +filePrepender := func(filename string) string { + now := time.Now().Format(time.RFC3339) + name := filepath.Base(filename) + base := strings.TrimSuffix(name, path.Ext(name)) + url := "/commands/" + strings.ToLower(base) + "/" + return fmt.Sprintf(fmTemplate, now, strings.Replace(base, "_", " ", -1), base, url) +} +``` + +The `linkHandler` can be used to customize the rendered internal links to the commands, given a filename: + +```go +linkHandler := func(name string) string { + base := strings.TrimSuffix(name, path.Ext(name)) + return "/commands/" + strings.ToLower(base) + "/" +} +``` diff --git a/doc/asciidoc_docs_test.go b/doc/asciidoc_docs_test.go new file mode 100644 index 000000000..c5f0d6d34 --- /dev/null +++ b/doc/asciidoc_docs_test.go @@ -0,0 +1,205 @@ +package doc + +import ( + "bufio" + "bytes" + "io/ioutil" + "os" + "path/filepath" + "testing" + + "github.com/spf13/cobra" +) + +func TestGenAsciidocDoc(t *testing.T) { + // We generate on subcommand so we have both subcommands and parents. + buf := new(bytes.Buffer) + if err := GenAsciidoc(echoCmd, buf); err != nil { + t.Fatal(err) + } + output := buf.String() + + checkStringContains(t, output, echoCmd.Long) + checkStringContains(t, output, echoCmd.Example) + checkStringContains(t, output, "boolone") + checkStringContains(t, output, "rootflag") + checkStringContains(t, output, rootCmd.Short) + checkStringContains(t, output, echoSubCmd.Short) + checkStringOmits(t, output, deprecatedCmd.Short) + checkStringContains(t, output, "Options inherited from parent commands") + // check the output. + //println(output) +} + +func TestGenAsciidocDocWithNoLongOrSynopsis(t *testing.T) { + // We generate on subcommand so we have both subcommands and parents. + buf := new(bytes.Buffer) + if err := GenAsciidoc(dummyCmd, buf); err != nil { + t.Fatal(err) + } + output := buf.String() + + checkStringContains(t, output, dummyCmd.Example) + checkStringContains(t, output, dummyCmd.Short) + checkStringContains(t, output, "Options inherited from parent commands") + checkStringOmits(t, output, "=== Synopsis") + // check the output. + //println(output) +} + +func TestGenAsciidocNoHiddenParents(t *testing.T) { + // We generate on subcommand so we have both subcommands and parents. + for _, name := range []string{"rootflag", "strtwo"} { + f := rootCmd.PersistentFlags().Lookup(name) + f.Hidden = true + defer func() { f.Hidden = false }() + } + buf := new(bytes.Buffer) + if err := GenAsciidoc(echoCmd, buf); err != nil { + t.Fatal(err) + } + output := buf.String() + + checkStringContains(t, output, echoCmd.Long) + checkStringContains(t, output, echoCmd.Example) + checkStringContains(t, output, "boolone") + checkStringOmits(t, output, "rootflag") + checkStringContains(t, output, rootCmd.Short) + checkStringContains(t, output, echoSubCmd.Short) + checkStringOmits(t, output, deprecatedCmd.Short) + checkStringOmits(t, output, "Options inherited from parent commands") + // check the output. + //println(output) +} + +func TestGenAsciidocNoGenTag(t *testing.T) { + echoCmd.DisableAutoGenTag = true + defer func() { echoCmd.DisableAutoGenTag = false }() + + // We generate on a subcommand so we have both subcommands and parents + buf := new(bytes.Buffer) + if err := GenAsciidoc(echoCmd, buf); err != nil { + t.Fatal(err) + } + output := buf.String() + + unexpected := translate("#HISTORY") + checkStringOmits(t, output, unexpected) + unexpected = translate("Auto generated by spf13/cobra") + checkStringOmits(t, output, unexpected) + // check the output. + //println(output) +} + +func TestGenAsciidocNoTag(t *testing.T) { + rootCmd.DisableAutoGenTag = true + defer func() { rootCmd.DisableAutoGenTag = false }() + + buf := new(bytes.Buffer) + if err := GenAsciidoc(rootCmd, buf); err != nil { + t.Fatal(err) + } + output := buf.String() + + checkStringOmits(t, output, "Auto generated") +} + +func TestGenAsciiDocSeeAlso(t *testing.T) { + rootCmd := &cobra.Command{Use: "root", Run: emptyRun} + aCmd := &cobra.Command{Use: "aaa", Run: emptyRun, Hidden: true} // #229 + bCmd := &cobra.Command{Use: "bbb", Run: emptyRun} + cCmd := &cobra.Command{Use: "ccc", Run: emptyRun} + rootCmd.AddCommand(aCmd, bCmd, cCmd) + + buf := new(bytes.Buffer) + if err := GenAsciidoc(rootCmd, buf); err != nil { + t.Fatal(err) + } + scanner := bufio.NewScanner(buf) + + if err := assertLineFound(scanner, "== SEE ALSO"); err != nil { + t.Fatalf("Couldn't find SEE ALSO section header: %v", err) + } + if err := assertNextLineEquals(scanner, ""); err != nil { + t.Fatalf("First line after SEE ALSO wasn't empty line: %v", err) + } + if err := assertNextLineEquals(scanner, "* xref:root_bbb.adoc[root bbb] - "); err != nil { + t.Fatalf("Second line after SEE ALSO wasn't correct: %v", err) + } +} + +func TestGenAsciidocTree(t *testing.T) { + c := &cobra.Command{Use: "do [OPTIONS] arg1 arg2"} + + tmpdir, err := ioutil.TempDir("", "test-gen-asciidoc-tree") + if err != nil { + t.Fatalf("Failed to create tmpdir: %v", err) + } + defer os.RemoveAll(tmpdir) + + if err := GenAsciidocTree(c, tmpdir); err != nil { + t.Fatalf("GenAsciidocTree failed: %v", err) + } + + if _, err := os.Stat(filepath.Join(tmpdir, "do.adoc")); err != nil { + t.Fatalf("Expected file 'do.adoc' to exist") + } +} + +func TestGenAsciidocTreeViaEchoCmd(t *testing.T) { + + tmpdir, err := ioutil.TempDir("", "test-gen-asciidoc-tree-echocmd") + if err != nil { + t.Fatalf("Failed to create tmpdir: %v", err) + } + // Note: comment this out for a dirty hack to get the generated files to hang around after the test. + defer os.RemoveAll(tmpdir) + + if err := GenAsciidocTree(echoCmd, tmpdir); err != nil { + t.Fatalf("TestGenAsciidocTreeViaEchoCmd failed: %v", err) + } + // Check the three files are generated. + // check for root + if _, err := os.Stat(filepath.Join(tmpdir, "root_echo.adoc")); err != nil { + t.Fatalf("Expected file 'root_echo.adoc' to exist") + } + // Check sub command + if _, err := os.Stat(filepath.Join(tmpdir, "root_echo_echosub.adoc")); err != nil { + t.Fatalf("Expected file 'root_echo_echosub.adoc' to exist") + } + // check sub command. + if _, err := os.Stat(filepath.Join(tmpdir, "root_echo_times.adoc")); err != nil { + t.Fatalf("Expected file 'root_echo_times.adoc' to exist") + } +} + +func BenchmarkGenAsciidocToFile(b *testing.B) { + file, err := ioutil.TempFile("", "") + if err != nil { + b.Fatal(err) + } + defer os.Remove(file.Name()) + defer file.Close() + + b.ResetTimer() + for i := 0; i < b.N; i++ { + if err := GenAsciidoc(rootCmd, file); err != nil { + b.Fatal(err) + } + } +} + +func TestAsciidocPrintFlagsHidesShortDeperecated(t *testing.T) { + c := &cobra.Command{} + c.Flags().StringP("foo", "f", "default", "Foo flag") + assertNoErr(t, c.Flags().MarkShorthandDeprecated("foo", "don't use it no more")) + + buf := new(bytes.Buffer) + manPrintFlags(buf, c.Flags()) + + got := buf.String() + expected := "**--foo**=\"default\"\n\tFoo flag\n\n" + if got != expected { + t.Errorf("Expected %v, got %v", expected, got) + } +} From 2ed34e6995f3dd5cbdf58292e755f0149e6d76cf Mon Sep 17 00:00:00 2001 From: Paul Snow <2058588+bovinemagnet@users.noreply.github.com> Date: Thu, 26 May 2022 17:15:33 +1000 Subject: [PATCH 2/2] Removed incorrect license header. --- doc/asciidoc_docs.go | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/doc/asciidoc_docs.go b/doc/asciidoc_docs.go index 8c3a76c58..e39258e97 100644 --- a/doc/asciidoc_docs.go +++ b/doc/asciidoc_docs.go @@ -1,16 +1,3 @@ -//Copyright 2015 Red Hat Inc. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - package doc import (