Adding packr files (#1956)

buffalo/cmd/fix/fix.go

@@ -67,8 +67,9 @@ var checks = []Check{
 	DeprecrationsCheck,
 	fixDocker,
 	encodeApp,
-	removeOldPlugins,
-	Plugins,
+	Plugins{}.RemoveOld,
+	Plugins{}.CleanCache,
+	Plugins{}.Reinstall,
 	Plush,
 }
 

buffalo/cmd/fix/plugins.go

@@ -1,13 +1,13 @@
 package fix
 
 import (
-	"bytes"
 	"context"
 	"fmt"
 	"os"
 	"path"
 	"strings"
 
+	cmdPlugins "github.com/gobuffalo/buffalo/buffalo/cmd/plugins"
 	"github.com/gobuffalo/buffalo/genny/plugins/install"
 	"github.com/gobuffalo/buffalo/internal/takeon/github.com/markbates/errx"
 	"github.com/gobuffalo/buffalo/plugins"
@@ -16,10 +16,17 @@ import (
 	"github.com/gobuffalo/meta"
 )
 
-// Plugins will fix plugins between releases
-func Plugins(r *Runner) error {
+type Plugins struct{}
+
+//CleanCache cleans the plugins cache folder by removing it
+func (pf Plugins) CleanCache(r *Runner) error {
 	fmt.Println("~~~ Cleaning plugins cache ~~~")
 	os.RemoveAll(plugins.CachePath)
+	return nil
+}
+
+//Reinstall installs latest versions of the plugins
+func (pf Plugins) Reinstall(r *Runner) error {
 	plugs, err := plugdeps.List(r.App)
 	if err != nil && (errx.Unwrap(err) != plugdeps.ErrMissingConfig) {
 		return err
@@ -37,8 +44,7 @@ func Plugins(r *Runner) error {
 	return run.Run()
 }
 
-// removeOldPlugins will remove old Pop plugin
-func removeOldPlugins(r *Runner) error {
+func (pf Plugins) RemoveOld(r *Runner) error {
 	fmt.Println("~~~ Removing old plugins ~~~")
 
 	run := genny.WetRunner(context.Background())
@@ -57,17 +63,7 @@ func removeOldPlugins(r *Runner) error {
 
 	fmt.Println("~~~ Removing github.com/gobuffalo/buffalo-pop plugin ~~~")
 
-	run.WithRun(func(r *genny.Runner) error {
-		p := plugdeps.ConfigPath(app)
-		bb := &bytes.Buffer{}
-		if err := plugs.Encode(bb); err != nil {
-			return err
-		}
-		return r.File(genny.NewFile(p, bb))
-	})
-	if err != nil {
-		return err
-	}
+	run.WithRun(cmdPlugins.NewEncodePluginsRunner(app, plugs))
 
 	return run.Run()
 }

buffalo/cmd/plugins/encode.go

@@ -0,0 +1,22 @@
+package plugins
+
+import (
+	"bytes"
+
+	"github.com/gobuffalo/buffalo/plugins/plugdeps"
+	"github.com/gobuffalo/genny/v2"
+	"github.com/gobuffalo/meta"
+)
+
+// NewEncodePluginsRunner will return a runner that will encode the plugins file
+func NewEncodePluginsRunner(app meta.App, plugs *plugdeps.Plugins) func(r *genny.Runner) error {
+	return func(r *genny.Runner) error {
+		p := plugdeps.ConfigPath(app)
+		bb := &bytes.Buffer{}
+		if err := plugs.Encode(bb); err != nil {
+			return err
+		}
+
+		return r.File(genny.NewFile(p, bb))
+	}
+}

buffalo/cmd/plugins/remove.go

@@ -1,7 +1,6 @@
 package plugins
 
 import (
-	"bytes"
 	"context"
 	"fmt"
 	"path"
@@ -46,18 +45,7 @@ var removeCmd = &cobra.Command{
 			})
 		}
 
-		run.WithRun(func(r *genny.Runner) error {
-			p := plugdeps.ConfigPath(app)
-			bb := &bytes.Buffer{}
-			if err := plugs.Encode(bb); err != nil {
-				return err
-			}
-			return r.File(genny.NewFile(p, bb))
-		})
-		if err != nil {
-			return err
-		}
-
+		run.WithRun(NewEncodePluginsRunner(app, plugs))
 		return run.Run()
 	},
 }