removed markbates/going as a direct dep for buffalo (#1235)

Gopkg.toml

@@ -129,10 +129,6 @@
   name = "github.com/markbates/deplist"
   version = "1.0.2"
 
-[[constraint]]
-  name = "github.com/markbates/going"
-  version = "1.0.1"
-
 [[constraint]]
   name = "github.com/markbates/grift"
   version = "1.0.1"

errors.go

@@ -8,8 +8,8 @@ import (
 	"strings"
 
 	"github.com/gobuffalo/plush"
+	"github.com/gobuffalo/x/defaults"
 	"github.com/gobuffalo/x/httpx"
-	"github.com/markbates/going/defaults"
 	"github.com/pkg/errors"
 )
 

generators/helpers_test.go

@@ -28,7 +28,7 @@ import (
 	"github.com/gobuffalo/buffalo"
 	"github.com/gobuffalo/buffalo/examples/json-crud/models"
 	"github.com/gobuffalo/buffalo/middleware"
-	"github.com/markbates/going/defaults"
+	"github.com/gobuffalo/x/defaults"
 )
 
 var ENV = defaults.String(os.Getenv("GO_ENV"), "development")
@@ -67,7 +67,7 @@ import (
 	"github.com/gobuffalo/buffalo"
 	"github.com/gobuffalo/buffalo/examples/json-crud/models"
 	"github.com/gobuffalo/buffalo/middleware"
-	"github.com/markbates/going/defaults"
+	"github.com/gobuffalo/x/defaults"
 )
 
 var ENV = defaults.String(os.Getenv("GO_ENV"), "development")

go.mod

@@ -23,18 +23,16 @@ require (
 	github.com/gobuffalo/mw-tokenauth v0.0.0-20180802152212-d09751da96e0
 	github.com/gobuffalo/packr v1.13.2
 	github.com/gobuffalo/plush v3.7.14+incompatible
-	github.com/gobuffalo/pop v4.6.4+incompatible
+	github.com/gobuffalo/pop v4.6.5+incompatible
 	github.com/gobuffalo/shoulders v0.0.0-20180815165021-5569039eac2f
 	github.com/gobuffalo/tags v2.0.8+incompatible
 	github.com/gobuffalo/uuid v2.0.2+incompatible
-	github.com/gobuffalo/validate v2.0.1+incompatible // indirect
-	github.com/gobuffalo/x v0.0.0-20180117215853-11ca13c05abd
+	github.com/gobuffalo/x v0.0.0-20180816203319-dc54d929c4a2
 	github.com/gorilla/context v1.1.1
 	github.com/gorilla/mux v1.6.2
-	github.com/gorilla/pat v0.0.0-20180118222023-199c85a7f6d1 // indirect
 	github.com/gorilla/sessions v1.1.1
 	github.com/markbates/deplist v1.0.2
-	github.com/markbates/going v1.0.1
+	github.com/markbates/going v1.0.2 // indirect
 	github.com/markbates/grift v1.0.1
 	github.com/markbates/inflect v1.0.0
 	github.com/markbates/refresh v1.4.1
@@ -48,11 +46,6 @@ require (
 	github.com/spf13/viper v1.1.0
 	github.com/stretchr/testify v1.2.2
 	golang.org/x/crypto v0.0.0-20180808211826-de0752318171
-	golang.org/x/net v0.0.0-20180816102801-aaf60122140d // indirect
 	golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f
-	golang.org/x/sys v0.0.0-20180816055513-1c9583448a9c // indirect
-	golang.org/x/tools v0.0.0-20180816002632-9de19001913f // indirect
-	gopkg.in/airbrake/gobrake.v2 v2.0.9 // indirect
-	gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2 // indirect
 	gopkg.in/mail.v2 v2.0.0-20180731213649-a0242b2233b4
 )

go.sum

@@ -63,8 +63,8 @@ github.com/gobuffalo/plush v0.0.0-20180810170812-274552812256/go.mod h1:vdLIKHIw
 github.com/gobuffalo/plush v3.7.14+incompatible h1:4gpmcE0seCv3OyzgA+vLbHh+dmcwzSoW2Ybm3XOy5oQ=
 github.com/gobuffalo/plush v3.7.14+incompatible/go.mod h1:2bzmOVW0Xie7mPwGJ141IeZ5lLITGfdOQJvw89R+m1E=
 github.com/gobuffalo/pop v0.0.0-20180810203029-9f8bf0c11920/go.mod h1:rYdFIDMO4v9I4SK6BQ3q+vnd5HlQnTtlY/ANF7wKzGM=
-github.com/gobuffalo/pop v4.6.4+incompatible h1:M1VZiQfQMW+wpUljm/JfQ34n3Fw1pIq9/3whFBZlqGk=
-github.com/gobuffalo/pop v4.6.4+incompatible/go.mod h1:rYdFIDMO4v9I4SK6BQ3q+vnd5HlQnTtlY/ANF7wKzGM=
+github.com/gobuffalo/pop v4.6.5+incompatible h1:Tk7O3CHDGvYa3QRi4KH1wnG2AoVAkZ2hGCWDD1tAN0Y=
+github.com/gobuffalo/pop v4.6.5+incompatible/go.mod h1:gHLkK0rtGkVoqxneV3f8uUc7zj0t1kvii5sCk0qLjgI=
 github.com/gobuffalo/shoulders v0.0.0-20180815165021-5569039eac2f h1:FdNwdqDxs4t4GKKS1yG3krQRVWSmJ9tntDhm69wfVq4=
 github.com/gobuffalo/shoulders v0.0.0-20180815165021-5569039eac2f/go.mod h1:6BOi9bQ44FOef+BnbjTps9APr8fZE1Yvcs4BdeY940U=
 github.com/gobuffalo/tags v2.0.6+incompatible/go.mod h1:9XmhOkyaB7UzvuY4UoZO4s67q8/xRMVJEaakauVQYeY=
@@ -80,6 +80,8 @@ github.com/gobuffalo/validate v2.0.1+incompatible h1:kAH2aizLUcFa0k5TkWNJZGgWGGd
 github.com/gobuffalo/validate v2.0.1+incompatible/go.mod h1:JUiXzPhWPJhzqoQjARUkSoeTOTI0vy12dhTiAG+mCtk=
 github.com/gobuffalo/x v0.0.0-20180117215853-11ca13c05abd h1:0AiAe/jaKqMCar/zjOQFewW33iOLsCD6lPbqYlTcr2Q=
 github.com/gobuffalo/x v0.0.0-20180117215853-11ca13c05abd/go.mod h1:WevpGD+5YOreDJznWevcn8NTmQEW5STSBgIkpkjzqXc=
+github.com/gobuffalo/x v0.0.0-20180816203319-dc54d929c4a2 h1:L4IIzLTXHRmnCnH4/OOa7yeDL9kk6dK+tnLcXfu8nDo=
+github.com/gobuffalo/x v0.0.0-20180816203319-dc54d929c4a2/go.mod h1:oX3kj94UfTZqmz9XowUgR7Ghpz5I+JmkMDpWJlwa9h8=
 github.com/golang/protobuf v1.1.0 h1:0iH4Ffd/meGoXqF2lSAhZHt8X+cPgkfn/cb6Cce5Vpc=
 github.com/golang/protobuf v1.1.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/gorilla/context v1.1.1 h1:AWwleXJkX/nhcU9bZSnZoi3h/qGYqQAGhq6zZe/aQW8=
@@ -117,6 +119,8 @@ github.com/markbates/deplist v1.0.2/go.mod h1:ZerU6FuDYMFbdh+BdCNmce+SexbmOZd/ft
 github.com/markbates/going v1.0.0/go.mod h1:I6mnB4BPnEeqo85ynXIx1ZFLLbtiLHNXVgWeFO9OGOA=
 github.com/markbates/going v1.0.1 h1:IFDakPS7ROqx1rESYPSZmURUTwI4HWuM5waQIFCUZZQ=
 github.com/markbates/going v1.0.1/go.mod h1:I6mnB4BPnEeqo85ynXIx1ZFLLbtiLHNXVgWeFO9OGOA=
+github.com/markbates/going v1.0.2 h1:uNQHDDfMRNOUmuxDbPbvatyw4wr4UOSUZkGkdkcip1o=
+github.com/markbates/going v1.0.2/go.mod h1:UWCk3zm0UKefHZ7l8BNqi26UyiEMniznk8naLdTcy6c=
 github.com/markbates/grift v0.0.0-20180319170132-76f93617a788/go.mod h1:6qyNEZSY8v6duE2tBtO/tPgBvxhT7g7DnQoIYpEyCfw=
 github.com/markbates/grift v1.0.0/go.mod h1:6qyNEZSY8v6duE2tBtO/tPgBvxhT7g7DnQoIYpEyCfw=
 github.com/markbates/grift v1.0.1 h1:n3yUdXi+qdChTRvVCbRmD9iMLjSzv7ainzW3qYTP284=
@@ -213,12 +217,12 @@ golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sys v0.0.0-20180616030259-6c888cc515d3/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180814072032-4e1fef560951 h1:VfGaXvV9wRnTJreeGDE0FWEDiQP1WWUDmutCjCThDz8=
 golang.org/x/sys v0.0.0-20180814072032-4e1fef560951/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20180815093151-14742f9018cd/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180816055513-1c9583448a9c h1:uHnKXcvx6SNkuwC+nrzxkJ+TpPwZOtumbhWrrOYN5YA=
 golang.org/x/sys v0.0.0-20180816055513-1c9583448a9c/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/tools v0.0.0-20180813205110-a434f64ace81/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20180816002632-9de19001913f/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 google.golang.org/appengine v1.1.0 h1:igQkv0AAhEIvTEpD5LIpAfav2eeVO9HBTjvKHVJPRSs=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 gopkg.in/airbrake/gobrake.v2 v2.0.9 h1:7z2uVWwn7oVeeugY1DtlPAy5H+KYgB1KeKTnqjNatLo=
@@ -233,6 +237,7 @@ gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4=
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
 gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2 h1:OAj3g0cR6Dx/R07QgQe8wkA9RNjB2u4i700xBkIT4e0=
 gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod h1:Xk6kEKp8OKb+X14hQBKWaSkCsqBpgog8nAV2xsGOxlo=
+gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df/go.mod h1:LRQQ+SO6ZHR7tOkpBDuZnXENFzX8qRjMDMyPD6BRkCw=
 gopkg.in/mail.v2 v2.0.0-20180301192024-63235f23494b/go.mod h1:htwXN1Qh09vZJ1NVKxQqHPBaCBbzKhp5GzuJEA4VJWw=
 gopkg.in/mail.v2 v2.0.0-20180731213649-a0242b2233b4 h1:a3llQg4+Czqaf+QH4diHuHiKv4j1abMwuRXwaRNHTPU=
 gopkg.in/mail.v2 v2.0.0-20180731213649-a0242b2233b4/go.mod h1:htwXN1Qh09vZJ1NVKxQqHPBaCBbzKhp5GzuJEA4VJWw=

grifts.go

@@ -7,7 +7,7 @@ import (
 	"strings"
 	"text/tabwriter"
 
-	"github.com/markbates/going/randx"
+	"github.com/gobuffalo/x/randx"
 	"github.com/markbates/grift/grift"
 	"github.com/pkg/errors"
 	"golang.org/x/crypto/bcrypt"

method_override.go

@@ -3,7 +3,7 @@ package buffalo
 import (
 	"net/http"
 
-	"github.com/markbates/going/defaults"
+	"github.com/gobuffalo/x/defaults"
 )
 
 // MethodOverride is the default implementation for the

options.go

@@ -10,8 +10,8 @@ import (
 	"github.com/gobuffalo/buffalo/worker"
 	"github.com/gobuffalo/envy"
 	"github.com/gobuffalo/pop"
+	"github.com/gobuffalo/x/defaults"
 	"github.com/gorilla/sessions"
-	"github.com/markbates/going/defaults"
 )
 
 // Options are used to configure and define how your application should run.

request_logger.go

@@ -5,7 +5,7 @@ import (
 
 	humanize "github.com/dustin/go-humanize"
 	"github.com/gobuffalo/x/httpx"
-	"github.com/markbates/going/randx"
+	"github.com/gobuffalo/x/randx"
 )
 
 // RequestLogger can be be overridden to a user specified