From 958e0a53295c33f32dddb6084b690476c984317c Mon Sep 17 00:00:00 2001 From: Tony Worm Date: Fri, 8 May 2020 17:43:34 -0600 Subject: [PATCH] some cool updates from hofmod-cli --- .hof/Cli/cmd/mvs/.goreleaser.yml | 14 ++-- .hof/Cli/cmd/mvs/cmd/convert.go | 12 +++ .hof/Cli/cmd/mvs/cmd/graph.go | 12 +++ .hof/Cli/cmd/mvs/cmd/hack.go | 12 +++ .hof/Cli/cmd/mvs/cmd/info.go | 12 +++ .hof/Cli/cmd/mvs/cmd/init.go | 12 +++ .hof/Cli/cmd/mvs/cmd/root.go | 21 ++++++ .hof/Cli/cmd/mvs/cmd/status.go | 12 +++ .hof/Cli/cmd/mvs/cmd/tidy.go | 12 +++ .hof/Cli/cmd/mvs/cmd/vendor.go | 12 +++ .hof/Cli/cmd/mvs/cmd/verify.go | 12 +++ .hof/Cli/cmd/mvs/cmd/version.go | 28 ++++--- .hof/Cli/cmd/mvs/ga/ga.go | 33 ++++++++ .hof/Cli/cmd/mvs/verinfo/verinfo.go | 26 +++++++ cli.cue | 2 + cmd/mvs/.goreleaser.yml | 14 ++-- cmd/mvs/cmd/convert.go | 12 +++ cmd/mvs/cmd/graph.go | 12 +++ cmd/mvs/cmd/hack.go | 12 +++ cmd/mvs/cmd/info.go | 12 +++ cmd/mvs/cmd/init.go | 12 +++ cmd/mvs/cmd/root.go | 21 ++++++ cmd/mvs/cmd/status.go | 12 +++ cmd/mvs/cmd/tidy.go | 12 +++ cmd/mvs/cmd/vendor.go | 12 +++ cmd/mvs/cmd/verify.go | 12 +++ cmd/mvs/cmd/version.go | 28 ++++--- cmd/mvs/ga/ga.go | 33 ++++++++ cmd/mvs/verinfo/verinfo.go | 26 +++++++ cue.mod/go.mod | 0 cue.mods | 2 +- cue.sums | 2 + go.mod | 8 +- go.sum | 113 ++++++++++++++++++++++++++++ 34 files changed, 538 insertions(+), 49 deletions(-) create mode 100644 .hof/Cli/cmd/mvs/ga/ga.go create mode 100644 .hof/Cli/cmd/mvs/verinfo/verinfo.go create mode 100644 cmd/mvs/ga/ga.go create mode 100644 cmd/mvs/verinfo/verinfo.go create mode 100644 cue.mod/go.mod diff --git a/.hof/Cli/cmd/mvs/.goreleaser.yml b/.hof/Cli/cmd/mvs/.goreleaser.yml index 2cece20..1b01f5d 100644 --- a/.hof/Cli/cmd/mvs/.goreleaser.yml +++ b/.hof/Cli/cmd/mvs/.goreleaser.yml @@ -10,13 +10,13 @@ builds: ldflags: - -s -w - - -X github.com/hofstadter-io/mvs/cmd/mvs/cmd.Version={{.Version}} - - -X github.com/hofstadter-io/mvs/cmd/mvs/cmd.Commit={{.FullCommit}} - - -X github.com/hofstadter-io/mvs/cmd/mvs/cmd.BuildDate={{.Date}} - - -X github.com/hofstadter-io/mvs/cmd/mvs/cmd.GoVersion=go1.14 - - -X github.com/hofstadter-io/mvs/cmd/mvs/cmd.BuildOS={{.Os}} - - -X github.com/hofstadter-io/mvs/cmd/mvs/cmd.BuildArch={{.Arch}} - - -X github.com/hofstadter-io/mvs/cmd/mvs/cmd.BuildArm={{.Arm}} + - -X github.com/hofstadter-io/mvs/cmd/mvs/verinfo.Version={{.Version}} + - -X github.com/hofstadter-io/mvs/cmd/mvs/verinfo.Commit={{.FullCommit}} + - -X github.com/hofstadter-io/mvs/cmd/mvs/verinfo.BuildDate={{.Date}} + - -X github.com/hofstadter-io/mvs/cmd/mvs/verinfo.GoVersion=go1.14 + - -X github.com/hofstadter-io/mvs/cmd/mvs/verinfo.BuildOS={{.Os}} + - -X github.com/hofstadter-io/mvs/cmd/mvs/verinfo.BuildArch={{.Arch}} + - -X github.com/hofstadter-io/mvs/cmd/mvs/verinfo.BuildArm={{.Arm}} env: - CGO_ENABLED=0 diff --git a/.hof/Cli/cmd/mvs/cmd/convert.go b/.hof/Cli/cmd/mvs/cmd/convert.go index 4b0156c..dd33df6 100644 --- a/.hof/Cli/cmd/mvs/cmd/convert.go +++ b/.hof/Cli/cmd/mvs/cmd/convert.go @@ -4,9 +4,13 @@ import ( "fmt" "os" + "strings" + "github.com/spf13/cobra" "github.com/hofstadter-io/mvs/lib" + + "github.com/hofstadter-io/mvs/cmd/mvs/ga" ) var convertLong = `convert another package system to MVS.` @@ -30,6 +34,14 @@ var ConvertCmd = &cobra.Command{ Long: convertLong, + PreRun: func(cmd *cobra.Command, args []string) { + + cs := strings.Fields(cmd.CommandPath()) + c := strings.Join(cs[1:], "/") + ga.SendGaEvent(c, strings.Join(args, "/"), 0) + + }, + Run: func(cmd *cobra.Command, args []string) { var err error diff --git a/.hof/Cli/cmd/mvs/cmd/graph.go b/.hof/Cli/cmd/mvs/cmd/graph.go index 01df8a4..676ab01 100644 --- a/.hof/Cli/cmd/mvs/cmd/graph.go +++ b/.hof/Cli/cmd/mvs/cmd/graph.go @@ -4,9 +4,13 @@ import ( "fmt" "os" + "strings" + "github.com/spf13/cobra" "github.com/hofstadter-io/mvs/lib" + + "github.com/hofstadter-io/mvs/cmd/mvs/ga" ) var graphLong = `print module requirement graph` @@ -30,6 +34,14 @@ var GraphCmd = &cobra.Command{ Long: graphLong, + PreRun: func(cmd *cobra.Command, args []string) { + + cs := strings.Fields(cmd.CommandPath()) + c := strings.Join(cs[1:], "/") + ga.SendGaEvent(c, strings.Join(args, "/"), 0) + + }, + Run: func(cmd *cobra.Command, args []string) { var err error diff --git a/.hof/Cli/cmd/mvs/cmd/hack.go b/.hof/Cli/cmd/mvs/cmd/hack.go index 801b73e..f05dfe4 100644 --- a/.hof/Cli/cmd/mvs/cmd/hack.go +++ b/.hof/Cli/cmd/mvs/cmd/hack.go @@ -4,9 +4,13 @@ import ( "fmt" "os" + "strings" + "github.com/spf13/cobra" "github.com/hofstadter-io/mvs/lib" + + "github.com/hofstadter-io/mvs/cmd/mvs/ga" ) var hackLong = `dev command` @@ -32,6 +36,14 @@ var HackCmd = &cobra.Command{ Long: hackLong, + PreRun: func(cmd *cobra.Command, args []string) { + + cs := strings.Fields(cmd.CommandPath()) + c := strings.Join(cs[1:], "/") + ga.SendGaEvent(c, strings.Join(args, "/"), 0) + + }, + Run: func(cmd *cobra.Command, args []string) { var err error diff --git a/.hof/Cli/cmd/mvs/cmd/info.go b/.hof/Cli/cmd/mvs/cmd/info.go index 576b85c..1556369 100644 --- a/.hof/Cli/cmd/mvs/cmd/info.go +++ b/.hof/Cli/cmd/mvs/cmd/info.go @@ -4,9 +4,13 @@ import ( "fmt" "os" + "strings" + "github.com/spf13/cobra" "github.com/hofstadter-io/mvs/lib" + + "github.com/hofstadter-io/mvs/cmd/mvs/ga" ) var infoLong = ` print info about languages and modders known to mvs @@ -33,6 +37,14 @@ var InfoCmd = &cobra.Command{ Long: infoLong, + PreRun: func(cmd *cobra.Command, args []string) { + + cs := strings.Fields(cmd.CommandPath()) + c := strings.Join(cs[1:], "/") + ga.SendGaEvent(c, strings.Join(args, "/"), 0) + + }, + Run: func(cmd *cobra.Command, args []string) { var err error diff --git a/.hof/Cli/cmd/mvs/cmd/init.go b/.hof/Cli/cmd/mvs/cmd/init.go index dff6ec4..639caf7 100644 --- a/.hof/Cli/cmd/mvs/cmd/init.go +++ b/.hof/Cli/cmd/mvs/cmd/init.go @@ -4,9 +4,13 @@ import ( "fmt" "os" + "strings" + "github.com/spf13/cobra" "github.com/hofstadter-io/mvs/lib" + + "github.com/hofstadter-io/mvs/cmd/mvs/ga" ) var initLong = `initialize a new module in the current directory` @@ -30,6 +34,14 @@ var InitCmd = &cobra.Command{ Long: initLong, + PreRun: func(cmd *cobra.Command, args []string) { + + cs := strings.Fields(cmd.CommandPath()) + c := strings.Join(cs[1:], "/") + ga.SendGaEvent(c, strings.Join(args, "/"), 0) + + }, + Run: func(cmd *cobra.Command, args []string) { var err error diff --git a/.hof/Cli/cmd/mvs/cmd/root.go b/.hof/Cli/cmd/mvs/cmd/root.go index 60f7c67..9b2e3ce 100644 --- a/.hof/Cli/cmd/mvs/cmd/root.go +++ b/.hof/Cli/cmd/mvs/cmd/root.go @@ -4,9 +4,13 @@ import ( "fmt" "os" + "strings" + "github.com/spf13/cobra" "github.com/hofstadter-io/mvs/lib" + + "github.com/hofstadter-io/mvs/cmd/mvs/ga" ) var mvsLong = `MVS is a polyglot dependency management tool based on go mods. @@ -51,9 +55,26 @@ var RootCmd = &cobra.Command{ os.Exit(1) } }, + + PreRun: func(cmd *cobra.Command, args []string) { + + ga.SendGaEvent("root", strings.Join(args, "/"), 0) + + }, } func init() { + + hf := RootCmd.HelpFunc() + f := func(cmd *cobra.Command, args []string) { + if RootCmd.Name() == cmd.Name() { + as := strings.Join(args, "/") + ga.SendGaEvent("root/help", as, 0) + } + hf(cmd, args) + } + RootCmd.SetHelpFunc(f) + cobra.OnInitialize(initConfig) RootCmd.AddCommand(InfoCmd) RootCmd.AddCommand(ConvertCmd) diff --git a/.hof/Cli/cmd/mvs/cmd/status.go b/.hof/Cli/cmd/mvs/cmd/status.go index 9ad2fb1..19d2eda 100644 --- a/.hof/Cli/cmd/mvs/cmd/status.go +++ b/.hof/Cli/cmd/mvs/cmd/status.go @@ -4,9 +4,13 @@ import ( "fmt" "os" + "strings" + "github.com/spf13/cobra" "github.com/hofstadter-io/mvs/lib" + + "github.com/hofstadter-io/mvs/cmd/mvs/ga" ) var statusLong = `print module dependencies status` @@ -30,6 +34,14 @@ var StatusCmd = &cobra.Command{ Long: statusLong, + PreRun: func(cmd *cobra.Command, args []string) { + + cs := strings.Fields(cmd.CommandPath()) + c := strings.Join(cs[1:], "/") + ga.SendGaEvent(c, strings.Join(args, "/"), 0) + + }, + Run: func(cmd *cobra.Command, args []string) { var err error diff --git a/.hof/Cli/cmd/mvs/cmd/tidy.go b/.hof/Cli/cmd/mvs/cmd/tidy.go index e60e840..4f4e992 100644 --- a/.hof/Cli/cmd/mvs/cmd/tidy.go +++ b/.hof/Cli/cmd/mvs/cmd/tidy.go @@ -4,9 +4,13 @@ import ( "fmt" "os" + "strings" + "github.com/spf13/cobra" "github.com/hofstadter-io/mvs/lib" + + "github.com/hofstadter-io/mvs/cmd/mvs/ga" ) var tidyLong = `add missinad and remove unused modules` @@ -30,6 +34,14 @@ var TidyCmd = &cobra.Command{ Long: tidyLong, + PreRun: func(cmd *cobra.Command, args []string) { + + cs := strings.Fields(cmd.CommandPath()) + c := strings.Join(cs[1:], "/") + ga.SendGaEvent(c, strings.Join(args, "/"), 0) + + }, + Run: func(cmd *cobra.Command, args []string) { var err error diff --git a/.hof/Cli/cmd/mvs/cmd/vendor.go b/.hof/Cli/cmd/mvs/cmd/vendor.go index 9a36900..fa0575d 100644 --- a/.hof/Cli/cmd/mvs/cmd/vendor.go +++ b/.hof/Cli/cmd/mvs/cmd/vendor.go @@ -4,9 +4,13 @@ import ( "fmt" "os" + "strings" + "github.com/spf13/cobra" "github.com/hofstadter-io/mvs/lib" + + "github.com/hofstadter-io/mvs/cmd/mvs/ga" ) var vendorLong = `make a vendored copy of dependencies` @@ -30,6 +34,14 @@ var VendorCmd = &cobra.Command{ Long: vendorLong, + PreRun: func(cmd *cobra.Command, args []string) { + + cs := strings.Fields(cmd.CommandPath()) + c := strings.Join(cs[1:], "/") + ga.SendGaEvent(c, strings.Join(args, "/"), 0) + + }, + Run: func(cmd *cobra.Command, args []string) { var err error diff --git a/.hof/Cli/cmd/mvs/cmd/verify.go b/.hof/Cli/cmd/mvs/cmd/verify.go index 85f6175..6119d8e 100644 --- a/.hof/Cli/cmd/mvs/cmd/verify.go +++ b/.hof/Cli/cmd/mvs/cmd/verify.go @@ -4,9 +4,13 @@ import ( "fmt" "os" + "strings" + "github.com/spf13/cobra" "github.com/hofstadter-io/mvs/lib" + + "github.com/hofstadter-io/mvs/cmd/mvs/ga" ) var verifyLong = `verify dependencies have expected content` @@ -30,6 +34,14 @@ var VerifyCmd = &cobra.Command{ Long: verifyLong, + PreRun: func(cmd *cobra.Command, args []string) { + + cs := strings.Fields(cmd.CommandPath()) + c := strings.Join(cs[1:], "/") + ga.SendGaEvent(c, strings.Join(args, "/"), 0) + + }, + Run: func(cmd *cobra.Command, args []string) { var err error diff --git a/.hof/Cli/cmd/mvs/cmd/version.go b/.hof/Cli/cmd/mvs/cmd/version.go index 68fe320..06e7c86 100644 --- a/.hof/Cli/cmd/mvs/cmd/version.go +++ b/.hof/Cli/cmd/mvs/cmd/version.go @@ -2,18 +2,12 @@ package cmd import ( "fmt" + "os" + "path/filepath" "github.com/spf13/cobra" -) - -var ( - Version = "Local" - Commit = "Dirty" - BuildDate = "Unknown" - GoVersion = "Unknown" - BuildOS = "Unknown" - BuildArch = "Unknown" + "github.com/hofstadter-io/mvs/cmd/mvs/verinfo" ) const versionMessage = ` @@ -40,14 +34,18 @@ var VersionCmd = &cobra.Command{ Long: VersionLong, Run: func(cmd *cobra.Command, args []string) { + + s, e := os.UserConfigDir() + fmt.Printf("mvs ConfigDir %q %v\n", filepath.Join(s, "mvs"), e) + fmt.Printf( versionMessage, - Version, - Commit, - BuildDate, - GoVersion, - BuildOS, - BuildArch, + verinfo.Version, + verinfo.Commit, + verinfo.BuildDate, + verinfo.GoVersion, + verinfo.BuildOS, + verinfo.BuildArch, ) }, } diff --git a/.hof/Cli/cmd/mvs/ga/ga.go b/.hof/Cli/cmd/mvs/ga/ga.go new file mode 100644 index 0000000..1936f80 --- /dev/null +++ b/.hof/Cli/cmd/mvs/ga/ga.go @@ -0,0 +1,33 @@ +package ga + +import ( + "github.com/hofstadter-io/yagu" + + "github.com/hofstadter-io/mvs/cmd/mvs/verinfo" +) + +func SendGaEvent(action, label string, value int) { + // Do something here to lookup / create + cid := "13b3ad64-9154-11ea-9eba-47f617ab74f7" + + cfg := yagu.GaConfig{ + TID: "UA-103579574-5", + CID: cid, + UA: "mvs/" + verinfo.Version, + CS: "mvs", + CN: verinfo.Version, + } + + evt := yagu.GaEvent{ + Source: cfg.UA, + Category: "mvs", + Action: action, + Label: label, + } + + if value >= 0 { + evt.Value = value + } + + yagu.SendGaEvent(cfg, evt) +} diff --git a/.hof/Cli/cmd/mvs/verinfo/verinfo.go b/.hof/Cli/cmd/mvs/verinfo/verinfo.go new file mode 100644 index 0000000..ee12d8a --- /dev/null +++ b/.hof/Cli/cmd/mvs/verinfo/verinfo.go @@ -0,0 +1,26 @@ +package verinfo + +import ( + "runtime" + "time" +) + +var ( + Version = "Local" + Commit = "Dirty" + + BuildDate = "Unknown" + GoVersion = "Unknown" + BuildOS = "Unknown" + BuildArch = "Unknown" +) + +func init() { + + if BuildDate == "Unknown" { + BuildDate = time.Now().String() + GoVersion = "run 'go version', you should have been the one who built this" + BuildOS = runtime.GOOS + BuildArch = runtime.GOARCH + } +} diff --git a/cli.cue b/cli.cue index 6dd849f..4c73c47 100644 --- a/cli.cue +++ b/cli.cue @@ -57,6 +57,8 @@ HofGenCli: gen.#HofGenerator & { } } + Telemetry: "UA-103579574-5" + OmitRun: true Imports: [ diff --git a/cmd/mvs/.goreleaser.yml b/cmd/mvs/.goreleaser.yml index 2cece20..1b01f5d 100644 --- a/cmd/mvs/.goreleaser.yml +++ b/cmd/mvs/.goreleaser.yml @@ -10,13 +10,13 @@ builds: ldflags: - -s -w - - -X github.com/hofstadter-io/mvs/cmd/mvs/cmd.Version={{.Version}} - - -X github.com/hofstadter-io/mvs/cmd/mvs/cmd.Commit={{.FullCommit}} - - -X github.com/hofstadter-io/mvs/cmd/mvs/cmd.BuildDate={{.Date}} - - -X github.com/hofstadter-io/mvs/cmd/mvs/cmd.GoVersion=go1.14 - - -X github.com/hofstadter-io/mvs/cmd/mvs/cmd.BuildOS={{.Os}} - - -X github.com/hofstadter-io/mvs/cmd/mvs/cmd.BuildArch={{.Arch}} - - -X github.com/hofstadter-io/mvs/cmd/mvs/cmd.BuildArm={{.Arm}} + - -X github.com/hofstadter-io/mvs/cmd/mvs/verinfo.Version={{.Version}} + - -X github.com/hofstadter-io/mvs/cmd/mvs/verinfo.Commit={{.FullCommit}} + - -X github.com/hofstadter-io/mvs/cmd/mvs/verinfo.BuildDate={{.Date}} + - -X github.com/hofstadter-io/mvs/cmd/mvs/verinfo.GoVersion=go1.14 + - -X github.com/hofstadter-io/mvs/cmd/mvs/verinfo.BuildOS={{.Os}} + - -X github.com/hofstadter-io/mvs/cmd/mvs/verinfo.BuildArch={{.Arch}} + - -X github.com/hofstadter-io/mvs/cmd/mvs/verinfo.BuildArm={{.Arm}} env: - CGO_ENABLED=0 diff --git a/cmd/mvs/cmd/convert.go b/cmd/mvs/cmd/convert.go index 4b0156c..dd33df6 100644 --- a/cmd/mvs/cmd/convert.go +++ b/cmd/mvs/cmd/convert.go @@ -4,9 +4,13 @@ import ( "fmt" "os" + "strings" + "github.com/spf13/cobra" "github.com/hofstadter-io/mvs/lib" + + "github.com/hofstadter-io/mvs/cmd/mvs/ga" ) var convertLong = `convert another package system to MVS.` @@ -30,6 +34,14 @@ var ConvertCmd = &cobra.Command{ Long: convertLong, + PreRun: func(cmd *cobra.Command, args []string) { + + cs := strings.Fields(cmd.CommandPath()) + c := strings.Join(cs[1:], "/") + ga.SendGaEvent(c, strings.Join(args, "/"), 0) + + }, + Run: func(cmd *cobra.Command, args []string) { var err error diff --git a/cmd/mvs/cmd/graph.go b/cmd/mvs/cmd/graph.go index 01df8a4..676ab01 100644 --- a/cmd/mvs/cmd/graph.go +++ b/cmd/mvs/cmd/graph.go @@ -4,9 +4,13 @@ import ( "fmt" "os" + "strings" + "github.com/spf13/cobra" "github.com/hofstadter-io/mvs/lib" + + "github.com/hofstadter-io/mvs/cmd/mvs/ga" ) var graphLong = `print module requirement graph` @@ -30,6 +34,14 @@ var GraphCmd = &cobra.Command{ Long: graphLong, + PreRun: func(cmd *cobra.Command, args []string) { + + cs := strings.Fields(cmd.CommandPath()) + c := strings.Join(cs[1:], "/") + ga.SendGaEvent(c, strings.Join(args, "/"), 0) + + }, + Run: func(cmd *cobra.Command, args []string) { var err error diff --git a/cmd/mvs/cmd/hack.go b/cmd/mvs/cmd/hack.go index 801b73e..f05dfe4 100644 --- a/cmd/mvs/cmd/hack.go +++ b/cmd/mvs/cmd/hack.go @@ -4,9 +4,13 @@ import ( "fmt" "os" + "strings" + "github.com/spf13/cobra" "github.com/hofstadter-io/mvs/lib" + + "github.com/hofstadter-io/mvs/cmd/mvs/ga" ) var hackLong = `dev command` @@ -32,6 +36,14 @@ var HackCmd = &cobra.Command{ Long: hackLong, + PreRun: func(cmd *cobra.Command, args []string) { + + cs := strings.Fields(cmd.CommandPath()) + c := strings.Join(cs[1:], "/") + ga.SendGaEvent(c, strings.Join(args, "/"), 0) + + }, + Run: func(cmd *cobra.Command, args []string) { var err error diff --git a/cmd/mvs/cmd/info.go b/cmd/mvs/cmd/info.go index 576b85c..1556369 100644 --- a/cmd/mvs/cmd/info.go +++ b/cmd/mvs/cmd/info.go @@ -4,9 +4,13 @@ import ( "fmt" "os" + "strings" + "github.com/spf13/cobra" "github.com/hofstadter-io/mvs/lib" + + "github.com/hofstadter-io/mvs/cmd/mvs/ga" ) var infoLong = ` print info about languages and modders known to mvs @@ -33,6 +37,14 @@ var InfoCmd = &cobra.Command{ Long: infoLong, + PreRun: func(cmd *cobra.Command, args []string) { + + cs := strings.Fields(cmd.CommandPath()) + c := strings.Join(cs[1:], "/") + ga.SendGaEvent(c, strings.Join(args, "/"), 0) + + }, + Run: func(cmd *cobra.Command, args []string) { var err error diff --git a/cmd/mvs/cmd/init.go b/cmd/mvs/cmd/init.go index dff6ec4..639caf7 100644 --- a/cmd/mvs/cmd/init.go +++ b/cmd/mvs/cmd/init.go @@ -4,9 +4,13 @@ import ( "fmt" "os" + "strings" + "github.com/spf13/cobra" "github.com/hofstadter-io/mvs/lib" + + "github.com/hofstadter-io/mvs/cmd/mvs/ga" ) var initLong = `initialize a new module in the current directory` @@ -30,6 +34,14 @@ var InitCmd = &cobra.Command{ Long: initLong, + PreRun: func(cmd *cobra.Command, args []string) { + + cs := strings.Fields(cmd.CommandPath()) + c := strings.Join(cs[1:], "/") + ga.SendGaEvent(c, strings.Join(args, "/"), 0) + + }, + Run: func(cmd *cobra.Command, args []string) { var err error diff --git a/cmd/mvs/cmd/root.go b/cmd/mvs/cmd/root.go index 60f7c67..9b2e3ce 100644 --- a/cmd/mvs/cmd/root.go +++ b/cmd/mvs/cmd/root.go @@ -4,9 +4,13 @@ import ( "fmt" "os" + "strings" + "github.com/spf13/cobra" "github.com/hofstadter-io/mvs/lib" + + "github.com/hofstadter-io/mvs/cmd/mvs/ga" ) var mvsLong = `MVS is a polyglot dependency management tool based on go mods. @@ -51,9 +55,26 @@ var RootCmd = &cobra.Command{ os.Exit(1) } }, + + PreRun: func(cmd *cobra.Command, args []string) { + + ga.SendGaEvent("root", strings.Join(args, "/"), 0) + + }, } func init() { + + hf := RootCmd.HelpFunc() + f := func(cmd *cobra.Command, args []string) { + if RootCmd.Name() == cmd.Name() { + as := strings.Join(args, "/") + ga.SendGaEvent("root/help", as, 0) + } + hf(cmd, args) + } + RootCmd.SetHelpFunc(f) + cobra.OnInitialize(initConfig) RootCmd.AddCommand(InfoCmd) RootCmd.AddCommand(ConvertCmd) diff --git a/cmd/mvs/cmd/status.go b/cmd/mvs/cmd/status.go index 9ad2fb1..19d2eda 100644 --- a/cmd/mvs/cmd/status.go +++ b/cmd/mvs/cmd/status.go @@ -4,9 +4,13 @@ import ( "fmt" "os" + "strings" + "github.com/spf13/cobra" "github.com/hofstadter-io/mvs/lib" + + "github.com/hofstadter-io/mvs/cmd/mvs/ga" ) var statusLong = `print module dependencies status` @@ -30,6 +34,14 @@ var StatusCmd = &cobra.Command{ Long: statusLong, + PreRun: func(cmd *cobra.Command, args []string) { + + cs := strings.Fields(cmd.CommandPath()) + c := strings.Join(cs[1:], "/") + ga.SendGaEvent(c, strings.Join(args, "/"), 0) + + }, + Run: func(cmd *cobra.Command, args []string) { var err error diff --git a/cmd/mvs/cmd/tidy.go b/cmd/mvs/cmd/tidy.go index e60e840..4f4e992 100644 --- a/cmd/mvs/cmd/tidy.go +++ b/cmd/mvs/cmd/tidy.go @@ -4,9 +4,13 @@ import ( "fmt" "os" + "strings" + "github.com/spf13/cobra" "github.com/hofstadter-io/mvs/lib" + + "github.com/hofstadter-io/mvs/cmd/mvs/ga" ) var tidyLong = `add missinad and remove unused modules` @@ -30,6 +34,14 @@ var TidyCmd = &cobra.Command{ Long: tidyLong, + PreRun: func(cmd *cobra.Command, args []string) { + + cs := strings.Fields(cmd.CommandPath()) + c := strings.Join(cs[1:], "/") + ga.SendGaEvent(c, strings.Join(args, "/"), 0) + + }, + Run: func(cmd *cobra.Command, args []string) { var err error diff --git a/cmd/mvs/cmd/vendor.go b/cmd/mvs/cmd/vendor.go index 9a36900..fa0575d 100644 --- a/cmd/mvs/cmd/vendor.go +++ b/cmd/mvs/cmd/vendor.go @@ -4,9 +4,13 @@ import ( "fmt" "os" + "strings" + "github.com/spf13/cobra" "github.com/hofstadter-io/mvs/lib" + + "github.com/hofstadter-io/mvs/cmd/mvs/ga" ) var vendorLong = `make a vendored copy of dependencies` @@ -30,6 +34,14 @@ var VendorCmd = &cobra.Command{ Long: vendorLong, + PreRun: func(cmd *cobra.Command, args []string) { + + cs := strings.Fields(cmd.CommandPath()) + c := strings.Join(cs[1:], "/") + ga.SendGaEvent(c, strings.Join(args, "/"), 0) + + }, + Run: func(cmd *cobra.Command, args []string) { var err error diff --git a/cmd/mvs/cmd/verify.go b/cmd/mvs/cmd/verify.go index 85f6175..6119d8e 100644 --- a/cmd/mvs/cmd/verify.go +++ b/cmd/mvs/cmd/verify.go @@ -4,9 +4,13 @@ import ( "fmt" "os" + "strings" + "github.com/spf13/cobra" "github.com/hofstadter-io/mvs/lib" + + "github.com/hofstadter-io/mvs/cmd/mvs/ga" ) var verifyLong = `verify dependencies have expected content` @@ -30,6 +34,14 @@ var VerifyCmd = &cobra.Command{ Long: verifyLong, + PreRun: func(cmd *cobra.Command, args []string) { + + cs := strings.Fields(cmd.CommandPath()) + c := strings.Join(cs[1:], "/") + ga.SendGaEvent(c, strings.Join(args, "/"), 0) + + }, + Run: func(cmd *cobra.Command, args []string) { var err error diff --git a/cmd/mvs/cmd/version.go b/cmd/mvs/cmd/version.go index 68fe320..06e7c86 100644 --- a/cmd/mvs/cmd/version.go +++ b/cmd/mvs/cmd/version.go @@ -2,18 +2,12 @@ package cmd import ( "fmt" + "os" + "path/filepath" "github.com/spf13/cobra" -) - -var ( - Version = "Local" - Commit = "Dirty" - BuildDate = "Unknown" - GoVersion = "Unknown" - BuildOS = "Unknown" - BuildArch = "Unknown" + "github.com/hofstadter-io/mvs/cmd/mvs/verinfo" ) const versionMessage = ` @@ -40,14 +34,18 @@ var VersionCmd = &cobra.Command{ Long: VersionLong, Run: func(cmd *cobra.Command, args []string) { + + s, e := os.UserConfigDir() + fmt.Printf("mvs ConfigDir %q %v\n", filepath.Join(s, "mvs"), e) + fmt.Printf( versionMessage, - Version, - Commit, - BuildDate, - GoVersion, - BuildOS, - BuildArch, + verinfo.Version, + verinfo.Commit, + verinfo.BuildDate, + verinfo.GoVersion, + verinfo.BuildOS, + verinfo.BuildArch, ) }, } diff --git a/cmd/mvs/ga/ga.go b/cmd/mvs/ga/ga.go new file mode 100644 index 0000000..1936f80 --- /dev/null +++ b/cmd/mvs/ga/ga.go @@ -0,0 +1,33 @@ +package ga + +import ( + "github.com/hofstadter-io/yagu" + + "github.com/hofstadter-io/mvs/cmd/mvs/verinfo" +) + +func SendGaEvent(action, label string, value int) { + // Do something here to lookup / create + cid := "13b3ad64-9154-11ea-9eba-47f617ab74f7" + + cfg := yagu.GaConfig{ + TID: "UA-103579574-5", + CID: cid, + UA: "mvs/" + verinfo.Version, + CS: "mvs", + CN: verinfo.Version, + } + + evt := yagu.GaEvent{ + Source: cfg.UA, + Category: "mvs", + Action: action, + Label: label, + } + + if value >= 0 { + evt.Value = value + } + + yagu.SendGaEvent(cfg, evt) +} diff --git a/cmd/mvs/verinfo/verinfo.go b/cmd/mvs/verinfo/verinfo.go new file mode 100644 index 0000000..ee12d8a --- /dev/null +++ b/cmd/mvs/verinfo/verinfo.go @@ -0,0 +1,26 @@ +package verinfo + +import ( + "runtime" + "time" +) + +var ( + Version = "Local" + Commit = "Dirty" + + BuildDate = "Unknown" + GoVersion = "Unknown" + BuildOS = "Unknown" + BuildArch = "Unknown" +) + +func init() { + + if BuildDate == "Unknown" { + BuildDate = time.Now().String() + GoVersion = "run 'go version', you should have been the one who built this" + BuildOS = runtime.GOOS + BuildArch = runtime.GOARCH + } +} diff --git a/cue.mod/go.mod b/cue.mod/go.mod new file mode 100644 index 0000000..e69de29 diff --git a/cue.mods b/cue.mods index 7752667..0674cbb 100644 --- a/cue.mods +++ b/cue.mods @@ -3,5 +3,5 @@ module github.com/hofstadter-io/mvs cue master require ( - github.com/hofstadter-io/hofmod-cli v0.4.0 + github.com/hofstadter-io/hofmod-cli v0.5.0 ) diff --git a/cue.sums b/cue.sums index 3e5b90e..c6b17bf 100644 --- a/cue.sums +++ b/cue.sums @@ -22,3 +22,5 @@ github.com/hofstadter-io/hofmod-cli v0.3.5 h1:AKf1BeHDiVvRZLPoNC0gaRq+8H3vwnQrW/ github.com/hofstadter-io/hofmod-cli v0.3.5/cue.mods h1:YmxImIIBaXUl/P54xJqbLzLTFvpYCNQBhoyVCCfmad0= github.com/hofstadter-io/hofmod-cli v0.4.0 h1:M9qmHyUW9AxmOAgeAwbfa24L3+GBAuiBhbv9jFeWCEg= github.com/hofstadter-io/hofmod-cli v0.4.0/cue.mods h1:8TVLRMLOvfcVRZu6NqDr4VFmvuw/9Ca7YpCMo1fTRmU= +github.com/hofstadter-io/hofmod-cli v0.5.0 h1:hZT2BUWJftP9jq32bcOElXg1N9oXEFJCK9MxBmfS+24= +github.com/hofstadter-io/hofmod-cli v0.5.0/cue.mods h1:8TVLRMLOvfcVRZu6NqDr4VFmvuw/9Ca7YpCMo1fTRmU= diff --git a/go.mod b/go.mod index 884b03b..a4d281c 100644 --- a/go.mod +++ b/go.mod @@ -4,15 +4,15 @@ go 1.14 require ( cuelang.org/go v0.1.3-0.20200424192631-12927e83d318 - github.com/bmatcuk/doublestar v1.2.2 + github.com/bmatcuk/doublestar v1.3.0 github.com/go-git/go-billy/v5 v5.0.0 github.com/go-git/go-git/v5 v5.0.0 github.com/google/go-github/v30 v30.1.0 + github.com/hofstadter-io/yagu v0.0.1 github.com/parnurzeal/gorequest v0.2.16 - github.com/spf13/cobra v0.0.7 - github.com/spf13/viper v1.4.0 // indirect + github.com/spf13/cobra v1.0.0 golang.org/x/mod v0.2.0 - golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be + golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 // indirect gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c moul.io/http2curl v1.0.0 // indirect diff --git a/go.sum b/go.sum index dba201b..1375cd8 100644 --- a/go.sum +++ b/go.sum @@ -1,4 +1,5 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cuelang.org/go v0.0.15 h1:rpZtf1ZGYfZwbMHLwIif5Gczil+HF7rHAU7MFNOGV/A= cuelang.org/go v0.0.15/go.mod h1:gehQASsTv+lFZknWIG0hANGVSBiHD7HyKWmAdEZL3No= cuelang.org/go v0.1.1 h1:RIZpXgS3nw+hWFDbxm5peKo3XHIDJTpcaS9TCmpcVrA= @@ -13,31 +14,45 @@ github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRF github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c= github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= +github.com/aymerick/raymond v2.0.2+incompatible h1:VEp3GpgdAnv9B2GFyTvqgcKvY+mfKMjPOA3SbKLtnU0= +github.com/aymerick/raymond v2.0.2+incompatible/go.mod h1:osfaiScAUVup+UC9Nfq76eWqDhXlp+4UYaA8uhTBO6g= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= github.com/bmatcuk/doublestar v1.2.2 h1:oC24CykoSAB8zd7XgruHo33E0cHJf/WhQA/7BeXj+x0= github.com/bmatcuk/doublestar v1.2.2/go.mod h1:wiQtGV+rzVYxB7WIlirSN++5HPtPlXEo9MEoZQC/PmE= +github.com/bmatcuk/doublestar v1.3.0 h1:1jLE2y0VpSrOn/QR9G4f2RmrCtkM3AuATcWradjHUvM= +github.com/bmatcuk/doublestar v1.3.0/go.mod h1:wiQtGV+rzVYxB7WIlirSN++5HPtPlXEo9MEoZQC/PmE= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= +github.com/clbanning/mxj v1.8.4/go.mod h1:BVjHeAH+rl9rs6f+QIpeRl0tfu10SXn1pUSa5PVGJng= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cockroachdb/apd v1.1.0 h1:3LFP3629v+1aKXU5Q37mxmRxX/pIu1nijXydLShEq5I= github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ= github.com/cockroachdb/apd/v2 v2.0.1 h1:y1Rh3tEU89D+7Tgbw+lp52T6p/GJLpDmNvr10UWqLTE= github.com/cockroachdb/apd/v2 v2.0.1/go.mod h1:DDxRlzC2lo3/vSlmSoS7JkqbbrARPuFOGr0B9pvN3Gw= +github.com/codemodus/kace v0.5.1/go.mod h1:coddaHoX1ku1YFSe4Ip0mL9kQjJvKkzb9CfIdG1YR04= github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= +github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= +github.com/dsnet/compress v0.0.1/go.mod h1:Aw8dCMJ7RioblQeTqt88akK31OvO8Dhf5JflhBbQEHo= +github.com/dsnet/golib v0.0.0-20171103203638-1ea166775780/go.mod h1:Lj+Z9rebOhdfkVLjJ8T6VcRQv3SXugXy999NBtR9aFY= +github.com/elazarl/goproxy v0.0.0-20200310082302-296d8939dc5a/go.mod h1:Ro8st/ElPeALwNFlcTpWmkr6IoMFfkjXAvTHpevnDsM= +github.com/elazarl/goproxy/ext v0.0.0-20190711103511-473e67f1d7d2/go.mod h1:gNh8nYJoAm43RfaxurUnxr+N1PwuFV3ZMl/efxlIlY8= github.com/emicklei/proto v1.6.15/go.mod h1:rn1FgRS/FANiZdD2djyH7TMA9jdRDcYQ9IEN9yvjX0A= github.com/emirpasic/gods v1.12.0 h1:QAUIPSaCu4G+POclxeqb3F+WPpdKqFGlw36+yOzGlrg= github.com/emirpasic/gods v1.12.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3ymbK86o= +github.com/epiclabs-io/diff3 v0.0.0-20181217103619-05282cece609/go.mod h1:tM499ZoH5jQRF3wlMnl59SJQwVYXIBdJRZa/K71p0IM= +github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= +github.com/frankban/quicktest v1.7.3/go.mod h1:V1d2J5pfxYH6EjBAgSK7YNXcXlTWxUHdE1sVDXkjnig= github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk= @@ -57,6 +72,7 @@ github.com/go-git/go-git/v5 v5.0.0/go.mod h1:oYD8y9kWsGINPFJoLdaScGCN6dlKg23blmC github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= +github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= @@ -68,43 +84,74 @@ github.com/golang/protobuf v1.3.1 h1:YF8+flBXS5eO826T4nzqPrxfhQThhXl0YzfuUPu4SBg github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs= github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= +github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= +github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= +github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= +github.com/golang/protobuf v1.4.0 h1:oOuy+ugB+P/kBdUnG5QaMXSIyJ1q38wWSojYCb3z5VQ= +github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= +github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-github v17.0.0+incompatible h1:N0LgJ1j65A7kfXrZnUDaYCs/Sf4rEjNlfyDHW9dolSY= github.com/google/go-github/v30 v30.1.0 h1:VLDx+UolQICEOKu2m4uAoMti1SxuEBAl7RSEG16L+Oo= github.com/google/go-github/v30 v30.1.0/go.mod h1:n8jBpHl45a/rlBUtRJMOG4GhNADUQFEufcolZ95JfU8= github.com/google/go-querystring v1.0.0 h1:Xkwi/a1rcvNg1PPYe5vI8GbeBY/jrVuDX5ASuANWTrk= github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= +github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= +github.com/hofstadter-io/data-utils v0.0.0-20200128210141-0a3e569b27ed/go.mod h1:WEV97No6/53nUz5mPEBhMJeW4JJcw2xwZZjfPxppXLg= +github.com/hofstadter-io/dotpath v0.0.0-20191027071558-52e2819b7d2d h1:cnUMj92riFtchfxeKB5YBm2F6/0oUsuOOffUlZQh62g= +github.com/hofstadter-io/dotpath v0.0.0-20191027071558-52e2819b7d2d/go.mod h1:hOVbz4565GFOTrLbUiUf8IUP3Oi+vFaQJf1Zh86g7/Q= +github.com/hofstadter-io/hof v0.3.8/go.mod h1:EpDjAdUJEYeur98TFkN4ZdRyGZD/JrhXEiXYusPYJDQ= +github.com/hofstadter-io/hof-lang v0.0.0-20180925221847-4d1c962b0729/go.mod h1:4dVdBwjI9Mw89zYA2aE5kKZR4VL1rcBbCR0AScQ5wkU= +github.com/hofstadter-io/mvs v0.5.0/go.mod h1:Cvq23OVa/x1wA720bNCHPgvNuS5+4g2ZWFsWgXfLMUU= +github.com/hofstadter-io/yagu v0.0.1 h1:WNtWyXH2vu8C/Il7R2itvgFHHLy/WLqzbm+A+yPYFSc= +github.com/hofstadter-io/yagu v0.0.1/go.mod h1:UWTxRZtLMwWDfYcKPaWS6Bc4VZT+ue5P6yJcpS323rM= github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A= github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo= github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= +github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd h1:Coekwdh0v2wtGp9Gmz1Ze3eVRAWJMLokvN3QjdzCHLY= github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM= github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= +github.com/klauspost/compress v1.4.1/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= +github.com/klauspost/cpuid v1.2.0/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/magiconair/properties v1.8.0 h1:LLgXmsheXeRoUOBOjtwPQCWIYqM/LU1ayDtDePerRcY= github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= +github.com/magiconair/properties v1.8.1 h1:ZC2Vc7/ZFkGmsVC9KvOjumD+G5lXy2RtTKyzRKO2BQ4= +github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= +github.com/mattn/go-colorable v0.1.4 h1:snbPLB8fVfU9iwbbo30TPtbLRzwWu6aJS6Xh4eaaviA= +github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= +github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= +github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84= +github.com/mattn/go-isatty v0.0.11 h1:FxPOTFNqGkuDUGi3H/qkUbQO4ZiBa2brKq5r0l8TGeM= +github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE= +github.com/mattn/go-zglob v0.0.1/go.mod h1:9fxibJccNxU2cnpIKLRRFA7zX7qhkJIQWBb449FYHOo= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= +github.com/mholt/archiver v3.1.1+incompatible/go.mod h1:Dh2dOXnSdiLxRiPoVfIr/fI1TwETms9B8CTWfeh7ROU= github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE= @@ -112,15 +159,22 @@ github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh github.com/mpvl/unique v0.0.0-20150818121801-cbe035fff7de h1:D5x39vF5KCwKQaw+OC9ZPiLVHXz3UFw2+psEX+gYcto= github.com/mpvl/unique v0.0.0-20150818121801-cbe035fff7de/go.mod h1:kJun4WP5gFuHZgRjZUWWuH1DTxCtxbHDOIJsudS8jzY= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= +github.com/naoina/go-stringutil v0.1.0/go.mod h1:XJ2SJL9jCtBh+P9q5btrd/Ylo8XwT/h1USek5+NqSA0= +github.com/naoina/toml v0.1.1/go.mod h1:NBIhNtsFMo3G2szEBne+bO4gS192HuIYRqfvOWb4i1E= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= +github.com/nwaples/rardecode v1.1.0/go.mod h1:5DzqNKiOdpKKBH87u8VlvAnPZMXcGRhxWkRpHbbfGS0= github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= github.com/parnurzeal/gorequest v0.2.16 h1:T/5x+/4BT+nj+3eSknXmCTnEVGSzFzPGdpqmUVVZXHQ= github.com/parnurzeal/gorequest v0.2.16/go.mod h1:3Kh2QUMJoqw3icWAecsyzkpY7UzRfDhbRdTjtNwNiUE= +github.com/pelletier/go-buffruneio v0.2.0/go.mod h1:JkE26KsDizTr40EUHkXVtNPvgGtbSNq5BcowyYOWdKo= github.com/pelletier/go-toml v1.2.0 h1:T5zMGML61Wp+FlcbWjRDT7yAxhJNAiPPLOFECq181zc= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= +github.com/pierrec/lz4 v2.4.1+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= +github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso= @@ -132,12 +186,16 @@ github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= +github.com/rogpeppe/go-charset v0.0.0-20180617210344-2471d30d28b4/go.mod h1:qgYeAmZ5ZIpBWTGllZSQnw97Dj+woV0toclVaRGI8pc= github.com/rogpeppe/testscript v1.1.0/go.mod h1:lzMlnW8LS56mcdJoQYkrlzqOoTFCOemzt5LusJ93bDM= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= +github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0= github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= +github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= +github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spf13/afero v1.1.2 h1:m8/z1t7/fwjysjQRYbP0RD+bUIF/8tJwPdEZsI83ACI= @@ -149,21 +207,36 @@ github.com/spf13/cobra v0.0.6 h1:breEStsVwemnKh2/s6gMvSdMEkwW0sK8vGStnlVBMCs= github.com/spf13/cobra v0.0.6/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE= github.com/spf13/cobra v0.0.7 h1:FfTH+vuMXOas8jmfb5/M7dzEYx7LpcLb7a0LPe34uOU= github.com/spf13/cobra v0.0.7/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE= +github.com/spf13/cobra v1.0.0 h1:6m/oheQuQ13N9ks4hubMG6BnvwOeaJrqSPLahSnczz8= +github.com/spf13/cobra v1.0.0/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE= github.com/spf13/jwalterweatherman v1.0.0 h1:XHEdyB+EcvlqZamSM4ZOMGlc93t6AcsBEu9Gc1vn7yk= github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg= github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= +github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= +github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/spf13/viper v1.4.0 h1:yXHLWeravcrgGyFSyCgdYpXQ9dR9c/WED3pg1RhxqEU= github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE= +github.com/spf13/viper v1.6.2 h1:7aKfF+e8/k68gda3LOjo5RxiUqddoFxVq4BKBPrxk5E= +github.com/spf13/viper v1.6.2/go.mod h1:t3iDnF5Jlj76alVNuyFBk5oUMCvsrkbvZK0WQdfDi5k= +github.com/src-d/gcfg v1.4.0 h1:xXbNR5AlLSA315x2UO+fTSSAXCDf+Ar38/6oyGbDKQ4= +github.com/src-d/gcfg v1.4.0/go.mod h1:p/UMsR43ujA89BJY9duynAwIpvqEujIH/jFlfL7jWoI= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= github.com/stretchr/testify v1.2.0/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= +github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s= +github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= +github.com/ulikunitz/xz v0.5.6/go.mod h1:2bypXElzHzzJZwzH67Y6wb67pO62Rzfn7BSiF4ABRW8= +github.com/ulikunitz/xz v0.5.7/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= github.com/xanzy/ssh-agent v0.2.1 h1:TCbipTQL2JiiCprBWx9frJ2eJlCYT00NmctrHxVAr70= github.com/xanzy/ssh-agent v0.2.1/go.mod h1:mLlQY/MoOhWBj+gOGMQkOeiEvkx+8pJSI+0Bx9h2kr4= +github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8/go.mod h1:HUYIGzjTL3rfEspMxjDjgmT5uz5wzYJKVo23qUhYTos= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= @@ -173,25 +246,36 @@ go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190219172222-a4c6cb3142f2/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073 h1:xMPOj6Pz6UipU1wXLkrtqpHbR0AVFnyPEQq/wRWz9lM= golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20200423211502-4bdfaf469ed5 h1:Q7tZBpemrlsc2I7IyODzhtallWRSm4Q0d09pL6XbQtU= +golang.org/x/crypto v0.0.0-20200423211502-4bdfaf469ed5/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= golang.org/x/mod v0.2.0 h1:KU7oHjnv3XNWfa5COkzUifxZmxp1TyI7ImMXqFxLwvQ= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= +golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200301022130-244492dfa37a h1:GuSPYbZzB5/dcLNCwLQLsg3obCJtX9IJhpXkvY7kzk0= golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200425230154-ff2c4b7c35a0 h1:Jcxah/M+oLZ/R4/z5RzfPzGbPXnVDPkEDtf2JnuxN+U= +golang.org/x/net v0.0.0-20200425230154-ff2c4b7c35a0/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be h1:vEDujvNQGv4jgYKudGeI/+DAX4Jffq6hpD55MmoEvKs= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= +golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d h1:TzXSXBo42m9gQenoE3b9BGiEpg5IG2JkU5FkPIawgtw= +golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -202,9 +286,16 @@ golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5h golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190221075227-b4e8571b14e0/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527 h1:uYVVQ9WP/Ds2ROhcaGPeIdVq0RIXVLwsHlnvJ+cT1So= golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200420163511-1957bb5e6d1f h1:gWF768j/LaZugp8dyS4UwsslYCYz9XgFxvlgsn0n9H8= +golang.org/x/sys v0.0.0-20200420163511-1957bb5e6d1f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= @@ -214,6 +305,7 @@ golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGm golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190729092621-ff9f1409240a/go.mod h1:jcCCGcm9btYwXyDqrUWc6MKQKKGJCWEQ3AfLSRIbEuI= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200113154838-30cae5f2fb06/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -223,23 +315,44 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IV golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/appengine v1.1.0 h1:igQkv0AAhEIvTEpD5LIpAfav2eeVO9HBTjvKHVJPRSs= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= +google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/appengine v1.6.6 h1:lMO5rYAqUxkmaj76jAkRUvt5JZgFymx/+Q5Mzfivuhc= +google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= +google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= +google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= +google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= +google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= +google.golang.org/protobuf v1.21.0 h1:qdOKuR/EIArgaWNjetjgTzgVTAZ+S/WXVrq9HW9zimw= +google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= +gopkg.in/inconshreveable/log15.v2 v2.0.0-20180818164646-67afb5ed74ec h1:RlWgLqCMMIYYEVcAR5MDsuHlVkaIPDAF+5Dehzg8L5A= +gopkg.in/inconshreveable/log15.v2 v2.0.0-20180818164646-67afb5ed74ec/go.mod h1:aPpfJ7XW+gOuirDoZ8gHhLh3kZ1B08FtV2bbmy7Jv3s= +gopkg.in/ini.v1 v1.51.0 h1:AQvPpx3LzTDM0AjnIRlVFwFFGC+npRopjZxLJj6gdno= +gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= +gopkg.in/src-d/go-billy.v4 v4.3.2 h1:0SQA1pRztfTFx2miS8sA97XvooFeNOmvUenF4o0EcVg= +gopkg.in/src-d/go-billy.v4 v4.3.2/go.mod h1:nDjArDMp+XMs1aFAESLRjfGSgfvoYN0hDfzEk0GjC98= +gopkg.in/src-d/go-git-fixtures.v3 v3.5.0/go.mod h1:dLBcvytrw/TYZsNTWCnkNF2DSIlzWYqTe3rJR56Ac7g= +gopkg.in/src-d/go-git.v4 v4.13.1 h1:SRtFyV8Kxc0UP7aCHcijOMQGPxHSmMOPrzulQWolkYE= +gopkg.in/src-d/go-git.v4 v4.13.1/go.mod h1:nx5NYcxdKxq5fpltdHnPa2Exj4Sx0EclMWZQbYDu2z8= gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME= gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI= +gopkg.in/yaml.v1 v1.0.0-20140924161607-9f9df34309c0/go.mod h1:WDnlLJ4WF5VGsH/HVa3CI79GS0ol3YnhVnKP89i0kNg= gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10= +gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v3 v3.0.0-20200121175148-a6ecf24a6d71/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=