-
Notifications
You must be signed in to change notification settings - Fork 12
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
Man support #14
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 357f26d
Remove old cli framework.
dnephin 7b32646
Move api/client -> cli/command
dnephin 12670c0
Read long description from a file.
dnephin 5f4920e
Add example for device-cgroup-rule to man
mlaventure 3ef3474
Import completion scripts, docs, and man pages from docker/docker
51917b7
Add missing dependencies to vendor, and fix generation imports
dnephin 524adae
Disable adding [flags] to UseLine in man pages
dnephin 9d26ab2
Refactor content_trust cli/flags handling
vdemeester d55bb8e
Merge pull request #929 from vdemeester/trust-no-global-var
thaJeztah 2635ccf
man: obey SOURCE_DATE_EPOCH when generating man pages
cyphar 98cc7dc
Remove containerizedengine package dependency from docker/cli/command…
vdemeester da2b4a4
Merge pull request #1306 from cyphar/obey-source_date_epoch
vdemeester 22ad637
Introduce functional arguments to NewDockerCli for a more stable API.
silvin-lubecki 36c00b3
Merge pull request #1633 from silvin-lubecki/refactor-docker-cli-cons…
vdemeester 3c98406
man-pages: fix missing manual title in heading
thaJeztah ca0d6b2
Merge pull request #2801 from thaJeztah/fix_missing_manual_entry
silvin-lubecki 5090452
Import man/generate.go with history from docker/cli
crazy-max be388bf
add man support
crazy-max 4ecc2f2
test: "attach" and "buildx dial-stdio" cmds for testing
crazy-max File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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: "-", | ||
}) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 | ||
}) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
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 "seeother-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.
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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.