Update dependencies after buffalo new (#2128)

* Update dependencies after buffalo new

* Cleanup

buffalo.go

@@ -12,13 +12,4 @@ package buffalo
 // this import the package doesn't get vendored
 // by go mod vendor or by dep. this import fixes
 // this problem.
-import "github.com/gobuffalo/buffalo/runtime"
-
-var version string
-
-func init() {
-	// this is here to make sure that goimports
-	// doesn't remove the runtime import because
-	// it isn't being used.
-	version = runtime.Version
-}
+import _ "github.com/gobuffalo/buffalo/runtime"

buffalo/cmd/fix/plugins.go

@@ -39,6 +39,9 @@ func (pf Plugins) Reinstall(r *Runner) error {
 		App:     r.App,
 		Plugins: plugs.List(),
 	})
+	if err != nil {
+		return err
+	}
 
 	run.WithGroup(gg)
 

buffalo/cmd/new.go

@@ -1,6 +1,8 @@
 package cmd
 
 import (
+	"bufio"
+	"bytes"
 	"context"
 	"fmt"
 	"os"
@@ -188,7 +190,7 @@ var newCmd = &cobra.Command{
 			}
 			if app.WithWebpack {
 				wo.Webpack = &webpack.Options{}
-			} else if !app.AsAPI {
+			} else {
 				wo.Standard = &standard.Options{}
 			}
 			gg, err = web.New(wo)
@@ -199,13 +201,38 @@ var newCmd = &cobra.Command{
 			}
 			return err
 		}
-		run.WithGroup(gg)
 
 		g := genny.New()
 		g.Command(exec.Command("go", "mod", "tidy"))
-		if err := run.With(g); err != nil {
+		gg.Add(g)
+
+		g = genny.New()
+		g.RunFn(func(r *genny.Runner) error {
+			deps, err := exec.Command("go", "list", "-f", "{{if not (or .Main .Indirect)}}{{.Path}}{{end}}", "-m", "all").Output()
+			if err != nil {
+				return err
+			}
+
+			scanner := bufio.NewScanner(bytes.NewReader(deps))
+			for scanner.Scan() {
+				if err := exec.Command("go", "get", scanner.Text()).Run(); err != nil {
+					return err
+				}
+			}
+
+			if err := scanner.Err(); err != nil {
+				return err
+			}
+
 			return nil
-		}
+		})
+		gg.Add(g)
+
+		g = genny.New()
+		g.Command(exec.Command("go", "mod", "tidy"))
+		gg.Add(g)
+
+		run.WithGroup(gg)
 
 		if err := run.WithNew(gogen.Fmt(app.Root)); err != nil {
 			return err

buffalo/cmd/plugins/list.go

@@ -24,9 +24,7 @@ var listCmd = &cobra.Command{
 		var cmds pluginsin.Commands
 
 		for _, l := range list {
-			for _, c := range l {
-				cmds = append(cmds, c)
-			}
+			cmds = append(cmds, l...)
 		}
 
 		sort.Slice(cmds, func(i, j int) bool {

go.mod

@@ -22,7 +22,7 @@ require (
 	github.com/gobuffalo/packd v1.0.0
 	github.com/gobuffalo/packr/v2 v2.8.1
 	github.com/gobuffalo/plush/v4 v4.1.5
-	github.com/gobuffalo/pop/v5 v5.3.3
+	github.com/gobuffalo/pop/v5 v5.3.4
 	github.com/gobuffalo/tags/v3 v3.1.0
 	github.com/google/go-cmp v0.5.6
 	github.com/gorilla/handlers v1.5.1
@@ -36,12 +36,12 @@ require (
 	github.com/markbates/sigtx v1.0.0
 	github.com/monoculum/formam v0.0.0-20210523135142-1af3317b7b9b
 	github.com/sirupsen/logrus v1.8.1
-	github.com/spf13/cobra v1.1.3
+	github.com/spf13/cobra v1.2.1
 	github.com/spf13/pflag v1.0.5
-	github.com/spf13/viper v1.7.1
+	github.com/spf13/viper v1.8.1
 	github.com/stretchr/testify v1.7.0
 	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
-	golang.org/x/tools v0.1.3
+	golang.org/x/tools v0.1.5
 	gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc
 	gopkg.in/yaml.v2 v2.4.0
 )

plugins.go

@@ -16,15 +16,15 @@ import (
 
 // LoadPlugins will add listeners for any plugins that support "events"
 func LoadPlugins() error {
-	var err error
+	var errResult error
 	oncer.Do("events.LoadPlugins", func() {
 		// don't send plugins events during testing
 		if envy.Get("GO_ENV", "development") == "test" {
 			return
 		}
 		plugs, err := plugins.Available()
 		if err != nil {
-			err = err
+			errResult = err
 			return
 		}
 		for _, cmds := range plugs {
@@ -57,12 +57,11 @@ func LoadPlugins() error {
 					})
 				}(c)
 				if err != nil {
-					err = err
+					errResult = err
 					return
 				}
 			}
-
 		}
 	})
-	return err
+	return errResult
 }

plugins/decorate.go

@@ -19,9 +19,7 @@ var ErrPlugMissing = fmt.Errorf("plugin missing")
 func Decorate(c Command) *cobra.Command {
 	var flags []string
 	if len(c.Flags) > 0 {
-		for _, f := range c.Flags {
-			flags = append(flags, f)
-		}
+		flags = append(flags, c.Flags...)
 	}
 	cc := &cobra.Command{
 		Use:     c.Name,