diff --git a/SHOULDERS.md b/SHOULDERS.md index e1d186271..bd12ff14c 100644 --- a/SHOULDERS.md +++ b/SHOULDERS.md @@ -95,6 +95,8 @@ Thank you to the following **GIANTS**: * [github.com/gobuffalo/pop/nulls](https://godoc.org/github.com/gobuffalo/pop/nulls) +* [github.com/gobuffalo/syncx](https://godoc.org/github.com/gobuffalo/syncx) + * [github.com/gobuffalo/tags](https://godoc.org/github.com/gobuffalo/tags) * [github.com/gobuffalo/tags/form](https://godoc.org/github.com/gobuffalo/tags/form) @@ -167,10 +169,6 @@ Thank you to the following **GIANTS**: * [github.com/markbates/sigtx](https://godoc.org/github.com/markbates/sigtx) -* [github.com/mattn/go-colorable](https://godoc.org/github.com/mattn/go-colorable) - -* [github.com/mattn/go-isatty](https://godoc.org/github.com/mattn/go-isatty) - * [github.com/microcosm-cc/bluemonday](https://godoc.org/github.com/microcosm-cc/bluemonday) * [github.com/mitchellh/go-homedir](https://godoc.org/github.com/mitchellh/go-homedir) @@ -199,8 +197,6 @@ Thank you to the following **GIANTS**: * [golang.org/x/crypto/ssh/terminal](https://godoc.org/golang.org/x/crypto/ssh/terminal) -* [golang.org/x/net/context](https://godoc.org/golang.org/x/net/context) - * [golang.org/x/net/html](https://godoc.org/golang.org/x/net/html) * [golang.org/x/net/html/atom](https://godoc.org/golang.org/x/net/html/atom) diff --git a/buffalo/cmd/fix/npm.go b/buffalo/cmd/fix/npm.go index add2501a7..bf9765fef 100644 --- a/buffalo/cmd/fix/npm.go +++ b/buffalo/cmd/fix/npm.go @@ -3,13 +3,12 @@ package fix import ( "bytes" "fmt" + "html/template" "io/ioutil" "os" "os/exec" "path/filepath" - "html/template" - "github.com/gobuffalo/buffalo/generators/assets/webpack" "github.com/gobuffalo/buffalo/generators/newapp" "github.com/pkg/errors" @@ -33,7 +32,7 @@ func PackageJSONCheck(r *Runner) error { box := webpack.TemplateBox - f, err := box.MustString("package.json.tmpl") + f, err := box.FindString("package.json.tmpl") if err != nil { return errors.WithStack(err) } diff --git a/buffalo/cmd/fix/webpack.go b/buffalo/cmd/fix/webpack.go index 54ec1c16c..8ca68d605 100644 --- a/buffalo/cmd/fix/webpack.go +++ b/buffalo/cmd/fix/webpack.go @@ -3,11 +3,10 @@ package fix import ( "bytes" "fmt" + "html/template" "io/ioutil" "os" - "html/template" - "github.com/gobuffalo/buffalo/generators/assets/webpack" "github.com/gobuffalo/buffalo/generators/newapp" "github.com/pkg/errors" @@ -31,7 +30,7 @@ func WebpackCheck(r *Runner) error { box := webpack.TemplateBox - f, err := box.MustString("webpack.config.js.tmpl") + f, err := box.FindString("webpack.config.js.tmpl") if err != nil { return errors.WithStack(err) } diff --git a/generators/resource/resource.go b/generators/resource/resource.go index 02c0125c9..6bc7b51e7 100644 --- a/generators/resource/resource.go +++ b/generators/resource/resource.go @@ -6,12 +6,11 @@ import ( "path/filepath" "strings" - "github.com/pkg/errors" - "github.com/gobuffalo/buffalo/generators" "github.com/gobuffalo/genny" "github.com/gobuffalo/makr" "github.com/gobuffalo/packr" + "github.com/pkg/errors" ) // Run generates a new actions/resource file and a stub test. diff --git a/genny/build/a_build-packr.go b/genny/build/a_build-packr.go index 063aa9ce7..009d641e3 100644 --- a/genny/build/a_build-packr.go +++ b/genny/build/a_build-packr.go @@ -7,7 +7,7 @@ import "github.com/gobuffalo/packr" // You can use the "packr clean" command to clean up this, // and any other packr generated files. func init() { - packr.PackJSONBytes("../build/templates", "a/a.go.plush", "\"cGFja2FnZSBhCgppbXBvcnQgKAogICJsb2ciCiAgInN0cmluZ3MiCiAgImdpdGh1Yi5jb20vZ29idWZmYWxvL3BvcCIKICAiZ2l0aHViLmNvbS9tYXJrYmF0ZXMvaW5mbGVjdCIKICAiZ2l0aHViLmNvbS9nb2J1ZmZhbG8vcGFja3IiCiAgPCU9IGlmIChvcHRzLkVudmlyb25tZW50ICE9ICJkZXZlbG9wbWVudCIpIHsgJT4KICAiZ2l0aHViLmNvbS9nb2J1ZmZhbG8vZW52eSIKICA8JSB9ICU+CikKCmZ1bmMgaW5pdCgpIHsKICA8JT0gaWYgKG9wdHMuRW52aXJvbm1lbnQgIT0gImRldmVsb3BtZW50IikgeyAlPgogIGlmIGVyciA6PSBlbnZ5Lk11c3RTZXQoIkdPX0VOViIsICI8JT0gb3B0cy5FbnZpcm9ubWVudCAlPiIpOyBlcnIgIT0gbmlsIHsKICAgICAgbG9nLkZhdGFsKGVycikKICB9CiAgPCUgfSAlPgoKICBkcm9wRGF0YWJhc2VZbWwoKQoKICBib3ggOj0gcGFja3IuTmV3Qm94KCIuLyIpCiAgaWYgYm94LkhhcygiaW5mbGVjdGlvbnMuanNvbiIpIHsKICAgIHIgOj0gc3RyaW5ncy5OZXdSZWFkZXIoYm94LlN0cmluZygiaW5mbGVjdGlvbnMuanNvbiIpKQogICAgZXJyIDo9IGluZmxlY3QuTG9hZFJlYWRlcihyKQogICAgaWYgZXJyICE9IG5pbCB7CiAgICAgIGxvZy5GYXRhbChlcnIpCiAgICB9CiAgfQp9CgpmdW5jIGRyb3BEYXRhYmFzZVltbCgpIHsKICBpZiBEQl9DT05GSUcgIT0gIiIgewogICAgciA6PSBzdHJpbmdzLk5ld1JlYWRlcihEQl9DT05GSUcpCiAgICBlcnIgOj0gcG9wLkxvYWRGcm9tKHIpCiAgICBpZiBlcnIgIT0gbmlsIHsKICAgICAgbG9nLkZhdGFsKGVycikKICAgIH0KICB9Cn0K\"") - packr.PackJSONBytes("../build/templates", "buffalo_build_main.go.plush", "\"cGFja2FnZSBtYWluCgppbXBvcnQgKAogICJmbXQiCiAgImxvZyIKICAib3MiCiAgIm9zL2V4ZWMiCiAgInRpbWUiCgogICJnaXRodWIuY29tL21hcmtiYXRlcy9ncmlmdC9ncmlmdCIKICAiZ2l0aHViLmNvbS9nb2J1ZmZhbG8vYnVmZmFsby9ydW50aW1lIgogIF8gIjwlPSBvcHRzLlBhY2thZ2VQa2cgJT4vYSIKICBfICI8JT0gb3B0cy5BY3Rpb25zUGtnICU+IgogIDwlPSBpZiAob3B0cy5XaXRoUG9wKSB7ICU+CiAgImdpdGh1Yi5jb20vZ29idWZmYWxvL3BhY2tyIgogICJnaXRodWIuY29tL2dvYnVmZmFsby9wb3AiCiAgIjwlPSBvcHRzLk1vZGVsc1BrZyAlPiIKICA8JSB9ICU+CiAgPCU9IGlmIChvcHRzLldpdGhHcmlmdHMpIHsgJT4KICBfICI8JT0gb3B0cy5HcmlmdHNQa2cgJT4iCiAgPCUgfSAlPgopCgpmdW5jIGluaXQoKSB7CnQsIGVyciA6PSB0aW1lLlBhcnNlKHRpbWUuUkZDMzMzOSwgIjwlPSBidWlsZFRpbWUgJT4iKQogIGlmIGVyciAhPSBuaWwgewogICAgZm10LlByaW50bG4oZXJyKQogIH0KICBydW50aW1lLlNldEJ1aWxkKHJ1bnRpbWUuQnVpbGRJbmZvewogIFZlcnNpb246ICI8JT0gYnVpbGRWZXJzaW9uICU+IiwKICAgIFRpbWU6IHQsCiAgfSkKfQoKZnVuYyBtYWluKCkgewogIGFyZ3MgOj0gb3MuQXJncwogIGlmIGxlbihhcmdzKSA9PSAxIHsKICAgIG9yaWdpbmFsTWFpbigpCiAgICByZXR1cm4KICB9CiAgYyA6PSBhcmdzWzFdCiAgc3dpdGNoIGMgewogIDwlPSBpZiAob3B0cy5XaXRoUG9wKSB7ICU+CiAgY2FzZSAibWlncmF0ZSI6CiAgICBtaWdyYXRlKCkKICA8JSB9ICU+CiAgY2FzZSAidmVyc2lvbiI6CiAgICBwcmludFZlcnNpb24oKQogIGNhc2UgInRhc2siLCAidCIsICJ0YXNrcyI6CiAgICBpZiBsZW4oYXJncykgPCAzIHsKICAgICAgbG9nLkZhdGFsKCJub3QgZW5vdWdoIGFyZ3VtZW50cyBwYXNzZWQgdG8gdGFzayIpCiAgICB9CiAgICBjIDo9IGdyaWZ0Lk5ld0NvbnRleHQoYXJnc1syXSkKICAgIGlmIGxlbihhcmdzKSA+IDIgewogICAgICBjLkFyZ3MgPSBhcmdzWzM6XQogICAgfQogICAgZXJyIDo9IGdyaWZ0LlJ1bihhcmdzWzJdLCBjKQogICAgaWYgZXJyICE9IG5pbCB7CiAgICAgIGxvZy5GYXRhbChlcnIpCiAgICB9CiAgZGVmYXVsdDoKICAgIGlmIF8sIGVyciA6PSBleGVjLkxvb2tQYXRoKCJidWZmYWxvIik7IGVyciAhPSBuaWwgewogICAgICBpZiBlcnIgIT0gbmlsIHsKICAgICAgICBsb2cuRmF0YWwoZXJyKQogICAgICB9CiAgICB9CiAgICBjbWQgOj0gZXhlYy5Db21tYW5kKCJidWZmYWxvIiwgYXJnc1sxOl0uLi4pCiAgICBjbWQuU3RkaW4gPSBvcy5TdGRpbgogICAgY21kLlN0ZG91dCA9IG9zLlN0ZG91dAogICAgY21kLlN0ZGVyciA9IG9zLlN0ZGVycgogICAgZXJyIDo9IGNtZC5SdW4oKQogICAgaWYgZXJyICE9IG5pbCB7CiAgICAgIGxvZy5GYXRhbChlcnIpCiAgICB9CiAgfQp9CgpmdW5jIHByaW50VmVyc2lvbigpIHsKICBmbXQuUHJpbnRmKCI8JT0gb3B0cy5OYW1lLlRpdGxlKCkgJT4gdmVyc2lvbiAlc1xuIiwgcnVudGltZS5CdWlsZCgpKQp9Cgo8JT0gaWYgKG9wdHMuV2l0aFBvcCkgeyAlPgpmdW5jIG1pZ3JhdGUoKSB7CiAgYm94LCBlcnIgOj0gcG9wLk5ld01pZ3JhdGlvbkJveChwYWNrci5OZXdCb3goIi4vbWlncmF0aW9ucyIpLCBtb2RlbHMuREIpCiAgaWYgZXJyICE9IG5pbCB7CiAgICBsb2cuRmF0YWxmKCJGYWlsZWQgdG8gdW5wYWNrIG1pZ3JhdGlvbnM6ICVzIiwgZXJyKQogIH0KICBlcnIgPSBib3guVXAoKQogIGlmIGVyciAhPSBuaWwgewogICAgbG9nLkZhdGFsZigiRmFpbGVkIHRvIHJ1biBtaWdyYXRpb25zOiAlcyIsIGVycikKICB9Cn0KPCUgfSAlPgo=\"") - packr.PackJSONBytes("../build/templates", "migrations/-dot-pop-tmp.md", "\"aGkhIGknbSBqdXN0IGhlcmUgdG8gZW5zdXJlIHRoYXQgYGJ1ZmZhbG8gYnVpbGRgIGhhcyBhIGAuL21pZ3JhdGlvbnNgIGlmIHRoZSBhcHBsaWNhdGlvbiBoYXMgcG9wLgoKdW5mb3J0dW5hdGVseSwgaSdtIGp1c3QgdGVtcG9yYXJ5LCBzbyBhcyBtdWNoIGFzIGkgd291bGQgbG92ZSB0byBtZWV0IHlvdSwgYW5kIHRydXN0IG1lLCBpIHJlYWxseSB3b3VsZCAoaSd2ZSBoZWFyZCBnb29kIHRoaW5ncyksIGkgaGF2ZSB0byBiZSBnb2luZy4gOigKCmlmIHlvdSdyZSBzZWVpbmcgbWUgaW4geW91ciBhcHBsaWNhdGlvbiwgdGhlbiBzb21ldGhpbmcgaG9ycmlibHksIGhvcnJpYmx5IHdyb25nIGhhcHBlbmVkIGR1cmluZyBgYnVmZmFsbyBidWlsZGAsIG9yIHlvdSByYW4gaXQgd2l0aCB0aGUgYC1kYCBmbGFnLiA6KQoKcmVnYXJkbGVzcywgc2hvdWxkIHlvdSBjb21lIGFjcm9zcyBtZSBsYXlpbmcgYWJvdXQsIGZlZWwgZnJlZSBhbmQgZGVsZXRlIG1lLiBpdCdzIG9rLiBpdCB3b24ndCBodXJ0LiB3ZWxsLCBpdCBtaWdodCBpZiB5b3UgdXNlIHRoZSBgLWZgIGZsYWcsIGkgZG9uJ3Qga25vdy4KCmknbGwgbGVhdmUgeW91IHdpdGggdGhlc2UgZmFtb3VzIHBhcnRpbmcgd29yZHM6Cgo+PiBTbyBsb25nLCBhbmQgdGhhbmtzIGZvciBhbGwgdGhlIGZpc2gK\"") + packr.PackJSONBytes("../build/templates", "a/a.go.plush", "\"H4sIAAAAAAAA/5xRUYsTMRB+z6+YCxQSkOy7uvdw3vUUtAULgk8lu5tdY7OZkGRrpex/l2SDqNUKzUuSmfm++b4ZJ9uDHBRIQvTo0EdgBIAaHGi6Q/TaDiG/Bx2/TI1ocawGbKa+lwYrh+7P5Cj9oZFRhUrb3qg2XkHL9uBT+vWqBt0DQxeDeLJH7dGOyka4q4F26qgMuvSnHM6wuv8nobLH7wsfzKmOE9JPtgVtdWQczje10j0o7+FlDYlefJhC3KnI6PN2/7T5RF8ATZwXfKt7yl9l5F0NVpvcPR2Dg1jLKA1T3nMCMP+imAB0Ht2jjLKRQX0eDeMp2OApKcgTExv17QFPjIqK8kVggyfxVgZGy8w12iC+BrSUl77ZQNlnIvioZKc8S8Bdjv4NyzO0uC9p8R5lV9B+KSgT+p/PxelM5rKVC6MZqnt4fNi/2W7W757zUuh1Bz+LfxPr0GWha4/jzTJ/BAAA///A1D2JHgMAAA==\"") + packr.PackJSONBytes("../build/templates", "buffalo_build_main.go.plush", "\"H4sIAAAAAAAA/5xU32vbMBB+919xEwRsMAptnpY1gbajY7CW0HbbQxeK4siOiCUZ6dwGSv73oR92kqYtbC/Wjzt9393nu2tYsWYVB8mEShIhG20Q0gSAlBKJW2td+VXbuAz5hhd+j0JykrhdJXDVLmih5VAys14w5HZYGVFi+JJXTpVetGXJaj3sVtOqAAfwCORsMAHdoKWzEN9sXcFgOmSvzecFCq1sMDujs4gSUm/9LXA1000GLzCYvhuBk8C8H2CjG2/sOa/1ktcHlLAN+Efk31zutuffjzyYjlGyJClbVYBQAtMMXhLMgRsD4wk4feiMGctTv729uhyNRp/zgLpoRb28F5I7wCwBF4l7+GkCStTwkgAAlBLpzAiFtUq5Mc5tmwBE8ekdxwsHk3YX/vRdldo9/8WNFVqN9/jilaPMPYELYAzoDtss2cZkXHX5ZACYqaxLRlt6biob4qy5Sp0hg8kETmKs2ohKKFZf+8f+ynBsjYpBFw7GvXo4mScA9llgsYLCv/6wDApmORApKsOQk7FHjifPs/uhwfMpJBk9GydfzNu7Bydkdk1yIOg/zK5t9D9I7wxGMTuAWlf0iiGrU6I0Ale6rVYuoVZyhRYaZi1fAmrw2EGBrf/61H1j0Rv+fKkV8g16iofTeXZMO4XTnrbwukOUbjSe7+HGQgvIt63qIHMoetSjmtrPJNZUwFvykrU19jI89pXsJgj9ofV6xnCVkthqJPvyFvrbnG+ydnlEleSyJ7vUUjK13HHlsXTGc0pp1vnTO1wKBb48/XbfoFvsLbrFfZMLsDNxY/bFdB5Oyv8QcNs30GHR+Xd9K5fpbqrcMMnpvcCapxkMpvDU9af9o0gOB22dZr5BP2iV0LtdZ3jWhd70f7HRjSu/a+8gtLrQm9QPU3frDoQOZWe0JMtB+tFJv168N596IcqUXDFRh/pvlYOFHdYYBpb4OLoJFn7AQm/ozyb9N3TTqg+gt0k3Dv4GAAD//wtAi1UrBwAA\"") + packr.PackJSONBytes("../build/templates", "migrations/-dot-pop-tmp.md", "\"H4sIAAAAAAAA/1xRTW7cOgze6xTfWzkB/Nx9FrlEL2DOiLLYkUSDkmL49oU8E7ToygTN71dR/oNMGb96bYhsjKbgUvuYIjWstx4CJcWtS/IrIlUQ1uVHls2oiZa6QgJaZNC+J7lfy+tu131xrpeg1nqhxumc/6g1zrsa2TmjKqgi93scX8GhPXkk/brsZOaGU/sMKh7NBjjzDIExpXS+zt9k+mJEJvPYVD1alLLV93EY6Ul1Y2wqZVvw8eachEE7GaMyS9mQGVLGzv7OMo9wBVUzX5SIaia3EeZ7wmE6ftC+c2EP320c/lPeDLXBDqMCaTikxau49X+/IiQavt6dM97IfOJaZ9R4hRuou2YG3U1rHU4TnUODbtrbjMCcEIz5Kslz4sbIvEDaVKGP5RLUMjXEbm3BwSnNY5lliw3PLtArvxyFp6PRnr9gj6LH4pxMKSHxKHQAvjNURqCsvWIna8PYoebrh3Ofn/ipSFq21wNGKo+KoAZK6VILUqP7HQAA///THlhKiwIAAA==\"") } diff --git a/go.mod b/go.mod index d7d78f9c1..fd3a313be 100644 --- a/go.mod +++ b/go.mod @@ -6,20 +6,20 @@ require ( github.com/fatih/color v1.7.0 github.com/go-sql-driver/mysql v1.4.1 // indirect github.com/gobuffalo/buffalo-docker v1.0.5 - github.com/gobuffalo/buffalo-plugins v1.7.0 + github.com/gobuffalo/buffalo-plugins v1.7.2 github.com/gobuffalo/envy v1.6.9 github.com/gobuffalo/events v1.1.8 github.com/gobuffalo/fizz v1.1.3 // indirect github.com/gobuffalo/flect v0.0.0-20181114183036-47375f6d8328 github.com/gobuffalo/genny v0.0.0-20181119162812-e8ff4adce8bb github.com/gobuffalo/github_flavored_markdown v1.0.7 - github.com/gobuffalo/httptest v1.0.4 + github.com/gobuffalo/httptest v1.0.5 github.com/gobuffalo/logger v0.0.0-20181117211126-8e9b89b7c264 github.com/gobuffalo/makr v1.1.5 - github.com/gobuffalo/meta v0.0.0-20181116202903-8850e47774f5 - github.com/gobuffalo/packd v0.0.0-20181114190715-f25c5d2471d7 - github.com/gobuffalo/packr v1.21.3 - github.com/gobuffalo/plush v3.7.22+incompatible + github.com/gobuffalo/meta v0.0.0-20181127070345-0d7e59dd540b + github.com/gobuffalo/packd v0.0.0-20181124090624-311c6248e5fb + github.com/gobuffalo/packr v1.21.5 + github.com/gobuffalo/plush v3.7.23+incompatible github.com/gobuffalo/pop v4.9.2+incompatible github.com/gobuffalo/tags v2.0.11+incompatible github.com/gobuffalo/x v0.0.0-20181110221217-14085ca3e1a9 @@ -41,10 +41,9 @@ require ( github.com/spf13/pflag v1.0.3 github.com/spf13/viper v1.2.1 github.com/stretchr/testify v1.2.2 - golang.org/x/crypto v0.0.0-20181112202954-3d3f9f413869 + golang.org/x/crypto v0.0.0-20181127143415-eb0de9b17e85 golang.org/x/net v0.0.0-20181114220301-adae6a3d119a // indirect golang.org/x/sync v0.0.0-20181108010431-42b317875d0f - golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8 // indirect - golang.org/x/tools v0.0.0-20181120173833-b6bf29589316 + golang.org/x/tools v0.0.0-20181122213734-04b5d21e00f1 gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc ) diff --git a/go.sum b/go.sum index 24d1c1a61..29749e99c 100644 --- a/go.sum +++ b/go.sum @@ -1,6 +1,5 @@ github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/Masterminds/semver v1.4.2 h1:WBLTQ37jOCzSLtXNdoo8bNM8876KhNqOKvrlGITgsTc= github.com/Masterminds/semver v1.4.2/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y= github.com/ajg/form v0.0.0-20160822230020-523a5da1a92f h1:zvClvFQwU++UpIUBGC8YmDlfhUrweEy1R1Fj1gu5iIM= github.com/ajg/form v0.0.0-20160822230020-523a5da1a92f/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY= @@ -46,8 +45,8 @@ github.com/gobuffalo/buffalo-plugins v1.6.6/go.mod h1:hSWAEkJyL9RENJlmanMivgnNkr github.com/gobuffalo/buffalo-plugins v1.6.7/go.mod h1:ZGZRkzz2PiKWHs0z7QsPBOTo2EpcGRArMEym6ghKYgk= github.com/gobuffalo/buffalo-plugins v1.6.9/go.mod h1:yYlYTrPdMCz+6/+UaXg5Jm4gN3xhsvsQ2ygVatZV5vw= github.com/gobuffalo/buffalo-plugins v1.6.11/go.mod h1:eAA6xJIL8OuynJZ8amXjRmHND6YiusVAaJdHDN1Lu8Q= -github.com/gobuffalo/buffalo-plugins v1.7.0 h1:7Ew81nKGu/yv2KZR8w6L0VCZrRpHOcOphhRnnf/nzRk= -github.com/gobuffalo/buffalo-plugins v1.7.0/go.mod h1:gixBU8giC1vlcLVQXU77+BqBw1luNglGr/Ypsa0R5+Q= +github.com/gobuffalo/buffalo-plugins v1.7.2 h1:W3YUz71m+P+nw/9Y9x2fbpChNKgd6D2lxgEKdyefQ4s= +github.com/gobuffalo/buffalo-plugins v1.7.2/go.mod h1:vEbx30cLFeeZ48gBA/rkhbqC2M/2JpsKs5CoESWhkPw= github.com/gobuffalo/buffalo-pop v1.0.5/go.mod h1:Fw/LfFDnSmB/vvQXPvcXEjzP98Tc+AudyNWUBWKCwQ8= github.com/gobuffalo/buffalo-pop v1.1.2/go.mod h1:czNLXcYbg5/fjr+uht0NyjZaQ0V2W23H1jzyORgCzQ4= github.com/gobuffalo/buffalo-pop v1.1.5/go.mod h1:H01JIg42XwOHS4gRMhSeDZqBovNVlfBUsVXckU617s4= @@ -105,13 +104,12 @@ github.com/gobuffalo/github_flavored_markdown v1.0.5/go.mod h1:U0643QShPF+OF2tJv github.com/gobuffalo/github_flavored_markdown v1.0.7 h1:Vjvz4wqOnviiLEfTh5bh270b3lhpJiwwQEWOWmHMwY8= github.com/gobuffalo/github_flavored_markdown v1.0.7/go.mod h1:w93Pd9Lz6LvyQXEG6DktTPHkOtCbr+arAD5mkwMzXLI= github.com/gobuffalo/httptest v1.0.2/go.mod h1:7T1IbSrg60ankme0aDLVnEY0h056g9M1/ZvpVThtB7E= -github.com/gobuffalo/httptest v1.0.4 h1:P0uKaPEjti1bbJmuBILE3QQ7iU1cS7oIkxVba5HbcVE= -github.com/gobuffalo/httptest v1.0.4/go.mod h1:7T1IbSrg60ankme0aDLVnEY0h056g9M1/ZvpVThtB7E= +github.com/gobuffalo/httptest v1.0.5 h1:52GpTZQ/+A1UNiahCYSIxVwPptx+xFeBOeaLU2SgEhI= +github.com/gobuffalo/httptest v1.0.5/go.mod h1:7T1IbSrg60ankme0aDLVnEY0h056g9M1/ZvpVThtB7E= github.com/gobuffalo/licenser v0.0.0-20180924033006-eae28e638a42/go.mod h1:Ubo90Np8gpsSZqNScZZkVXXAo5DGhTb+WYFIjlnog8w= github.com/gobuffalo/licenser v0.0.0-20181025145548-437d89de4f75/go.mod h1:x3lEpYxkRG/XtGCUNkio+6RZ/dlOvLzTI9M1auIwFcw= github.com/gobuffalo/licenser v0.0.0-20181027200154-58051a75da95/go.mod h1:BzhaaxGd1tq1+OLKObzgdCV9kqVhbTulxOpYbvMQWS0= github.com/gobuffalo/licenser v0.0.0-20181109171355-91a2a7aac9a7/go.mod h1:m+Ygox92pi9bdg+gVaycvqE8RVSjZp7mWw75+K5NPHk= -github.com/gobuffalo/licenser v0.0.0-20181116224424-1b7fd3f9cbb4 h1:9+T1CkwNBkuT2clVIx3zJ0tBoeOuaw/HnZ7W1anyLMw= github.com/gobuffalo/licenser v0.0.0-20181116224424-1b7fd3f9cbb4/go.mod h1:icHYfF2FVDi6CpI8BK9Sy1ChkSijz/0GNN7Qzzdk6JE= github.com/gobuffalo/logger v0.0.0-20181022175615-46cfb361fc27/go.mod h1:8sQkgyhWipz1mIctHF4jTxmJh1Vxhp7mP8IqbljgJZo= github.com/gobuffalo/logger v0.0.0-20181027144941-73d08d2bb969/go.mod h1:7uGg2duHKpWnN4+YmyKBdLXfhopkAdVM6H3nKbyFbz8= @@ -128,8 +126,9 @@ github.com/gobuffalo/meta v0.0.0-20181018155829-df62557efcd3/go.mod h1:XTTOhwMNr github.com/gobuffalo/meta v0.0.0-20181018192820-8c6cef77dab3/go.mod h1:E94EPzx9NERGCY69UWlcj6Hipf2uK/vnfrF4QD0plVE= github.com/gobuffalo/meta v0.0.0-20181025145500-3a985a084b0a/go.mod h1:YDAKBud2FP7NZdruCSlmTmDOZbVSa6bpK7LJ/A/nlKg= github.com/gobuffalo/meta v0.0.0-20181114191255-b130ebedd2f7/go.mod h1:K6cRZ29ozr4Btvsqkjvg5nDFTLOgTqf03KA70Ks0ypE= -github.com/gobuffalo/meta v0.0.0-20181116202903-8850e47774f5 h1:qnZhkaiC9drkU6CGWKnzEOGt1QX07+yU+9ZnCdqEhR0= github.com/gobuffalo/meta v0.0.0-20181116202903-8850e47774f5/go.mod h1:K6cRZ29ozr4Btvsqkjvg5nDFTLOgTqf03KA70Ks0ypE= +github.com/gobuffalo/meta v0.0.0-20181127070345-0d7e59dd540b h1:TP4reYa74tCqKmeisA9aULXzcb1fHIM3bi7PdoDxpuQ= +github.com/gobuffalo/meta v0.0.0-20181127070345-0d7e59dd540b/go.mod h1:RLO7tMvE0IAKAM8wny1aN12pvEKn7EtkBLkUZR00Qf8= github.com/gobuffalo/mw-basicauth v1.0.3/go.mod h1:dg7+ilMZOKnQFHDefUzUHufNyTswVUviCBgF244C1+0= github.com/gobuffalo/mw-basicauth v1.0.6/go.mod h1:RFyeGeDLZlVgp/eBflqu2eavFqyv0j0fVVP87WPYFwY= github.com/gobuffalo/mw-basicauth v1.0.7/go.mod h1:xJ9/OSiOWl+kZkjaSun62srODr3Cx8OB4AKr+G4FlS4= @@ -137,6 +136,7 @@ github.com/gobuffalo/mw-contenttype v0.0.0-20180802152300-74f5a47f4d56/go.mod h1 github.com/gobuffalo/mw-csrf v0.0.0-20180802151833-446ff26e108b/go.mod h1:sbGtb8DmDZuDUQoxjr8hG1ZbLtZboD9xsn6p77ppcHo= github.com/gobuffalo/mw-forcessl v0.0.0-20180802152810-73921ae7a130/go.mod h1:JvNHRj7bYNAMUr/5XMkZaDcw3jZhUZpsmzhd//FFWmQ= github.com/gobuffalo/mw-i18n v0.0.0-20180802152014-e3060b7e13d6/go.mod h1:91AQfukc52A6hdfIfkxzyr+kpVYDodgAeT5cjX1UIj4= +github.com/gobuffalo/mw-i18n v0.0.0-20181027200759-09e0c99be4d3 h1:ACN4mEXAmv7u1H8niLxZOzuKymMj5rvBmZqShrXOVf0= github.com/gobuffalo/mw-i18n v0.0.0-20181027200759-09e0c99be4d3/go.mod h1:1PpGPgqP8VsfUppgBA9FrTOXjI6X9gjqhh/8dmg48lg= github.com/gobuffalo/mw-paramlogger v0.0.0-20181005191442-d6ee392ec72e/go.mod h1:6OJr6VwSzgJMqWMj7TYmRUqzNe2LXu/W1rRW4MAz/ME= github.com/gobuffalo/mw-tokenauth v0.0.0-20181001105134-8545f626c189/go.mod h1:UqBF00IfKvd39ni5+yI5MLMjAf4gX7cDKN/26zDOD6c= @@ -149,8 +149,9 @@ github.com/gobuffalo/packd v0.0.0-20181031195726-c82734870264/go.mod h1:Yf2toFaI github.com/gobuffalo/packd v0.0.0-20181103221656-16c4ed88b296/go.mod h1:Yf2toFaISlyQrr5TfO3h6DB9pl9mZRmyvBGQb/aQ/pI= github.com/gobuffalo/packd v0.0.0-20181104210303-d376b15f8e96/go.mod h1:Yf2toFaISlyQrr5TfO3h6DB9pl9mZRmyvBGQb/aQ/pI= github.com/gobuffalo/packd v0.0.0-20181111195323-b2e760a5f0ff/go.mod h1:Yf2toFaISlyQrr5TfO3h6DB9pl9mZRmyvBGQb/aQ/pI= -github.com/gobuffalo/packd v0.0.0-20181114190715-f25c5d2471d7 h1:7AZMyDyRxIm2cbSXRvUEUJrankvMV1xcAOrrWUWp7yE= github.com/gobuffalo/packd v0.0.0-20181114190715-f25c5d2471d7/go.mod h1:Yf2toFaISlyQrr5TfO3h6DB9pl9mZRmyvBGQb/aQ/pI= +github.com/gobuffalo/packd v0.0.0-20181124090624-311c6248e5fb h1:039sqjIDVgXXcB5hOIKaSBL1kZpQj9u8WLXuu2xOcX8= +github.com/gobuffalo/packd v0.0.0-20181124090624-311c6248e5fb/go.mod h1:Foenia9ZvITEvG05ab6XpiD5EfBHPL8A6hush8SJ0o8= github.com/gobuffalo/packr v1.13.7/go.mod h1:KkinLIn/n6+3tVXMwg6KkNvWwVsrRAz4ph+jgpk3Z24= github.com/gobuffalo/packr v1.15.0/go.mod h1:t5gXzEhIviQwVlNx/+3SfS07GS+cZ2hn76WLzPp6MGI= github.com/gobuffalo/packr v1.15.1/go.mod h1:IeqicJ7jm8182yrVmNbM6PR4g79SjN9tZLH8KduZZwE= @@ -158,15 +159,17 @@ github.com/gobuffalo/packr v1.16.0/go.mod h1:Yx/lcR/7mDLXhuJSzsz2MauD/HUwSc+EK6o github.com/gobuffalo/packr v1.19.0/go.mod h1:MstrNkfCQhd5o+Ct4IJ0skWlxN8emOq8DsoT1G98VIU= github.com/gobuffalo/packr v1.20.0/go.mod h1:JDytk1t2gP+my1ig7iI4NcVaXr886+N0ecUga6884zw= github.com/gobuffalo/packr v1.21.0/go.mod h1:H00jGfj1qFKxscFJSw8wcL4hpQtPe1PfU2wa6sg/SR0= -github.com/gobuffalo/packr v1.21.3 h1:TJCUm5Kl/Ykl13kZ7KiJHATMtqEiOtQEubywPsAzt0U= -github.com/gobuffalo/packr v1.21.3/go.mod h1:IODzKNHqDtRH8Re8hDrLJeOZGJmY+66vmqb1kMgM69k= -github.com/gobuffalo/packr/v2 v2.0.0-rc.5 h1:85uvtUSjaZTsQ0o48kIi8hm8dQyt+BL9kxqNQ8Kp//w= +github.com/gobuffalo/packr v1.21.5 h1:wPOC4Cg5tGYDImw601x94a2d2PEa4KgVHzXMFR2WlBk= +github.com/gobuffalo/packr v1.21.5/go.mod h1:zCvDxrZzFmq5Xd7Jw4vaGe/OYwzuXnma31D2EbTHMWk= github.com/gobuffalo/packr/v2 v2.0.0-rc.5/go.mod h1:e6gmOfhf3KmT4zl2X/NDRSfBXk2oV4TXZ+NNOM0xwt8= +github.com/gobuffalo/packr/v2 v2.0.0-rc.7 h1:/a+itImnlv+KbdA2gIOVgQm/X7iWaVcLi6XOJsrjlK4= +github.com/gobuffalo/packr/v2 v2.0.0-rc.7/go.mod h1:BzhceHWfF3DMAkbPUONHYWs63uacCZxygFY1b4H9N2A= github.com/gobuffalo/plush v3.7.16+incompatible/go.mod h1:rQ4zdtUUyZNqULlc6bqd5scsPfLKfT0+TGMChgduDvI= github.com/gobuffalo/plush v3.7.20+incompatible/go.mod h1:rQ4zdtUUyZNqULlc6bqd5scsPfLKfT0+TGMChgduDvI= github.com/gobuffalo/plush v3.7.21+incompatible/go.mod h1:rQ4zdtUUyZNqULlc6bqd5scsPfLKfT0+TGMChgduDvI= -github.com/gobuffalo/plush v3.7.22+incompatible h1:SJxTrFxizR3wCxb7GOYf1ZUjo3mfAczK4B/FYROZg00= github.com/gobuffalo/plush v3.7.22+incompatible/go.mod h1:rQ4zdtUUyZNqULlc6bqd5scsPfLKfT0+TGMChgduDvI= +github.com/gobuffalo/plush v3.7.23+incompatible h1:URrgCIoxI/yOnUgTmFpyAyofFnbF0xOsmPZ8s+pdAOc= +github.com/gobuffalo/plush v3.7.23+incompatible/go.mod h1:rQ4zdtUUyZNqULlc6bqd5scsPfLKfT0+TGMChgduDvI= github.com/gobuffalo/pop v4.8.2+incompatible/go.mod h1:DwBz3SD5SsHpTZiTubcsFWcVDpJWGsxjVjMPnkiThWg= github.com/gobuffalo/pop v4.8.3+incompatible/go.mod h1:DwBz3SD5SsHpTZiTubcsFWcVDpJWGsxjVjMPnkiThWg= github.com/gobuffalo/pop v4.8.4+incompatible/go.mod h1:DwBz3SD5SsHpTZiTubcsFWcVDpJWGsxjVjMPnkiThWg= @@ -184,10 +187,11 @@ github.com/gobuffalo/release v1.0.53/go.mod h1:FdF257nd8rqhNaqtDWFGhxdJ/Ig4J7VcS github.com/gobuffalo/release v1.0.54/go.mod h1:Pe5/RxRa/BE8whDpGfRqSI7D1a0evGK1T4JDm339tJc= github.com/gobuffalo/release v1.0.61/go.mod h1:mfIO38ujUNVDlBziIYqXquYfBF+8FDHUjKZgYC1Hj24= github.com/gobuffalo/release v1.0.72/go.mod h1:NP5NXgg/IX3M5XmHmWR99D687/3Dt9qZtTK/Lbwc1hU= -github.com/gobuffalo/release v1.0.74 h1:7OqoyrKz5fVZvYp38ysZdhm2F9DXz5nBVeSi0HjldLc= github.com/gobuffalo/release v1.0.74/go.mod h1:NP5NXgg/IX3M5XmHmWR99D687/3Dt9qZtTK/Lbwc1hU= -github.com/gobuffalo/shoulders v1.0.1 h1:BqVJBUXlBWAf+WLhXijVk3SCpp75LXrVBiIkOCzZbNc= github.com/gobuffalo/shoulders v1.0.1/go.mod h1:V33CcVmaQ4gRUmHKwq1fiTXuf8Gp/qjQBUL5tHPmvbA= +github.com/gobuffalo/syncx v0.0.0-20181120191700-98333ab04150/go.mod h1:HhnNqWY95UYwwW3uSASeV7vtgYkT2t16hJgV3AEPUpw= +github.com/gobuffalo/syncx v0.0.0-20181120194010-558ac7de985f h1:S5EeH1reN93KR0L6TQvkRpu9YggCYXrUqFh1iEgvdC0= +github.com/gobuffalo/syncx v0.0.0-20181120194010-558ac7de985f/go.mod h1:HhnNqWY95UYwwW3uSASeV7vtgYkT2t16hJgV3AEPUpw= github.com/gobuffalo/tags v2.0.11+incompatible h1:zLkaontB8lWefU+DX38mzPLRKFGTJL8FKb9JnKMt0Z0= github.com/gobuffalo/tags v2.0.11+incompatible/go.mod h1:9XmhOkyaB7UzvuY4UoZO4s67q8/xRMVJEaakauVQYeY= github.com/gobuffalo/uuid v2.0.3+incompatible/go.mod h1:ErhIzkRhm0FtRuiE/PeORqcw4cVi1RtSpnwYrxuvkfE= @@ -211,6 +215,7 @@ github.com/gorilla/context v1.1.1 h1:AWwleXJkX/nhcU9bZSnZoi3h/qGYqQAGhq6zZe/aQW8 github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= github.com/gorilla/mux v1.6.2 h1:Pgr17XVTNXAk3q/r4CpKzC5xBM/qW1uVLV+IhRZpIIk= github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= +github.com/gorilla/pat v0.0.0-20180118222023-199c85a7f6d1 h1:LqbZZ9sNMWVjeXS4NN5oVvhMjDyLhmA1LG86oSo+IqY= github.com/gorilla/pat v0.0.0-20180118222023-199c85a7f6d1/go.mod h1:YeAe0gNeiNT5hoiZRI4yiOky6jVdNvfO2N6Kav/HmxY= github.com/gorilla/securecookie v1.1.1 h1:miw7JPhV+b/lAHSXz4qd/nN9jRiAFV5FwjeKyCS8BvQ= github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4= @@ -277,6 +282,7 @@ github.com/markbates/safe v1.0.1 h1:yjZkbvRM6IzKj9tlu/zMJLS0n/V351OZWRnF3QfaUxI= github.com/markbates/safe v1.0.1/go.mod h1:nAqgmRi7cY2nqMc92/bSEeQA+R4OheNU2T1kNSCBdG0= github.com/markbates/sigtx v1.0.0 h1:y/xtkBvNPRjD4KeEplf4w9rJVSc23/xl+jXYGowTwy0= github.com/markbates/sigtx v1.0.0/go.mod h1:QF1Hv6Ic6Ca6W+T+DL0Y/ypborFKyvUY9HmuCD4VeTc= +github.com/markbates/willie v1.0.9 h1:394PpHImWjScL9X2VRCDXJAcc77sHsSr3w3sOnL/DVc= github.com/markbates/willie v1.0.9/go.mod h1:fsrFVWl91+gXpx/6dv715j7i11fYPfZ9ZGfH0DQzY7w= github.com/mattn/go-colorable v0.0.9 h1:UVL0vNpWh04HeJXV0KLcaT7r06gOH2l4OW6ddYRUIY4= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= @@ -294,12 +300,15 @@ github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQz github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/monoculum/formam v0.0.0-20180901015400-4e68be1d79ba h1:FEJJhVHSH+Kyxa5qNe/7dprlZbFcj2TG51OWIouhwls= github.com/monoculum/formam v0.0.0-20180901015400-4e68be1d79ba/go.mod h1:RKgILGEJq24YyJ2ban8EO0RUVSJlF1pGsEvoLEACr/Q= +github.com/nicksnyder/go-i18n v1.10.0 h1:5AzlPKvXBH4qBzmZ09Ua9Gipyruv6uApMcrNZdo96+Q= github.com/nicksnyder/go-i18n v1.10.0/go.mod h1:HrK7VCrbOvQoUAQ7Vpy7i87N7JZZZ7R2xBGjv0j365Q= -github.com/onsi/ginkgo v1.6.0 h1:Ix8l273rp3QzYgXSR+c8d1fTG7UPgYkOSELPhiY/YGw= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.7.0 h1:WSHQ+IS43OoUrWtD1/bbclrwK8TTH5hzp+umCiuxHgs= +github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/gomega v1.4.1/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= -github.com/onsi/gomega v1.4.2 h1:3mYCb7aPxS/RU7TI1y4rkEn1oKmPRjNJLNEXgw7MH2I= github.com/onsi/gomega v1.4.2/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= +github.com/onsi/gomega v1.4.3 h1:RE1xgDvH7imwFD45h+u2SgIfERHlS2yNG4DObb5BSKU= +github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/pelletier/go-toml v1.2.0 h1:T5zMGML61Wp+FlcbWjRDT7yAxhJNAiPPLOFECq181zc= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= github.com/pkg/errors v0.8.0 h1:WdK/asTD0HN+q6hsWO3/vpuAkAr+tw6aNJNDFFf0+qw= @@ -361,8 +370,9 @@ golang.org/x/crypto v0.0.0-20181025113841-85e1b3f9139a/go.mod h1:6SG95UA2DQfeDnf golang.org/x/crypto v0.0.0-20181025213731-e84da0312774/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181030102418-4d3f4d9ffa16/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181106171534-e4dc69e5b2fd/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -golang.org/x/crypto v0.0.0-20181112202954-3d3f9f413869 h1:kkXA53yGe04D0adEYJwEVQjeBppL01Exg+fnMjfUraU= golang.org/x/crypto v0.0.0-20181112202954-3d3f9f413869/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20181127143415-eb0de9b17e85 h1:et7+NAX3lLIk5qUCTA9QelBjGE/NkhzYw/mhnr0s7nI= +golang.org/x/crypto v0.0.0-20181127143415-eb0de9b17e85/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180816102801-aaf60122140d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -396,8 +406,9 @@ golang.org/x/sys v0.0.0-20181026064943-731415f00dce/go.mod h1:STP8DvDyc/dI5b8T5h golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181030150119-7e31e0c00fa0/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181106135930-3a76605856fd/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8 h1:YoY1wS6JYVRpIfFngRf2HHo9R9dAne3xbkGOQ5rJXjU= golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b h1:MQE+LT/ABUuuvEZ+YQAMSXindAdUh7slEmAkup74op4= +golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/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-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -415,8 +426,9 @@ golang.org/x/tools v0.0.0-20181105230042-78dc5bac0cac/go.mod h1:n7NCudcB/nEzxVGm golang.org/x/tools v0.0.0-20181107215632-34b416bd17b3/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20181114190951-94339b83286c/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20181119130350-139d099f6620/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20181120173833-b6bf29589316 h1:LwWlI8LYNm8hsEKnZj0Lx7wY+9ahaBpE0xO35y4MK5w= -golang.org/x/tools v0.0.0-20181120173833-b6bf29589316/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20181120060634-fc4f04983f62/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20181122213734-04b5d21e00f1 h1:bsEj/LXbv3BCtkp/rBj9Wi/0Nde4OMaraIZpndHAhdI= +golang.org/x/tools v0.0.0-20181122213734-04b5d21e00f1/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= google.golang.org/appengine v1.2.0 h1:S0iUepdCWODXRvtE+gcRDd15L+k+k1AiHlMiMjefH24= google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U= diff --git a/it.sh b/it.sh index ff929d734..a9b916d79 100644 --- a/it.sh +++ b/it.sh @@ -32,7 +32,7 @@ rm -rfv $GOPATH/src/github.com/markbates/coke cd $GOPATH/src/ -buffalo new --db-type=sqlite3 hello_world --ci-provider=travis +buffalo new --db-type=sqlite3 hello_world --ci-provider=travis cd ./hello_world filetest -c $GOPATH/src/github.com/gobuffalo/buffalo/buffalo/cmd/filetests/new_travis.json @@ -102,7 +102,7 @@ buffalo g actions users update --skip-template --method POST filetest -c $GOPATH/src/github.com/gobuffalo/buffalo/buffalo/cmd/filetests/generate_action_with_method.json cd $GOPATH/src -buffalo new --api apiapp +buffalo new --api apiapp cd ./apiapp buffalo build filetest -c $GOPATH/src/github.com/gobuffalo/buffalo/buffalo/cmd/filetests/apiapp.json