switched to gobuffalo/meta

gobuffalo · Nov 5, 2018 · 32bef5d · 32bef5d
1 parent 8ed5c4a
commit 32bef5d
Show file tree

Hide file tree

Showing 6 changed files with 187 additions and 109 deletions.
diff --git a/.goreleaser.yml b/.goreleaser.yml
diff --git a/.goreleaser.yml.plush b/.goreleaser.yml.plush
@@ -6,7 +6,7 @@ builds:
     - windows
   env:
     - CGO_ENABLED=0
-  # main: ./main.go
+  main: main.go
 
 checksum:
   name_template: 'checksums.txt'
@@ -23,6 +23,6 @@ changelog:
 <%= if (brew) { %>
 brew:
   github:
-    owner: gobuffalo
+    owner: markbates
     name: homebrew-tap
 <% } %>
diff --git a/Makefile b/Makefile
@@ -3,44 +3,53 @@ GO_BIN ?= go
 
 install:
 	packr
-	$(GO_BIN) install -v ./.
+	$(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 ./...
-ifeq ($(GO111MODULE),on)
-	$(GO_BIN) mod tidy
-endif
+	make tidy
 
 build:
 	packr
 	$(GO_BIN) build -v .
+	make tidy
 
 test:
 	packr
 	$(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}
-ifeq ($(GO111MODULE),on)
-	$(GO_BIN) mod tidy
-endif
+	make tidy
 	packr
 	make test
 	make install
-ifeq ($(GO111MODULE),on)
-	$(GO_BIN) mod tidy
-endif
+	make tidy
 
 release-test:
 	$(GO_BIN) test -tags ${TAGS} -race ./...
+	make tidy
 
 release:
+	make tidy
 	release -y -f version.go
+	make tidy
diff --git a/genny/auth/auth.go b/genny/auth/auth.go
@@ -8,9 +8,9 @@ import (
 	"text/template"
 
 	"github.com/gobuffalo/buffalo-goth/genny/goth"
-	"github.com/gobuffalo/buffalo/meta"
 	"github.com/gobuffalo/genny"
 	"github.com/gobuffalo/genny/movinglater/gotools"
+	"github.com/gobuffalo/meta"
 	"github.com/gobuffalo/packr"
 	"github.com/pkg/errors"
 )

diff --git a/go.mod b/go.mod
@@ -1,10 +1,10 @@
 module github.com/gobuffalo/buffalo-goth
 
 require (
-	github.com/gobuffalo/buffalo v0.12.6
-	github.com/gobuffalo/buffalo-plugins v1.0.3
-	github.com/gobuffalo/genny v0.0.0-20181003150629-3786a0744c5d
-	github.com/gobuffalo/packr v1.13.7
+	github.com/gobuffalo/buffalo-plugins v1.6.7
+	github.com/gobuffalo/genny v0.0.0-20181030163439-ed103521b8ec
+	github.com/gobuffalo/meta v0.0.0-20181025145500-3a985a084b0a
+	github.com/gobuffalo/packr v1.19.0
 	github.com/pkg/errors v0.8.0
 	github.com/spf13/cobra v0.0.3
 	github.com/stretchr/testify v1.2.2