v0.16.0 (#1924)

* merge changes from buffalo-cli into main repo

* cache deps before building and copying source (#1884)

cache deps before building and copying source so that we don't need to re-download as much
and so that source changes don't invalidate our downloaded layer

* Generator resource action test breaks with unused imports fixes #1893 (#1894)

* Generator resource action test breaks with unused imports fixes #1893

* break packr cache

* fix broken test

* update deps (#1896)

* update deps

* update envy

* update meta

* switch to tags/v3 for consistency (#1901)

* update helpers/tags

* update validate

* try to fix mismatched imports (#1921)

* fixes more broken semantic import paths (#1925)

* adding a few packages to replace

* Replace Azure badge with Github actions badge (#1920)

Co-authored-by: Antonio Pagano <apagano@wawand.co>

Co-authored-by: Dr Nic Williams <drnicwilliams@gmail.com>
Co-authored-by: HD Moore <x@hdm.io>
Co-authored-by: Antonio Pagano <apagano@wawand.co>
Co-authored-by: Stanislas Michalak <stanislas-m@users.noreply.github.com>

.github/workflows/tests.yml

@@ -8,7 +8,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        go-version: [1.12.x, 1.13.x]
+        go-version: [1.13.x, 1.14.x]
         os: [macos-latest, windows-latest, ubuntu-latest]
     env:
       GO111MODULE: on
@@ -21,5 +21,5 @@ jobs:
     - name: Test
       run: |
         go mod tidy -v
-        go test -tags "sqlite integration_test" -cover -race ./...
+        go test -tags "sqlite" -cover  ./...
 

README.md

@@ -2,7 +2,7 @@
 
 <p align="center">
 <a href="https://godoc.org/github.com/gobuffalo/buffalo"><img src="https://godoc.org/github.com/gobuffalo/buffalo?status.svg" alt="GoDoc" /></a>
-<a href="https://dev.azure.com/markbates/buffalo/_build?definitionId=1"><img src="https://dev.azure.com/markbates/buffalo/_apis/build/status/gobuffalo.buffalo?branchName=master" alt="Build Status" /></a>
+<img src="https://github.com/gobuffalo/buffalo/workflows/Tests/badge.svg" alt="Tests Status" />
 <a href="https://goreportcard.com/report/github.com/gobuffalo/buffalo"><img src="https://goreportcard.com/badge/github.com/gobuffalo/buffalo" alt="Go Report Card" /></a>
 <a href="https://www.codetriage.com/gobuffalo/buffalo"><img src="https://www.codetriage.com/gobuffalo/buffalo/badges/users.svg" alt="Open Source Helpers" /></a>
 </p>

buffalo/cmd/build.go

@@ -10,7 +10,7 @@ import (
 	"time"
 
 	"github.com/gobuffalo/buffalo/genny/build"
-	"github.com/gobuffalo/genny"
+	"github.com/gobuffalo/genny/v2"
 	"github.com/gobuffalo/logger"
 	"github.com/gobuffalo/meta"
 	"github.com/markbates/sigtx"

buffalo/cmd/dev.go

@@ -13,7 +13,7 @@ import (
 	"github.com/gobuffalo/buffalo/genny/assets/webpack"
 	rg "github.com/gobuffalo/buffalo/genny/refresh"
 	"github.com/gobuffalo/events"
-	"github.com/gobuffalo/genny"
+	"github.com/gobuffalo/genny/v2"
 	"github.com/gobuffalo/meta"
 	"github.com/markbates/refresh/refresh"
 	"github.com/sirupsen/logrus"

buffalo/cmd/fix/docker.go

@@ -8,7 +8,7 @@ import (
 	"strings"
 
 	"github.com/gobuffalo/buffalo/runtime"
-	"github.com/gobuffalo/genny"
+	"github.com/gobuffalo/genny/v2"
 )
 
 func fixDocker(r *Runner) error {

buffalo/cmd/fix/fix.go

@@ -14,14 +14,20 @@ import (
 var YesToAll bool
 
 var replace = map[string]string{
-	"github.com/markbates/pop":                     "github.com/gobuffalo/pop",
-	"github.com/markbates/validate":                "github.com/gobuffalo/validate",
-	"github.com/satori/go.uuid":                    "github.com/gofrs/uuid",
-	"github.com/markbates/willie":                  "github.com/gobuffalo/httptest",
-	"github.com/shurcooL/github_flavored_markdown": "github.com/gobuffalo/github_flavored_markdown",
 	"github.com/gobuffalo/buffalo-plugins":         "github.com/gobuffalo/buffalo/plugins",
-	"github.com/gobuffalo/uuid":                    "github.com/gofrs/uuid",
+	"github.com/gobuffalo/genny":                   "github.com/gobuffalo/genny/v2",
+	"github.com/gobuffalo/pop":                     "github.com/gobuffalo/pop/v5",
 	"github.com/gobuffalo/pop/nulls":               "github.com/gobuffalo/nulls",
+	"github.com/gobuffalo/uuid":                    "github.com/gofrs/uuid/v3",
+	"github.com/markbates/pop":                     "github.com/gobuffalo/pop/v5",
+	"github.com/markbates/validate":                "github.com/gobuffalo/validate/v3",
+	"github.com/markbates/willie":                  "github.com/gobuffalo/httptest",
+	"github.com/satori/go.uuid":                    "github.com/gofrs/uuid",
+	"github.com/shurcooL/github_flavored_markdown": "github.com/gobuffalo/github_flavored_markdown",
+	"github.com/gofrs/uuid":                        "github.com/gofrs/uuid/v3",
+	"github.com/gobuffalo/validate":                "github.com/gobuffalo/validate/v3",
+	"github.com/gobuffalo/suite":                   "github.com/gobuffalo/suite/v3",
+	"github.com/gobuffalo/buffalo-pop/":            "github.com/gobuffalo/buffalo-pop/v2",
 }
 
 var ic = ImportConverter{
@@ -39,12 +45,12 @@ var mr = MiddlewareTransformer{
 
 	Aliases: map[string]string{
 		"github.com/gobuffalo/mw-basicauth":   "basicauth",
+		"github.com/gobuffalo/mw-contenttype": "contenttype",
 		"github.com/gobuffalo/mw-csrf":        "csrf",
-		"github.com/gobuffalo/mw-i18n":        "i18n",
 		"github.com/gobuffalo/mw-forcessl":    "forcessl",
-		"github.com/gobuffalo/mw-tokenauth":   "tokenauth",
+		"github.com/gobuffalo/mw-i18n":        "i18n",
 		"github.com/gobuffalo/mw-paramlogger": "paramlogger",
-		"github.com/gobuffalo/mw-contenttype": "contenttype",
+		"github.com/gobuffalo/mw-tokenauth":   "tokenauth",
 	},
 }
 

buffalo/cmd/fix/middleware.go

@@ -78,7 +78,7 @@ func (mw MiddlewareTransformer) addMissingRootMiddlewareImports(fset *token.File
 	}
 
 	if strings.Contains(content, "popmw.Transaction") {
-		astutil.AddImport(fset, f, "github.com/gobuffalo/buffalo-pop/pop/popmw")
+		astutil.AddImport(fset, f, "github.com/gobuffalo/buffalo-pop/v2/pop/popmw")
 	}
 
 	if strings.Contains(content, "contenttype.Add") || strings.Contains(content, "contenttype.Set") {

buffalo/cmd/fix/plugins.go

@@ -9,7 +9,7 @@ import (
 	"github.com/gobuffalo/buffalo/internal/takeon/github.com/markbates/errx"
 	"github.com/gobuffalo/buffalo/plugins"
 	"github.com/gobuffalo/buffalo/plugins/plugdeps"
-	"github.com/gobuffalo/genny"
+	"github.com/gobuffalo/genny/v2"
 )
 
 // Plugins will fix plugins between releases

buffalo/cmd/fix/tools.go

@@ -3,9 +3,9 @@ package fix
 import (
 	"context"
 	"fmt"
+	"os/exec"
 
-	"github.com/gobuffalo/genny"
-	"github.com/gobuffalo/genny/gogen"
+	"github.com/gobuffalo/genny/v2"
 )
 
 var rTools = []string{}
@@ -16,10 +16,10 @@ func installTools(r *Runner) error {
 	g := genny.New()
 	app := r.App
 	if app.WithPop {
-		rTools = append(rTools, "github.com/gobuffalo/buffalo-pop")
+		rTools = append(rTools, "github.com/gobuffalo/buffalo-pop/v2")
 	}
 	for _, t := range rTools {
-		g.Command(gogen.Get(t))
+		g.Command(exec.Command("go", "get", t))
 	}
 	run.With(g)
 	return run.Run()

buffalo/cmd/generate/action.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 
 	"github.com/gobuffalo/buffalo/genny/actions"
-	"github.com/gobuffalo/genny"
+	"github.com/gobuffalo/genny/v2"
 	"github.com/gobuffalo/logger"
 	"github.com/spf13/cobra"
 )

buffalo/cmd/generate/mailer.go

@@ -5,8 +5,8 @@ import (
 
 	"github.com/gobuffalo/buffalo/genny/mail"
 	"github.com/gobuffalo/flect/name"
-	"github.com/gobuffalo/genny"
-	"github.com/gobuffalo/genny/gogen"
+	"github.com/gobuffalo/genny/v2"
+	"github.com/gobuffalo/genny/v2/gogen"
 	"github.com/gobuffalo/meta"
 	"github.com/spf13/cobra"
 )

buffalo/cmd/generate/resource.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/gobuffalo/attrs"
 	"github.com/gobuffalo/buffalo/genny/resource"
-	"github.com/gobuffalo/genny"
+	"github.com/gobuffalo/genny/v2"
 	"github.com/gobuffalo/logger"
 	"github.com/spf13/cobra"
 )

buffalo/cmd/generate/task.go

@@ -5,8 +5,8 @@ import (
 	"os"
 
 	"github.com/gobuffalo/buffalo/genny/grift"
-	"github.com/gobuffalo/genny"
-	"github.com/gobuffalo/genny/gogen"
+	"github.com/gobuffalo/genny/v2"
+	"github.com/gobuffalo/genny/v2/gogen"
 	"github.com/spf13/cobra"
 )
 

buffalo/cmd/info.go

@@ -6,8 +6,8 @@ import (
 	"time"
 
 	"github.com/gobuffalo/buffalo/genny/info"
-	"github.com/gobuffalo/clara/genny/rx"
-	"github.com/gobuffalo/genny"
+	"github.com/gobuffalo/clara/v2/genny/rx"
+	"github.com/gobuffalo/genny/v2"
 	"github.com/gobuffalo/meta"
 	"github.com/spf13/cobra"
 )

buffalo/cmd/internal/integration/new_test.go

@@ -7,7 +7,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/gobuffalo/pop"
+	"github.com/gobuffalo/pop/v5"
 	"github.com/stretchr/testify/require"
 )
 

buffalo/cmd/new.go

@@ -9,7 +9,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	pop "github.com/gobuffalo/buffalo-pop/genny/newapp"
+	pop "github.com/gobuffalo/buffalo-pop/v2/genny/newapp"
 	"github.com/gobuffalo/buffalo/genny/assets/standard"
 	"github.com/gobuffalo/buffalo/genny/assets/webpack"
 	"github.com/gobuffalo/buffalo/genny/ci"
@@ -22,12 +22,12 @@ import (
 	"github.com/gobuffalo/buffalo/internal/takeon/github.com/markbates/errx"
 	"github.com/gobuffalo/envy"
 	fname "github.com/gobuffalo/flect/name"
-	"github.com/gobuffalo/genny"
-	"github.com/gobuffalo/genny/gogen"
+	"github.com/gobuffalo/genny/v2"
+	"github.com/gobuffalo/genny/v2/gogen"
 	"github.com/gobuffalo/logger"
 	"github.com/gobuffalo/meta"
 	"github.com/gobuffalo/packr/v2/plog"
-	"github.com/gobuffalo/plush"
+	"github.com/gobuffalo/plush/v4"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"

buffalo/cmd/plugins/add.go

@@ -9,7 +9,7 @@ import (
 	"github.com/gobuffalo/buffalo/genny/add"
 	"github.com/gobuffalo/buffalo/internal/takeon/github.com/markbates/errx"
 	"github.com/gobuffalo/buffalo/plugins/plugdeps"
-	"github.com/gobuffalo/genny"
+	"github.com/gobuffalo/genny/v2"
 	"github.com/gobuffalo/meta"
 	"github.com/spf13/cobra"
 )

buffalo/cmd/plugins/install.go

@@ -11,7 +11,7 @@ import (
 	"github.com/gobuffalo/buffalo/genny/plugins/install"
 	"github.com/gobuffalo/buffalo/internal/takeon/github.com/markbates/errx"
 	"github.com/gobuffalo/buffalo/plugins/plugdeps"
-	"github.com/gobuffalo/genny"
+	"github.com/gobuffalo/genny/v2"
 	"github.com/gobuffalo/logger"
 	"github.com/gobuffalo/meta"
 	"github.com/spf13/cobra"

buffalo/cmd/plugins/listen.go

@@ -6,7 +6,7 @@ import (
 	"github.com/gobuffalo/buffalo/genny/plugins/install"
 	"github.com/gobuffalo/buffalo/plugins"
 	"github.com/gobuffalo/events"
-	"github.com/gobuffalo/genny"
+	"github.com/gobuffalo/genny/v2"
 )
 
 // Listen is listener for plugin events pipeline

buffalo/cmd/plugins/remove.go

@@ -9,7 +9,7 @@ import (
 
 	"github.com/gobuffalo/buffalo/internal/takeon/github.com/markbates/errx"
 	"github.com/gobuffalo/buffalo/plugins/plugdeps"
-	"github.com/gobuffalo/genny"
+	"github.com/gobuffalo/genny/v2"
 	"github.com/gobuffalo/meta"
 	"github.com/spf13/cobra"
 )

buffalo/cmd/test.go

@@ -13,7 +13,7 @@ import (
 	"github.com/gobuffalo/meta"
 	"github.com/sirupsen/logrus"
 
-	"github.com/gobuffalo/pop"
+	"github.com/gobuffalo/pop/v5"
 	"github.com/spf13/cobra"
 )
 

errors.go

@@ -13,7 +13,7 @@ import (
 	"github.com/gobuffalo/buffalo/internal/httpx"
 	"github.com/gobuffalo/buffalo/internal/takeon/github.com/markbates/errx"
 	"github.com/gobuffalo/events"
-	"github.com/gobuffalo/plush"
+	"github.com/gobuffalo/plush/v4"
 )
 
 // HTTPError a typed error returned by http Handlers and used for choosing error handlers

genny/actions/actions.go

@@ -5,8 +5,8 @@ import (
 	"strings"
 
 	"github.com/gobuffalo/flect/name"
-	"github.com/gobuffalo/genny"
-	"github.com/gobuffalo/genny/gogen"
+	"github.com/gobuffalo/genny/v2"
+	"github.com/gobuffalo/genny/v2/gogen"
 	"github.com/gobuffalo/packr/v2"
 )
 

genny/actions/actions_test.go

@@ -5,8 +5,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/gobuffalo/genny"
-	"github.com/gobuffalo/genny/gentest"
+	"github.com/gobuffalo/genny/v2"
+	"github.com/gobuffalo/genny/v2/gentest"
 	packr "github.com/gobuffalo/packr/v2"
 	"github.com/google/go-cmp/cmp"
 	"github.com/stretchr/testify/require"

genny/actions/build_actions.go

@@ -5,7 +5,7 @@ import (
 	"strings"
 
 	"github.com/gobuffalo/flect/name"
-	"github.com/gobuffalo/genny"
+	"github.com/gobuffalo/genny/v2"
 )
 
 // buildActions is the top level action builder

genny/actions/build_templates.go

@@ -3,7 +3,7 @@ package actions
 import (
 	"fmt"
 
-	"github.com/gobuffalo/genny"
+	"github.com/gobuffalo/genny/v2"
 )
 
 func buildTemplates(pres *presenter) genny.RunFn {

genny/actions/build_tests.go

@@ -3,7 +3,7 @@ package actions
 import (
 	"fmt"
 
-	"github.com/gobuffalo/genny"
+	"github.com/gobuffalo/genny/v2"
 )
 
 // buildTests is the top level action/test builder

genny/add/add.go

@@ -5,7 +5,7 @@ import (
 	"path/filepath"
 
 	"github.com/gobuffalo/buffalo/plugins/plugdeps"
-	"github.com/gobuffalo/genny"
+	"github.com/gobuffalo/genny/v2"
 )
 
 // New add plugin to the config file

genny/add/add_test.go

@@ -8,8 +8,8 @@ import (
 	"testing"
 
 	"github.com/gobuffalo/buffalo/plugins/plugdeps"
-	"github.com/gobuffalo/genny"
-	"github.com/gobuffalo/genny/gentest"
+	"github.com/gobuffalo/genny/v2"
+	"github.com/gobuffalo/genny/v2/gentest"
 	"github.com/gobuffalo/meta"
 	"github.com/stretchr/testify/require"
 )
@@ -20,7 +20,7 @@ func Test_New(t *testing.T) {
 	g, err := New(&Options{
 		App: meta.New("."),
 		Plugins: []plugdeps.Plugin{
-			{Binary: "buffalo-pop", GoGet: "github.com/gobuffalo/buffalo-pop"},
+			{Binary: "buffalo-pop", GoGet: "github.com/gobuffalo/buffalo-pop/v2"},
 			{Binary: "buffalo-hello.rb", Local: "./plugins/buffalo-hello.rb"},
 		},
 	})

genny/assets/standard/standard.go

@@ -4,8 +4,8 @@ import (
 	"strings"
 	"text/template"
 
-	"github.com/gobuffalo/genny"
-	"github.com/gobuffalo/genny/gogen"
+	"github.com/gobuffalo/genny/v2"
+	"github.com/gobuffalo/genny/v2/gogen"
 	"github.com/gobuffalo/packr/v2"
 )
 

genny/assets/standard/standard_test.go

@@ -3,8 +3,8 @@ package standard
 import (
 	"testing"
 
-	"github.com/gobuffalo/genny"
-	"github.com/gobuffalo/genny/gentest"
+	"github.com/gobuffalo/genny/v2"
+	"github.com/gobuffalo/genny/v2/gentest"
 	"github.com/stretchr/testify/require"
 )
 

genny/assets/webpack/webpack.go

@@ -6,8 +6,8 @@ import (
 	"path/filepath"
 	"runtime"
 
-	"github.com/gobuffalo/genny"
-	"github.com/gobuffalo/genny/gogen"
+	"github.com/gobuffalo/genny/v2"
+	"github.com/gobuffalo/genny/v2/gogen"
 	"github.com/gobuffalo/packr/v2"
 )
 

genny/assets/webpack/webpack_test.go

@@ -4,8 +4,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/gobuffalo/genny"
-	"github.com/gobuffalo/genny/gentest"
+	"github.com/gobuffalo/genny/v2"
+	"github.com/gobuffalo/genny/v2/gentest"
 	"github.com/gobuffalo/meta"
 	"github.com/stretchr/testify/require"
 )