Skip to content
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.

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

Man support #14

Merged
merged 20 commits into from
Feb 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
891740e
Add a script to generate man pages from cobra commands.
dnephin Jun 9, 2016
357f26d
Remove old cli framework.
dnephin Jun 23, 2016
7b32646
Move api/client -> cli/command
dnephin Sep 8, 2016
12670c0
Read long description from a file.
dnephin Sep 22, 2016
5f4920e
Add example for device-cgroup-rule to man
mlaventure Jan 13, 2017
3ef3474
Import completion scripts, docs, and man pages from docker/docker
Jun 2, 2017
51917b7
Add missing dependencies to vendor, and fix generation imports
dnephin Jun 2, 2017
524adae
Disable adding [flags] to UseLine in man pages
dnephin Nov 20, 2017
9d26ab2
Refactor content_trust cli/flags handling
vdemeester Mar 8, 2018
d55bb8e
Merge pull request #929 from vdemeester/trust-no-global-var
thaJeztah Mar 9, 2018
2635ccf
man: obey SOURCE_DATE_EPOCH when generating man pages
cyphar Aug 23, 2018
98cc7dc
Remove containerizedengine package dependency from docker/cli/command…
vdemeester Sep 11, 2018
da2b4a4
Merge pull request #1306 from cyphar/obey-source_date_epoch
vdemeester Nov 29, 2018
22ad637
Introduce functional arguments to NewDockerCli for a more stable API.
silvin-lubecki Jan 28, 2019
36c00b3
Merge pull request #1633 from silvin-lubecki/refactor-docker-cli-cons…
vdemeester Jan 28, 2019
3c98406
man-pages: fix missing manual title in heading
thaJeztah Oct 20, 2020
ca0d6b2
Merge pull request #2801 from thaJeztah/fix_missing_manual_entry
silvin-lubecki Oct 20, 2020
5090452
Import man/generate.go with history from docker/cli
crazy-max Nov 10, 2021
be388bf
add man support
crazy-max Feb 21, 2024
4ecc2f2
test: "attach" and "buildx dial-stdio" cmds for testing
crazy-max Feb 21, 2024
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
74 changes: 71 additions & 3 deletions clidocstool.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,13 @@ package clidocstool
import (
"errors"
"io"
"log"
"os"
"path/filepath"
"strings"

"github.com/spf13/cobra"
"github.com/spf13/cobra/doc"
)

// Options defines options for cli-docs-tool
Expand All @@ -29,6 +32,8 @@ type Options struct {
SourceDir string
TargetDir string
Plugin bool

ManHeader *doc.GenManHeader
}

// Client represents an active cli-docs-tool object
Expand All @@ -37,6 +42,8 @@ type Client struct {
source string
target string
plugin bool

manHeader *doc.GenManHeader
}

// New initializes a new cli-docs-tool client
Expand All @@ -48,9 +55,10 @@ func New(opts Options) (*Client, error) {
return nil, errors.New("source dir required")
}
c := &Client{
root: opts.Root,
source: opts.SourceDir,
plugin: opts.Plugin,
root: opts.Root,
source: opts.SourceDir,
plugin: opts.Plugin,
manHeader: opts.ManHeader,
}
if len(opts.TargetDir) == 0 {
c.target = c.source
Expand All @@ -73,9 +81,69 @@ func (c *Client) GenAllTree() error {
if err = c.GenYamlTree(c.root); err != nil {
return err
}
if err = c.GenManTree(c.root); err != nil {
return err
}
return nil
}

// loadLongDescription gets long descriptions and examples from markdown.
func (c *Client) loadLongDescription(parentCmd *cobra.Command, generator string) error {
for _, cmd := range parentCmd.Commands() {
if cmd.HasSubCommands() {
if err := c.loadLongDescription(cmd, generator); err != nil {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is the intent to use the same markdown files for man pages and online docs?

I know we had some discussions about that in the past, and while this would be "great!", it can be somewhat difficult (and I wasn't able to come up with a one-size-fits-all solution). Conventions in man pages can be quite different from conventions in online docs. For example, the online docs would refer to another command using something like "for details on other command, refer to the <link>other command reference documentation</link>", whereas in a man page it would be "see other-command(1)".

For the cli, that lead us to maintain two separate sets of markdown files (https://github.com/docker/cli/tree/3fb4fb83dfb5db0c0753a8316f21aea54dab32c5/man), but that situation is also kinda horrible, as they're not as well maintained, and often not as up-to-date as the equivalent "online docs" man pages.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hum yeah it will be hard to be generic with the library. I will think about it and keep you in touch.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder if https://github.com/muesli/mango could solve this issue. I will take a look.

return err
}
}
name := cmd.CommandPath()
if i := strings.Index(name, " "); i >= 0 {
// remove root command / binary name
name = name[i+1:]
}
if name == "" {
continue
}
mdFile := strings.ReplaceAll(name, " ", "_") + ".md"
sourcePath := filepath.Join(c.source, mdFile)
content, err := os.ReadFile(sourcePath)
if os.IsNotExist(err) {
log.Printf("WARN: %s does not exist, skipping Markdown examples for %s docs\n", mdFile, generator)
continue
}
if err != nil {
return err
}
applyDescriptionAndExamples(cmd, string(content))
}
return nil
}

// applyDescriptionAndExamples fills in cmd.Long and cmd.Example with the
// "Description" and "Examples" H2 sections in mdString (if present).
func applyDescriptionAndExamples(cmd *cobra.Command, mdString string) {
sections := getSections(mdString)
var (
anchors []string
md string
)
if sections["description"] != "" {
md, anchors = cleanupMarkDown(sections["description"])
cmd.Long = md
anchors = append(anchors, md)
}
if sections["examples"] != "" {
md, anchors = cleanupMarkDown(sections["examples"])
cmd.Example = md
anchors = append(anchors, md)
}
if len(anchors) > 0 {
if cmd.Annotations == nil {
cmd.Annotations = make(map[string]string)
}
cmd.Annotations["anchors"] = strings.Join(anchors, ",")
}
}

func fileExists(f string) bool {
info, err := os.Stat(f)
if os.IsNotExist(err) {
Expand Down
74 changes: 74 additions & 0 deletions clidocstool_man.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
// Copyright 2016 cli-docs-tool authors
//
// 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 clidocstool

import (
"fmt"
"log"
"os"
"strconv"
"time"

"github.com/spf13/cobra"
"github.com/spf13/cobra/doc"
)

// GenManTree generates a man page for the command and all descendants.
// If SOURCE_DATE_EPOCH is set, in order to allow reproducible package
// builds, we explicitly set the build time to SOURCE_DATE_EPOCH.
func (c *Client) GenManTree(cmd *cobra.Command) error {
if err := c.loadLongDescription(cmd, "man"); err != nil {
return err
}

if epoch := os.Getenv("SOURCE_DATE_EPOCH"); c.manHeader != nil && epoch != "" {
unixEpoch, err := strconv.ParseInt(epoch, 10, 64)
if err != nil {
return fmt.Errorf("invalid SOURCE_DATE_EPOCH: %v", err)
}
now := time.Unix(unixEpoch, 0)
c.manHeader.Date = &now
}

return c.genManTreeCustom(cmd)
}

func (c *Client) genManTreeCustom(cmd *cobra.Command) error {
for _, sc := range cmd.Commands() {
if err := c.genManTreeCustom(sc); err != nil {
return err
}
}

// always disable the addition of [flags] to the usage
cmd.DisableFlagsInUseLine = true

// always disable "spf13/cobra" auto gen tag
cmd.DisableAutoGenTag = true

// Skip the root command altogether, to prevent generating a useless
// md file for plugins.
if c.plugin && !cmd.HasParent() {
return nil
}

log.Printf("INFO: Generating Man for %q", cmd.CommandPath())

return doc.GenManTreeFromOpts(cmd, doc.GenManTreeOptions{
Header: c.manHeader,
Path: c.target,
CommandSeparator: "-",
})
}
93 changes: 93 additions & 0 deletions clidocstool_man_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
// Copyright 2024 cli-docs-tool authors
//
// 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 clidocstool

import (
"io/fs"
"os"
"path"
"path/filepath"
"regexp"
"strconv"
"testing"
"time"

"github.com/spf13/cobra/doc"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)

//nolint:errcheck
func TestGenManTree(t *testing.T) {
setup()
tmpdir := t.TempDir()

epoch, err := time.Parse("2006-Jan-02", "2020-Jan-10")
require.NoError(t, err)
t.Setenv("SOURCE_DATE_EPOCH", strconv.FormatInt(epoch.Unix(), 10))

require.NoError(t, copyFile(path.Join("fixtures", "buildx_stop.pre.md"), path.Join(tmpdir, "buildx_stop.md")))

c, err := New(Options{
Root: dockerCmd,
SourceDir: tmpdir,
Plugin: true,
ManHeader: &doc.GenManHeader{
Title: "DOCKER",
Section: "1",
Source: "Docker Community",
Manual: "Docker User Manuals",
},
})
require.NoError(t, err)
require.NoError(t, c.GenManTree(dockerCmd))

seen := make(map[string]struct{})
remanpage := regexp.MustCompile(`\.\d+$`)

filepath.Walk("fixtures", func(path string, info fs.FileInfo, err error) error {
fname := filepath.Base(path)
// ignore dirs and any file that is not a manpage
if info.IsDir() || !remanpage.MatchString(fname) {
return nil
}
t.Run(fname, func(t *testing.T) {
seen[fname] = struct{}{}
require.NoError(t, err)

bres, err := os.ReadFile(filepath.Join(tmpdir, fname))
require.NoError(t, err)

bexc, err := os.ReadFile(path)
require.NoError(t, err)
assert.Equal(t, string(bexc), string(bres))
})
return nil
})

filepath.Walk(tmpdir, func(path string, info fs.FileInfo, err error) error {
fname := filepath.Base(path)
// ignore dirs and any file that is not a manpage
if info.IsDir() || !remanpage.MatchString(fname) {
return nil
}
t.Run("seen_"+fname, func(t *testing.T) {
if _, ok := seen[fname]; !ok {
t.Errorf("file %s not found in fixtures", fname)
}
})
return nil
})
}
5 changes: 3 additions & 2 deletions clidocstool_md_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,17 +27,18 @@ import (

//nolint:errcheck
func TestGenMarkdownTree(t *testing.T) {
setup()
tmpdir := t.TempDir()

require.NoError(t, copyFile(path.Join("fixtures", "buildx_stop.pre.md"), path.Join(tmpdir, "buildx_stop.md")))

c, err := New(Options{
Root: buildxCmd,
Root: dockerCmd,
SourceDir: tmpdir,
Plugin: true,
})
require.NoError(t, err)
require.NoError(t, c.GenMarkdownTree(buildxCmd))
require.NoError(t, c.GenMarkdownTree(dockerCmd))

seen := make(map[string]struct{})

Expand Down
Loading