mirror of
https://gitea.com/gitea/tea.git
synced 2026-10-26 11:01:25 +01:00
feat!: rebuild tea on Cobra with explicit noun/verb commands (#1126)
- **switch tea to the Cobra command tree:** `internal/app` wires the packages from parts 1–4 into explicit noun/verb commands with `--repo`, `--json` / `--jq`, `--sudo` and `--debug`; `main.go` points at it. Build, release and docs tooling (`tools/cli-docs`, Makefile, goreleaser, snap, CI) and README / CONTRIBUTING are updated. - **remove the urfave/cli command tree:** deletes `cmd/`, `modules/`, the old integration tests, contrib completion scripts and the generated `docs/CLI.md`, and drops their dependencies. This commit only deletes. ## Breaking changes This is a breaking release. It requires Gitea 28 or newer; configuration moves to separate `config.yml` and `hosts.yml` files and requires fresh authentication, and command names, aliases, flags and output formats change. `docs/migration-1.0.md` maps every old command, flag and environment variable to its replacement. ## Issues fixes #1118 fixes #1116 fixes #1115 fixes #1094 fixes #1091 fixes #1073 fixes #1052 fixes #1032 fixes #1023 fixes #966 fixes #908 fixes #833 fixes #831 fixes #817 fixes #804 fixes #779 fixes #770 fixes #737 fixes #697 fixes #726 fixes #677 fixes #672 fixes #633 fixes #632 fixes #560 fixes #556 fixes #523 fixes #516 fixes #510 fixes #504 fixes #500 fixes #482 fixes #406 fixes #403 fixes #373 fixes #351 fixes #344 fixes #326 fixes #325 fixes #323 fixes #246 fixes #240 fixes #232 fixes #197 fixes #172 fixes #141 fixes #69 fixes #1110 fixes #569 fixes #480 fixes #666 fixes #670 fixes #457 fixes #643 fixes #498 fixes #490 fixes #1069 fixes #834 fixes #602 fixes #328 fixes #417 fixes #571 fixes #1029 fixes #489 fixes #1050 fixes #162 fixes #430 fixes #1087 fixes #683 Reviewed-on: https://gitea.com/gitea/tea/pulls/1126 Reviewed-by: TheFox0x7 <95654+thefox0x7@noreply.gitea.com>
This commit is contained in:
1 parent
12e415a7a7
commit
f02245449b
456 files changed
+18892
-34015
No files matched your search
@@ -0,0 +1,128 @@
|
||||
// Copyright 2026 The Gitea Authors. All rights reserved.
|
||||
// SPDX-License-Identifier: MIT
|
||||
|
||||
package app
|
||||
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
"fmt"
|
||||
"io"
|
||||
"os"
|
||||
"strings"
|
||||
|
||||
"gitea.dev/tea/internal/clierr"
|
||||
"gitea.dev/tea/internal/terminal"
|
||||
"github.com/spf13/cobra"
|
||||
)
|
||||
|
||||
func finishDraft(draft *terminal.Draft, result *error) {
|
||||
if draft.Path == "" {
|
||||
return
|
||||
}
|
||||
if *result == nil {
|
||||
if err := os.Remove(draft.Path); err != nil {
|
||||
*result = errors.New("operation completed, but its draft could not be removed")
|
||||
}
|
||||
}
|
||||
if *result != nil {
|
||||
*result = fmt.Errorf("%w; draft saved at %s", *result, draft.Path)
|
||||
}
|
||||
}
|
||||
|
||||
func (a *application) editor() (terminal.Editor, string, error) {
|
||||
preferences, err := a.preferences()
|
||||
if err != nil {
|
||||
return nil, "", err
|
||||
}
|
||||
if preferences.Editor == "" {
|
||||
return nil, "", clierr.Wrap(clierr.Usage, errors.New("configure an editor using tea config set editor or EDITOR"))
|
||||
}
|
||||
return a.deps.Editor, preferences.Editor, nil
|
||||
}
|
||||
|
||||
func (a *application) editDraft(cmd *cobra.Command, body string) (terminal.Draft, error) {
|
||||
editor, command, err := a.editor()
|
||||
if err != nil {
|
||||
return terminal.Draft{}, err
|
||||
}
|
||||
return editor.Edit(cmd.Context(), command, body)
|
||||
}
|
||||
|
||||
func (a *application) bodyEditor(cmd *cobra.Command) terminal.BodyEditor {
|
||||
return func(_ context.Context, initial string) (terminal.Draft, error) { return a.editDraft(cmd, initial) }
|
||||
}
|
||||
|
||||
func (a *application) editPath(cmd *cobra.Command, path string) error {
|
||||
editor, command, err := a.editor()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
return editor.EditPath(cmd.Context(), command, path)
|
||||
}
|
||||
|
||||
// readBody checks source conflicts before reading stdin or invoking any service.
|
||||
func (a *application) readBody(cmd *cobra.Command, body, file string) (string, error) {
|
||||
return a.readTextSource(cmd, body, file, "body", "body-file")
|
||||
}
|
||||
|
||||
func (a *application) readTextSource(cmd *cobra.Command, text, file, textFlag, fileFlag string) (string, error) {
|
||||
if err := validateTextSources(cmd, textFlag, fileFlag); err != nil {
|
||||
return "", err
|
||||
}
|
||||
if !cmd.Flags().Changed(fileFlag) {
|
||||
return text, nil
|
||||
}
|
||||
data, err := readFileOrStdin(a.deps.Streams.In, file)
|
||||
if err != nil {
|
||||
return "", fmt.Errorf("read %s: %w", textFlag, err)
|
||||
}
|
||||
return string(data), nil
|
||||
}
|
||||
|
||||
// readSecret is readTextSource for credentials: one trailing line ending from a file is dropped.
|
||||
func (a *application) readSecret(cmd *cobra.Command, text, file, textFlag, fileFlag string) (string, error) {
|
||||
value, err := a.readTextSource(cmd, text, file, textFlag, fileFlag)
|
||||
if cmd.Flags().Changed(fileFlag) {
|
||||
value = strings.TrimSuffix(strings.TrimSuffix(value, "\n"), "\r")
|
||||
}
|
||||
return value, err
|
||||
}
|
||||
|
||||
// readFileOrStdin reads a file, or stdin when path is "-".
|
||||
func readFileOrStdin(stdin io.Reader, path string) ([]byte, error) {
|
||||
if path == "-" {
|
||||
return io.ReadAll(stdin)
|
||||
}
|
||||
return os.ReadFile(path)
|
||||
}
|
||||
|
||||
func validateBodySources(cmd *cobra.Command) error {
|
||||
return validateTextSources(cmd, "body", "body-file")
|
||||
}
|
||||
|
||||
func validateTextSources(cmd *cobra.Command, textFlag, fileFlag string) error {
|
||||
text, file := cmd.Flags().Changed(textFlag), cmd.Flags().Changed(fileFlag)
|
||||
if flag := cmd.Flags().Lookup("editor"); flag != nil {
|
||||
editor, err := cmd.Flags().GetBool("editor")
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if editor && (text || file) {
|
||||
return clierr.Wrap(clierr.Usage, fmt.Errorf("--editor, --%s, and --%s are mutually exclusive", textFlag, fileFlag))
|
||||
}
|
||||
}
|
||||
if text && file {
|
||||
return clierr.Wrap(clierr.Usage, fmt.Errorf("--%s and --%s are mutually exclusive", textFlag, fileFlag))
|
||||
}
|
||||
if file {
|
||||
path, err := cmd.Flags().GetString(fileFlag)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if path == "" {
|
||||
return clierr.Wrap(clierr.Usage, fmt.Errorf("--%s must name a file or -", fileFlag))
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
Reference in new issue
Block a user