updated to hopefully fix all the issues

.github/FUNDING.yml

@@ -0,0 +1,4 @@
+# These are supported funding model platforms
+
+github: markbates
+patreon: buffalo

.github/workflows/release.yml

@@ -0,0 +1,28 @@
+name: Release
+on:
+  release:
+    types:
+      - published
+
+jobs:
+  release:
+    name: Release
+    runs-on: ubuntu-latest
+    steps:
+      -
+        name: Set up Go 1.13
+        uses: actions/setup-go@v1
+        with:
+          go-version: 1.13
+        id: go
+      -
+        name: Checkout Code
+        uses: actions/checkout@master
+      -
+        name: Run GoReleaser
+        env:
+          GITHUB_TOKEN: ${{ secrets.GORELEASER_GITHUB_TOKEN }}
+        uses: goreleaser/goreleaser-action@v1
+        with:
+          version: latest
+          args: release --rm-dist

.github/workflows/tests.yml

@@ -0,0 +1,22 @@
+name: Tests
+on: [push]
+jobs:
+
+  tests-on:
+    name: ${{matrix.go-version}} ${{matrix.os}}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        go-version: [1.12.x, 1.13.x]
+        os: [macos-latest, windows-latest, ubuntu-latest]
+    steps:
+    - name: Checkout Code
+      uses: actions/checkout@v1
+      with:
+        fetch-depth: 1
+    - name: Test
+      run: |
+        go mod tidy -v
+        go test -race ./...
+
+

.goreleaser.yml

@@ -1,31 +1,45 @@
-# Code generated by github.com/gobuffalo/release. DO NOT EDIT.
-# Edit .goreleaser.yml.plush instead
-
 builds:
--
-  goos:
-    - darwin
-    - linux
-    - windows
-  env:
-    - CGO_ENABLED=0
-  main: main.go
-
+  -
+    main: ./cmd/main.go
+    env:
+      - CGO_ENABLED=0
+    ldflags:
+      - -s -w -X "github.com/gobuffalo/buffalo-goth/main.Version={{.Tag}}"
+    goos:
+      - darwin
+      - linux
+      - windows
+    goarch:
+      - amd64
+      - 386
+      - arm
+      - arm64
+    goarm:
+      - 6
+      - 7
+archives:
+  -
+    replacements:
+      '386': i386
+      darwin: Darwin
+      linux: Linux
+      windows: Windows
+      amd64: x86_64
 checksum:
-  name_template: 'checksums.txt'
-
+  name_template: checksums.txt
 snapshot:
-  name_template: "{{ .Tag }}-next"
-
+  name_template: '{{ .Tag }}-next'
 changelog:
   sort: asc
   filters:
     exclude:
       - '^docs:'
       - '^test:'
-
-brew:
-  github:
-    owner: markbates
-    name: homebrew-tap
-
+brews:
+  -
+    name: 'buffalo-goth'
+    github:
+      owner: 'gobuffalo'
+      name: 'homebrew-tap'
+    install: |
+      bin.install "buffalo-goth"

Makefile

@@ -2,54 +2,20 @@ TAGS ?= "sqlite"
 GO_BIN ?= go
 
 install:
-	packr
+	packr2
 	$(GO_BIN) install -tags ${TAGS} -v ./.
 	make tidy
 
 tidy:
-ifeq ($(GO111MODULE),on)
 	$(GO_BIN) mod tidy
-else
-	echo skipping go mod tidy
-endif
-
-deps:
-	$(GO_BIN) get github.com/gobuffalo/release
-	$(GO_BIN) get github.com/gobuffalo/packr/packr
-	$(GO_BIN) get -tags ${TAGS} -t ./...
-	make tidy
 
 build:
-	packr
+	packr2
 	$(GO_BIN) build -v .
 	make tidy
 
 test:
-	packr
+	packr2 clean
 	$(GO_BIN) test -tags ${TAGS} ./...
 	make tidy
-
-ci-test:
-	$(GO_BIN) test -tags ${TAGS} -race ./...
-	make tidy
-
-lint:
-	gometalinter --vendor ./... --deadline=1m --skip=internal
-	make tidy
-
-update:
-	$(GO_BIN) get -u -tags ${TAGS}
-	make tidy
-	packr
-	make test
-	make install
-	make tidy
-
-release-test:
-	$(GO_BIN) test -tags ${TAGS} -race ./...
-	make tidy
-
-release:
-	make tidy
-	release -y -f version.go
-	make tidy
+	packr2

cmd/auth.go

@@ -4,8 +4,8 @@ import (
 	"context"
 
 	"github.com/gobuffalo/buffalo-goth/genny/auth"
-	"github.com/gobuffalo/genny"
-	"github.com/gobuffalo/genny/movinglater/gotools"
+	"github.com/gobuffalo/genny/v2"
+	"github.com/gobuffalo/genny/v2/gogen"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 )
@@ -36,7 +36,7 @@ var authCmd = &cobra.Command{
 		}
 		gg.With(r)
 
-		g, err := gotools.GoFmt(r.Root)
+		g, err := gogen.Fmt(r.Root)
 		if err != nil {
 			return errors.WithStack(err)
 		}

cmd/generate.go

@@ -4,8 +4,8 @@ import (
 	"context"
 
 	"github.com/gobuffalo/buffalo-goth/genny/goth"
-	"github.com/gobuffalo/genny"
-	"github.com/gobuffalo/genny/movinglater/gotools"
+	"github.com/gobuffalo/genny/v2"
+	"github.com/gobuffalo/genny/v2/gogen"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 )
@@ -36,7 +36,7 @@ var generateCmd = &cobra.Command{
 		}
 		r.With(g)
 
-		g, err = gotools.GoFmt(r.Root)
+		g, err = gogen.Fmt(r.Root)
 		if err != nil {
 			return errors.WithStack(err)
 		}

genny/auth/auth.go

@@ -7,10 +7,10 @@ import (
 	"text/template"
 
 	"github.com/gobuffalo/buffalo-goth/genny/goth"
-	"github.com/gobuffalo/genny"
-	"github.com/gobuffalo/genny/movinglater/gotools"
+	"github.com/gobuffalo/genny/v2"
+	"github.com/gobuffalo/genny/v2/gogen"
 	"github.com/gobuffalo/meta"
-	"github.com/gobuffalo/packr"
+	"github.com/gobuffalo/packr/v2"
 	"github.com/pkg/errors"
 )
 
@@ -26,7 +26,7 @@ func New(opts *Options) (*genny.Group, error) {
 
 	g = genny.New()
 
-	if err := g.Box(packr.NewBox("../auth/templates")); err != nil {
+	if err := g.Box(packr.New("", "../auth/templates")); err != nil {
 		return gg, errors.WithStack(err)
 	}
 
@@ -38,7 +38,7 @@ func New(opts *Options) (*genny.Group, error) {
 		"providers": opts.Providers,
 		"app":       meta.New("."),
 	}
-	t := gotools.TemplateTransformer(data, h)
+	t := gogen.TemplateTransformer(data, h)
 	g.Transformer(t)
 
 	cmd := exec.Command("buffalo", "db", "generate", "model", "user", "name", "email:nulls.String", "provider", "provider_id")

genny/auth/auth_test.go

@@ -5,7 +5,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/gobuffalo/genny"
+	"github.com/gobuffalo/genny/v2"
 	"github.com/stretchr/testify/require"
 )
 
@@ -33,9 +33,9 @@ func Test_Auth(t *testing.T) {
 	r.Equal("actions/app.go", f.Name())
 	r.Equal(appAfter, f.String())
 
-	r.Len(res.Commands, 2)
+	r.Len(res.Commands, 1)
 
-	c := res.Commands[1]
+	c := res.Commands[0]
 	r.Equal("buffalo db generate model user name email:nulls.String provider provider_id", strings.Join(c.Args, " "))
 }