Merge branch 'master' into development

.goreleaser.yml

@@ -25,3 +25,15 @@ changelog:
     - '^docs:'
     - '^test:'
 
+brew:
+  name: buffalo
+  github:
+    owner: gobuffalo
+    name: homebrew-tap
+  homepage: https://gobuffalo.io
+  description: A Go web development eco-system, designed to make your life easier.
+  install: |
+    bin.install "buffalo"
+  test: |
+    system "#{bin}/buffalo", "version"
+

Makefile

@@ -31,6 +31,7 @@ build:
 test:
 	packr2
 	$(GO_BIN) test -tags ${TAGS} ./...
+	packr2
 	make tidy
 
 ci-deps:

SHOULDERS.md

@@ -39,6 +39,8 @@ Thank you to the following **GIANTS**:
 
 * [github.com/gobuffalo/httptest](https://godoc.org/github.com/gobuffalo/httptest)
 
+* [github.com/gobuffalo/licenser](https://godoc.org/github.com/gobuffalo/licenser)
+
 * [github.com/gobuffalo/logger](https://godoc.org/github.com/gobuffalo/logger)
 
 * [github.com/gobuffalo/meta](https://godoc.org/github.com/gobuffalo/meta)
@@ -47,8 +49,6 @@ Thank you to the following **GIANTS**:
 
 * [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)
@@ -57,6 +57,8 @@ Thank you to the following **GIANTS**:
 
 * [github.com/gobuffalo/pop](https://godoc.org/github.com/gobuffalo/pop)
 
+* [github.com/gobuffalo/release](https://godoc.org/github.com/gobuffalo/release)
+
 * [github.com/gobuffalo/syncx](https://godoc.org/github.com/gobuffalo/syncx)
 
 * [github.com/gobuffalo/tags](https://godoc.org/github.com/gobuffalo/tags)

genny/plugin/plugin.go

@@ -9,6 +9,7 @@ import (
 	"github.com/gobuffalo/plush"
 	"github.com/gobuffalo/plushgen"
 	"github.com/gobuffalo/release/genny/initgen"
+	"github.com/gobuffalo/release/genny/makefile"
 	"github.com/pkg/errors"
 )
 
@@ -43,8 +44,10 @@ func New(opts *Options) (*genny.Group, error) {
 	ig, err := initgen.New(&initgen.Options{
 		Version:     "v0.0.1",
 		VersionFile: filepath.Join(opts.ShortName, "version.go"),
-		MainFile:    "main.go",
-		Root:        opts.Root,
+		Options: &makefile.Options{
+			MainFile: "main.go",
+			Root:     opts.Root,
+		},
 	})
 	if err != nil {
 		return gg, errors.WithStack(err)

go.mod

@@ -6,38 +6,39 @@ require (
 	github.com/BurntSushi/toml v0.3.1
 	github.com/dustin/go-humanize v1.0.0
 	github.com/fatih/color v1.7.0
-	github.com/gobuffalo/attrs v0.0.0-20190224210810-a9411de4debd
+	github.com/gobuffalo/attrs v0.1.0
 	github.com/gobuffalo/buffalo-docker v1.0.7
-	github.com/gobuffalo/buffalo-pop v1.12.0
-	github.com/gobuffalo/clara v0.4.1
-	github.com/gobuffalo/depgen v0.1.1
+	github.com/gobuffalo/buffalo-pop v1.13.0
+	github.com/gobuffalo/clara v0.6.0
+	github.com/gobuffalo/depgen v0.2.0
 	github.com/gobuffalo/envy v1.7.0
 	github.com/gobuffalo/events v1.3.1
-	github.com/gobuffalo/fizz v1.8.0 // indirect
-	github.com/gobuffalo/flect v0.1.3
-	github.com/gobuffalo/genny v0.1.1
+	github.com/gobuffalo/fizz v1.9.0 // indirect
+	github.com/gobuffalo/flect v0.1.5
+	github.com/gobuffalo/genny v0.2.0
 	github.com/gobuffalo/github_flavored_markdown v1.0.7
-	github.com/gobuffalo/gogen v0.1.1
-	github.com/gobuffalo/helpers v0.0.0-20190506214229-8e6f634af7c3
-	github.com/gobuffalo/httptest v1.2.0
-	github.com/gobuffalo/licenser v1.0.0
+	github.com/gobuffalo/gogen v0.2.0
+	github.com/gobuffalo/helpers v0.2.2
+	github.com/gobuffalo/httptest v1.3.0
+	github.com/gobuffalo/licenser v1.1.0
 	github.com/gobuffalo/logger v0.0.0-20190315122211-86e12af44bc2
 	github.com/gobuffalo/meta v0.0.0-20190329152330-e161e8a93e3b
 	github.com/gobuffalo/nulls v0.0.0-20190305142546-85f3c9250d87
-	github.com/gobuffalo/packd v0.1.0
-	github.com/gobuffalo/packr/v2 v2.3.2
+	github.com/gobuffalo/packd v0.2.0
+	github.com/gobuffalo/packr/v2 v2.4.0
 	github.com/gobuffalo/plush v3.8.2+incompatible
-	github.com/gobuffalo/plushgen v0.1.0
+	github.com/gobuffalo/plushgen v0.1.2
 	github.com/gobuffalo/pop v4.11.1+incompatible
-	github.com/gobuffalo/release v1.5.0
+	github.com/gobuffalo/release v1.7.0
+	github.com/gobuffalo/shoulders v1.1.0 // indirect
 	github.com/gobuffalo/syncx v0.0.0-20190224160051-33c29581e754
 	github.com/gobuffalo/tags v2.1.0+incompatible
 	github.com/gobuffalo/x v0.0.0-20190224155809-6bb134105960
 	github.com/gorilla/context v1.1.1
 	github.com/gorilla/mux v1.7.2
 	github.com/gorilla/sessions v1.1.3
-	github.com/karrick/godirwalk v1.10.3
-	github.com/markbates/deplist v1.1.3
+	github.com/karrick/godirwalk v1.10.11
+	github.com/markbates/deplist v1.2.0
 	github.com/markbates/grift v1.0.6
 	github.com/markbates/oncer v0.0.0-20181203154359-bf2de49a0be2
 	github.com/markbates/refresh v1.7.1
@@ -50,8 +51,8 @@ require (
 	github.com/spf13/pflag v1.0.3
 	github.com/spf13/viper v1.4.0
 	github.com/stretchr/testify v1.3.0
-	golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5
+	golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8
 	golang.org/x/sync v0.0.0-20190423024810-112230192c58
-	golang.org/x/tools v0.0.0-20190608022120-eacb66d2a7c3
+	golang.org/x/tools v0.0.0-20190614152001-1edc8e83c897
 	gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc
 )