Rename packages to use OneCloud

This commit is contained in:
Brian Meyers 2019-02-22 12:58:38 -05:00
parent 7547e83b2d
commit 9224a9a8f3
31 changed files with 111 additions and 56 deletions

View file

@ -2,7 +2,7 @@ version: 2
references: references:
workspace: &workspace workspace: &workspace
/go/src/github.com/spf13/cobra /go/src/github.com/OneCloudInc/cobra
run_tests: &run_tests run_tests: &run_tests
run: run:

2
.gitignore vendored
View file

@ -34,3 +34,5 @@ tags
*.exe *.exe
cobra.test cobra.test
.idea

6
.idea/vcs.xml generated Normal file
View file

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" />
</component>
</project>

View file

@ -24,7 +24,7 @@ Many of the most widely used Go projects are built using Cobra including:
[![Build Status](https://travis-ci.org/spf13/cobra.svg "Travis CI status")](https://travis-ci.org/spf13/cobra) [![Build Status](https://travis-ci.org/spf13/cobra.svg "Travis CI status")](https://travis-ci.org/spf13/cobra)
[![CircleCI status](https://circleci.com/gh/spf13/cobra.png?circle-token=:circle-token "CircleCI status")](https://circleci.com/gh/spf13/cobra) [![CircleCI status](https://circleci.com/gh/spf13/cobra.png?circle-token=:circle-token "CircleCI status")](https://circleci.com/gh/spf13/cobra)
[![GoDoc](https://godoc.org/github.com/spf13/cobra?status.svg)](https://godoc.org/github.com/spf13/cobra) [![GoDoc](https://godoc.org/github.com/OneCloudInc/cobra?status.svg)](https://godoc.org/github.com/OneCloudInc/cobra)
# Table of Contents # Table of Contents
@ -103,7 +103,7 @@ have children commands and optionally run an action.
In the example above, 'server' is the command. In the example above, 'server' is the command.
[More about cobra.Command](https://godoc.org/github.com/spf13/cobra#Command) [More about cobra.Command](https://godoc.org/github.com/OneCloudInc/cobra#Command)
## Flags ## Flags
@ -123,12 +123,12 @@ Using Cobra is easy. First, use `go get` to install the latest version
of the library. This command will install the `cobra` generator executable of the library. This command will install the `cobra` generator executable
along with the library and its dependencies: along with the library and its dependencies:
go get -u github.com/spf13/cobra/cobra go get -u github.com/OneCloudInc/cobra/cobra
Next, include Cobra in your application: Next, include Cobra in your application:
```go ```go
import "github.com/spf13/cobra" import "github.com/OneCloudInc/cobra"
``` ```
# Getting Started # Getting Started
@ -165,7 +165,7 @@ func main() {
Cobra provides its own program that will create your application and add any Cobra provides its own program that will create your application and add any
commands you want. It's the easiest way to incorporate Cobra into your application. commands you want. It's the easiest way to incorporate Cobra into your application.
[Here](https://github.com/spf13/cobra/blob/master/cobra/README.md) you can find more information about it. [Here](https://github.com/OneCloudInc/cobra/blob/master/cobra/README.md) you can find more information about it.
## Using the Cobra Library ## Using the Cobra Library
@ -208,7 +208,7 @@ import (
"os" "os"
homedir "github.com/mitchellh/go-homedir" homedir "github.com/mitchellh/go-homedir"
"github.com/spf13/cobra" "github.com/OneCloudInc/cobra"
"github.com/spf13/viper" "github.com/spf13/viper"
) )
@ -284,7 +284,7 @@ package cmd
import ( import (
"fmt" "fmt"
"github.com/spf13/cobra" "github.com/OneCloudInc/cobra"
) )
func init() { func init() {
@ -430,7 +430,7 @@ import (
"fmt" "fmt"
"strings" "strings"
"github.com/spf13/cobra" "github.com/OneCloudInc/cobra"
) )
func main() { func main() {
@ -597,7 +597,7 @@ package main
import ( import (
"fmt" "fmt"
"github.com/spf13/cobra" "github.com/OneCloudInc/cobra"
) )
func main() { func main() {
@ -728,4 +728,4 @@ Cobra can generate a bash-completion file. If you add more information to your c
# License # License
Cobra is released under the Apache 2.0 license. See [LICENSE.txt](https://github.com/spf13/cobra/blob/master/LICENSE.txt) Cobra is released under the Apache 2.0 license. See [LICENSE.txt](https://github.com/OneCloudInc/cobra/blob/master/LICENSE.txt)

View file

@ -5,7 +5,7 @@ commands you want. It's the easiest way to incorporate Cobra into your applicati
In order to use the cobra command, compile it using the following command: In order to use the cobra command, compile it using the following command:
go get github.com/spf13/cobra/cobra go get github.com/OneCloudInc/cobra/cobra
This will create the cobra executable under your `$GOPATH/bin` directory. This will create the cobra executable under your `$GOPATH/bin` directory.

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() {

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"
) )
@ -144,7 +144,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}}

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
} }

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")
} }

View file

@ -17,7 +17,7 @@ import (
"fmt" "fmt"
homedir "github.com/mitchellh/go-homedir" homedir "github.com/mitchellh/go-homedir"
"github.com/spf13/cobra" "github.com/OneCloudInc/cobra"
"github.com/spf13/viper" "github.com/spf13/viper"
) )

47
cobra/cmd/test.go Normal file
View file

@ -0,0 +1,47 @@
// Copyright © 2019 NAME HERE <EMAIL ADDRESS>
//
// 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 cmd
import (
"fmt"
"github.com/OneCloudInc/cobra"
)
var testqueryIdFlag string
var testparamsFlag stringMap
func init() {
testCmd.Flags().StringVar(&testqueryIdFlag, "queryId", "", "Query ID")
testCmd.Flags().StringMapVar(&testparamsFlag, "params", "", "Params")
rootCmd.AddCommand(testCmd)
}
// testCmd represents the test command
var testCmd = &cobra.Command{
Use: "test",
Short: "A brief description of your command",
Long: `A longer description that spans multiple lines and likely contains examples
and usage of using your command. For example:
Cobra is a CLI library for Go that empowers applications.
This application is a tool to generate the needed files
to quickly create a Cobra application.`,
Run: func(cmd *cobra.Command, args []string) {
fmt.Println("test called")
},
}

View file

@ -19,7 +19,7 @@ import (
"os" "os"
homedir "github.com/mitchellh/go-homedir" homedir "github.com/mitchellh/go-homedir"
"github.com/spf13/cobra" "github.com/OneCloudInc/cobra"
"github.com/spf13/viper" "github.com/spf13/viper"
) )

View file

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

View file

@ -13,7 +13,7 @@
package main package main
import "github.com/spf13/cobra/cobra/cmd" import "github.com/OneCloudInc/cobra/cobra/cmd"
func main() { func main() {
cmd.Execute() cmd.Execute()

View file

@ -1223,7 +1223,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 {

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()

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) {}

View file

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

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() {

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 {

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() {

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 {

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() {

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) {

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 {

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() {

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) {

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

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"
) )

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() {

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) {