Merge pull request #29 from fasmat/feature/upgrade-pop

Upgrade pop dependency

.github/dependabot.yml

@@ -0,0 +1,11 @@
+version: 2
+updates:
+  - package-ecosystem: "gomod"
+    directory: "/"
+    schedule:
+      interval: "daily"
+
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"

.github/workflows/release.yml

@@ -1,24 +1,25 @@
 name: Release
 on:
-  create:
-    tags:
-      - v*.*.*
+  release:
+    types:
+      - published
 
 jobs:
   release:
     name: Release
     runs-on: ubuntu-latest
-    container:
-      image: bepsays/ci-goreleaser:1.13-4
     steps:
-      - name: Checkout Code
-        uses: actions/checkout@master
+      - name: Set up Go 1.17
+        uses: actions/setup-go@v2
         with:
-          fetch-depth: 0
-      - name: Fetch tags
-        run: git fetch --depth=1 origin +refs/tags/*:refs/tags/*
+          go-version: 1.17
+        id: go
+
+      - name: Checkout Code
+        uses: actions/checkout@v2
+
       - name: Run GoReleaser
-        uses: goreleaser/goreleaser-action@v1
+        uses: goreleaser/goreleaser-action@v2
         env:
           GITHUB_TOKEN: ${{ secrets.GORELEASER_GITHUB_TOKEN }}
         with:

.github/workflows/tests.yml

@@ -1,22 +1,32 @@
 name: Tests
-on: [push]
-jobs:
+on:
+  push:
+    branches:
+      - main
+  pull_request:
 
-  tests-on:
-    name: ${{matrix.go-version}} ${{matrix.os}}
+jobs:
+  tests-off:
+    name: ${{ matrix.os }} - Go v${{ matrix.go-version }}
     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 -tags sqlite -race ./...
+        go-version:
+          - "1.16.x"
+          - "1.17.x"
+        os:
+          - "macos-latest"
+          - "windows-latest"
+          - "ubuntu-latest"
 
+    steps:
+      - uses: actions/checkout@v2
+      - name: Setup Go ${{ matrix.go }}
+        uses: actions/setup-go@v2
+        with:
+          go-version: ${{ matrix.go-version }}
 
+      - name: Test
+        run: |
+          go mod tidy -v
+          go test -tags "sqlite" -cover  ./...

Makefile

@@ -1,18 +1,12 @@
 test:
-	packr2 clean
 	go test -tags sqlite -failfast -short -cover ./...
-	packr2
 	go mod tidy -v
 
 cov:
-	packr2 clean
 	go test -short -coverprofile cover.out ./...
 	go tool cover -html cover.out
-	packr2
 	go mod tidy -v
 
 install:
-	packr2 clean
-	packr2
 	go install -v .
 

README.md

@@ -12,13 +12,13 @@ This is the home for all things that combine [Buffalo](https://github.com/gobuff
 ## Installation
 
 ```bash
-$ go get -u -v github.com/gobuffalo/buffalo-pop/v2
+go install github.com/gobuffalo/buffalo-pop/v3@latest
 ```
 
 Or with SQLite 3 support:
 
 ```bash
-$ go get -tags sqlite -u -v github.com/gobuffalo/buffalo-pop/v2
+go get -tags sqlite -v github.com/gobuffalo/buffalo-pop/v3
 ```
 
 ## Transaction Middleware
@@ -30,7 +30,7 @@ The `popmw.Transaction` will wrap each request inside of a new database transact
 First you need to add the middleware to your application giving it access to your `*pop.Connection`, typically found at `models.DB`.
 
 ```go
-import "github.com/gobuffalo/buffalo-pop/v2/pop/popmw"
+import "github.com/gobuffalo/buffalo-pop/v3/pop/popmw"
 
 func App() *buffalo.App {
   // ...

SHOULDERS.md

@@ -4,7 +4,6 @@ github.com/gobuffalo/buffalo-pop does not try to reinvent the wheel! Instead, it
 
 Thank you to the following **GIANTS**:
 
-
 * [cloud.google.com/go](https://godoc.org/cloud.google.com/go)
 
 * [dmitri.shuralyov.com/app/changes](https://godoc.org/dmitri.shuralyov.com/app/changes)
@@ -149,12 +148,6 @@ Thank you to the following **GIANTS**:
 
 * [github.com/gobuffalo/nulls](https://godoc.org/github.com/gobuffalo/nulls)
 
-* [github.com/gobuffalo/packd](https://godoc.org/github.com/gobuffalo/packd)
-
-* [github.com/gobuffalo/packr](https://godoc.org/github.com/gobuffalo/packr)
-
-* [github.com/gobuffalo/packr/v2](https://godoc.org/github.com/gobuffalo/packr/v2)
-
 * [github.com/gobuffalo/plush](https://godoc.org/github.com/gobuffalo/plush)
 
 * [github.com/gobuffalo/plushgen](https://godoc.org/github.com/gobuffalo/plushgen)

cmd/available.go

@@ -4,9 +4,9 @@ import (
 	"encoding/json"
 	"os"
 
-	"github.com/gobuffalo/buffalo-pop/v2/cmd/destroy"
-	"github.com/gobuffalo/pop/v5"
-	"github.com/gobuffalo/pop/v5/logging"
+	"github.com/gobuffalo/buffalo-pop/v3/cmd/destroy"
+	"github.com/gobuffalo/pop/v6"
+	"github.com/gobuffalo/pop/v6/logging"
 	"github.com/spf13/cobra"
 )
 

cmd/destroy.go

@@ -1,7 +1,7 @@
 package cmd
 
 import (
-	"github.com/gobuffalo/buffalo-pop/v2/cmd/destroy"
+	"github.com/gobuffalo/buffalo-pop/v3/cmd/destroy"
 	"github.com/spf13/cobra"
 )
 

cmd/pop.go

@@ -1,7 +1,7 @@
 package cmd
 
 import (
-	"github.com/gobuffalo/pop/v5/soda/cmd"
+	"github.com/gobuffalo/pop/v6/soda/cmd"
 )
 
 // popCmd represents the pop command

genny/newapp/newapp.go

@@ -1,25 +1,37 @@
 package newapp
 
 import (
+	"embed"
+	"io/fs"
+
 	"github.com/gobuffalo/genny/v2"
 	"github.com/gobuffalo/genny/v2/plushgen"
-	"github.com/gobuffalo/packr/v2"
 	"github.com/gobuffalo/plush/v4"
-	"github.com/gobuffalo/pop/v5"
-	"github.com/gobuffalo/pop/v5/genny/config"
+	"github.com/gobuffalo/pop/v6"
+	"github.com/gobuffalo/pop/v6/genny/config"
 )
 
 var AvailableDialects = pop.AvailableDialects
 
+//go:embed templates/*
+var templates embed.FS
+
 func New(opts *Options) (*genny.Group, error) {
 	gg := &genny.Group{}
 
 	if err := opts.Validate(); err != nil {
 		return gg, err
 	}
 
+	sub, err := fs.Sub(templates, "templates")
+	if err != nil {
+		return gg, err
+	}
+
 	g := genny.New()
-	g.Box(packr.New("github.com/gobuffalo/buffalo-pop/v2/genny/newapp/templates", "../newapp/templates"))
+	if err := g.FS(sub); err != nil {
+		return gg, err
+	}
 
 	ctx := plush.NewContext()
 	ctx.Set("opts", opts)
@@ -28,7 +40,7 @@ func New(opts *Options) (*genny.Group, error) {
 
 	gg.Add(g)
 
-	g, err := config.New(&config.Options{
+	g, err = config.New(&config.Options{
 		Dialect:  opts.Dialect,
 		Prefix:   opts.Prefix,
 		FileName: "database.yml",

genny/newapp/newapp_test.go

@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/gobuffalo/genny/v2/gentest"
-	"github.com/gobuffalo/pop/v5"
+	"github.com/gobuffalo/pop/v6"
 	"github.com/stretchr/testify/require"
 )
 

genny/newapp/options.go

@@ -5,7 +5,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/gobuffalo/pop/v5"
+	"github.com/gobuffalo/pop/v6"
 )
 
 type Options struct {

genny/newapp/templates/models/models.go.plush

@@ -4,7 +4,7 @@ import (
 	"log"
 
 	"github.com/gobuffalo/envy"
-	"github.com/gobuffalo/pop/v5"
+	"github.com/gobuffalo/pop/v6"
 )
 
 // DB is a connection to your database to be used

genny/newapp/templates/models/models_test.go.plush

@@ -1,9 +1,9 @@
 package models
 
 import (
+	"os"
 	"testing"
 
-	"github.com/gobuffalo/packr/v2"
 	"github.com/gobuffalo/suite"
 )
 
@@ -12,7 +12,7 @@ type ModelSuite struct {
 }
 
 func Test_ModelSuite(t *testing.T) {
-	model, err := suite.NewModelWithFixtures(packr.New("app:models:test:fixtures","../fixtures"))
+	model, err := suite.NewModelWithFixtures(os.DirFS("fixtures"))
 	if err != nil {
 		t.Fatal(err)
 	}

go.mod

@@ -1,21 +1,18 @@
-module github.com/gobuffalo/buffalo-pop/v2
+module github.com/gobuffalo/buffalo-pop/v3
 
-go 1.13
+go 1.16
 
 require (
-	github.com/fatih/color v1.9.0
-	github.com/gobuffalo/buffalo v0.15.5
-	github.com/gobuffalo/events v1.4.1
-	github.com/gobuffalo/flect v0.2.1
-	github.com/gobuffalo/genny/v2 v2.0.5
-	github.com/gobuffalo/httptest v1.5.0
-	github.com/gobuffalo/packr/v2 v2.8.0
-	github.com/gobuffalo/plush/v4 v4.0.0
-	github.com/gobuffalo/pop/v5 v5.3.0
-	github.com/gofrs/uuid v3.2.0+incompatible
-	github.com/markbates/errx v1.1.0
-	github.com/pkg/errors v0.9.1
-	github.com/sirupsen/logrus v1.4.2
-	github.com/spf13/cobra v0.0.6
-	github.com/stretchr/testify v1.5.1
+	github.com/fatih/color v1.13.0
+	github.com/gobuffalo/buffalo v0.18.0
+	github.com/gobuffalo/events v1.4.2
+	github.com/gobuffalo/flect v0.2.4
+	github.com/gobuffalo/genny/v2 v2.0.8
+	github.com/gobuffalo/httptest v1.5.1
+	github.com/gobuffalo/plush/v4 v4.1.9
+	github.com/gobuffalo/pop/v6 v6.0.0
+	github.com/gofrs/uuid v4.1.0+incompatible
+	github.com/sirupsen/logrus v1.8.1
+	github.com/spf13/cobra v1.2.1
+	github.com/stretchr/testify v1.7.0
 )