(v0.15.0) Drop dep support fixes #1545

Dockerfile.build

@@ -20,8 +20,7 @@ RUN npm -v
 RUN service postgresql start && \
     su -c "psql -c \"ALTER USER postgres  WITH PASSWORD 'postgres';\"" - postgres
 
-RUN go get -u github.com/golang/dep/cmd/dep \
-&& go get -tags sqlite -v -u github.com/gobuffalo/pop \
+RUN go get -tags sqlite -v -u github.com/gobuffalo/pop \
 && go get -tags sqlite -v -u github.com/gobuffalo/packr/v2/packr2 \
 && go get -tags sqlite -v -u github.com/gobuffalo/buffalo-pop \
 && rm -rf $GOPATH/src && mkdir -p $BP

buffalo/cmd/fix/fix.go

@@ -55,7 +55,6 @@ var checks = []Check{
 	WebpackCheck,
 	PackageJSONCheck,
 	AddPackageJSONScripts,
-	DepEnsure,
 	installTools,
 	DeprecrationsCheck,
 	fixDocker,

buffalo/cmd/fix/imports.go

@@ -1,12 +1,10 @@
 package fix
 
 import (
-	"bytes"
 	"fmt"
 	"go/ast"
 	"go/parser"
 	"go/token"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"strconv"
@@ -26,27 +24,8 @@ type ImportConverter struct {
 func (c ImportConverter) Process(r *Runner) error {
 	fmt.Println("~~~ Rewriting Imports ~~~")
 
-	err := filepath.Walk(".", c.processFile)
-	if err != nil {
-		return err
-	}
-
-	if !r.App.WithDep {
-		return nil
-	}
-
-	b, err := ioutil.ReadFile("Gopkg.toml")
-	if err != nil {
-		return err
-	}
-
-	for k := range c.Data {
-		if bytes.Contains(b, []byte(k)) {
-			r.Warnings = append(r.Warnings, fmt.Sprintf("Your Gopkg.toml contains the following import that need to be changed MANUALLY: %s", k))
-		}
-	}
+	return filepath.Walk(".", c.processFile)
 
-	return nil
 }
 
 func (c ImportConverter) processFile(p string, info os.FileInfo, err error) error {

buffalo/cmd/fix/tools.go

@@ -3,7 +3,6 @@ package fix
 import (
 	"context"
 	"fmt"
-	"os/exec"
 
 	"github.com/gobuffalo/genny"
 	"github.com/gobuffalo/genny/gogen"
@@ -16,11 +15,6 @@ func installTools(r *Runner) error {
 	run := genny.WetRunner(context.Background())
 	g := genny.New()
 	app := r.App
-	if app.WithDep {
-		if _, err := exec.LookPath("dep"); err != nil {
-			g.RunFn(gogen.Install("github.com/golang/dep/cmd/dep"))
-		}
-	}
 	if app.WithPop {
 		rTools = append(rTools, "github.com/gobuffalo/buffalo-pop")
 	}

buffalo/cmd/new.go

@@ -81,7 +81,6 @@ func parseNewOptions(args []string) (newAppOptions, error) {
 
 	app.AsAPI = viper.GetBool("api")
 	app.VCS = viper.GetString("vcs")
-	app.WithDep = viper.GetBool("with-dep")
 	if app.WithDep {
 		app.WithModules = false
 		envy.MustSet("GO111MODULE", "off")
@@ -273,7 +272,6 @@ func init() {
 	newCmd.Flags().BoolP("dry-run", "d", false, "dry run")
 	newCmd.Flags().BoolP("verbose", "v", false, "verbosely print out the go get commands")
 	newCmd.Flags().Bool("skip-pop", false, "skips adding pop/soda to your app")
-	newCmd.Flags().Bool("with-dep", false, "adds github.com/golang/dep to your app")
 	newCmd.Flags().Bool("skip-webpack", false, "skips adding Webpack to your app")
 	newCmd.Flags().Bool("skip-yarn", false, "use npm instead of yarn for frontend dependencies management")
 	newCmd.Flags().String("db-type", "postgres", fmt.Sprintf("specify the type of database you want to use [%s]", strings.Join(pop.AvailableDialects, ", ")))

buffalo/cmd/setup.go

@@ -2,25 +2,19 @@ package cmd
 
 import (
 	"bytes"
-	"context"
 	"fmt"
 	"os"
 	"os/exec"
 	"strings"
 
-	"golang.org/x/sync/errgroup"
-
-	"github.com/gobuffalo/envy"
 	"github.com/gobuffalo/events"
 	"github.com/gobuffalo/meta"
-	"github.com/markbates/deplist"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 )
 
 var setupOptions = struct {
 	verbose       bool
-	updateGoDeps  bool
 	dropDatabases bool
 }{}
 
@@ -31,9 +25,6 @@ var setupCmd = &cobra.Command{
 	Short: "Setup a newly created, or recently checked out application.",
 	Long: `Setup runs through checklist to make sure dependencies are setup correctly.
 
-Dependencies (if used):
-* Runs "dep ensure" to install required Go dependencies.
-
 Asset Pipeline (if used):
 * Runs "npm install" or "yarn install" to install asset dependencies.
 
@@ -51,7 +42,7 @@ Tests:
 			"app": app,
 		}
 		events.EmitPayload(EvtSetupStarted, payload)
-		for _, check := range []setupCheck{assetCheck, updateGoDepsCheck, databaseCheck, testCheck} {
+		for _, check := range []setupCheck{assetCheck, databaseCheck, testCheck} {
 			err := check(app)
 			if err != nil {
 				events.EmitError(EvtSetupErr, err, payload)
@@ -63,64 +54,6 @@ Tests:
 	},
 }
 
-func updateGoDepsCheck(app meta.App) error {
-	if app.WithModules {
-		c := exec.Command(envy.Get("GO_BIN", "go"), "get")
-		return run(c)
-	}
-	if app.WithDep {
-		if _, err := exec.LookPath("dep"); err != nil {
-			if err := run(exec.Command(envy.Get("GO_BIN", "go"), "get", "github.com/golang/dep/cmd/dep")); err != nil {
-				return err
-			}
-		}
-		args := []string{"ensure"}
-		if setupOptions.verbose {
-			args = append(args, "-v")
-		}
-		if setupOptions.updateGoDeps {
-			args = append(args, "--update")
-		}
-		err := run(exec.Command("dep", args...))
-		if err != nil {
-			return err
-		}
-		return nil
-	}
-
-	// go old school with the installation
-	ctx, cancel := context.WithCancel(context.Background())
-	defer cancel()
-	wg, _ := errgroup.WithContext(ctx)
-	deps, err := deplist.List()
-	if err != nil {
-		return err
-	}
-
-	deps["github.com/gobuffalo/suite"] = "github.com/gobuffalo/suite"
-
-	for dep := range deps {
-		args := []string{"get"}
-		if setupOptions.verbose {
-			args = append(args, "-v")
-		}
-		if setupOptions.updateGoDeps {
-			args = append(args, "-u")
-		}
-		args = append(args, dep)
-		c := exec.Command(envy.Get("GO_BIN", "go"), args...)
-		f := func() error {
-			return run(c)
-		}
-		wg.Go(f)
-	}
-	err = wg.Wait()
-	if err != nil {
-		return fmt.Errorf("We encountered the following error trying to install and update the dependencies for this application:\n%s", err)
-	}
-	return nil
-}
-
 func testCheck(meta.App) error {
 	err := run(exec.Command("buffalo", "test"))
 	if err != nil {
@@ -238,7 +171,6 @@ func run(cmd *exec.Cmd) error {
 
 func init() {
 	setupCmd.Flags().BoolVarP(&setupOptions.verbose, "verbose", "v", false, "run with verbose output")
-	setupCmd.Flags().BoolVarP(&setupOptions.updateGoDeps, "update", "u", false, "run go get -u against the application's Go dependencies")
 	setupCmd.Flags().BoolVarP(&setupOptions.dropDatabases, "drop", "d", false, "drop existing databases")
 
 	decorate("setup", setupCmd)

genny/build/build_deps.go

@@ -3,7 +3,6 @@ package build
 import (
 	"github.com/gobuffalo/envy"
 	"github.com/gobuffalo/genny"
-	"github.com/gobuffalo/genny/depgen"
 	"github.com/gobuffalo/genny/gogen"
 )
 
@@ -18,11 +17,6 @@ func buildDeps(opts *Options) (*genny.Generator, error) {
 		return g, nil
 	}
 
-	if opts.App.WithDep {
-		// mount the dep generator
-		return depgen.Ensure(false)
-	}
-
 	// mount the go get runner
 	tf := opts.App.BuildTags(opts.Environment, opts.Tags...)
 	if len(tf) > 0 {