clear the plugins cache and re-install plugins when running `buffalo …

…fix` (#1705)

buffalo/cmd/fix/fix.go

@@ -57,6 +57,7 @@ var checks = []Check{
 	DeprecrationsCheck,
 	fixDocker,
 	encodeApp,
+	Plugins,
 }
 
 func encodeApp(r *Runner) error {

buffalo/cmd/fix/plugins.go

@@ -0,0 +1,34 @@
+package fix
+
+import (
+	"context"
+	"fmt"
+	"os"
+
+	"github.com/gobuffalo/buffalo/genny/plugins/install"
+	"github.com/gobuffalo/buffalo/plugins"
+	"github.com/gobuffalo/buffalo/plugins/plugdeps"
+	"github.com/gobuffalo/genny"
+	"github.com/pkg/errors"
+)
+
+// Plugins will fix plugins between releases
+func Plugins(r *Runner) error {
+	fmt.Println("~~~ Cleaning plugins cache ~~~")
+	os.RemoveAll(plugins.CachePath)
+	plugs, err := plugdeps.List(r.App)
+	if err != nil && (errors.Cause(err) != plugdeps.ErrMissingConfig) {
+		return errors.WithStack(err)
+	}
+
+	run := genny.WetRunner(context.Background())
+	gg, err := install.New(&install.Options{
+		App:     r.App,
+		Plugins: plugs.List(),
+	})
+
+	run.WithGroup(gg)
+
+	fmt.Println("~~~ Reinstalling plugins ~~~")
+	return run.Run()
+}

buffalo/cmd/plugins/generate.go

@@ -6,8 +6,8 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/gobuffalo/buffalo/genny/plugin"
-	"github.com/gobuffalo/buffalo/genny/plugin/with"
+	"github.com/gobuffalo/buffalo/genny/plugins/plugin"
+	"github.com/gobuffalo/buffalo/genny/plugins/plugin/with"
 	"github.com/gobuffalo/envy"
 	"github.com/gobuffalo/genny"
 	"github.com/gobuffalo/gogen"

buffalo/cmd/plugins/install.go

@@ -8,7 +8,7 @@ import (
 	"path"
 	"strings"
 
-	"github.com/gobuffalo/buffalo/genny/install"
+	"github.com/gobuffalo/buffalo/genny/plugins/install"
 	"github.com/gobuffalo/buffalo/plugins/plugdeps"
 	"github.com/gobuffalo/genny"
 	"github.com/gobuffalo/logger"

buffalo/cmd/plugins/listen.go

@@ -3,7 +3,7 @@ package plugins
 import (
 	"context"
 
-	"github.com/gobuffalo/buffalo/genny/install"
+	"github.com/gobuffalo/buffalo/genny/plugins/install"
 	"github.com/gobuffalo/buffalo/plugins"
 	"github.com/gobuffalo/events"
 	"github.com/gobuffalo/genny"

genny/newapp/core/core.go

@@ -4,7 +4,7 @@ import (
 	"github.com/gobuffalo/buffalo-docker/genny/docker"
 	pop "github.com/gobuffalo/buffalo-pop/genny/newapp"
 	"github.com/gobuffalo/buffalo/genny/ci"
-	"github.com/gobuffalo/buffalo/genny/install"
+	"github.com/gobuffalo/buffalo/genny/plugins/install"
 	"github.com/gobuffalo/buffalo/genny/refresh"
 	"github.com/gobuffalo/buffalo/plugins/plugdeps"
 	"github.com/gobuffalo/buffalo/runtime"

genny/plugin/with/generate.go → genny/plugins/plugin/with/generate.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/gobuffalo/buffalo/genny/plugin"
+	"github.com/gobuffalo/buffalo/genny/plugins/plugin"
 	"github.com/gobuffalo/genny"
 	"github.com/gobuffalo/genny/genny/new"
 	"github.com/gobuffalo/packr/v2"

genny/plugin/with/generate_test.go → genny/plugins/plugin/with/generate_test.go

@@ -4,7 +4,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/gobuffalo/buffalo/genny/plugin"
+	"github.com/gobuffalo/buffalo/genny/plugins/plugin"
 	"github.com/gobuffalo/genny"
 	"github.com/gobuffalo/genny/gentest"
 	"github.com/gobuffalo/gogen/gomods"

go.mod

@@ -35,7 +35,6 @@ require (
 	github.com/gobuffalo/syncx v0.0.0-20190224160051-33c29581e754
 	github.com/gobuffalo/tags v2.1.0+incompatible
 	github.com/gobuffalo/x v0.0.0-20190614162758-d80e318e1bb4
-	github.com/gorilla/context v1.1.1
 	github.com/gorilla/mux v1.7.2
 	github.com/gorilla/sessions v1.1.3
 	github.com/karrick/godirwalk v1.10.12

route_info.go

@@ -12,7 +12,6 @@ import (
 	"github.com/pkg/errors"
 
 	"github.com/gobuffalo/events"
-	gcontext "github.com/gorilla/context"
 	"github.com/gorilla/mux"
 )
 
@@ -92,8 +91,6 @@ func (ri *RouteInfo) BuildPathHelper() RouteHelperFunc {
 }
 
 func (ri RouteInfo) ServeHTTP(res http.ResponseWriter, req *http.Request) {
-	defer gcontext.Clear(req)
-
 	a := ri.App
 
 	c := a.newContext(ri, res, req)