glenux-archive/spf13--cobra
1
0
Fork 0
mirror of https://github.com/spf13/cobra synced 2025-05-05 12:57:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

Converting cobra to use OneCloudInc/cobra in all cases

Browse source
This commit is contained in:
Ryan Curtin 2021-12-16 14:27:35 -05:00
parent c21dc0fc86
commit ef632ed1e1
25 changed files with 45 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cobra/cmd/add.go
View file

@ -19,7 +19,7 @@ import (
"path/filepath" "path/filepath"
"unicode" "unicode"
"github.com/spf13/cobra" "github.com/OneCloudInc/cobra"
) )
func init() { func init() {
@ -71,7 +71,7 @@ Example: cobra add server -> resulting in a new cmd/server.go`,
// validateCmdName returns source without any dashes and underscore. // validateCmdName returns source without any dashes and underscore.
// If there will be dash or underscore, next letter will be uppered. // If there will be dash or underscore, next letter will be uppered.
// It supports only ASCII (1-byte character) strings. // It supports only ASCII (1-byte character) strings.
// https://github.com/spf13/cobra/issues/269 // https://github.com/OneCloudInc/cobra/issues/269
func validateCmdName(source string) string { func validateCmdName(source string) string {
i := 0 i := 0
l := len(source) l := len(source)
@ -130,7 +130,7 @@ package {{.cmdPackage}}
import ( import (
"fmt" "fmt"
"github.com/spf13/cobra" "github.com/OneCloudInc/cobra"
) )
{{ printFlagVars .flags }} {{ printFlagVars .flags }}

4
cobra/cmd/init.go
View file

@ -19,7 +19,7 @@ import (
"path" "path"
"path/filepath" "path/filepath"
"github.com/spf13/cobra" "github.com/OneCloudInc/cobra"
"github.com/spf13/viper" "github.com/spf13/viper"
) )
@ -148,7 +148,7 @@ import (
"os" "os"
{{if .viper}} {{if .viper}}
homedir "github.com/mitchellh/go-homedir"{{end}} homedir "github.com/mitchellh/go-homedir"{{end}}
"github.com/spf13/cobra"{{if .viper}} "github.com/OneCloudInc/cobra"{{if .viper}}
"github.com/spf13/viper"{{end}} "github.com/spf13/viper"{{end}}
){{if .viper}} ){{if .viper}}

2
cobra/cmd/project.go
View file

@ -114,7 +114,7 @@ func (p *Project) License() License {
return p.license return p.license
} }
// Name returns the name of project, e.g. "github.com/spf13/cobra" // Name returns the name of project, e.g. "github.com/OneCloudInc/cobra"
func (p Project) Name() string { func (p Project) Name() string {
return p.name return p.name
} }

2
cobra/cmd/project_test.go
View file

@ -5,7 +5,7 @@ import (
) )
func TestFindExistingPackage(t *testing.T) { func TestFindExistingPackage(t *testing.T) {
path := findPackage("github.com/spf13/cobra") path := findPackage("github.com/OneCloudInc/cobra")
if path == "" { if path == "" {
t.Fatal("findPackage didn't find the existing package") t.Fatal("findPackage didn't find the existing package")
} }

2
cobra/cmd/root.go
View file

@ -16,8 +16,8 @@ package cmd
import ( import (
"fmt" "fmt"
"github.com/OneCloudInc/cobra"
homedir "github.com/mitchellh/go-homedir" homedir "github.com/mitchellh/go-homedir"
"github.com/spf13/cobra"
"github.com/spf13/viper" "github.com/spf13/viper"
) )

2
cobra/cmd/testdata/root.go.golden vendored
View file

@ -18,7 +18,7 @@ import (
"fmt" "fmt"
"os" "os"
"github.com/spf13/cobra" "github.com/OneCloudInc/cobra"
) )

2
cobra/cmd/testdata/test.go.golden vendored
View file

@ -17,7 +17,7 @@ package cmd
import ( import (
"fmt" "fmt"
"github.com/spf13/cobra" "github.com/OneCloudInc/cobra"
) )

2
command.go
View file

@ -1229,7 +1229,7 @@ func (c *Command) IsAvailableCommand() bool {
// help topic command; additional help topic command is determined by the // help topic command; additional help topic command is determined by the
// fact that it is NOT runnable/hidden/deprecated, and has no sub commands that // fact that it is NOT runnable/hidden/deprecated, and has no sub commands that
// are runnable/hidden/deprecated. // are runnable/hidden/deprecated.
// Concrete example: https://github.com/spf13/cobra/issues/393#issuecomment-282741924. // Concrete example: https://github.com/OneCloudInc/cobra/issues/393#issuecomment-282741924.
func (c *Command) IsAdditionalHelpTopicCommand() bool { func (c *Command) IsAdditionalHelpTopicCommand() bool {
// if a command is runnable, deprecated, or hidden it is not a 'help' command // if a command is runnable, deprecated, or hidden it is not a 'help' command
if c.Runnable() || len(c.Deprecated) != 0 || c.Hidden { if c.Runnable() || len(c.Deprecated) != 0 || c.Hidden {

22
command_test.go
View file

@ -805,7 +805,7 @@ func TestHelpFlagExecutedOnChild(t *testing.T) {
// TestHelpFlagInHelp checks, // TestHelpFlagInHelp checks,
// if '--help' flag is shown in help for child (executing `parent help child`), // if '--help' flag is shown in help for child (executing `parent help child`),
// that has no other flags. // that has no other flags.
// Related to https://github.com/spf13/cobra/issues/302. // Related to https://github.com/OneCloudInc/cobra/issues/302.
func TestHelpFlagInHelp(t *testing.T) { func TestHelpFlagInHelp(t *testing.T) {
parentCmd := &Command{Use: "parent", Run: func(*Command, []string) {}} parentCmd := &Command{Use: "parent", Run: func(*Command, []string) {}}
@ -1166,7 +1166,7 @@ func TestPersistentHooks(t *testing.T) {
// TODO: currently PersistenPreRun* defined in parent does not // TODO: currently PersistenPreRun* defined in parent does not
// run if the matchin child subcommand has PersistenPreRun. // run if the matchin child subcommand has PersistenPreRun.
// If the behavior changes (https://github.com/spf13/cobra/issues/252) // If the behavior changes (https://github.com/OneCloudInc/cobra/issues/252)
// this test must be fixed. // this test must be fixed.
if parentPersPreArgs != "" { if parentPersPreArgs != "" {
t.Errorf("Expected blank parentPersPreArgs, got %q", parentPersPreArgs) t.Errorf("Expected blank parentPersPreArgs, got %q", parentPersPreArgs)
@ -1182,7 +1182,7 @@ func TestPersistentHooks(t *testing.T) {
} }
// TODO: currently PersistenPostRun* defined in parent does not // TODO: currently PersistenPostRun* defined in parent does not
// run if the matchin child subcommand has PersistenPostRun. // run if the matchin child subcommand has PersistenPostRun.
// If the behavior changes (https://github.com/spf13/cobra/issues/252) // If the behavior changes (https://github.com/OneCloudInc/cobra/issues/252)
// this test must be fixed. // this test must be fixed.
if parentPersPostArgs != "" { if parentPersPostArgs != "" {
t.Errorf("Expected blank parentPersPostArgs, got %q", parentPersPostArgs) t.Errorf("Expected blank parentPersPostArgs, got %q", parentPersPostArgs)
@ -1205,7 +1205,7 @@ func TestPersistentHooks(t *testing.T) {
} }
} }
// Related to https://github.com/spf13/cobra/issues/521. // Related to https://github.com/OneCloudInc/cobra/issues/521.
func TestGlobalNormFuncPropagation(t *testing.T) { func TestGlobalNormFuncPropagation(t *testing.T) {
normFunc := func(f *pflag.FlagSet, name string) pflag.NormalizedName { normFunc := func(f *pflag.FlagSet, name string) pflag.NormalizedName {
return pflag.NormalizedName(name) return pflag.NormalizedName(name)
@ -1225,7 +1225,7 @@ func TestGlobalNormFuncPropagation(t *testing.T) {
} }
} }
// Related to https://github.com/spf13/cobra/issues/521. // Related to https://github.com/OneCloudInc/cobra/issues/521.
func TestNormPassedOnLocal(t *testing.T) { func TestNormPassedOnLocal(t *testing.T) {
toUpper := func(f *pflag.FlagSet, name string) pflag.NormalizedName { toUpper := func(f *pflag.FlagSet, name string) pflag.NormalizedName {
return pflag.NormalizedName(strings.ToUpper(name)) return pflag.NormalizedName(strings.ToUpper(name))
@ -1239,7 +1239,7 @@ func TestNormPassedOnLocal(t *testing.T) {
} }
} }
// Related to https://github.com/spf13/cobra/issues/521. // Related to https://github.com/OneCloudInc/cobra/issues/521.
func TestNormPassedOnInherited(t *testing.T) { func TestNormPassedOnInherited(t *testing.T) {
toUpper := func(f *pflag.FlagSet, name string) pflag.NormalizedName { toUpper := func(f *pflag.FlagSet, name string) pflag.NormalizedName {
return pflag.NormalizedName(strings.ToUpper(name)) return pflag.NormalizedName(strings.ToUpper(name))
@ -1267,7 +1267,7 @@ func TestNormPassedOnInherited(t *testing.T) {
} }
} }
// Related to https://github.com/spf13/cobra/issues/521. // Related to https://github.com/OneCloudInc/cobra/issues/521.
func TestConsistentNormalizedName(t *testing.T) { func TestConsistentNormalizedName(t *testing.T) {
toUpper := func(f *pflag.FlagSet, name string) pflag.NormalizedName { toUpper := func(f *pflag.FlagSet, name string) pflag.NormalizedName {
return pflag.NormalizedName(strings.ToUpper(name)) return pflag.NormalizedName(strings.ToUpper(name))
@ -1400,7 +1400,7 @@ func TestFlagErrorFunc(t *testing.T) {
// TestSortedFlags checks, // TestSortedFlags checks,
// if cmd.LocalFlags() is unsorted when cmd.Flags().SortFlags set to false. // if cmd.LocalFlags() is unsorted when cmd.Flags().SortFlags set to false.
// Related to https://github.com/spf13/cobra/issues/404. // Related to https://github.com/OneCloudInc/cobra/issues/404.
func TestSortedFlags(t *testing.T) { func TestSortedFlags(t *testing.T) {
c := &Command{} c := &Command{}
c.Flags().SortFlags = false c.Flags().SortFlags = false
@ -1426,7 +1426,7 @@ func TestSortedFlags(t *testing.T) {
// TestMergeCommandLineToFlags checks, // TestMergeCommandLineToFlags checks,
// if pflag.CommandLine is correctly merged to c.Flags() after first call // if pflag.CommandLine is correctly merged to c.Flags() after first call
// of c.mergePersistentFlags. // of c.mergePersistentFlags.
// Related to https://github.com/spf13/cobra/issues/443. // Related to https://github.com/OneCloudInc/cobra/issues/443.
func TestMergeCommandLineToFlags(t *testing.T) { func TestMergeCommandLineToFlags(t *testing.T) {
pflag.Bool("boolflag", false, "") pflag.Bool("boolflag", false, "")
c := &Command{Use: "c", Run: emptyRun} c := &Command{Use: "c", Run: emptyRun}
@ -1440,7 +1440,7 @@ func TestMergeCommandLineToFlags(t *testing.T) {
// TestUseDeprecatedFlags checks, // TestUseDeprecatedFlags checks,
// if cobra.Execute() prints a message, if a deprecated flag is used. // if cobra.Execute() prints a message, if a deprecated flag is used.
// Related to https://github.com/spf13/cobra/issues/463. // Related to https://github.com/OneCloudInc/cobra/issues/463.
func TestUseDeprecatedFlags(t *testing.T) { func TestUseDeprecatedFlags(t *testing.T) {
c := &Command{Use: "c", Run: emptyRun} c := &Command{Use: "c", Run: emptyRun}
c.Flags().BoolP("deprecated", "d", false, "deprecated flag") c.Flags().BoolP("deprecated", "d", false, "deprecated flag")
@ -1555,7 +1555,7 @@ func TestTraverseWithTwoSubcommands(t *testing.T) {
} }
// TestUpdateName checks if c.Name() updates on changed c.Use. // TestUpdateName checks if c.Name() updates on changed c.Use.
// Related to https://github.com/spf13/cobra/pull/422#discussion_r143918343. // Related to https://github.com/OneCloudInc/cobra/pull/422#discussion_r143918343.
func TestUpdateName(t *testing.T) { func TestUpdateName(t *testing.T) {
c := &Command{Use: "name xyz"} c := &Command{Use: "name xyz"}
originalName := c.Name() originalName := c.Name()

2
doc/cmd_test.go
View file

@ -4,7 +4,7 @@ import (
"strings" "strings"
"testing" "testing"
"github.com/spf13/cobra" "github.com/OneCloudInc/cobra"
) )
func emptyRun(*cobra.Command, []string) {} func emptyRun(*cobra.Command, []string) {}

2
doc/man_docs.go
View file

@ -24,8 +24,8 @@ import (
"strings" "strings"
"time" "time"
"github.com/OneCloudInc/cobra"
"github.com/cpuguy83/go-md2man/md2man" "github.com/cpuguy83/go-md2man/md2man"
"github.com/spf13/cobra"
"github.com/spf13/pflag" "github.com/spf13/pflag"
) )

4
doc/man_docs.md
View file

@ -8,8 +8,8 @@ package main
import ( import (
"log" "log"
"github.com/spf13/cobra" "github.com/OneCloudInc/cobra"
"github.com/spf13/cobra/doc" "github.com/OneCloudInc/cobra/doc"
) )
func main() { func main() {

2
doc/man_docs_test.go
View file

@ -10,7 +10,7 @@ import (
"strings" "strings"
"testing" "testing"
"github.com/spf13/cobra" "github.com/OneCloudInc/cobra"
) )
func translate(in string) string { func translate(in string) string {

4
doc/man_examples_test.go
View file

@ -4,8 +4,8 @@ import (
"bytes" "bytes"
"fmt" "fmt"
"github.com/spf13/cobra" "github.com/OneCloudInc/cobra"
"github.com/spf13/cobra/doc" "github.com/OneCloudInc/cobra/doc"
) )
func ExampleGenManTree() { func ExampleGenManTree() {

2
doc/md_docs.go
View file

@ -23,7 +23,7 @@ import (
"strings" "strings"
"time" "time"
"github.com/spf13/cobra" "github.com/OneCloudInc/cobra"
) )
func printOptions(buf *bytes.Buffer, cmd *cobra.Command, name string) error { func printOptions(buf *bytes.Buffer, cmd *cobra.Command, name string) error {

6
doc/md_docs.md
View file

@ -8,8 +8,8 @@ package main
import ( import (
"log" "log"
"github.com/spf13/cobra" "github.com/OneCloudInc/cobra"
"github.com/spf13/cobra/doc" "github.com/OneCloudInc/cobra/doc"
) )
func main() { func main() {
@ -41,7 +41,7 @@ import (
"k8s.io/kubernetes/pkg/kubectl/cmd" "k8s.io/kubernetes/pkg/kubectl/cmd"
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
"github.com/spf13/cobra/doc" "github.com/OneCloudInc/cobra/doc"
) )
func main() { func main() {

2
doc/md_docs_test.go
View file

@ -7,7 +7,7 @@ import (
"path/filepath" "path/filepath"
"testing" "testing"
"github.com/spf13/cobra" "github.com/OneCloudInc/cobra"
) )
func TestGenMdDoc(t *testing.T) { func TestGenMdDoc(t *testing.T) {

2
doc/rest_docs.go
View file

@ -23,7 +23,7 @@ import (
"strings" "strings"
"time" "time"
"github.com/spf13/cobra" "github.com/OneCloudInc/cobra"
) )
func printOptionsReST(buf *bytes.Buffer, cmd *cobra.Command, name string) error { func printOptionsReST(buf *bytes.Buffer, cmd *cobra.Command, name string) error {

6
doc/rest_docs.md
View file

@ -8,8 +8,8 @@ package main
import ( import (
"log" "log"
"github.com/spf13/cobra" "github.com/OneCloudInc/cobra"
"github.com/spf13/cobra/doc" "github.com/OneCloudInc/cobra/doc"
) )
func main() { func main() {
@ -41,7 +41,7 @@ import (
"k8s.io/kubernetes/pkg/kubectl/cmd" "k8s.io/kubernetes/pkg/kubectl/cmd"
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
"github.com/spf13/cobra/doc" "github.com/OneCloudInc/cobra/doc"
) )
func main() { func main() {

2
doc/rest_docs_test.go
View file

@ -7,7 +7,7 @@ import (
"path/filepath" "path/filepath"
"testing" "testing"
"github.com/spf13/cobra" "github.com/OneCloudInc/cobra"
) )
func TestGenRSTDoc(t *testing.T) { func TestGenRSTDoc(t *testing.T) {

2
doc/util.go
View file

@ -16,7 +16,7 @@ package doc
import ( import (
"strings" "strings"
"github.com/spf13/cobra" "github.com/OneCloudInc/cobra"
) )
// Test to see if we have a reason to print See Also information in docs // Test to see if we have a reason to print See Also information in docs

2
doc/yaml_docs.go
View file

@ -21,7 +21,7 @@ import (
"sort" "sort"
"strings" "strings"
"github.com/spf13/cobra" "github.com/OneCloudInc/cobra"
"github.com/spf13/pflag" "github.com/spf13/pflag"
"gopkg.in/yaml.v2" "gopkg.in/yaml.v2"
) )

6
doc/yaml_docs.md
View file

@ -8,8 +8,8 @@ package main
import ( import (
"log" "log"
"github.com/spf13/cobra" "github.com/OneCloudInc/cobra"
"github.com/spf13/cobra/doc" "github.com/OneCloudInc/cobra/doc"
) )
func main() { func main() {
@ -41,7 +41,7 @@ import (
"k8s.io/kubernetes/pkg/kubectl/cmd" "k8s.io/kubernetes/pkg/kubectl/cmd"
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
"github.com/spf13/cobra/doc" "github.com/OneCloudInc/cobra/doc"
) )
func main() { func main() {

2
doc/yaml_docs_test.go
View file

@ -7,7 +7,7 @@ import (
"path/filepath" "path/filepath"
"testing" "testing"
"github.com/spf13/cobra" "github.com/OneCloudInc/cobra"
) )
func TestGenYamlDoc(t *testing.T) { func TestGenYamlDoc(t *testing.T) {

1
go.mod
View file

@ -17,7 +17,6 @@ require (
github.com/russross/blackfriday v1.5.2 // indirect github.com/russross/blackfriday v1.5.2 // indirect
github.com/spf13/afero v1.2.1 // indirect github.com/spf13/afero v1.2.1 // indirect
github.com/spf13/cast v1.3.0 // indirect github.com/spf13/cast v1.3.0 // indirect
github.com/spf13/cobra v0.0.3
github.com/spf13/jwalterweatherman v1.0.0 // indirect github.com/spf13/jwalterweatherman v1.0.0 // indirect
github.com/spf13/pflag v1.0.3 github.com/spf13/pflag v1.0.3
github.com/spf13/viper v1.3.1 github.com/spf13/viper v1.3.1