removes the direct dependency on gobuffalo/x (gobuffalo#1708)

* removes the direct dependency on gobuffalo/x * remove the older *gen packages
pavan541cs · Jun 23, 2019 · 7c454ed · 7c454ed
1 parent 2976ded
commit 7c454ed
Show file tree

Hide file tree

Showing 45 changed files with 392 additions and 67 deletions.
diff --git a/binding/binding.go b/binding/binding.go
@@ -12,7 +12,7 @@ import (
 	"errors"
 
 	"github.com/gobuffalo/nulls"
-	"github.com/gobuffalo/x/httpx"
+	"github.com/gobuffalo/buffalo/internal/httpx"
 	"github.com/monoculum/formam"
 )
 

diff --git a/buffalo/cmd/fix/dep.go b/buffalo/cmd/fix/dep.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/gobuffalo/buffalo/runtime"
 	"github.com/gobuffalo/genny"
-	"github.com/gobuffalo/gogen"
+	"github.com/gobuffalo/genny/gogen"
 )
 
 // packages to add to Gopkg.toml

diff --git a/buffalo/cmd/fix/tools.go b/buffalo/cmd/fix/tools.go
@@ -6,7 +6,7 @@ import (
 	"os/exec"
 
 	"github.com/gobuffalo/genny"
-	"github.com/gobuffalo/gogen"
+	"github.com/gobuffalo/genny/gogen"
 )
 
 var rTools = []string{}

diff --git a/buffalo/cmd/generate/mailer.go b/buffalo/cmd/generate/mailer.go
@@ -6,7 +6,7 @@ import (
 	"github.com/gobuffalo/buffalo/genny/mail"
 	"github.com/gobuffalo/flect/name"
 	"github.com/gobuffalo/genny"
-	"github.com/gobuffalo/gogen"
+	"github.com/gobuffalo/genny/gogen"
 	"github.com/gobuffalo/meta"
 	"github.com/spf13/cobra"
 )

diff --git a/buffalo/cmd/generate/task.go b/buffalo/cmd/generate/task.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/gobuffalo/buffalo/genny/grift"
 	"github.com/gobuffalo/genny"
-	"github.com/gobuffalo/gogen"
+	"github.com/gobuffalo/genny/gogen"
 	"github.com/spf13/cobra"
 )
 

diff --git a/buffalo/cmd/new.go b/buffalo/cmd/new.go
@@ -22,7 +22,7 @@ import (
 	"github.com/gobuffalo/envy"
 	fname "github.com/gobuffalo/flect/name"
 	"github.com/gobuffalo/genny"
-	"github.com/gobuffalo/gogen"
+	"github.com/gobuffalo/genny/gogen"
 	"github.com/gobuffalo/logger"
 	"github.com/gobuffalo/meta"
 	"github.com/gobuffalo/packr/v2/plog"

diff --git a/buffalo/cmd/plugins/generate.go b/buffalo/cmd/plugins/generate.go
@@ -10,7 +10,7 @@ import (
 	"github.com/gobuffalo/buffalo/genny/plugins/plugin/with"
 	"github.com/gobuffalo/envy"
 	"github.com/gobuffalo/genny"
-	"github.com/gobuffalo/gogen"
+	"github.com/gobuffalo/genny/gogen"
 	"github.com/gobuffalo/licenser/genny/licenser"
 	"github.com/gobuffalo/logger"
 	"github.com/pkg/errors"

diff --git a/context.go b/context.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/gobuffalo/buffalo/binding"
 	"github.com/gobuffalo/buffalo/render"
-	"github.com/gobuffalo/x/httpx"
+	"github.com/gobuffalo/buffalo/internal/httpx"
 	"github.com/gorilla/mux"
 )
 

diff --git a/errors.go b/errors.go
@@ -9,10 +9,10 @@ import (
 	"sort"
 	"strings"
 
+	"github.com/gobuffalo/buffalo/internal/defaults"
+	"github.com/gobuffalo/buffalo/internal/httpx"
 	"github.com/gobuffalo/events"
 	"github.com/gobuffalo/plush"
-	"github.com/gobuffalo/x/defaults"
-	"github.com/gobuffalo/x/httpx"
 	"github.com/pkg/errors"
 )
 

diff --git a/genny/actions/actions.go b/genny/actions/actions.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/gobuffalo/flect/name"
 	"github.com/gobuffalo/genny"
-	"github.com/gobuffalo/gogen"
+	"github.com/gobuffalo/genny/gogen"
 	"github.com/gobuffalo/packr/v2"
 )
 

diff --git a/genny/assets/standard/standard.go b/genny/assets/standard/standard.go
@@ -5,7 +5,7 @@ import (
 	"text/template"
 
 	"github.com/gobuffalo/genny"
-	"github.com/gobuffalo/gogen"
+	"github.com/gobuffalo/genny/gogen"
 	"github.com/gobuffalo/packr/v2"
 )
 

diff --git a/genny/assets/webpack/webpack.go b/genny/assets/webpack/webpack.go
@@ -8,7 +8,7 @@ import (
 	"errors"
 
 	"github.com/gobuffalo/genny"
-	"github.com/gobuffalo/gogen"
+	"github.com/gobuffalo/genny/gogen"
 	"github.com/gobuffalo/packr/v2"
 )
 

diff --git a/genny/build/bin.go b/genny/build/bin.go
@@ -6,7 +6,7 @@ import (
 	"strings"
 
 	"github.com/gobuffalo/genny"
-	"github.com/gobuffalo/gogen/gomods"
+	"github.com/gobuffalo/genny/gogen/gomods"
 )
 
 func buildCmd(opts *Options) (*exec.Cmd, error) {

diff --git a/genny/build/bin_test.go b/genny/build/bin_test.go
@@ -7,7 +7,7 @@ import (
 	"testing"
 
 	"github.com/gobuffalo/envy"
-	"github.com/gobuffalo/gogen/gomods"
+	"github.com/gobuffalo/genny/gogen/gomods"
 	"github.com/gobuffalo/meta"
 	"github.com/stretchr/testify/require"
 )

diff --git a/genny/build/build.go b/genny/build/build.go
@@ -7,10 +7,10 @@ import (
 
 	"github.com/gobuffalo/events"
 	"github.com/gobuffalo/genny"
+	"github.com/gobuffalo/genny/plushgen"
 	"github.com/gobuffalo/packr/v2"
 	"github.com/gobuffalo/packr/v2/jam"
 	"github.com/gobuffalo/plush"
-	"github.com/gobuffalo/plushgen"
 )
 
 // New generator for building a Buffalo application

diff --git a/genny/build/build_deps.go b/genny/build/build_deps.go
@@ -1,10 +1,10 @@
 package build
 
 import (
-	"github.com/gobuffalo/depgen"
+	"github.com/gobuffalo/genny/depgen"
 	"github.com/gobuffalo/envy"
 	"github.com/gobuffalo/genny"
-	"github.com/gobuffalo/gogen"
+	"github.com/gobuffalo/genny/gogen"
 )
 
 func buildDeps(opts *Options) (*genny.Generator, error) {

diff --git a/genny/ci/ci.go b/genny/ci/ci.go
@@ -5,7 +5,7 @@ import (
 	"html/template"
 
 	"github.com/gobuffalo/genny"
-	"github.com/gobuffalo/gogen"
+	"github.com/gobuffalo/genny/gogen"
 	"github.com/gobuffalo/packr/v2"
 )
 

diff --git a/genny/grift/grift.go b/genny/grift/grift.go
@@ -5,7 +5,7 @@ import (
 	"text/template"
 
 	"github.com/gobuffalo/genny"
-	"github.com/gobuffalo/gogen"
+	"github.com/gobuffalo/genny/gogen"
 )
 
 // New generator to create a grift task

diff --git a/genny/mail/mail.go b/genny/mail/mail.go
@@ -4,7 +4,7 @@ import (
 	"text/template"
 
 	"github.com/gobuffalo/genny"
-	"github.com/gobuffalo/gogen"
+	"github.com/gobuffalo/genny/gogen"
 	"github.com/gobuffalo/packr/v2"
 )
 

diff --git a/genny/newapp/api/api.go b/genny/newapp/api/api.go
@@ -5,8 +5,8 @@ import (
 
 	"github.com/gobuffalo/buffalo/genny/newapp/core"
 	"github.com/gobuffalo/genny"
-	"github.com/gobuffalo/gogen"
-	"github.com/gobuffalo/gogen/gomods"
+	"github.com/gobuffalo/genny/gogen"
+	"github.com/gobuffalo/genny/gogen/gomods"
 	"github.com/gobuffalo/packr/v2"
 )
 

diff --git a/genny/newapp/core/core.go b/genny/newapp/core/core.go
@@ -8,10 +8,10 @@ import (
 	"github.com/gobuffalo/buffalo/genny/refresh"
 	"github.com/gobuffalo/buffalo/plugins/plugdeps"
 	"github.com/gobuffalo/buffalo/runtime"
-	"github.com/gobuffalo/depgen"
+	"github.com/gobuffalo/genny/depgen"
 	"github.com/gobuffalo/genny"
-	"github.com/gobuffalo/gogen"
-	"github.com/gobuffalo/gogen/gomods"
+	"github.com/gobuffalo/genny/gogen"
+	"github.com/gobuffalo/genny/gogen/gomods"
 	"github.com/gobuffalo/meta"
 	"github.com/pkg/errors"
 )

diff --git a/genny/newapp/core/root.go b/genny/newapp/core/root.go
@@ -7,7 +7,7 @@ import (
 	"github.com/BurntSushi/toml"
 	"github.com/gobuffalo/envy"
 	"github.com/gobuffalo/genny"
-	"github.com/gobuffalo/gogen"
+	"github.com/gobuffalo/genny/gogen"
 	"github.com/gobuffalo/packr/v2"
 )
 

diff --git a/genny/newapp/web/web.go b/genny/newapp/web/web.go
@@ -7,8 +7,8 @@ import (
 	"github.com/gobuffalo/buffalo/genny/assets/webpack"
 	"github.com/gobuffalo/buffalo/genny/newapp/core"
 	"github.com/gobuffalo/genny"
-	"github.com/gobuffalo/gogen"
-	"github.com/gobuffalo/gogen/gomods"
+	"github.com/gobuffalo/genny/gogen"
+	"github.com/gobuffalo/genny/gogen/gomods"
 	"github.com/gobuffalo/packr/v2"
 )
 

diff --git a/genny/plugins/install/install.go b/genny/plugins/install/install.go
@@ -8,7 +8,7 @@ import (
 	"github.com/gobuffalo/buffalo/genny/add"
 	"github.com/gobuffalo/buffalo/plugins/plugdeps"
 	"github.com/gobuffalo/genny"
-	"github.com/gobuffalo/gogen"
+	"github.com/gobuffalo/genny/gogen"
 	"github.com/pkg/errors"
 )
 

diff --git a/genny/plugins/plugin/plugin.go b/genny/plugins/plugin/plugin.go
@@ -4,10 +4,10 @@ import (
 	"path/filepath"
 
 	"github.com/gobuffalo/genny"
+	"github.com/gobuffalo/genny/plushgen"
 	"github.com/gobuffalo/licenser/genny/licenser"
 	"github.com/gobuffalo/packr/v2"
 	"github.com/gobuffalo/plush"
-	"github.com/gobuffalo/plushgen"
 	"github.com/gobuffalo/release/genny/initgen"
 	"github.com/gobuffalo/release/genny/makefile"
 	"github.com/pkg/errors"

diff --git a/genny/plugins/plugin/plugin_test.go b/genny/plugins/plugin/plugin_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/gobuffalo/genny/gentest"
-	"github.com/gobuffalo/gogen/gomods"
+	"github.com/gobuffalo/genny/gogen/gomods"
 	"github.com/stretchr/testify/require"
 )
 

diff --git a/genny/plugins/plugin/with/generate.go b/genny/plugins/plugin/with/generate.go
@@ -7,9 +7,9 @@ import (
 	"github.com/gobuffalo/buffalo/genny/plugins/plugin"
 	"github.com/gobuffalo/genny"
 	"github.com/gobuffalo/genny/genny/new"
+	"github.com/gobuffalo/genny/plushgen"
 	"github.com/gobuffalo/packr/v2"
 	"github.com/gobuffalo/plush"
-	"github.com/gobuffalo/plushgen"
 	"github.com/pkg/errors"
 )
 

diff --git a/genny/plugins/plugin/with/generate_test.go b/genny/plugins/plugin/with/generate_test.go
@@ -7,7 +7,7 @@ import (
 	"github.com/gobuffalo/buffalo/genny/plugins/plugin"
 	"github.com/gobuffalo/genny"
 	"github.com/gobuffalo/genny/gentest"
-	"github.com/gobuffalo/gogen/gomods"
+	"github.com/gobuffalo/genny/gogen/gomods"
 	"github.com/gobuffalo/packr/v2"
 	"github.com/stretchr/testify/require"
 )

diff --git a/genny/refresh/refresh.go b/genny/refresh/refresh.go
@@ -2,9 +2,9 @@ package refresh
 
 import (
 	"github.com/gobuffalo/genny"
+	"github.com/gobuffalo/genny/plushgen"
 	"github.com/gobuffalo/packr/v2"
 	"github.com/gobuffalo/plush"
-	"github.com/gobuffalo/plushgen"
 )
 
 // New generator to generate refresh templates

diff --git a/genny/resource/actions.go b/genny/resource/actions.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/gobuffalo/flect/name"
 	"github.com/gobuffalo/genny"
-	"github.com/gobuffalo/gogen"
+	"github.com/gobuffalo/genny/gogen"
 )
 
 func addResource(pres presenter) genny.RunFn {

diff --git a/genny/resource/models.go b/genny/resource/models.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/gobuffalo/flect/name"
 	"github.com/gobuffalo/genny"
-	"github.com/gobuffalo/gogen"
+	"github.com/gobuffalo/genny/gogen"
 )
 
 func modelCommand(model name.Ident, opts *Options) *exec.Cmd {

diff --git a/genny/resource/resource.go b/genny/resource/resource.go
@@ -6,7 +6,7 @@ import (
 	"github.com/gobuffalo/flect"
 	"github.com/gobuffalo/flect/name"
 	"github.com/gobuffalo/genny"
-	"github.com/gobuffalo/gogen"
+	"github.com/gobuffalo/genny/gogen"
 	"github.com/gobuffalo/packd"
 	"github.com/gobuffalo/packr/v2"
 )

diff --git a/go.mod b/go.mod
@@ -10,14 +10,12 @@ require (
 	github.com/gobuffalo/buffalo-docker v1.1.0
 	github.com/gobuffalo/buffalo-pop v1.14.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.9.1 // indirect
 	github.com/gobuffalo/flect v0.1.5
 	github.com/gobuffalo/genny v0.3.0
 	github.com/gobuffalo/github_flavored_markdown v1.1.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
@@ -27,13 +25,12 @@ require (
 	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.2
 	github.com/gobuffalo/pop v4.11.1+incompatible
 	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-20190614162758-d80e318e1bb4
+	github.com/gobuffalo/x v0.0.0-20190614162758-d80e318e1bb4 // indirect
 	github.com/gorilla/mux v1.7.2
 	github.com/gorilla/sessions v1.1.3
 	github.com/karrick/godirwalk v1.10.12
@@ -50,7 +47,6 @@ 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-20190621222207-cc06ce4a13d4
 	golang.org/x/sync v0.0.0-20190423024810-112230192c58
 	golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac
 	gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc

diff --git a/go.sum b/go.sum
@@ -783,9 +783,8 @@ golang.org/x/crypto v0.0.0-20190403202508-8e1b8d32e692/go.mod h1:WFFai1msRO1wXaE
 golang.org/x/crypto v0.0.0-20190404164418-38d8ce5564a5/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE=
 golang.org/x/crypto v0.0.0-20190422162423-af44ce270edf/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE=
 golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8 h1:1wopBVtVdWnn03fZelqdXTqk7U7zPQCb+T4rbU9ZEoU=
 golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20190621222207-cc06ce4a13d4 h1:ydJNl0ENAG67pFbB+9tfhiL2pYqLhfoaZFw/cjLhY4A=
-golang.org/x/crypto v0.0.0-20190621222207-cc06ce4a13d4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=