update deps for retry tool

cmd/generate/gen.go

@@ -6,11 +6,11 @@ import (
 	"text/template"
 )
 
-//go:generate go run gen.go -output parser_gen.go
-//go:generate gofmt -w parser_gen.go
+//go:generate go run gen.go -output ../retry/parser_gen.go
+//go:generate goimports -ungroup -w ../retry/parser_gen.go
 
 const tpl = `
-{{ if .BuildTags }}// +build{{ range .BuildTags }} {{ . }}{{ end }}{{ end }}
+{{ if .BuildTags }}//+build{{ range .BuildTags }} {{ . }}{{ end }}{{ end }}
 
 package main
 
@@ -312,15 +312,16 @@ func generatedNormalDistributionTransformation(raw string) (jitter.Transformatio
 var output = flag.String("output", "parser_gen.go", "output filename")
 
 func main() {
+	flag.Parse()
 	t := template.Must(template.New("parser").Parse(tpl))
 	f, err := os.Create(*output)
 	if err != nil {
 		panic(err)
 	}
-	defer f.Close()
-	t.Execute(f, struct {
+	defer func () { _ = f.Close() }()
+	_ = t.Execute(f, struct {
 		BuildTags []string
 	}{
-		BuildTags: []string{"go1.10"},
+		BuildTags: []string{"go1.11"},
 	})
 }

cmd/retry/Gopkg.toml

@@ -1,26 +1,26 @@
 [[constraint]]
   name = "github.com/briandowns/spinner"
-  version = "^1.0.0"
+  version = "1.4.0"
 
 [[constraint]]
   name = "github.com/fatih/color"
-  version = "^1.5.0"
+  version = "1.7.0"
 
 [[constraint]]
   name = "github.com/kamilsk/go-kit"
   branch = "master"
 
 [[override]]
   name = "github.com/pkg/errors"
-  version = "^0.8.0"
+  version = "0.8.1"
 
 [[constraint]]
   name = "github.com/spf13/cobra"
-  version = "^0.0.3"
+  version = "0.0.3"
 
 [[constraint]]
   name = "github.com/stretchr/testify"
-  version = "^1.1.4"
+  version = "1.3.0"
 
 [prune]
   go-tests = true

cmd/retry/completion.go

@@ -1,4 +1,4 @@
-// +build go1.10
+//+build go1.11
 
 package main
 
@@ -12,8 +12,7 @@ const (
 	zshFormat  = "zsh"
 )
 
-// Completion prints Bash or Zsh completion.
-var Completion = &cobra.Command{
+var completionCommand = &cobra.Command{
 	Use:   "completion",
 	Short: "Print Bash or Zsh completion",
 	RunE: func(cmd *cobra.Command, args []string) error {
@@ -32,6 +31,6 @@ var Completion = &cobra.Command{
 }
 
 func init() {
-	Completion.Flags().StringVarP(new(string), "format", "f", zshFormat, "output format, one of: bash|zsh")
-	fn.Must(func() error { return Completion.MarkFlagRequired("format") })
+	completionCommand.Flags().StringVarP(new(string), "format", "f", zshFormat, "output format, one of: bash|zsh")
+	fn.Must(func() error { return completionCommand.MarkFlagRequired("format") })
 }

cmd/retry/completion_test.go

@@ -1,4 +1,4 @@
-// +build go1.10
+//+build go1.11
 
 package main
 
@@ -11,12 +11,12 @@ import (
 )
 
 func TestCompletion(t *testing.T) {
-	before := Completion.OutOrStdout()
-	defer Completion.SetOutput(before)
+	before := completionCommand.OutOrStdout()
+	defer completionCommand.SetOutput(before)
 
 	buf := bytes.NewBuffer(nil)
 	cmd := &cobra.Command{Use: "test"}
-	cmd.AddCommand(Completion)
+	cmd.AddCommand(completionCommand)
 	cmd.SetOutput(buf)
 
 	tests := []struct {
@@ -31,8 +31,8 @@ func TestCompletion(t *testing.T) {
 		tc := test
 		t.Run(test.name, func(t *testing.T) {
 			buf.Reset()
-			Completion.Flag("format").Value.Set(tc.format)
-			assert.NoError(t, Completion.RunE(Completion, nil))
+			assert.NoError(t, completionCommand.Flag("format").Value.Set(tc.format))
+			assert.NoError(t, completionCommand.RunE(completionCommand, nil))
 			assert.Contains(t, buf.String(), tc.expected)
 		})
 	}

cmd/retry/main.go

@@ -1,4 +1,4 @@
-// +build go1.10
+//+build go1.11
 
 package main
 
@@ -24,8 +24,7 @@ const (
 	failed  = 1
 )
 
-// DefaultReport is a default template for report.
-var DefaultReport = `
+var reportTpl = `
 
 ---
 
@@ -41,16 +40,16 @@ details: started at {{ .Start }}, finished at {{ .End }}, elapsed {{ .Elapsed }}
 {{ .Stderr }}
 `
 
-func main() { application{Args: os.Args, Stderr: os.Stderr, Stdout: os.Stdout, Shutdown: os.Exit}.Run() }
+func main() { tool{Args: os.Args, Stderr: os.Stderr, Stdout: os.Stdout, Shutdown: os.Exit}.Run() }
 
-type application struct {
+type tool struct {
 	Args           []string
 	Stderr, Stdout io.Writer
 	Shutdown       func(code int)
 }
 
-// Run executes the application logic.
-func (app application) Run() {
+// Run executes the tool logic.
+func (app tool) Run() {
 	var (
 		result, err = parse(app.Stderr, app.Args[0], app.Args[1:]...)
 		format      = func() string {
@@ -62,11 +61,11 @@ func (app application) Run() {
 		start, finish  time.Time
 		shutdown, spin = app.Shutdown, spinner.New(spinner.CharSets[17], 100*time.Millisecond)
 		stderr, stdout = bytes.NewBuffer(nil), bytes.NewBuffer(nil)
-		report         = template.Must(template.New("report").Parse(DefaultReport))
+		report         = template.Must(template.New("report").Parse(reportTpl))
 	)
 	if err != nil {
 		if err != flag.ErrHelp {
-			color.New(color.FgRed).Fprintf(app.Stderr, format, err)
+			_, _ = color.New(color.FgRed).Fprintf(app.Stderr, format, err)
 			app.Shutdown(failed)
 			return
 		}
@@ -87,9 +86,9 @@ func (app application) Run() {
 				// TODO try to find or implement by myself
 				// - https://github.com/variadico/noti
 				// - https://github.com/jolicode/JoliNotif
-				color.New(color.FgYellow).Fprintln(stderr, "notify component is not ready yet")
+				_, _ = color.New(color.FgYellow).Fprintln(stderr, "notify component is not ready yet")
 			}
-			report.Execute(app.Stdout, struct {
+			_ = report.Execute(app.Stdout, struct {
 				Name       string
 				Error      string
 				Start, End string
@@ -115,8 +114,8 @@ func (app application) Run() {
 			spin.Start()
 			start = time.Now()
 		} else {
-			spin.Color("red")
-			color.New(color.FgYellow).Fprintf(stderr, "#%d attempt at %s... \n", attempt+1, time.Now().Sub(start))
+			_ = spin.Color("red")
+			_, _ = color.New(color.FgYellow).Fprintf(stderr, "#%d attempt at %s... \n", attempt+1, time.Now().Sub(start))
 		}
 		cmd := exec.Command(result.Args[0], result.Args[1:]...)
 		cmd.Stderr, cmd.Stdout = stderr, stdout

cmd/retry/main_test.go

@@ -1,4 +1,4 @@
-// +build go1.10
+//+build go1.11
 
 package main
 
@@ -11,7 +11,7 @@ import (
 
 func TestMain_Exec_Fails(t *testing.T) {
 	var status int
-	application{
+	tool{
 		Args:   []string{"cmd", "unknown"},
 		Stderr: ioutil.Discard, Stdout: ioutil.Discard,
 		Shutdown: func(code int) { status = code },

cmd/retry/parser.go

@@ -1,4 +1,4 @@
-// +build go1.10
+//+build go1.11
 
 package main
 
@@ -33,7 +33,7 @@ type Command struct {
 }
 
 var (
-	re = regexp.MustCompile(`^(\w+)(?::((?:[\w\.]+,?)+))?$`)
+	re = regexp.MustCompile(`^(\w+)(?::((?:[\w.]+,?)+))?$`)
 
 	compliance map[string]struct {
 		cursor  interface{}

cmd/retry/parser_gen.go

@@ -1,4 +1,4 @@
-// +build go1.10
+//+build go1.11
 
 package main
 
@@ -55,7 +55,7 @@ func init() {
 	}
 	usage = func(output io.Writer, md Metadata) func() {
 		return func() {
-			fmt.Fprintf(output, `
+			_, _ = fmt.Fprintf(output, `
 Usage: %s [-timeout Timeout] [--debug] [--notify] [strategy flags] -- command
 
 The strategy flags

cmd/retry/parser_gen_test.go

@@ -1,4 +1,4 @@
-// +build go1.10
+//+build go1.11
 
 package main
 

cmd/retry/parser_test.go

@@ -1,4 +1,4 @@
-// +build go1.10
+//+build go1.11
 
 package main