From d612e0cc63ab8eca1b05022e6df9cfedecc01e7d Mon Sep 17 00:00:00 2001 From: Mark Bates Date: Wed, 13 Jun 2018 10:57:46 -0400 Subject: [PATCH 1/7] reset back to development --- buffalo/cmd/build/build-packr.go | 12 --------- generators/assets/standard/standard-packr.go | 13 ---------- generators/assets/webpack/webpack-packr.go | 17 ------------ generators/docker/docker-packr.go | 14 ---------- generators/mail/mail-packr.go | 12 --------- generators/newapp/newapp-packr.go | 27 -------------------- generators/refresh/refresh-packr.go | 11 -------- generators/resource/resource-packr.go | 21 --------------- runtime/version.go | 5 ++-- 9 files changed, 2 insertions(+), 130 deletions(-) delete mode 100644 buffalo/cmd/build/build-packr.go delete mode 100644 generators/assets/standard/standard-packr.go delete mode 100644 generators/assets/webpack/webpack-packr.go delete mode 100644 generators/docker/docker-packr.go delete mode 100644 generators/mail/mail-packr.go delete mode 100644 generators/newapp/newapp-packr.go delete mode 100644 generators/refresh/refresh-packr.go delete mode 100644 generators/resource/resource-packr.go diff --git a/buffalo/cmd/build/build-packr.go b/buffalo/cmd/build/build-packr.go deleted file mode 100644 index 2dbf7a938..000000000 --- a/buffalo/cmd/build/build-packr.go +++ /dev/null @@ -1,12 +0,0 @@ -// Code generated by github.com/gobuffalo/packr. DO NOT EDIT - -package build - -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("./templates", "a.go.tmpl", "\"cGFja2FnZSBhCgppbXBvcnQgKAogICJsb2ciCiAgInN0cmluZ3MiCiAgImdpdGh1Yi5jb20vZ29idWZmYWxvL3BvcCIKICAiZ2l0aHViLmNvbS9tYXJrYmF0ZXMvaW5mbGVjdCIKICAiZ2l0aHViLmNvbS9nb2J1ZmZhbG8vcGFja3IiCiAgPCU9IGlmIChvcHRzLkVudmlyb25tZW50ICE9ICJkZXZlbG9wbWVudCIpIHsgJT4KICAiZ2l0aHViLmNvbS9nb2J1ZmZhbG8vZW52eSIKICA8JSB9ICU+CikKCmZ1bmMgaW5pdCgpIHsKICA8JT0gaWYgKG9wdHMuRW52aXJvbm1lbnQgIT0gImRldmVsb3BtZW50IikgeyAlPgogIGlmIGVyciA6PSBlbnZ5Lk11c3RTZXQoIkdPX0VOViIsICI8JT0gb3B0cy5FbnZpcm9ubWVudCAlPiIpOyBlcnIgIT0gbmlsIHsKICAgICAgbG9nLkZhdGFsKGVycikKICB9CiAgPCUgfSAlPgogIGRyb3BEYXRhYmFzZVltbCgpCgogIGJveCA6PSBwYWNrci5OZXdCb3goIi4vIikKICBpZiBib3guSGFzKCJpbmZsZWN0aW9ucy5qc29uIikgewogICAgciA6PSBzdHJpbmdzLk5ld1JlYWRlcihib3guU3RyaW5nKCJpbmZsZWN0aW9ucy5qc29uIikpCiAgICBlcnIgOj0gaW5mbGVjdC5Mb2FkUmVhZGVyKHIpCiAgICBpZiBlcnIgIT0gbmlsIHsKICAgICAgbG9nLkZhdGFsKGVycikKICAgIH0KICB9Cn0KCmZ1bmMgZHJvcERhdGFiYXNlWW1sKCkgewogIGlmIERCX0NPTkZJRyAhPSAiIiB7CiAgICByIDo9IHN0cmluZ3MuTmV3UmVhZGVyKERCX0NPTkZJRykKICAgIGVyciA6PSBwb3AuTG9hZEZyb20ocikKICAgIGlmIGVyciAhPSBuaWwgewogICAgICBsb2cuRmF0YWwoZXJyKQogICAgfQogIH0KfQo=\"") - packr.PackJSONBytes("./templates", "main.go.tmpl", "\"cGFja2FnZSBtYWluCgppbXBvcnQgKAogICJmbXQiCiAgImxvZyIKICAib3MiCiAgInRpbWUiCiAgInN0cmluZ3MiCgogICJnaXRodWIuY29tL21hcmtiYXRlcy9ncmlmdC9ncmlmdCIKICAiZ2l0aHViLmNvbS9nb2J1ZmZhbG8vYnVmZmFsby9idWZmYWxvL2NtZCIKICAiZ2l0aHViLmNvbS9nb2J1ZmZhbG8vYnVmZmFsby9ydW50aW1lIgogIF8gIjwlPSBvcHRzLlBhY2thZ2VQa2cgJT4vYSIKICBfICI8JT0gb3B0cy5BY3Rpb25zUGtnICU+IgogIDwlPSBpZiAob3B0cy5XaXRoUG9wKSB7ICU+CiAgImdpdGh1Yi5jb20vZ29idWZmYWxvL3BhY2tyIgogICJnaXRodWIuY29tL2dvYnVmZmFsby9wb3AiCiAgIjwlPSBvcHRzLk1vZGVsc1BrZyAlPiIKICA8JSB9ICU+CiAgPCU9IGlmIChvcHRzLldpdGhHcmlmdHMpIHsgJT4KICBfICI8JT0gb3B0cy5HcmlmdHNQa2cgJT4iCiAgPCUgfSAlPgopCgp2YXIgQnVpbGRWZXJzaW9uID0gIiIKdmFyIEJ1aWxkVGltZSA9ICIiCgpmdW5jIGluaXQoKSB7CiAgQnVpbGRUaW1lID0gc3RyaW5ncy5UcmltKEJ1aWxkVGltZSwgIlwiIikKICB0LCBlcnIgOj0gdGltZS5QYXJzZSh0aW1lLlJGQzMzMzksIEJ1aWxkVGltZSkKICBpZiBlcnIgIT0gbmlsIHsKICAgIGZtdC5QcmludGxuKGVycikKICB9CiAgcnVudGltZS5TZXRCdWlsZChydW50aW1lLkJ1aWxkSW5mb3sKICAgIFZlcnNpb246IEJ1aWxkVmVyc2lvbiwKICAgIFRpbWU6IHQsCiAgfSkKfQoKZnVuYyBtYWluKCkgewogIGFyZ3MgOj0gb3MuQXJncwogIGlmIGxlbihhcmdzKSA9PSAxIHsKICAgIG9yaWdpbmFsTWFpbigpCiAgICByZXR1cm4KICB9CiAgYyA6PSBhcmdzWzFdCiAgc3dpdGNoIGMgewogIDwlPSBpZiAob3B0cy5XaXRoUG9wKSB7ICU+CiAgY2FzZSAibWlncmF0ZSI6CiAgICBtaWdyYXRlKCkKICA8JSB9ICU+CiAgY2FzZSAidmVyc2lvbiI6CiAgICBwcmludFZlcnNpb24oKQogIGNhc2UgInRhc2siLCAidCIsICJ0YXNrcyI6CiAgICBpZiBsZW4oYXJncykgPCAzIHsKICAgICAgbG9nLkZhdGFsKCJub3QgZW5vdWdoIGFyZ3VtZW50cyBwYXNzZWQgdG8gdGFzayIpCiAgICB9CiAgICBjIDo9IGdyaWZ0Lk5ld0NvbnRleHQoYXJnc1syXSkKICAgIGlmIGxlbihhcmdzKSA+IDIgewogICAgICBjLkFyZ3MgPSBhcmdzWzM6XQogICAgfQogICAgZXJyIDo9IGdyaWZ0LlJ1bihhcmdzWzJdLCBjKQogICAgaWYgZXJyICE9IG5pbCB7CiAgICAgIGxvZy5GYXRhbChlcnIpCiAgICB9CiAgZGVmYXVsdDoKICAgIGNtZC5FeGVjdXRlKCkKICB9Cn0KCmZ1bmMgcHJpbnRWZXJzaW9uKCkgewogIGZtdC5QcmludGYoIjwlPSBvcHRzLk5hbWUuVGl0bGUoKSAlPiB2ZXJzaW9uICVzXG4iLCBydW50aW1lLkJ1aWxkKCkpCn0KCjwlPSBpZiAob3B0cy5XaXRoUG9wKSB7ICU+CmZ1bmMgbWlncmF0ZSgpIHsKICBib3gsIGVyciA6PSBwb3AuTmV3TWlncmF0aW9uQm94KHBhY2tyLk5ld0JveCgiLi9taWdyYXRpb25zIiksIG1vZGVscy5EQikKICBpZiBlcnIgIT0gbmlsIHsKICAgIGxvZy5GYXRhbGYoIkZhaWxlZCB0byB1bnBhY2sgbWlncmF0aW9uczogJXMiLCBlcnIpCiAgfQogIGVyciA9IGJveC5VcCgpCiAgaWYgZXJyICE9IG5pbCB7CiAgICBsb2cuRmF0YWxmKCJGYWlsZWQgdG8gcnVuIG1pZ3JhdGlvbnM6ICVzIiwgZXJyKQogIH0KfQo8JSB9ICU+Cg==\"") -} diff --git a/generators/assets/standard/standard-packr.go b/generators/assets/standard/standard-packr.go deleted file mode 100644 index 9e2b8dffe..000000000 --- a/generators/assets/standard/standard-packr.go +++ /dev/null @@ -1,13 +0,0 @@ -// Code generated by github.com/gobuffalo/packr. DO NOT EDIT - -package standard - -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("../standard/templates", "public/assets/application.css.tmpl", "\"\"") - packr.PackJSONBytes("../standard/templates", "public/assets/application.js.tmpl", "\"\"") - packr.PackJSONBytes("../standard/templates", "public/assets/images/favicon.ico.tmpl", "\"AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAQAABILAAASCwAAAAAAAAAAAAD///////////z8/f//////7+/u/5+ks/9ea4z/QlJ9/0BRff9ZZ4r/k5qs/+Xm5////////Pz9//7+/v////////////39/v//////sLS//zdKeP8YOHf/HDx7/yA+e/8gPHr/GjR1/xUwcv8sP3L/maCx///+/P/+/v7//v7+//39/v//////jZWo/xAoaP8kTIb/OmGF/zFkl/8sYpf/LWSd/y9WhP8ySnH/JEiH/w4oaf9ve5b///78//7+////////rbO9/xEsZ/8mPXr/JD91/0Zifv9hj6z/XpC0/16Stv9hjaf/PmGC/ydOiP8oP3v/DChj/4uSpP//////7uzq/0Funf8rZaH/MGOd/yZRjf9ejK//cKPA/1JwhP9Wd4z/caXB/010nf8bM3L/Lk2G/zBblv8sW43/1dfb/6Cuvf8oZ6b/NXKu/zNrov9Cd6P/TnCH/ys6Tf8iLUP/Ii1B/y8/UP9Oc43/N2WQ/zVwp/9EhL//NXe0/4GZsf9kgJ7/K2us/zJuqv81a6D/PFNn/xomPv8eLET/TFJI/0NLSf8ZJ0P/IS9E/0Fad/8pSYP/JEN8/yRFf/9HXof/S3GY/y5vsP8zb6z/L2Wb/x8sQf9NVEj/tqxU/7y5dP/DvWv/optQ/zdBQf8pN1f/Q2qv/ytelf8vXpj/RmWk/0Rwnf8vbaz/M2+q/y1jnP89V2n/zsmF/+Xfvf+hpoX/sLKU/+7ls/+usHL/OFF8/0t1tf8rZpv/L26o/0purf87bJ7/MG2q/zNuqf8vaqj/UISm/7a6nv/OzNj/5NiP/9jRqP/RzND/obGU/1aBvf9Xecn/P3a2/zV/xv9ce7X/MmOU/zFtqf8ybKb/Lmei/0J4qf9+oKX/ubuM/0pmZf9pfXH/u76R/2uVqf97l7//ZobM/12Czv9cgc3/iJe4/36Uqv8oZaH/NGqf/zJrpf8zX4b/i56r/2Z/kv8fOlb/I0BZ/4GWpP90i5z/Xnuk/52uzP+zwNX/fpKw/8nM0f+KnK//IF6f/zBsqv8nZaX/NV+I/1Zkbf8gLT//KjVF/yUwQf8qN0n/WGh0/4CSqP+qus3/sb3I/6SrtP////7/8vDy/2eFmP9Gaof/UHic/2iLqP+nsrj/Ul5t/xspQP8hL0L/bnmB/626vP+xvb//p7W3/5Sepf/w8PH////////////Q19T/3uHe/83Mxv+wtaP/zNDE/9zg3v+fp53/tLml/9Xawv/K0Lf/trup/7W4s//y8vL///////7+/v/+/v7//f3+//7/////////4OHg/76/sf+4uaH/ycml/8jHpP+8vKD/vL2u/9fX1v/9/f3///////7+/v//////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==\"") -} diff --git a/generators/assets/webpack/webpack-packr.go b/generators/assets/webpack/webpack-packr.go deleted file mode 100644 index b29b3eace..000000000 --- a/generators/assets/webpack/webpack-packr.go +++ /dev/null @@ -1,17 +0,0 @@ -// Code generated by github.com/gobuffalo/packr. DO NOT EDIT - -package webpack - -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("../webpack/templates", "assets/css/application.scss.tmpl", "\"e3sgaWYgZXEgLm9wdHMuQm9vdHN0cmFwIDMgLX19CkBpbXBvcnQgIn5ib290c3RyYXAtc2Fzcy9hc3NldHMvc3R5bGVzaGVldHMvX2Jvb3RzdHJhcC1zcHJvY2tldHMuc2NzcyI7CkBpbXBvcnQgIn5ib290c3RyYXAtc2Fzcy9hc3NldHMvc3R5bGVzaGVldHMvX2Jvb3RzdHJhcC5zY3NzIjsKe3sgZWxzZSAtfX0KQGltcG9ydCAifmJvb3RzdHJhcC9zY3NzL2Jvb3RzdHJhcC5zY3NzIjsKe3sgZW5kIC19fQpAaW1wb3J0ICJ+Zm9udC1hd2Vzb21lL2Nzcy9mb250LWF3ZXNvbWUuY3NzIjsK\"") - packr.PackJSONBytes("../webpack/templates", "assets/images/favicon.ico.tmpl", "\"AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAQAABILAAASCwAAAAAAAAAAAAD///////////z8/f//////7+/u/5+ks/9ea4z/QlJ9/0BRff9ZZ4r/k5qs/+Xm5////////Pz9//7+/v////////////39/v//////sLS//zdKeP8YOHf/HDx7/yA+e/8gPHr/GjR1/xUwcv8sP3L/maCx///+/P/+/v7//v7+//39/v//////jZWo/xAoaP8kTIb/OmGF/zFkl/8sYpf/LWSd/y9WhP8ySnH/JEiH/w4oaf9ve5b///78//7+////////rbO9/xEsZ/8mPXr/JD91/0Zifv9hj6z/XpC0/16Stv9hjaf/PmGC/ydOiP8oP3v/DChj/4uSpP//////7uzq/0Funf8rZaH/MGOd/yZRjf9ejK//cKPA/1JwhP9Wd4z/caXB/010nf8bM3L/Lk2G/zBblv8sW43/1dfb/6Cuvf8oZ6b/NXKu/zNrov9Cd6P/TnCH/ys6Tf8iLUP/Ii1B/y8/UP9Oc43/N2WQ/zVwp/9EhL//NXe0/4GZsf9kgJ7/K2us/zJuqv81a6D/PFNn/xomPv8eLET/TFJI/0NLSf8ZJ0P/IS9E/0Fad/8pSYP/JEN8/yRFf/9HXof/S3GY/y5vsP8zb6z/L2Wb/x8sQf9NVEj/tqxU/7y5dP/DvWv/optQ/zdBQf8pN1f/Q2qv/ytelf8vXpj/RmWk/0Rwnf8vbaz/M2+q/y1jnP89V2n/zsmF/+Xfvf+hpoX/sLKU/+7ls/+usHL/OFF8/0t1tf8rZpv/L26o/0purf87bJ7/MG2q/zNuqf8vaqj/UISm/7a6nv/OzNj/5NiP/9jRqP/RzND/obGU/1aBvf9Xecn/P3a2/zV/xv9ce7X/MmOU/zFtqf8ybKb/Lmei/0J4qf9+oKX/ubuM/0pmZf9pfXH/u76R/2uVqf97l7//ZobM/12Czv9cgc3/iJe4/36Uqv8oZaH/NGqf/zJrpf8zX4b/i56r/2Z/kv8fOlb/I0BZ/4GWpP90i5z/Xnuk/52uzP+zwNX/fpKw/8nM0f+KnK//IF6f/zBsqv8nZaX/NV+I/1Zkbf8gLT//KjVF/yUwQf8qN0n/WGh0/4CSqP+qus3/sb3I/6SrtP////7/8vDy/2eFmP9Gaof/UHic/2iLqP+nsrj/Ul5t/xspQP8hL0L/bnmB/626vP+xvb//p7W3/5Sepf/w8PH////////////Q19T/3uHe/83Mxv+wtaP/zNDE/9zg3v+fp53/tLml/9Xawv/K0Lf/trup/7W4s//y8vL///////7+/v/+/v7//f3+//7/////////4OHg/76/sf+4uaH/ycml/8jHpP+8vKD/vL2u/9fX1v/9/f3///////7+/v//////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==\"") - packr.PackJSONBytes("../webpack/templates", "assets/js/application.js.tmpl", "\"cmVxdWlyZSgiZXhwb3NlLWxvYWRlcj8kIWV4cG9zZS1sb2FkZXI/alF1ZXJ5IWpxdWVyeSIpOwp7eyBpZiBlcSAub3B0cy5Cb290c3RyYXAgMyAtfX0KcmVxdWlyZSgiYm9vdHN0cmFwLXNhc3MvYXNzZXRzL2phdmFzY3JpcHRzL2Jvb3RzdHJhcC5qcyIpOwp7eyBlbHNlIC19fQpyZXF1aXJlKCJib290c3RyYXAvZGlzdC9qcy9ib290c3RyYXAuYnVuZGxlLmpzIik7Cnt7IGVuZCAtfX0KCiQoKCkgPT4gewoKfSk7Cg==\"") - packr.PackJSONBytes("../webpack/templates", "dot-babelrc.tmpl", "\"ewogICJwcmVzZXRzIjogWyJlbnYiXQp9\"") - packr.PackJSONBytes("../webpack/templates", "package.json.tmpl", "\"ewogICJuYW1lIjogImJ1ZmZhbG8iLAogICJ2ZXJzaW9uIjogIjEuMC4wIiwKICAibWFpbiI6ICJpbmRleC5qcyIsCiAgImxpY2Vuc2UiOiAiTUlUIiwKICAicmVwb3NpdG9yeSI6ICJnaXRodWIuY29tL2dvYnVmZmFsby9idWZmYWxvIiwKICAiZGVwZW5kZW5jaWVzIjogewogICAge3sgaWYgZXEgLm9wdHMuQm9vdHN0cmFwIDMgLX19CiAgICAiYm9vdHN0cmFwLXNhc3MiOiAifjMuMy43IiwKICAgIHt7IGVsc2UgLX19CiAgICAiYm9vdHN0cmFwIjogIjQuMS4xIiwKICAgIHt7IGVuZCAtfX0KICAgICJmb250LWF3ZXNvbWUiOiAifjQuNy4wIiwKICAgICJqcXVlcnkiOiAifjMuMi4xIiwKICAgICJqcXVlcnktdWpzIjogIn4xLjIuMiIKICB9LAogICJkZXZEZXBlbmRlbmNpZXMiOiB7CiAgICAiYmFiZWwtY2xpIjogIn42LjI2LjAiLAogICAgImJhYmVsLWNvcmUiOiAifjYuMjYuMCIsCiAgICAiYmFiZWwtbG9hZGVyIjogIn43LjEuMiIsCiAgICAiYmFiZWwtcHJlc2V0LWVudiI6ICJ+MS41LjIiLAogICAgIndlYnBhY2stY2xlYW4tb2Jzb2xldGUtY2h1bmtzIjogIl4wLjQuMCIsCiAgICAiY29weS13ZWJwYWNrLXBsdWdpbiI6ICJ+NC41LjEiLAogICAgImNzcy1sb2FkZXIiOiAifjAuMjguMTEiLAogICAgImV4cG9zZS1sb2FkZXIiOiAifjAuNy41IiwKICAgICJmaWxlLWxvYWRlciI6ICJ+MS4xLjExIiwKICAgICJnb3BoZXJqcy1sb2FkZXIiOiAiXjAuMC4xIiwKICAgICJtaW5pLWNzcy1leHRyYWN0LXBsdWdpbiI6ICJeMC40LjAiLAogICAgIm5vZGUtc2FzcyI6ICJ+NC44LjMiLAogICAgIm5wbS1pbnN0YWxsLXdlYnBhY2stcGx1Z2luIjogIjQuMC41IiwKICAgICJzYXNzLWxvYWRlciI6ICJ+Ni4wLjciLAogICAgInN0eWxlLWxvYWRlciI6ICJ+MC4yMC4zIiwKICAgICJ1Z2xpZnlqcy13ZWJwYWNrLXBsdWdpbiI6ICJ+MS4yLjQiLAogICAgInVybC1sb2FkZXIiOiAifjEuMC4xIiwKICAgICJ3ZWJwYWNrIjogIn40LjUuMCIsCiAgICAid2VicGFjay1jbGkiOiAiMi4wLjE0IiwKICAgICJ3ZWJwYWNrLWxpdmVyZWxvYWQtcGx1Z2luIjoiMi4xLjEiLAogICAgIndlYnBhY2stbWFuaWZlc3QtcGx1Z2luIjogIn4yLjAuMCIKICB9Cn0K\"") - packr.PackJSONBytes("../webpack/templates", "public/assets/dot-keep.tmpl", "\"\"") - packr.PackJSONBytes("../webpack/templates", "webpack.config.js.tmpl", "\"Y29uc3QgV2VicGFjayA9IHJlcXVpcmUoIndlYnBhY2siKTsKY29uc3QgR2xvYiA9IHJlcXVpcmUoImdsb2IiKTsKY29uc3QgcGF0aCA9IHJlcXVpcmUoInBhdGgiKTsKY29uc3QgQ29weVdlYnBhY2tQbHVnaW4gPSByZXF1aXJlKCJjb3B5LXdlYnBhY2stcGx1Z2luIik7CmNvbnN0IE1pbmlDc3NFeHRyYWN0UGx1Z2luID0gcmVxdWlyZSgibWluaS1jc3MtZXh0cmFjdC1wbHVnaW4iKTsKY29uc3QgTWFuaWZlc3RQbHVnaW4gPSByZXF1aXJlKCJ3ZWJwYWNrLW1hbmlmZXN0LXBsdWdpbiIpOwpjb25zdCBDbGVhbk9ic29sZXRlQ2h1bmtzID0gcmVxdWlyZSgnd2VicGFjay1jbGVhbi1vYnNvbGV0ZS1jaHVua3MnKTsKY29uc3QgVWdsaWZ5SnNQbHVnaW4gPSByZXF1aXJlKCJ1Z2xpZnlqcy13ZWJwYWNrLXBsdWdpbiIpOwpjb25zdCBMaXZlUmVsb2FkUGx1Z2luID0gcmVxdWlyZSgnd2VicGFjay1saXZlcmVsb2FkLXBsdWdpbicpOwoKY29uc3QgY29uZmlndXJhdG9yID0gewogIGVudHJpZXM6IGZ1bmN0aW9uKCl7CiAgICB2YXIgZW50cmllcyA9IHsKICAgICAgYXBwbGljYXRpb246IFsKICAgICAgICAnLi9ub2RlX21vZHVsZXMvanF1ZXJ5LXVqcy9zcmMvcmFpbHMuanMnLAogICAgICAgICcuL2Fzc2V0cy9jc3MvYXBwbGljYXRpb24uc2NzcycsCiAgICAgIF0sCiAgICB9CiAgICAKICAgIEdsb2Iuc3luYygiLi9hc3NldHMvKi8qLioiKS5mb3JFYWNoKChlbnRyeSkgPT4gewogICAgICBpZiAoZW50cnkgPT09ICcuL2Fzc2V0cy9jc3MvYXBwbGljYXRpb24uc2NzcycpIHsKICAgICAgICByZXR1cm4KICAgICAgfQogICAgICAKICAgICAgbGV0IGtleSA9IGVudHJ5LnJlcGxhY2UoLyhcLlwvYXNzZXRzXC8oanN8Y3NzfGdvKVwvKXxcLihqc3xzW2FjXXNzfGdvKS9nLCAnJykKICAgICAgaWYoa2V5LnN0YXJ0c1dpdGgoIl8iKSB8fCAoLyhqc3xzW2FjXXNzfGdvKSQvaSkudGVzdChlbnRyeSkgPT0gZmFsc2UpIHsKICAgICAgICByZXR1cm4KICAgICAgfQogICAgICAKICAgICAgaWYoIGVudHJpZXNba2V5XSA9PSBudWxsKSB7CiAgICAgICAgZW50cmllc1trZXldID0gW2VudHJ5XQogICAgICAgIHJldHVybgogICAgICB9IAogICAgICAKICAgICAgZW50cmllc1trZXldLnB1c2goZW50cnkpCiAgICB9KQoKICAgIHJldHVybiBlbnRyaWVzCiAgfSwKCiAgcGx1Z2lucygpIHsKICAgIHZhciBwbHVnaW5zID0gWwogICAgICBuZXcgQ2xlYW5PYnNvbGV0ZUNodW5rcygpLAogICAgICBuZXcgV2VicGFjay5Qcm92aWRlUGx1Z2luKHskOiAianF1ZXJ5IixqUXVlcnk6ICJqcXVlcnkifSksCiAgICAgIG5ldyBNaW5pQ3NzRXh0cmFjdFBsdWdpbih7ZmlsZW5hbWU6ICJbbmFtZV0uW2NvbnRlbnRoYXNoXS5jc3MifSksCiAgICAgIG5ldyBDb3B5V2VicGFja1BsdWdpbihbe2Zyb206ICIuL2Fzc2V0cyIsdG86ICIifV0sIHtjb3B5VW5tb2RpZmllZDogdHJ1ZSxpZ25vcmU6IFsiY3NzLyoqIiwgImpzLyoqIl0gfSksCiAgICAgIG5ldyBXZWJwYWNrLkxvYWRlck9wdGlvbnNQbHVnaW4oe21pbmltaXplOiB0cnVlLGRlYnVnOiBmYWxzZX0pLAogICAgICBuZXcgTWFuaWZlc3RQbHVnaW4oe2ZpbGVOYW1lOiAibWFuaWZlc3QuanNvbiJ9KQogICAgXTsKCiAgICByZXR1cm4gcGx1Z2lucwogIH0sCgogIG1vZHVsZU9wdGlvbnM6IGZ1bmN0aW9uKCkgewogICAgcmV0dXJuIHsKICAgICAgcnVsZXM6IFsKICAgICAgICB7CiAgICAgICAgICB0ZXN0OiAvXC5zW2FjXXNzJC8sCiAgICAgICAgICB1c2U6IFsKICAgICAgICAgICAgTWluaUNzc0V4dHJhY3RQbHVnaW4ubG9hZGVyLAogICAgICAgICAgICB7IGxvYWRlcjogImNzcy1sb2FkZXIiLCBvcHRpb25zOiB7c291cmNlTWFwOiB0cnVlfX0sCiAgICAgICAgICAgIHsgbG9hZGVyOiAic2Fzcy1sb2FkZXIiLCBvcHRpb25zOiB7c291cmNlTWFwOiB0cnVlfX0KICAgICAgICAgIF0KICAgICAgICB9LAogICAgICAgIHsgdGVzdDogL1wuanN4PyQvLGxvYWRlcjogImJhYmVsLWxvYWRlciIsZXhjbHVkZTogL25vZGVfbW9kdWxlcy8gfSwKICAgICAgICB7IHRlc3Q6IC9cLih3b2ZmfHdvZmYyfHR0ZnxzdmcpKFw/dj1cZCtcLlxkK1wuXGQrKT8kLyx1c2U6ICJ1cmwtbG9hZGVyIn0sCiAgICAgICAgeyB0ZXN0OiAvXC5lb3QoXD92PVxkK1wuXGQrXC5cZCspPyQvLHVzZTogImZpbGUtbG9hZGVyIiB9LAogICAgICAgIHsgdGVzdDogcmVxdWlyZS5yZXNvbHZlKCJqcXVlcnkiKSx1c2U6ICJleHBvc2UtbG9hZGVyP2pRdWVyeSFleHBvc2UtbG9hZGVyPyQifSwKICAgICAgICB7IHRlc3Q6IC9cLmdvJC8sIHVzZTogImdvcGhlcmpzLWxvYWRlciJ9CiAgICAgIF0KICAgIH0KICB9LAoKICBidWlsZENvbmZpZzogZnVuY3Rpb24oKXsKICAgIGNvbnN0IGVudiA9IHByb2Nlc3MuZW52Lk5PREVfRU5WIHx8ICJkZXZlbG9wbWVudCI7CiAgICAKICAgIHZhciBjb25maWcgPSB7CiAgICAgIG1vZGU6IGVudiwKICAgICAgZW50cnk6IGNvbmZpZ3VyYXRvci5lbnRyaWVzKCksCiAgICAgIG91dHB1dDoge2ZpbGVuYW1lOiAiW25hbWVdLltoYXNoXS5qcyIsIHBhdGg6IGAke19fZGlybmFtZX0vcHVibGljL2Fzc2V0c2B9LAogICAgICBwbHVnaW5zOiBjb25maWd1cmF0b3IucGx1Z2lucygpLAogICAgICBtb2R1bGU6IGNvbmZpZ3VyYXRvci5tb2R1bGVPcHRpb25zKCkKICAgIH0KCiAgICBpZiggZW52ID09PSAiZGV2ZWxvcG1lbnQiICl7CiAgICAgIGNvbmZpZy5wbHVnaW5zLnB1c2gobmV3IExpdmVSZWxvYWRQbHVnaW4oe2FwcGVuZFNjcmlwdFRhZzogdHJ1ZX0pKQogICAgICByZXR1cm4gY29uZmlnCiAgICB9CgogICAgY29uc3QgdWdsaWZpZXIgPSBuZXcgVWdsaWZ5SnNQbHVnaW4oewogICAgICB1Z2xpZnlPcHRpb25zOiB7CiAgICAgICAgYmVhdXRpZnk6IGZhbHNlLAogICAgICAgIG1hbmdsZToge2tlZXBfZm5hbWVzOiB0cnVlfSwKICAgICAgICBvdXRwdXQ6IHtjb21tZW50czogZmFsc2V9LAogICAgICAgIGNvbXByZXNzOiB7fQogICAgICB9CiAgICB9KQoKICAgIGNvbmZpZy5vcHRpbWl6YXRpb24gPSB7CiAgICAgIG1pbmltaXplcjogW3VnbGlmaWVyXQogICAgfQoKICAgIHJldHVybiBjb25maWcKICB9Cn0KCm1vZHVsZS5leHBvcnRzID0gY29uZmlndXJhdG9yLmJ1aWxkQ29uZmlnKCk=\"") -} diff --git a/generators/docker/docker-packr.go b/generators/docker/docker-packr.go deleted file mode 100644 index 7466fd3d5..000000000 --- a/generators/docker/docker-packr.go +++ /dev/null @@ -1,14 +0,0 @@ -// Code generated by github.com/gobuffalo/packr. DO NOT EDIT - -package docker - -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("./multi/templates", "Dockerfile.tmpl", "\"IyBUaGlzIGlzIGEgbXVsdGktc3RhZ2UgRG9ja2VyZmlsZSBhbmQgcmVxdWlyZXMgPj0gRG9ja2VyIDE3LjA1CiMgaHR0cHM6Ly9kb2NzLmRvY2tlci5jb20vZW5naW5lL3VzZXJndWlkZS9lbmctaW1hZ2UvbXVsdGlzdGFnZS1idWlsZC8KRlJPTSBnb2J1ZmZhbG8vYnVmZmFsbzp7ey5vcHRzLlZlcnNpb259fSBhcyBidWlsZGVyCgpSVU4gbWtkaXIgLXAgJEdPUEFUSC9zcmMve3sub3B0cy5BcHAuUGFja2FnZVBrZ319CldPUktESVIgJEdPUEFUSC9zcmMve3sub3B0cy5BcHAuUGFja2FnZVBrZ319Cgp7e2lmIC5vcHRzLkFwcC5XaXRoV2VicGFjayAtfX0KIyB0aGlzIHdpbGwgY2FjaGUgdGhlIG5wbSBpbnN0YWxsIHN0ZXAsIHVubGVzcyBwYWNrYWdlLmpzb24gY2hhbmdlcwpBREQgcGFja2FnZS5qc29uIC4Ke3tpZiAub3B0cy5BcHAuV2l0aFlhcm4gLX19CkFERCB5YXJuLmxvY2sgLgpSVU4geWFybiBpbnN0YWxsIC0tbm8tcHJvZ3Jlc3MKe3tlbHNlIC19fQpSVU4gbnBtIGluc3RhbGwgLS1uby1wcm9ncmVzcwp7e2VuZCAtfX0Ke3tlbmQgLX19CgpBREQgLiAuCnt7aWYgLm9wdHMuQXBwLldpdGhEZXAgLX19ClJVTiBkZXAgZW5zdXJlCnt7ZWxzZSAtfX0KUlVOIGdvIGdldCAkKGdvIGxpc3QgLi8uLi4gfCBncmVwIC12IC92ZW5kb3IvKQp7e2VuZCAtfX0KUlVOIGJ1ZmZhbG8gYnVpbGQgLS1zdGF0aWMgLW8gL2Jpbi9hcHAKCkZST00gYWxwaW5lClJVTiBhcGsgYWRkIC0tbm8tY2FjaGUgYmFzaApSVU4gYXBrIGFkZCAtLW5vLWNhY2hlIGNhLWNlcnRpZmljYXRlcwoKV09SS0RJUiAvYmluLwoKQ09QWSAtLWZyb209YnVpbGRlciAvYmluL2FwcCAuCgojIFVuY29tbWVudCB0byBydW4gdGhlIGJpbmFyeSBpbiAicHJvZHVjdGlvbiIgbW9kZToKIyBFTlYgR09fRU5WPXByb2R1Y3Rpb24KCiMgQmluZCB0aGUgYXBwIHRvIDAuMC4wLjAgc28gaXQgY2FuIGJlIHNlZW4gZnJvbSBvdXRzaWRlIHRoZSBjb250YWluZXIKRU5WIEFERFI9MC4wLjAuMAoKRVhQT1NFIDMwMDAKCiMgVW5jb21tZW50IHRvIHJ1biB0aGUgbWlncmF0aW9ucyBiZWZvcmUgcnVubmluZyB0aGUgYmluYXJ5OgojIENNRCAvYmluL2FwcCBtaWdyYXRlOyAvYmluL2FwcApDTUQgZXhlYyAvYmluL2FwcAo=\"") - packr.PackJSONBytes("./multi/templates", "dot-dockerignore.tmpl", "\"bm9kZV9tb2R1bGVzLwoqLmxvZwpiaW4vCg==\"") - packr.PackJSONBytes("./standard/templates", "Dockerfile.tmpl", "\"RlJPTSBnb2J1ZmZhbG8vYnVmZmFsbzp7ey5vcHRzLlZlcnNpb259fQoKUlVOIG1rZGlyIC1wICRHT1BBVEgvc3JjL3t7Lm9wdHMuQXBwLlBhY2thZ2VQa2d9fQpXT1JLRElSICRHT1BBVEgvc3JjL3t7Lm9wdHMuQXBwLlBhY2thZ2VQa2d9fQoKe3tpZiAub3B0cy5Bc1dlYiAtfX0Ke3tpZiAub3B0cy5BcHAuV2l0aFdlYnBhY2sgLX19CiMgdGhpcyB3aWxsIGNhY2hlIHRoZSBucG0gaW5zdGFsbCBzdGVwLCB1bmxlc3MgcGFja2FnZS5qc29uIGNoYW5nZXMKQUREIHBhY2thZ2UuanNvbiAuCnt7aWYgLm9wdHMuQXBwLldpdGhZYXJuIC19fQpBREQgeWFybi5sb2NrIC4KUlVOIHlhcm4gaW5zdGFsbCAtLW5vLXByb2dyZXNzCnt7ZWxzZSAtfX0KUlVOIG5wbSBpbnN0YWxsIC0tbm8tcHJvZ3Jlc3MKe3tlbmQgLX19Cnt7ZW5kIC19fQp7e2VuZCAtfX0KCkFERCAuIC4Ke3tpZiAub3B0cy5BcHAuV2l0aERlcCAtfX0KUlVOIGRlcCBlbnN1cmUKe3tlbHNlIC19fQpSVU4gZ28gZ2V0ICQoZ28gbGlzdCAuLy4uLiB8IGdyZXAgLXYgL3ZlbmRvci8pCnt7ZW5kIC19fQpSVU4gYnVmZmFsbyBidWlsZCAtLXN0YXRpYyAtbyAvYmluL2FwcAoKIyBVbmNvbW1lbnQgdG8gcnVuIHRoZSBiaW5hcnkgaW4gInByb2R1Y3Rpb24iIG1vZGU6CiMgRU5WIEdPX0VOVj1wcm9kdWN0aW9uCgojIEJpbmQgdGhlIGFwcCB0byAwLjAuMC4wIHNvIGl0IGNhbiBiZSBzZWVuIGZyb20gb3V0c2lkZSB0aGUgY29udGFpbmVyCkVOViBBRERSPTAuMC4wLjAKCkVYUE9TRSAzMDAwCgojIFVuY29tbWVudCB0byBydW4gdGhlIG1pZ3JhdGlvbnMgYmVmb3JlIHJ1bm5pbmcgdGhlIGJpbmFyeToKIyBDTUQgL2Jpbi9hcHAgbWlncmF0ZTsgL2Jpbi9hcHAKQ01EIGV4ZWMgL2Jpbi9hcHAK\"") - packr.PackJSONBytes("./standard/templates", "dot-dockerignore.tmpl", "\"bm9kZV9tb2R1bGVzLwoqLmxvZwpiaW4vCg==\"") -} diff --git a/generators/mail/mail-packr.go b/generators/mail/mail-packr.go deleted file mode 100644 index 10cd7caf8..000000000 --- a/generators/mail/mail-packr.go +++ /dev/null @@ -1,12 +0,0 @@ -// Code generated by github.com/gobuffalo/packr. DO NOT EDIT - -package mail - -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("../mail/init/templates", "mailers/mailers.go.tmpl", "\"cGFja2FnZSBtYWlsZXJzCgppbXBvcnQgKAoJImxvZyIKCgkiZ2l0aHViLmNvbS9nb2J1ZmZhbG8vYnVmZmFsby9yZW5kZXIiCgkiZ2l0aHViLmNvbS9nb2J1ZmZhbG8vZW52eSIKCSJnaXRodWIuY29tL2dvYnVmZmFsby9wYWNrciIKCSJnaXRodWIuY29tL2dvYnVmZmFsby9idWZmYWxvL21haWwiCgkiZ2l0aHViLmNvbS9wa2cvZXJyb3JzIgopCgp2YXIgc210cCBtYWlsLlNlbmRlcgp2YXIgciAqcmVuZGVyLkVuZ2luZQoKZnVuYyBpbml0KCkgewoKCS8vIFB1bGxpbmcgY29uZmlnIGZyb20gdGhlIGVudi4KCXBvcnQgOj0gZW52eS5HZXQoIlNNVFBfUE9SVCIsICIxMDI1IikKCWhvc3QgOj0gZW52eS5HZXQoIlNNVFBfSE9TVCIsICJsb2NhbGhvc3QiKQoJdXNlciA6PSBlbnZ5LkdldCgiU01UUF9VU0VSIiwgIiIpCglwYXNzd29yZCA6PSBlbnZ5LkdldCgiU01UUF9QQVNTV09SRCIsICIiKQoKCXZhciBlcnIgZXJyb3IKCXNtdHAsIGVyciA9IG1haWwuTmV3U01UUFNlbmRlcihob3N0LCBwb3J0LCB1c2VyLCBwYXNzd29yZCkKCglpZiBlcnIgIT0gbmlsIHsKCQlsb2cuRmF0YWwoZXJyKQoJfQoKCXIgPSByZW5kZXIuTmV3KHJlbmRlci5PcHRpb25zewogICAgSFRNTExheW91dDogImxheW91dC5odG1sIiwKCQlUZW1wbGF0ZXNCb3g6IHBhY2tyLk5ld0JveCgiLi4vdGVtcGxhdGVzL21haWwiKSwKICAgIEhlbHBlcnM6IHJlbmRlci5IZWxwZXJze30sCgl9KQp9Cg==\"") - packr.PackJSONBytes("../mail/init/templates", "templates/mail/layout.html.tmpl", "\"PGgxPnRlbXBsYXRlcy9tYWlsZXJzL2xheW91dC5odG1sPC9oMT4KCjwlPSB5aWVsZCAlPgo=\"") -} diff --git a/generators/newapp/newapp-packr.go b/generators/newapp/newapp-packr.go deleted file mode 100644 index 4353f435e..000000000 --- a/generators/newapp/newapp-packr.go +++ /dev/null @@ -1,27 +0,0 @@ -// Code generated by github.com/gobuffalo/packr. DO NOT EDIT - -package newapp - -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("../newapp/templates", "README.md.tmpl", "\"IyBXZWxjb21lIHRvIEJ1ZmZhbG8hCgpUaGFuayB5b3UgZm9yIGNob29zaW5nIEJ1ZmZhbG8gZm9yIHlvdXIgd2ViIGRldmVsb3BtZW50IG5lZWRzLgoKe3sgaWYgLm9wdHMuV2l0aFBvcCAtfX0KIyMgRGF0YWJhc2UgU2V0dXAKCkl0IGxvb2tzIGxpa2UgeW91IGNob3NlIHRvIHNldCB1cCB5b3VyIGFwcGxpY2F0aW9uIHVzaW5nIGEge3sub3B0cy5EQlR5cGV9fSBkYXRhYmFzZSEgRmFudGFzdGljIQoKVGhlIGZpcnN0IHRoaW5nIHlvdSBuZWVkIHRvIGRvIGlzIG9wZW4gdXAgdGhlICJkYXRhYmFzZS55bWwiIGZpbGUgYW5kIGVkaXQgaXQgdG8gdXNlIHRoZSBjb3JyZWN0IHVzZXJuYW1lcywgcGFzc3dvcmRzLCBob3N0cywgZXRjLi4uIHRoYXQgYXJlIGFwcHJvcHJpYXRlIGZvciB5b3VyIGVudmlyb25tZW50LgoKWW91IHdpbGwgYWxzbyBuZWVkIHRvIG1ha2Ugc3VyZSB0aGF0ICoqeW91Kiogc3RhcnQvaW5zdGFsbCB0aGUgZGF0YWJhc2Ugb2YgeW91ciBjaG9pY2UuIEJ1ZmZhbG8gKip3b24ndCoqIGluc3RhbGwgYW5kIHN0YXJ0IHt7Lm9wdHMuREJUeXBlfX0gZm9yIHlvdS4KCiMjIyBDcmVhdGUgWW91ciBEYXRhYmFzZXMKCk9rLCBzbyB5b3UndmUgZWRpdGVkIHRoZSAiZGF0YWJhc2UueW1sIiBmaWxlIGFuZCBzdGFydGVkIHt7Lm9wdHMuREJUeXBlfX0sIG5vdyBCdWZmYWxvIGNhbiBjcmVhdGUgdGhlIGRhdGFiYXNlcyBpbiB0aGF0IGZpbGUgZm9yIHlvdToKCgkkIGJ1ZmZhbG8gZGIgY3JlYXRlIC1hCgp7e2VuZCAtfX0KCiMjIFN0YXJ0aW5nIHRoZSBBcHBsaWNhdGlvbgoKQnVmZmFsbyBzaGlwcyB3aXRoIGEgY29tbWFuZCB0aGF0IHdpbGwgd2F0Y2ggeW91ciBhcHBsaWNhdGlvbiBhbmQgYXV0b21hdGljYWxseSByZWJ1aWxkIHRoZSBHbyBiaW5hcnkgYW5kIGFueSBhc3NldHMgZm9yIHlvdS4gVG8gZG8gdGhhdCBydW4gdGhlICJidWZmYWxvIGRldiIgY29tbWFuZDoKCgkkIGJ1ZmZhbG8gZGV2CgpJZiB5b3UgcG9pbnQgeW91ciBicm93c2VyIHRvIFtodHRwOi8vMTI3LjAuMC4xOjMwMDBdKGh0dHA6Ly8xMjcuMC4wLjE6MzAwMCkgeW91IHNob3VsZCBzZWUgYSAiV2VsY29tZSB0byBCdWZmYWxvISIgcGFnZS4KCioqQ29uZ3JhdHVsYXRpb25zISoqIFlvdSBub3cgaGF2ZSB5b3VyIEJ1ZmZhbG8gYXBwbGljYXRpb24gdXAgYW5kIHJ1bm5pbmcuCgojIyBXaGF0IE5leHQ/CgpXZSByZWNvbW1lbmQgeW91IGhlYWRpbmcgb3ZlciB0byBbaHR0cDovL2dvYnVmZmFsby5pb10oaHR0cDovL2dvYnVmZmFsby5pbykgYW5kIHJldmlld2luZyBhbGwgb2YgdGhlIGdyZWF0IGRvY3VtZW50YXRpb24gdGhlcmUuCgpHb29kIGx1Y2shCgpbUG93ZXJlZCBieSBCdWZmYWxvXShodHRwOi8vZ29idWZmYWxvLmlvKQo=\"") - packr.PackJSONBytes("../newapp/templates", "actions/actions_test.go.tmpl", "\"cGFja2FnZSBhY3Rpb25zCgppbXBvcnQgKAoJInRlc3RpbmciCgoJImdpdGh1Yi5jb20vZ29idWZmYWxvL3BhY2tyIgoJImdpdGh1Yi5jb20vZ29idWZmYWxvL3N1aXRlIgopCgp0eXBlIEFjdGlvblN1aXRlIHN0cnVjdCB7Cgkqc3VpdGUuQWN0aW9uCn0KCmZ1bmMgVGVzdF9BY3Rpb25TdWl0ZSh0ICp0ZXN0aW5nLlQpIHsKCWFjdGlvbiwgZXJyIDo9IHN1aXRlLk5ld0FjdGlvbldpdGhGaXh0dXJlcyhBcHAoKSwgcGFja3IuTmV3Qm94KCIuLi9maXh0dXJlcyIpKQoJaWYgZXJyICE9IG5pbCB7CgkJdC5GYXRhbChlcnIpCgl9CgoJYXMgOj0gJkFjdGlvblN1aXRlewoJCUFjdGlvbjogYWN0aW9uLAoJfQoJc3VpdGUuUnVuKHQsIGFzKQp9Cg==\"") - packr.PackJSONBytes("../newapp/templates", "actions/app.go.tmpl", "\"cGFja2FnZSBhY3Rpb25zCgppbXBvcnQgKAogICJnaXRodWIuY29tL2dvYnVmZmFsby9lbnZ5IgogICJnaXRodWIuY29tL2dvYnVmZmFsby9idWZmYWxvIgogICJnaXRodWIuY29tL2dvYnVmZmFsby9idWZmYWxvL21pZGRsZXdhcmUiCiAgImdpdGh1Yi5jb20vZ29idWZmYWxvL2J1ZmZhbG8vbWlkZGxld2FyZS9zc2wiCiAgImdpdGh1Yi5jb20vdW5yb2xsZWQvc2VjdXJlIgoKICB7eyBpZiAub3B0cy5XaXRoUG9wIH19CiAgInt7Lm9wdHMuTW9kZWxzUGtnfX0iCiAge3sgZW5kIC19fQoKICB7eyBpZiAub3B0cy5Bc1dlYiAtfX0KICAiZ2l0aHViLmNvbS9nb2J1ZmZhbG8vYnVmZmFsby9taWRkbGV3YXJlL2NzcmYiCiAgImdpdGh1Yi5jb20vZ29idWZmYWxvL2J1ZmZhbG8vbWlkZGxld2FyZS9pMThuIgogICJnaXRodWIuY29tL2dvYnVmZmFsby9wYWNrciIKICB7eyBlbmQgLX19CgogIHt7IGlmIC5vcHRzLkFzQVBJIC19fQogICJnaXRodWIuY29tL3JzL2NvcnMiCiAgImdpdGh1Yi5jb20vZ29idWZmYWxvL3gvc2Vzc2lvbnMiCiAge3sgZW5kIC19fQopCgovLyBFTlYgaXMgdXNlZCB0byBoZWxwIHN3aXRjaCBzZXR0aW5ncyBiYXNlZCBvbiB3aGVyZSB0aGUKLy8gYXBwbGljYXRpb24gaXMgYmVpbmcgcnVuLiBEZWZhdWx0IGlzICJkZXZlbG9wbWVudCIuCnZhciBFTlYgPSBlbnZ5LkdldCgiR09fRU5WIiwgImRldmVsb3BtZW50IikKdmFyIGFwcCAqYnVmZmFsby5BcHAKe3sgaWYgLm9wdHMuQXNXZWIgLX19CnZhciBUICppMThuLlRyYW5zbGF0b3IKe3sgZW5kIH19CgovLyBBcHAgaXMgd2hlcmUgYWxsIHJvdXRlcyBhbmQgbWlkZGxld2FyZSBmb3IgYnVmZmFsbwovLyBzaG91bGQgYmUgZGVmaW5lZC4gVGhpcyBpcyB0aGUgbmVydmUgY2VudGVyIG9mIHlvdXIKLy8gYXBwbGljYXRpb24uCmZ1bmMgQXBwKCkgKmJ1ZmZhbG8uQXBwIHsKICBpZiBhcHAgPT0gbmlsIHsKICAgIGFwcCA9IGJ1ZmZhbG8uTmV3KGJ1ZmZhbG8uT3B0aW9uc3sKICAgICAgRW52OiBFTlYsCiAgICAgIHt7IGlmIC5vcHRzLkFzQVBJIC19fQogICAgICBTZXNzaW9uU3RvcmU6IHNlc3Npb25zLk51bGx7fSwKICAgICAgUHJlV2FyZXM6IFtdYnVmZmFsby5QcmVXYXJlewogICAgICAgIGNvcnMuRGVmYXVsdCgpLkhhbmRsZXIsCiAgICAgIH0sCiAgICAgIHt7IGVuZCAtfX0KICAgICAgU2Vzc2lvbk5hbWU6ICJfe3sub3B0cy5OYW1lLkZpbGV9fV9zZXNzaW9uIiwKICAgIH0pCiAgICAvLyBBdXRvbWF0aWNhbGx5IHJlZGlyZWN0IHRvIFNTTAogICAgYXBwLlVzZShmb3JjZVNTTCgpKQoKICAgIHt7IGlmIC5vcHRzLkFzQVBJIC19fQogICAgLy8gU2V0IHRoZSByZXF1ZXN0IGNvbnRlbnQgdHlwZSB0byBKU09OCiAgICBhcHAuVXNlKG1pZGRsZXdhcmUuU2V0Q29udGVudFR5cGUoImFwcGxpY2F0aW9uL2pzb24iKSkKICAgIHt7IGVuZCB9fQoKICAgIGlmIEVOViA9PSAiZGV2ZWxvcG1lbnQiIHsKICAgICAgYXBwLlVzZShtaWRkbGV3YXJlLlBhcmFtZXRlckxvZ2dlcikKICAgIH0KCiAgICB7eyBpZiAub3B0cy5Bc1dlYiAtfX0KICAgIC8vIFByb3RlY3QgYWdhaW5zdCBDU1JGIGF0dGFja3MuIGh0dHBzOi8vd3d3Lm93YXNwLm9yZy9pbmRleC5waHAvQ3Jvc3MtU2l0ZV9SZXF1ZXN0X0ZvcmdlcnlfKENTUkYpCiAgICAvLyBSZW1vdmUgdG8gZGlzYWJsZSB0aGlzLgogICAgYXBwLlVzZShjc3JmLk5ldykKICAgIHt7IGVuZCB9fQoKICAgIHt7IGlmIC5vcHRzLldpdGhQb3AgfX0KICAgIC8vIFdyYXBzIGVhY2ggcmVxdWVzdCBpbiBhIHRyYW5zYWN0aW9uLgogICAgLy8gIGMuVmFsdWUoInR4IikuKCpwb3AuUG9wVHJhbnNhY3Rpb24pCiAgICAvLyBSZW1vdmUgdG8gZGlzYWJsZSB0aGlzLgogICAgYXBwLlVzZShtaWRkbGV3YXJlLlBvcFRyYW5zYWN0aW9uKG1vZGVscy5EQikpCiAgICB7eyBlbmQgfX0KCiAgICB7eyBpZiAub3B0cy5Bc1dlYiAtfX0KICAgIC8vIFNldHVwIGFuZCB1c2UgdHJhbnNsYXRpb25zOgogICAgYXBwLlVzZSh0cmFuc2xhdGlvbnMoKSkKICAgIHt7IGVuZCB9fQoKICAgIGFwcC5HRVQoIi8iLCBIb21lSGFuZGxlcikKCiAgICB7eyBpZiAub3B0cy5Bc1dlYiAtfX0KICAgIGFwcC5TZXJ2ZUZpbGVzKCIvIiwgYXNzZXRzQm94KSAvLyBzZXJ2ZSBmaWxlcyBmcm9tIHRoZSBwdWJsaWMgZGlyZWN0b3J5CiAgICB7eyBlbmQgLX19CiAgfQoKICByZXR1cm4gYXBwCn0KCnt7IGlmIC5vcHRzLkFzV2ViIC19fQovLyB0cmFuc2xhdGlvbnMgd2lsbCBsb2FkIGxvY2FsZSBmaWxlcywgc2V0IHVwIHRoZSB0cmFuc2xhdG9yIGBhY3Rpb25zLlRgLAovLyBhbmQgd2lsbCByZXR1cm4gYSBtaWRkbGV3YXJlIHRvIHVzZSB0byBsb2FkIHRoZSBjb3JyZWN0IGxvY2FsZSBmb3IgZWFjaAovLyByZXF1ZXN0LgovLyBmb3IgbW9yZSBpbmZvcm1hdGlvbjogaHR0cHM6Ly9nb2J1ZmZhbG8uaW8vZW4vZG9jcy9sb2NhbGl6YXRpb24KZnVuYyB0cmFuc2xhdGlvbnMoKSBidWZmYWxvLk1pZGRsZXdhcmVGdW5jIHsKICB2YXIgZXJyIGVycm9yCiAgaWYgVCwgZXJyID0gaTE4bi5OZXcocGFja3IuTmV3Qm94KCIuLi9sb2NhbGVzIiksICJlbi1VUyIpOyBlcnIgIT0gbmlsIHsKICAgIGFwcC5TdG9wKGVycikKICB9CiAgcmV0dXJuIFQuTWlkZGxld2FyZSgpCn0Ke3sgZW5kIH19CgovLyBmb3JjZVNTTCB3aWxsIHJldHVybiBhIG1pZGRsZXdhcmUgdGhhdCB3aWxsIHJlZGlyZWN0IGFuIGluY29taW5nIHJlcXVlc3QKLy8gaWYgaXQgaXMgbm90IEhUVFBTLiAiaHR0cDovL2V4YW1wbGUuY29tIiA9PiAiaHR0cHM6Ly9leGFtcGxlLmNvbSIuCi8vIFRoaXMgbWlkZGxld2FyZSBkb2VzICoqbm90KiogZW5hYmxlIFNTTC4gZm9yIHlvdXIgYXBwbGljYXRpb24uIFRvIGRvIHRoYXQKLy8gd2UgcmVjb21tZW5kIHVzaW5nIGEgcHJveHk6IGh0dHBzOi8vZ29idWZmYWxvLmlvL2VuL2RvY3MvcHJveHkKLy8gZm9yIG1vcmUgaW5mb3JtYXRpb246IGh0dHBzOi8vZ2l0aHViLmNvbS91bnJvbGxlZC9zZWN1cmUvCmZ1bmMgZm9yY2VTU0woKSBidWZmYWxvLk1pZGRsZXdhcmVGdW5jIHsKICByZXR1cm4gc3NsLkZvcmNlU1NMKHNlY3VyZS5PcHRpb25zewogICAgU1NMUmVkaXJlY3Q6ICAgICBFTlYgPT0gInByb2R1Y3Rpb24iLAogICAgU1NMUHJveHlIZWFkZXJzOiBtYXBbc3RyaW5nXXN0cmluZ3siWC1Gb3J3YXJkZWQtUHJvdG8iOiAiaHR0cHMifSwKICB9KQp9Cg==\"") - packr.PackJSONBytes("../newapp/templates", "actions/home.go.tmpl", "\"cGFja2FnZSBhY3Rpb25zCgppbXBvcnQgImdpdGh1Yi5jb20vZ29idWZmYWxvL2J1ZmZhbG8iCgovLyBIb21lSGFuZGxlciBpcyBhIGRlZmF1bHQgaGFuZGxlciB0byBzZXJ2ZSB1cAovLyBhIGhvbWUgcGFnZS4KZnVuYyBIb21lSGFuZGxlcihjIGJ1ZmZhbG8uQ29udGV4dCkgZXJyb3IgewogIHt7IGlmIC5vcHRzLkFzV2ViIC19fQoJcmV0dXJuIGMuUmVuZGVyKDIwMCwgci5IVE1MKCJpbmRleC5odG1sIikpCiAge3sgZW5kIC19fQogIHt7IGlmIC5vcHRzLkFzQVBJIC19fQogIHJldHVybiBjLlJlbmRlcigyMDAsIHIuSlNPTihtYXBbc3RyaW5nXXN0cmluZ3sibWVzc2FnZSI6ICJXZWxjb21lIHRvIEJ1ZmZhbG8hIn0pKQogIHt7IGVuZCAtfX0KfQo=\"") - packr.PackJSONBytes("../newapp/templates", "actions/home_test.go.tmpl", "\"cGFja2FnZSBhY3Rpb25zCgpmdW5jIChhcyAqQWN0aW9uU3VpdGUpIFRlc3RfSG9tZUhhbmRsZXIoKSB7CiAge3sgaWYgLm9wdHMuQXNXZWIgLX19CglyZXMgOj0gYXMuSFRNTCgiLyIpLkdldCgpCiAge3sgZW5kIC19fQogIHt7IGlmIC5vcHRzLkFzQVBJIC19fQoJcmVzIDo9IGFzLkpTT04oIi8iKS5HZXQoKQogIHt7IGVuZCAtfX0KCglhcy5FcXVhbCgyMDAsIHJlcy5Db2RlKQoJYXMuQ29udGFpbnMocmVzLkJvZHkuU3RyaW5nKCksICJXZWxjb21lIHRvIEJ1ZmZhbG8iKQp9Cg==\"") - packr.PackJSONBytes("../newapp/templates", "actions/render.go.tmpl", "\"cGFja2FnZSBhY3Rpb25zCgppbXBvcnQgKAogIHt7IGlmIC5vcHRzLkFzV2ViIC19fQogICJnaXRodWIuY29tL2dvYnVmZmFsby9wYWNrciIKICB7eyBlbmQgLX19CiAgImdpdGh1Yi5jb20vZ29idWZmYWxvL2J1ZmZhbG8vcmVuZGVyIgopCgp2YXIgciAqcmVuZGVyLkVuZ2luZQp7eyBpZiAub3B0cy5Bc1dlYiAtfX0KdmFyIGFzc2V0c0JveCA9IHBhY2tyLk5ld0JveCgiLi4vcHVibGljIikKe3sgZW5kIC19fQoKZnVuYyBpbml0KCkgewogIHIgPSByZW5kZXIuTmV3KHJlbmRlci5PcHRpb25zewogICAge3sgaWYgLm9wdHMuQXNXZWIgLX19CiAgICAgIC8vIEhUTUwgbGF5b3V0IHRvIGJlIHVzZWQgZm9yIGFsbCBIVE1MIHJlcXVlc3RzOgogICAgICBIVE1MTGF5b3V0OiAgICAgImFwcGxpY2F0aW9uLmh0bWwiLAoKICAgICAgLy8gQm94IGNvbnRhaW5pbmcgYWxsIG9mIHRoZSB0ZW1wbGF0ZXM6CiAgICAgIFRlbXBsYXRlc0JveDogcGFja3IuTmV3Qm94KCIuLi90ZW1wbGF0ZXMiKSwKICAgICAgQXNzZXRzQm94OiAgICBhc3NldHNCb3gsCgogICAgICAvLyBBZGQgdGVtcGxhdGUgaGVscGVycyBoZXJlOgogICAgICBIZWxwZXJzOiByZW5kZXIuSGVscGVyc3sKICAgICAgLy8gdW5jb21tZW50IGZvciBub24tQm9vdHN0cmFwIGZvcm0gaGVscGVyczoKICAgICAgLy8gImZvcm0iOiAgICAgcGx1c2guRm9ybUhlbHBlciwKICAgICAgLy8gImZvcm1fZm9yIjogcGx1c2guRm9ybUZvckhlbHBlciwKICAgICAgfSwKICAgIHt7IGVuZCAtfX0KICB9KQp9Cg==\"") - packr.PackJSONBytes("../newapp/templates", "dot-codeclimate.yml.tmpl", "\"ZW5naW5lczoKICBmaXhtZToKICAgIGVuYWJsZWQ6IHRydWUKICBnb2ZtdDoKICAgIGVuYWJsZWQ6IHRydWUKICBnb2xpbnQ6CiAgICBlbmFibGVkOiB0cnVlCiAgZ292ZXQ6CiAgICBlbmFibGVkOiB0cnVlCmV4Y2x1ZGVfcGF0aHM6CiAgLSBncmlmdHMvKiovKgogIC0gIioqLypfdGVzdC5nbyIKICAtICIqX3Rlc3QuZ28iCiAgLSAiKipfdGVzdC5nbyIKICAtIGxvZ3MvKgogIC0gcHVibGljLyoKICAtIHRlbXBsYXRlcy8qCnJhdGluZ3M6CiAgcGF0aHM6CiAgICAtICIqKi5nbyIK\"") - packr.PackJSONBytes("../newapp/templates", "dot-env.tmpl", "\"IyBUaGlzIC5lbnYgZmlsZSB3YXMgZ2VuZXJhdGVkIGJ5IGJ1ZmZhbG8sIGFkZCBoZXJlIHRoZSBlbnYgdmFyaWFibGVzIHlvdSBuZWVkIAojIGJ1ZmZhbG8gdG8gbG9hZCBpbnRvIHRoZSBFTlYgb24gYXBwbGljYXRpb24gc3RhcnR1cCBzbyB5b3VyIGFwcGxpY2F0aW9uIHdvcmtzIGNvcnJlY3RseS4KIyBUbyBhZGQgdmFyaWFibGVzIHVzZSBLRVk9VkFMVUUgZm9ybWF0LCB5b3UgY2FuIGxhdGVyIHJldHJpZXZlIHRoaXMgaW4geW91ciBhcHBsaWNhdGlvbgojIGJ5IHVzaW5nIG9zLkdldGVudigiS0VZIikuCiMKIyBFeGFtcGxlOgojIERBVEFCQVNFX1BBU1NXT1JEPVhYWFhYWFhYWAojIFNFU1NJT05fU0VDUkVUPVhYWFhYWFhYWAojIFNNVFBfU0VSVkVSPVhYWFhYWFhYWAo=\"") - packr.PackJSONBytes("../newapp/templates", "fixtures/sample.toml.tmpl", "\"W1tzY2VuYXJpb11dCm5hbWUgPSAibG90cyBvZiB3aWRnZXRzIgoKICBbW3NjZW5hcmlvLnRhYmxlXV0KICAgIG5hbWUgPSAid2lkZ2V0cyIKCiAgICBbW3NjZW5hcmlvLnRhYmxlLnJvd11dCiAgICAgIGlkID0gIjwlPSB1dWlkTmFtZWQoIndpZGdldCIpICU+IgogICAgICBuYW1lID0gIlRoaXMgaXMgd2lkZ2V0ICMxIgogICAgICBib2R5ID0gInNvbWUgd2lkZ2V0IGJvZHkiCiAgICAgIGNyZWF0ZWRfYXQgPSAiPCU9IG5vdygpICU+IgogICAgICB1cGRhdGVkX2F0ID0gIjwlPSBub3coKSAlPiIKCiAgICBbW3NjZW5hcmlvLnRhYmxlLnJvd11dCiAgICAgIGlkID0gIjwlPSB1dWlkKCkgJT4iCiAgICAgIG5hbWUgPSAiVGhpcyBpcyB3aWRnZXQgIzIiCiAgICAgIGJvZHkgPSAic29tZSB3aWRnZXQgYm9keSIKICAgICAgY3JlYXRlZF9hdCA9ICI8JT0gbm93KCkgJT4iCiAgICAgIHVwZGF0ZWRfYXQgPSAiPCU9IG5vdygpICU+IgoKICBbW3NjZW5hcmlvLnRhYmxlXV0KICAgIG5hbWUgPSAidXNlcnMiCgogICAgW1tzY2VuYXJpby50YWJsZS5yb3ddXQogICAgICBpZCA9ICI8JT0gdXVpZCgpICU+IgogICAgICBuYW1lID0gIk1hcmsgQmF0ZXMiCiAgICAgIGFkbWluID0gdHJ1ZQogICAgICBhZ2UgPSA0MQogICAgICB3aWRnZXRfaWQgPSAiPCU9IHV1aWROYW1lZCgid2lkZ2V0IikgJT4iCiAgICAgIGNyZWF0ZWRfYXQgPSAiPCU9IG5vdygpICU+IgogICAgICB1cGRhdGVkX2F0ID0gIjwlPSBub3coKSAlPiIKCg==\"") - packr.PackJSONBytes("../newapp/templates", "grifts/init.go.tmpl", "\"cGFja2FnZSBncmlmdHMKCmltcG9ydCAoCiAgImdpdGh1Yi5jb20vZ29idWZmYWxvL2J1ZmZhbG8iCgkie3sgLm9wdHMuQWN0aW9uc1BrZyB9fSIKKQoKZnVuYyBpbml0KCkgewogIGJ1ZmZhbG8uR3JpZnRzKGFjdGlvbnMuQXBwKCkpCn0K\"") - packr.PackJSONBytes("../newapp/templates", "inflections.json.tmpl", "\"ewogICJzaW5ndWxhciI6ICJwbHVyYWwiCn0K\"") - packr.PackJSONBytes("../newapp/templates", "locales/all.en-us.yaml.tmpl", "\"IyBGb3IgbW9yZSBpbmZvcm1hdGlvbiBvbiB1c2luZyBpMThuIHNlZTogaHR0cHM6Ly9naXRodWIuY29tL25pY2tzbnlkZXIvZ28taTE4bgotIGlkOiB3ZWxjb21lX2dyZWV0aW5nCiAgdHJhbnNsYXRpb246ICJXZWxjb21lIHRvIEJ1ZmZhbG8gKEVOKSIK\"") - packr.PackJSONBytes("../newapp/templates", "main.go.tmpl", "\"cGFja2FnZSBtYWluCgppbXBvcnQgKAogICJsb2ciCgogICJ7eyAub3B0cy5BY3Rpb25zUGtnIH19IgopCgovLyBtYWluIGlzIHRoZSBzdGFydGluZyBwb2ludCB0byB5b3VyIEJ1ZmZhbG8gYXBwbGljYXRpb24uCi8vIHlvdSBjYW4gZmVlbCBmcmVlIGFuZCBhZGQgdG8gdGhpcyBgbWFpbmAgbWV0aG9kLCBjaGFuZ2UKLy8gd2hhdCBpdCBkb2VzLCBldGMuLi4KLy8gQWxsIHdlIGFzayBpcyB0aGF0LCBhdCBzb21lIHBvaW50LCB5b3UgbWFrZSBzdXJlIHRvCi8vIGNhbGwgYGFwcC5TZXJ2ZSgpYCwgdW5sZXNzIHlvdSBkb24ndCB3YW50IHRvIHN0YXJ0IHlvdXIKLy8gYXBwbGljYXRpb24gdGhhdCBpcy4gOikKZnVuYyBtYWluKCkgewogIGFwcCA6PSBhY3Rpb25zLkFwcCgpCiAgaWYgZXJyIDo9IGFwcC5TZXJ2ZSgpOyBlcnIgIT0gbmlsIHsKICAgIGxvZy5GYXRhbChlcnIpCiAgfQp9CgovKgojIE5vdGVzIGFib3V0IGBtYWluLmdvYAoKIyMgU1NMIFN1cHBvcnQKCldlIHJlY29tbWVuZCBwbGFjaW5nIHlvdXIgYXBwbGljYXRpb24gYmVoaW5kIGEgcHJveHksIHN1Y2ggYXMKQXBhY2hlIG9yIE5naW54IGFuZCBsZXR0aW5nIHRoZW0gZG8gdGhlIFNTTCBoZWF2aW5nIGxpZnRpbmcKZm9yIHlvdS4gaHR0cHM6Ly9nb2J1ZmZhbG8uaW8vZW4vZG9jcy9wcm94eQoKIyMgQnVmZmFsbyBCdWlsZAoKV2hlbiBgYnVmZmFsbyBidWlsZGAgaXMgcnVuIHRvIGNvbXBpbGUgeW91ciBiaW5hcnkgdGhpcyBgbWFpbmAKZnVuY3Rpb24gd2lsbCBiZSBhdCB0aGUgaGVhcnQgb2YgdGhhdCBiaW5hcnkuIEl0IGlzIGV4cGVjdGVkCnRoYXQgeW91ciBgbWFpbmAgZnVuY3Rpb24gd2lsbCBzdGFydCB5b3VyIGFwcGxpY2F0aW9uIHVzaW5nCnRoZSBgYXBwLlNlcnZlKClgIG1ldGhvZC4KCiovCg==\"") - packr.PackJSONBytes("../newapp/templates", "public/robots.txt.tmpl", "\"VXNlci1hZ2VudDogKgpEaXNhbGxvdzogLwo=\"") - packr.PackJSONBytes("../newapp/templates", "templates/_flash.html.tmpl", "\"PGRpdiBjbGFzcz0icm93Ij4KICA8ZGl2IGNsYXNzPSJjb2wtbWQtMTIiPgogICAgPCU9IGZvciAoaywgbWVzc2FnZXMpIGluIGZsYXNoIHsgJT4KICAgICAgPCU9IGZvciAobXNnKSBpbiBtZXNzYWdlcyB7ICU+CiAgICAgICAgPGRpdiBjbGFzcz0iYWxlcnQgYWxlcnQtPCU9IGsgJT4iIHJvbGU9ImFsZXJ0Ij4KICAgICAgICAgIDwlPSBtc2cgJT4KICAgICAgICAgIDxidXR0b24gdHlwZT0iYnV0dG9uIiBjbGFzcz0iY2xvc2UiIGRhdGEtZGlzbWlzcz0iYWxlcnQiIGFyaWEtbGFiZWw9IkNsb3NlIj4KICAgICAgICAgICAgPHNwYW4gYXJpYS1oaWRkZW49InRydWUiPiZ0aW1lczs8L3NwYW4+CiAgICAgICAgICA8L2J1dHRvbj4KICAgICAgICA8L2Rpdj4KICAgICAgPCUgfSAlPgogICAgPCUgfSAlPgogIDwvZGl2Pgo8L2Rpdj4K\"") - packr.PackJSONBytes("../newapp/templates", "templates/application.html.tmpl", "\"PCFET0NUWVBFIGh0bWw+CjxodG1sPgogIDxoZWFkPgogICAgPG1ldGEgbmFtZT0idmlld3BvcnQiIGNvbnRlbnQ9IndpZHRoPWRldmljZS13aWR0aCwgaW5pdGlhbC1zY2FsZT0xIj4KICAgIDxtZXRhIGNoYXJzZXQ9InV0Zi04Ij4KICAgIDx0aXRsZT5CdWZmYWxvIC0ge3sgLm9wdHMuTmFtZS5UaXRsZSB9fTwvdGl0bGU+CiAge3stIGlmIG5vdCAub3B0cy5XaXRoV2VicGFjayB9fQogICAge3stIGlmIGVxIC5vcHRzLkJvb3RzdHJhcCAzIH19CiAgICA8bGluayByZWw9InN0eWxlc2hlZXQiIGhyZWY9Imh0dHBzOi8vbWF4Y2RuLmJvb3RzdHJhcGNkbi5jb20vYm9vdHN0cmFwLzMuMy43L2Nzcy9ib290c3RyYXAubWluLmNzcyIgaW50ZWdyaXR5PSJzaGEzODQtQlZZaWlTSUZlSzFkR21KUkFreWN1SEFIUmczMk9tVWN3dzdvbjNSWWRnNFZhK1BtU1Rzei9LNjh2YmRFamg0dSIgY3Jvc3NvcmlnaW49ImFub255bW91cyI+CiAgICB7ey0gZWxzZSB9fQogICAgPGxpbmsgcmVsPSJzdHlsZXNoZWV0IiBocmVmPSJodHRwczovL3N0YWNrcGF0aC5ib290c3RyYXBjZG4uY29tL2Jvb3RzdHJhcC80LjEuMC9jc3MvYm9vdHN0cmFwLm1pbi5jc3MiIGludGVncml0eT0ic2hhMzg0LTlnVlE0ZFlGd3dXU2pJRFpuTEVXbnhDamVTV0ZwaEppd0dQWHIxamRkSWhPZWdpdTFGd081cVJHdkZYT2RKWjQiIGNyb3Nzb3JpZ2luPSJhbm9ueW1vdXMiPgogICAge3stIGVuZCB9fQogIHt7LSBlbmQgfX0KICAgIDwlPSBzdHlsZXNoZWV0VGFnKCJhcHBsaWNhdGlvbi5jc3MiKSAlPgogICAgPG1ldGEgbmFtZT0iY3NyZi1wYXJhbSIgY29udGVudD0iYXV0aGVudGljaXR5X3Rva2VuIiAvPgogICAgPG1ldGEgbmFtZT0iY3NyZi10b2tlbiIgY29udGVudD0iPCU9IGF1dGhlbnRpY2l0eV90b2tlbiAlPiIgLz4KICAgIDxsaW5rIHJlbD0iaWNvbiIgaHJlZj0iPCU9IGFzc2V0UGF0aCgiaW1hZ2VzL2Zhdmljb24uaWNvIikgJT4iPgogIDwvaGVhZD4KICA8Ym9keT4KCiAgICA8ZGl2IGNsYXNzPSJjb250YWluZXIiPgogICAgICA8JT0gcGFydGlhbCgiZmxhc2guaHRtbCIpICU+CiAgICAgIDwlPSB5aWVsZCAlPgogICAgPC9kaXY+CgogICAgPCU9IGphdmFzY3JpcHRUYWcoImFwcGxpY2F0aW9uLmpzIikgJT4KICA8L2JvZHk+CjwvaHRtbD4K\"") - packr.PackJSONBytes("../newapp/templates", "templates/index.html.tmpl", "\"PHN0eWxlIG1lZGlhPSJzY3JlZW4iPgogIC5jb250YWluZXIgewogICAgbWluLXdpZHRoOiAzMjBweDsKICB9CgogIGhlYWRlciB7CiAgICBiYWNrZ3JvdW5kLWNvbG9yOiAjNjJhNWVlOwogICAgcGFkZGluZzogMTBweCAyMHB4OwogICAgYm94LXNpemluZzogYm9yZGVyLWJveDsKICB9CgogIC5sb2dvIGltZyB7CiAgICB3aWR0aDogODBweDsKICB9CgogIC50aXRsZXMgaDEgewogICAgZm9udC1zaXplOiAzMHB4OwogICAgZm9udC13ZWlnaHQ6IDMwMDsKICAgIGNvbG9yOiB3aGl0ZTsKICAgIG1hcmdpbi1ib3R0b206IDEzcHg7CiAgICBtYXJnaW4tdG9wOiA1cHg7CiAgfQoKICAudGl0bGVzIGgyIHsKICAgIGZvbnQtd2VpZ2h0OiAzMDA7CiAgICBmb250LXNpemU6IDE4cHg7CiAgICBkaXNwbGF5OiBpbmxpbmUtYmxvY2s7CiAgICBtYXJnaW46IDA7CiAgfQoKICAudGl0bGVzIGEgewogICAgY29sb3I6IHdoaXRlOwogICAgdGV4dC1kZWNvcmF0aW9uOiB1bmRlcmxpbmU7CiAgfQoKICAudGl0bGVzIGkgewogICAgbWFyZ2luLXJpZ2h0OiA1cHg7CiAgICB0ZXh0LWRlY29yYXRpb246IG5vbmU7CiAgfQoKICAudGl0bGVzIC5kb2N1bWVudGF0aW9uIHsKICAgIG1hcmdpbi1sZWZ0OiAyOHB4OwogIH0KCiAgLnN1YnRpdGxlIHsKICAgIGNvbG9yOiB3aGl0ZTsKICAgIG1hcmdpbjogMDsKICAgIHBhZGRpbmc6IDEzcHggMDsKICAgIGJhY2tncm91bmQtY29sb3I6ICMyYTM1NDM7CiAgICBtYXJnaW4tYm90dG9tOiAyMHB4OwogIH0KCiAgLnN1YnRpdGxlIGgzIHsKICAgIGZvbnQtc2l6ZTogMjJweDsKICAgIGZvbnQtd2VpZ2h0OiA0MDA7CiAgICBtYXJnaW46IDA7CiAgfQoKICB0YWJsZSB7CiAgICBmb250LXNpemU6IDE0cHg7CiAgfQoKICB0YWJsZS50YWJsZSB0Ym9keSB0ciB0ZCB7CiAgICBib3JkZXItdG9wOiAwOwogICAgcGFkZGluZzogMTBweDsKICB9CgogIC5mb290IHsKICAgIHRleHQtYWxpZ246IHJpZ2h0OwogICAgY29sb3I6ICNjNWM1YzU7CiAgICBmb250LXdlaWdodDogMzAwOwogIH0KCiAgLmZvb3QgYSB7CiAgICBjb2xvcjogIzhiOGI4YjsKICAgIHRleHQtZGVjb3JhdGlvbjogdW5kZXJsaW5lOwogIH0KCiAgLmNlbnRlcmVkIHsKICAgIHRleHQtYWxpZ246IGNlbnRlcjsKICB9CgogIEBtZWRpYSBhbGwgYW5kIChtYXgtd2lkdGg6IDc3MHB4KSB7CiAgICAudGl0bGVzIGgxIHsKICAgICAgZm9udC1zaXplOiAyNXB4OwogICAgICBtYXJnaW46IDE1cHggMCA1cHggMDsKICAgIH0KICB9CgogIEBtZWRpYSBhbGwgYW5kIChtYXgtd2lkdGg6IDY0MHB4KSB7CiAgICAudGl0bGVzIGgxIHsKICAgICAgZm9udC1zaXplOiAyM3B4OwogICAgICBtYXJnaW46IDE1cHggMCA1cHggMDsKICAgIH0KICAgIC50aXRsZXMgaDIgewogICAgICBmb250LXNpemU6IDE1cHg7CiAgICB9CiAgICAudGl0bGVzIC5kb2N1bWVudGF0aW9uIHsKICAgICAgbWFyZ2luLWxlZnQ6IDEwcHg7CiAgICB9CiAgfQoKICBAbWVkaWEgYWxsIGFuZCAobWF4LXdpZHRoOiA1MzBweCkgewogICAgLnRpdGxlcyBoMSB7CiAgICAgIGZvbnQtc2l6ZTogMjBweDsKICAgICAgbWFyZ2luOiA1cHggMDsKICAgIH0KICAgIC5sb2dvIHsKICAgICAgcGFkZGluZzogMAogICAgfQogICAgLmxvZ28gaW1nIHsKICAgICAgd2lkdGg6IDEwMCUKICAgIH0KICAgIC50aXRsZXMgLmRvY3VtZW50YXRpb24gewogICAgICBtYXJnaW4tbGVmdDogMHB4OwogICAgICBtYXJnaW4tdG9wOiA1cHg7CiAgICAgIGRpc3BsYXk6IGJsb2NrOwogICAgfQogIH0KPC9zdHlsZT4KCjxoZWFkZXI+CiAgPGRpdiBjbGFzcz0iY29udGFpbmVyIj4KICAgIDxkaXYgY2xhc3M9InJvdyI+CiAgICAgIDxkaXYgY2xhc3M9ImNvbC1tZC0xIGNvbC1zbS0yIGNvbC14cy0yIGxvZ28iPgogICAgICAgIDxhIGhyZWY9IjwlPSByb290UGF0aCgpICU+Ij48aW1nIHNyYz0iPCU9IHJvb3RQYXRoKCkgJT5hc3NldHMvaW1hZ2VzL2xvZ28uc3ZnIiBhbHQ9IiI+PC9hPgogICAgICA8L2Rpdj4KICAgICAgPGRpdiBjbGFzcz0iY29sLW1kLTkgY29sLXNtLTkgY29sLXhzLTEwIHRpdGxlcyI+CiAgICAgICAgPGgxPjwlPSB0KCJ3ZWxjb21lX2dyZWV0aW5nIikgJT48L2gxPgogICAgICAgIDxoMj4KICAgICAgICAgIDxhIGhyZWY9Imh0dHBzOi8vZ2l0aHViLmNvbS9nb2J1ZmZhbG8vYnVmZmFsbyI+PGkgY2xhc3M9ImZhIGZhLWdpdGh1YiIgYXJpYS1oaWRkZW49InRydWUiPjwvaT4gaHR0cHM6Ly9naXRodWIuY29tL2dvYnVmZmFsby9idWZmYWxvPC9hPgogICAgICAgIDwvaDI+CiAgICAgICAgPGgyIGNsYXNzPSJkb2N1bWVudGF0aW9uIj4KICAgICAgICAgIDxhIGhyZWY9Imh0dHA6Ly9nb2J1ZmZhbG8uaW8vIj48aSBjbGFzcz0iZmEgZmEtYm9vayIgYXJpYS1oaWRkZW49InRydWUiPjwvaT4gRG9jdW1lbnRhdGlvbjwvYT4KICAgICAgICA8L2gyPgogICAgICA8L2Rpdj4KICAgIDwvZGl2PgogIDwvZGl2PgoKPC9oZWFkZXI+Cgo8ZGl2IGNsYXNzPSJyb3ciPgogIDxkaXYgY2xhc3M9ImNvbC1tZC0xMiI+CiAgICA8ZGl2IGNsYXNzPSJzdWJ0aXRsZSI+CiAgICAgIDxkaXYgY2xhc3M9ImNvbnRhaW5lciI+CiAgICAgICAgPGgzPkRlZmluZWQgUm91dGVzPC9oMz4KICAgICAgPC9kaXY+CiAgICA8L2Rpdj4KICAgIDxkaXYgY2xhc3M9InRhYmxlLXJlc3BvbnNpdmUiPgogICAgICA8dGFibGUgY2xhc3M9InRhYmxlIHRhYmxlLXN0cmlwZWQiPgogICAgICAgIDx0aGVhZD4KICAgICAgICAgIDx0ciB0ZXh0LWFsaWduPSJsZWZ0Ij4KICAgICAgICAgICAgPHRoIGNsYXNzPSJjZW50ZXJlZCI+TUVUSE9EPC90aD4KICAgICAgICAgICAgPHRoPlBBVEg8L3RoPgogICAgICAgICAgICA8dGg+TkFNRTwvdGg+CiAgICAgICAgICAgIDx0aD5IQU5ETEVSPC90aD4KICAgICAgICAgIDwvdHI+CiAgICAgICAgPC90aGVhZD4KICAgICAgICA8dGJvZHk+CgogICAgICAgICAgPCU9IGZvciAocikgaW4gcm91dGVzIHsgJT4KICAgICAgICAgICAgPHRyPgogICAgICAgICAgICAgIDx0ZCBjbGFzcz0iY2VudGVyZWQiPgogICAgICAgICAgICAgICAgPCU9IHIuTWV0aG9kICU+CiAgICAgICAgICAgICAgPC90ZD4KICAgICAgICAgICAgICA8dGQ+CiAgICAgICAgICAgICAgICA8JT0gaWYgKHIuTWV0aG9kICE9ICJHRVQiIHx8IHIuUGF0aCB+PSAieyIpIHsgJT4KICAgICAgICAgICAgICAgICAgPCU9IHIuUGF0aCAlPgogICAgICAgICAgICAgICAgPCUgfSBlbHNlIHsgJT4KICAgICAgICAgICAgICAgICAgPGEgaHJlZj0iPCU9IHIuUGF0aCAlPiI+PCU9IHIuUGF0aCAlPjwvYT4KICAgICAgICAgICAgICAgIDwlIH0gJT4KICAgICAgICAgICAgICA8L3RkPgogICAgICAgICAgICAgIDx0ZD4KICAgICAgICAgICAgICAgIDwlPSByLlBhdGhOYW1lICU+CiAgICAgICAgICAgICAgPC90ZD4KICAgICAgICAgICAgICA8dGQ+PGNvZGU+PCU9IHIuSGFuZGxlck5hbWUgJT48L2NvZGU+PC90ZD4KICAgICAgICAgICAgPC90cj4KICAgICAgICAgIDwlIH0gJT4KCiAgICAgICAgPC90Ym9keT4KICAgICAgPC90YWJsZT4KICAgIDwvZGl2PgogIDwvZGl2Pgo8L2Rpdj4KPGRpdiBjbGFzcz0iZm9vdCI+IDxzcGFuPiBQb3dlcmVkIGJ5IDxhIGhyZWY9Imh0dHA6Ly9nb2J1ZmZhbG8uaW8vIj5nb2J1ZmZhbG8uaW88L2E+PC9zcGFuPiA8L2Rpdj4K\"") -} diff --git a/generators/refresh/refresh-packr.go b/generators/refresh/refresh-packr.go deleted file mode 100644 index c1f56f206..000000000 --- a/generators/refresh/refresh-packr.go +++ /dev/null @@ -1,11 +0,0 @@ -// Code generated by github.com/gobuffalo/packr. DO NOT EDIT - -package refresh - -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("../refresh/templates", "dot-buffalo.dev.yml.tmpl", "\"YXBwX3Jvb3Q6IC4KaWdub3JlZF9mb2xkZXJzOgotIHZlbmRvcgotIGxvZwotIGxvZ3MKLSBhc3NldHMKLSBwdWJsaWMKLSBncmlmdHMKLSB0bXAKLSBiaW4KLSBub2RlX21vZHVsZXMKLSAuc2Fzcy1jYWNoZQppbmNsdWRlZF9leHRlbnNpb25zOgotIC5nbwotIC5lbnYKYnVpbGRfcGF0aDogdG1wCmJ1aWxkX2RlbGF5OiAyMDBucwpiaW5hcnlfbmFtZToge3submFtZX19LWJ1aWxkCmNvbW1hbmRfZmxhZ3M6IFtdCmVuYWJsZV9jb2xvcnM6IHRydWUKbG9nX25hbWU6IGJ1ZmZhbG8K\"") -} diff --git a/generators/resource/resource-packr.go b/generators/resource/resource-packr.go deleted file mode 100644 index 48ac27504..000000000 --- a/generators/resource/resource-packr.go +++ /dev/null @@ -1,21 +0,0 @@ -// Code generated by github.com/gobuffalo/packr. DO NOT EDIT - -package resource - -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("../resource/templates", "actions/resource-json-xml.go.tmpl", "\"cGFja2FnZSBhY3Rpb25zCgppbXBvcnQgKAoKICAiZ2l0aHViLmNvbS9wa2cvZXJyb3JzIgogICJnaXRodWIuY29tL2dvYnVmZmFsby9idWZmYWxvIgogICJnaXRodWIuY29tL2dvYnVmZmFsby9wb3AiCiAgInt7Lm9wdHMuQXBwLk1vZGVsc1BrZ319IgopCgovLyBUaGlzIGZpbGUgaXMgZ2VuZXJhdGVkIGJ5IEJ1ZmZhbG8uIEl0IG9mZmVycyBhIGJhc2ljIHN0cnVjdHVyZSBmb3IKLy8gYWRkaW5nLCBlZGl0aW5nIGFuZCBkZWxldGluZyBhIHBhZ2UuIElmIHlvdXIgbW9kZWwgaXMgbW9yZQovLyBjb21wbGV4IG9yIHlvdSBuZWVkIG1vcmUgdGhhbiB0aGUgYmFzaWMgaW1wbGVtZW50YXRpb24geW91IG5lZWQgdG8KLy8gZWRpdCB0aGlzIGZpbGUuCgovLyBGb2xsb3dpbmcgbmFtaW5nIGxvZ2ljIGlzIGltcGxlbWVudGVkIGluIEJ1ZmZhbG86Ci8vIE1vZGVsOiBTaW5ndWxhciAoe3sub3B0cy5Nb2RlbC5Nb2RlbH19KQovLyBEQiBUYWJsZTogUGx1cmFsICh7ey5vcHRzLk1vZGVsLlRhYmxlfX0pCi8vIFJlc291cmNlOiBQbHVyYWwgKHt7Lm9wdHMuTmFtZS5SZXNvdXJjZX19KQovLyBQYXRoOiBQbHVyYWwgKC97ey5vcHRzLk5hbWUuVVJMfX0pCi8vIFZpZXcgVGVtcGxhdGUgRm9sZGVyOiBQbHVyYWwgKC90ZW1wbGF0ZXMve3sub3B0cy5GaWxlc1BhdGh9fS8pCgovLyB7ey5vcHRzLk5hbWUuUmVzb3VyY2V9fVJlc291cmNlIGlzIHRoZSByZXNvdXJjZSBmb3IgdGhlIHt7Lm9wdHMuTW9kZWwuTW9kZWx9fSBtb2RlbAp0eXBlIHt7Lm9wdHMuTmFtZS5SZXNvdXJjZX19UmVzb3VyY2Ugc3RydWN0ewogIGJ1ZmZhbG8uUmVzb3VyY2UKfQoKLy8gTGlzdCBnZXRzIGFsbCB7ey5vcHRzLk1vZGVsLk1vZGVsUGx1cmFsfX0uIFRoaXMgZnVuY3Rpb24gaXMgbWFwcGVkIHRvIHRoZSBwYXRoCi8vIEdFVCAve3sub3B0cy5OYW1lLlVSTH19CmZ1bmMgKHYge3sub3B0cy5OYW1lLlJlc291cmNlfX1SZXNvdXJjZSkgTGlzdChjIGJ1ZmZhbG8uQ29udGV4dCkgZXJyb3IgewogIC8vIEdldCB0aGUgREIgY29ubmVjdGlvbiBmcm9tIHRoZSBjb250ZXh0Cgl0eCwgb2sgOj0gYy5WYWx1ZSgidHgiKS4oKnBvcC5Db25uZWN0aW9uKQoJaWYgIW9rIHsKCQlyZXR1cm4gZXJyb3JzLldpdGhTdGFjayhlcnJvcnMuTmV3KCJubyB0cmFuc2FjdGlvbiBmb3VuZCIpKQoJfQoKICB7ey5vcHRzLk1vZGVsLlZhckNhc2VQbHVyYWx9fSA6PSAmbW9kZWxzLnt7Lm9wdHMuTW9kZWwuTW9kZWxQbHVyYWx9fXt9CgogIC8vIFBhZ2luYXRlIHJlc3VsdHMuIFBhcmFtcyAicGFnZSIgYW5kICJwZXJfcGFnZSIgY29udHJvbCBwYWdpbmF0aW9uLgogIC8vIERlZmF1bHQgdmFsdWVzIGFyZSAicGFnZT0xIiBhbmQgInBlcl9wYWdlPTIwIi4KICBxIDo9IHR4LlBhZ2luYXRlRnJvbVBhcmFtcyhjLlBhcmFtcygpKQoKICAvLyBSZXRyaWV2ZSBhbGwge3sub3B0cy5Nb2RlbC5Nb2RlbFBsdXJhbH19IGZyb20gdGhlIERCCiAgaWYgZXJyIDo9IHEuQWxsKHt7Lm9wdHMuTW9kZWwuVmFyQ2FzZVBsdXJhbH19KTsgZXJyICE9IG5pbCB7CiAgICByZXR1cm4gZXJyb3JzLldpdGhTdGFjayhlcnIpCiAgfQoKICAvLyBBZGQgdGhlIHBhZ2luYXRvciB0byB0aGUgaGVhZGVycyBzbyBjbGllbnRzIGtub3cgaG93IHRvIHBhZ2luYXRlLgogIGMuUmVzcG9uc2UoKS5IZWFkZXIoKS5TZXQoIlgtUGFnaW5hdGlvbiIsIHEuUGFnaW5hdG9yLlN0cmluZygpKQoKICByZXR1cm4gYy5SZW5kZXIoMjAwLCByLnt7Lm9wdHMuTWltZVR5cGV9fSh7ey5vcHRzLk1vZGVsLlZhckNhc2VQbHVyYWx9fSkpCn0KCi8vIFNob3cgZ2V0cyB0aGUgZGF0YSBmb3Igb25lIHt7Lm9wdHMuTW9kZWwuTW9kZWx9fS4gVGhpcyBmdW5jdGlvbiBpcyBtYXBwZWQgdG8KLy8gdGhlIHBhdGggR0VUIC97ey5vcHRzLk5hbWUuVVJMfX0ve3sieyJ9fXt7Lm9wdHMuTmFtZS5QYXJhbUlEfX19CmZ1bmMgKHYge3sub3B0cy5OYW1lLlJlc291cmNlfX1SZXNvdXJjZSkgU2hvdyhjIGJ1ZmZhbG8uQ29udGV4dCkgZXJyb3IgewogIC8vIEdldCB0aGUgREIgY29ubmVjdGlvbiBmcm9tIHRoZSBjb250ZXh0Cgl0eCwgb2sgOj0gYy5WYWx1ZSgidHgiKS4oKnBvcC5Db25uZWN0aW9uKQoJaWYgIW9rIHsKCQlyZXR1cm4gZXJyb3JzLldpdGhTdGFjayhlcnJvcnMuTmV3KCJubyB0cmFuc2FjdGlvbiBmb3VuZCIpKQoJfQoKICAvLyBBbGxvY2F0ZSBhbiBlbXB0eSB7ey5vcHRzLk1vZGVsLk1vZGVsfX0KICB7ey5vcHRzLk1vZGVsLlZhckNhc2VTaW5ndWxhcn19IDo9ICZtb2RlbHMue3sub3B0cy5Nb2RlbC5Nb2RlbH19e30KCiAgLy8gVG8gZmluZCB0aGUge3sub3B0cy5Nb2RlbC5Nb2RlbH19IHRoZSBwYXJhbWV0ZXIge3sub3B0cy5OYW1lLlBhcmFtSUR9fSBpcyB1c2VkLgogIGlmIGVyciA6PSB0eC5GaW5kKHt7Lm9wdHMuTW9kZWwuVmFyQ2FzZVNpbmd1bGFyfX0sIGMuUGFyYW0oInt7Lm9wdHMuTmFtZS5QYXJhbUlEfX0iKSk7IGVyciAhPSBuaWwgewogICAgcmV0dXJuIGMuRXJyb3IoNDA0LCBlcnIpCiAgfQoKICByZXR1cm4gYy5SZW5kZXIoMjAwLCByLnt7Lm9wdHMuTWltZVR5cGV9fSh7ey5vcHRzLk1vZGVsLlZhckNhc2VTaW5ndWxhcn19KSkKfQoKLy8gTmV3IGRlZmF1bHQgaW1wbGVtZW50YXRpb24uIFJldHVybnMgYSA0MDQKZnVuYyAodiB7ey5vcHRzLk5hbWUuUmVzb3VyY2V9fVJlc291cmNlKSBOZXcoYyBidWZmYWxvLkNvbnRleHQpIGVycm9yIHsKICByZXR1cm4gYy5FcnJvcig0MDQsIGVycm9ycy5OZXcoIm5vdCBhdmFpbGFibGUiKSkKfQoKLy8gQ3JlYXRlIGFkZHMgYSB7ey5vcHRzLk1vZGVsLk1vZGVsfX0gdG8gdGhlIERCLiBUaGlzIGZ1bmN0aW9uIGlzIG1hcHBlZCB0byB0aGUKLy8gcGF0aCBQT1NUIC97ey5vcHRzLk5hbWUuVVJMfX0KZnVuYyAodiB7ey5vcHRzLk5hbWUuUmVzb3VyY2V9fVJlc291cmNlKSBDcmVhdGUoYyBidWZmYWxvLkNvbnRleHQpIGVycm9yIHsKICAvLyBBbGxvY2F0ZSBhbiBlbXB0eSB7ey5vcHRzLk1vZGVsLk1vZGVsfX0KICB7ey5vcHRzLk1vZGVsLlZhckNhc2VTaW5ndWxhcn19IDo9ICZtb2RlbHMue3sub3B0cy5Nb2RlbC5Nb2RlbH19e30KCiAgLy8gQmluZCB7ey5vcHRzLk1vZGVsLlZhckNhc2VTaW5ndWxhcn19IHRvIHRoZSBodG1sIGZvcm0gZWxlbWVudHMKICBpZiBlcnIgOj0gYy5CaW5kKHt7Lm9wdHMuTW9kZWwuVmFyQ2FzZVNpbmd1bGFyfX0pOyBlcnIgIT0gbmlsIHsKICAgIHJldHVybiBlcnJvcnMuV2l0aFN0YWNrKGVycikKICB9CgogIC8vIEdldCB0aGUgREIgY29ubmVjdGlvbiBmcm9tIHRoZSBjb250ZXh0Cgl0eCwgb2sgOj0gYy5WYWx1ZSgidHgiKS4oKnBvcC5Db25uZWN0aW9uKQoJaWYgIW9rIHsKCQlyZXR1cm4gZXJyb3JzLldpdGhTdGFjayhlcnJvcnMuTmV3KCJubyB0cmFuc2FjdGlvbiBmb3VuZCIpKQoJfQoKICAvLyBWYWxpZGF0ZSB0aGUgZGF0YSBmcm9tIHRoZSBodG1sIGZvcm0KICB2ZXJycywgZXJyIDo9IHR4LlZhbGlkYXRlQW5kQ3JlYXRlKHt7Lm9wdHMuTW9kZWwuVmFyQ2FzZVNpbmd1bGFyfX0pCiAgaWYgZXJyICE9IG5pbCB7CiAgICByZXR1cm4gZXJyb3JzLldpdGhTdGFjayhlcnIpCiAgfQoKICBpZiB2ZXJycy5IYXNBbnkoKSB7CiAgICAvLyBSZW5kZXIgZXJyb3JzIGFzIHt7Lm9wdHMuTWltZVR5cGV9fQogICAgcmV0dXJuIGMuUmVuZGVyKDQwMCwgci57ey5vcHRzLk1pbWVUeXBlfX0odmVycnMpKQogIH0KCiAgcmV0dXJuIGMuUmVuZGVyKDIwMSwgci57ey5vcHRzLk1pbWVUeXBlfX0oe3sub3B0cy5Nb2RlbC5WYXJDYXNlU2luZ3VsYXJ9fSkpCn0KCi8vIEVkaXQgZGVmYXVsdCBpbXBsZW1lbnRhdGlvbi4gUmV0dXJucyBhIDQwNApmdW5jICh2IHt7Lm9wdHMuTmFtZS5SZXNvdXJjZX19UmVzb3VyY2UpIEVkaXQoYyBidWZmYWxvLkNvbnRleHQpIGVycm9yIHsKICByZXR1cm4gYy5FcnJvcig0MDQsIGVycm9ycy5OZXcoIm5vdCBhdmFpbGFibGUiKSkKfQoKLy8gVXBkYXRlIGNoYW5nZXMgYSB7ey5vcHRzLk1vZGVsLk1vZGVsfX0gaW4gdGhlIERCLiBUaGlzIGZ1bmN0aW9uIGlzIG1hcHBlZCB0bwovLyB0aGUgcGF0aCBQVVQgL3t7Lm9wdHMuTmFtZS5VUkx9fS97eyJ7In19e3sub3B0cy5OYW1lLlBhcmFtSUR9fX0KZnVuYyAodiB7ey5vcHRzLk5hbWUuUmVzb3VyY2V9fVJlc291cmNlKSBVcGRhdGUoYyBidWZmYWxvLkNvbnRleHQpIGVycm9yIHsKICAvLyBHZXQgdGhlIERCIGNvbm5lY3Rpb24gZnJvbSB0aGUgY29udGV4dAoJdHgsIG9rIDo9IGMuVmFsdWUoInR4IikuKCpwb3AuQ29ubmVjdGlvbikKCWlmICFvayB7CgkJcmV0dXJuIGVycm9ycy5XaXRoU3RhY2soZXJyb3JzLk5ldygibm8gdHJhbnNhY3Rpb24gZm91bmQiKSkKCX0KCiAgLy8gQWxsb2NhdGUgYW4gZW1wdHkge3sub3B0cy5Nb2RlbC5Nb2RlbH19CiAge3sub3B0cy5Nb2RlbC5WYXJDYXNlU2luZ3VsYXJ9fSA6PSAmbW9kZWxzLnt7Lm9wdHMuTW9kZWwuTW9kZWx9fXt9CgogIGlmIGVyciA6PSB0eC5GaW5kKHt7Lm9wdHMuTW9kZWwuVmFyQ2FzZVNpbmd1bGFyfX0sIGMuUGFyYW0oInt7Lm9wdHMuTmFtZS5QYXJhbUlEfX0iKSk7IGVyciAhPSBuaWwgewogICAgcmV0dXJuIGMuRXJyb3IoNDA0LCBlcnIpCiAgfQoKICAvLyBCaW5kIHt7Lm9wdHMuTW9kZWwuTW9kZWx9fSB0byB0aGUgaHRtbCBmb3JtIGVsZW1lbnRzCiAgaWYgZXJyIDo9IGMuQmluZCh7ey5vcHRzLk1vZGVsLlZhckNhc2VTaW5ndWxhcn19KTsgZXJyICE9IG5pbCB7CiAgICByZXR1cm4gZXJyb3JzLldpdGhTdGFjayhlcnIpCiAgfQoKICB2ZXJycywgZXJyIDo9IHR4LlZhbGlkYXRlQW5kVXBkYXRlKHt7Lm9wdHMuTW9kZWwuVmFyQ2FzZVNpbmd1bGFyfX0pCiAgaWYgZXJyICE9IG5pbCB7CiAgICByZXR1cm4gZXJyb3JzLldpdGhTdGFjayhlcnIpCiAgfQoKICBpZiB2ZXJycy5IYXNBbnkoKSB7CiAgICAvLyBSZW5kZXIgZXJyb3JzIGFzIHt7Lm9wdHMuTWltZVR5cGV9fQogICAgcmV0dXJuIGMuUmVuZGVyKDQwMCwgci57ey5vcHRzLk1pbWVUeXBlfX0odmVycnMpKQogIH0KCiAgcmV0dXJuIGMuUmVuZGVyKDIwMCwgci57ey5vcHRzLk1pbWVUeXBlfX0oe3sub3B0cy5Nb2RlbC5WYXJDYXNlU2luZ3VsYXJ9fSkpCn0KCi8vIERlc3Ryb3kgZGVsZXRlcyBhIHt7Lm9wdHMuTW9kZWwuTW9kZWx9fSBmcm9tIHRoZSBEQi4gVGhpcyBmdW5jdGlvbiBpcyBtYXBwZWQKLy8gdG8gdGhlIHBhdGggREVMRVRFIC97ey5vcHRzLk5hbWUuVVJMfX0ve3sieyJ9fXt7Lm9wdHMuTmFtZS5QYXJhbUlEfX19CmZ1bmMgKHYge3sub3B0cy5OYW1lLlJlc291cmNlfX1SZXNvdXJjZSkgRGVzdHJveShjIGJ1ZmZhbG8uQ29udGV4dCkgZXJyb3IgewogIC8vIEdldCB0aGUgREIgY29ubmVjdGlvbiBmcm9tIHRoZSBjb250ZXh0Cgl0eCwgb2sgOj0gYy5WYWx1ZSgidHgiKS4oKnBvcC5Db25uZWN0aW9uKQoJaWYgIW9rIHsKCQlyZXR1cm4gZXJyb3JzLldpdGhTdGFjayhlcnJvcnMuTmV3KCJubyB0cmFuc2FjdGlvbiBmb3VuZCIpKQoJfQoKICAvLyBBbGxvY2F0ZSBhbiBlbXB0eSB7ey5vcHRzLk1vZGVsLk1vZGVsfX0KICB7ey5vcHRzLk1vZGVsLlZhckNhc2VTaW5ndWxhcn19IDo9ICZtb2RlbHMue3sub3B0cy5Nb2RlbC5Nb2RlbH19e30KCiAgLy8gVG8gZmluZCB0aGUge3sub3B0cy5Nb2RlbC5Nb2RlbH19IHRoZSBwYXJhbWV0ZXIge3sub3B0cy5OYW1lLlBhcmFtSUR9fSBpcyB1c2VkLgogIGlmIGVyciA6PSB0eC5GaW5kKHt7Lm9wdHMuTW9kZWwuVmFyQ2FzZVNpbmd1bGFyfX0sIGMuUGFyYW0oInt7Lm9wdHMuTmFtZS5QYXJhbUlEfX0iKSk7IGVyciAhPSBuaWwgewogICAgcmV0dXJuIGMuRXJyb3IoNDA0LCBlcnIpCiAgfQoKICBpZiBlcnIgOj0gdHguRGVzdHJveSh7ey5vcHRzLk1vZGVsLlZhckNhc2VTaW5ndWxhcn19KTsgZXJyICE9IG5pbCB7CiAgICByZXR1cm4gZXJyb3JzLldpdGhTdGFjayhlcnIpCiAgfQoKICByZXR1cm4gYy5SZW5kZXIoMjAwLCByLnt7Lm9wdHMuTWltZVR5cGV9fSh7ey5vcHRzLk1vZGVsLlZhckNhc2VTaW5ndWxhcn19KSkKfQo=\"") - packr.PackJSONBytes("../resource/templates", "actions/resource-name.go.tmpl", "\"cGFja2FnZSBhY3Rpb25zCgppbXBvcnQgImdpdGh1Yi5jb20vZ29idWZmYWxvL2J1ZmZhbG8iCgp0eXBlIHt7Lm9wdHMuTmFtZS5SZXNvdXJjZX19UmVzb3VyY2Ugc3RydWN0ewoJYnVmZmFsby5SZXNvdXJjZQp9Cgp7eyByYW5nZSAkYSA6PSAuYWN0aW9ucyB9fQovLyB7eyRhfX0gZGVmYXVsdCBpbXBsZW1lbnRhdGlvbi4KZnVuYyAodiB7eyQub3B0cy5OYW1lLlJlc291cmNlfX1SZXNvdXJjZSkge3skYX19KGMgYnVmZmFsby5Db250ZXh0KSBlcnJvciB7CglyZXR1cm4gYy5SZW5kZXIoMjAwLCByLlN0cmluZygie3skLm9wdHMuTW9kZWwuTW9kZWx9fSN7eyRhfX0iKSkKfQoKe3tlbmR9fQo=\"") - packr.PackJSONBytes("../resource/templates", "actions/resource-name_test.go.tmpl", "\"cGFja2FnZSBhY3Rpb25zCgppbXBvcnQgKAoJInRlc3RpbmciCgoJImdpdGh1Yi5jb20vc3RyZXRjaHIvdGVzdGlmeS9yZXF1aXJlIgopCnt7IHJhbmdlICRhIDo9IC5hY3Rpb25zIH19CmZ1bmMgKGFzICpBY3Rpb25TdWl0ZSkgVGVzdF97eyQub3B0cy5OYW1lLlJlc291cmNlfX1SZXNvdXJjZV97eyBjYW1lbGl6ZSAkYSB9fSgpIHsKCWFzLkZhaWwoIk5vdCBJbXBsZW1lbnRlZCEiKQp9Cnt7IGVuZCB9fQo=\"") - packr.PackJSONBytes("../resource/templates", "actions/resource-use_model.go.tmpl", "\"package actions

import (

  "github.com/pkg/errors"
  "github.com/gobuffalo/buffalo"
  "github.com/gobuffalo/pop"
  "{{.opts.App.ModelsPkg}}"
)

// This file is generated by Buffalo. It offers a basic structure for
// adding, editing and deleting a page. If your model is more
// complex or you need more than the basic implementation you need to
// edit this file.

// Following naming logic is implemented in Buffalo:
// Model: Singular ({{.opts.Model.Model}})
// DB Table: Plural ({{.opts.Model.Table}})
// Resource: Plural ({{.opts.Name.Resource}})
// Path: Plural (/{{.opts.Name.URL}})
// View Template Folder: Plural (/templates/{{.opts.FilesPath}}/)

// {{.opts.Name.Resource}}Resource is the resource for the {{.opts.Model.Model}} model
type {{.opts.Name.Resource}}Resource struct{
  buffalo.Resource
}

// List gets all {{.opts.Model.ModelPlural}}. This function is mapped to the path
// GET /{{.opts.Name.URL}}
func (v {{.opts.Name.Resource}}Resource) List(c buffalo.Context) error {
  // Get the DB connection from the context
  tx, ok := c.Value("tx").(*pop.Connection)
  if !ok {
    return errors.WithStack(errors.New("no transaction found"))
  }

  {{.opts.Model.VarCasePlural}} := &models.{{.opts.Model.ModelPlural}}{}

  // Paginate results. Params "page" and "per_page" control pagination.
  // Default values are "page=1" and "per_page=20".
  q := tx.PaginateFromParams(c.Params())

  // Retrieve all {{.opts.Model.ModelPlural}} from the DB
  if err := q.All({{.opts.Model.VarCasePlural}}); err != nil {
    return errors.WithStack(err)
  }

  // Add the paginator to the context so it can be used in the template.
  c.Set("pagination", q.Paginator)

  return c.Render(200, r.Auto(c, {{.opts.Model.VarCasePlural}}))
}

// Show gets the data for one {{.opts.Model.Model}}. This function is mapped to
// the path GET /{{.opts.Name.URL}}/{{"{"}}{{.opts.Name.ParamID}}}
func (v {{.opts.Name.Resource}}Resource) Show(c buffalo.Context) error {
  // Get the DB connection from the context
  tx, ok := c.Value("tx").(*pop.Connection)
  if !ok {
    return errors.WithStack(errors.New("no transaction found"))
  }

  // Allocate an empty {{.opts.Model.Model}}
  {{.opts.Model.VarCaseSingular}} := &models.{{.opts.Model.Model}}{}

  // To find the {{.opts.Model.Model}} the parameter {{.opts.Name.ParamID}} is used.
  if err := tx.Find({{.opts.Model.VarCaseSingular}}, c.Param("{{.opts.Name.ParamID}}")); err != nil {
    return c.Error(404, err)
  }

  return c.Render(200, r.Auto(c, {{.opts.Model.VarCaseSingular}}))
}

// New renders the form for creating a new {{.opts.Model.Model}}.
// This function is mapped to the path GET /{{.opts.Name.URL}}/new
func (v {{.opts.Name.Resource}}Resource) New(c buffalo.Context) error {
  return c.Render(200, r.Auto(c, &models.{{.opts.Model.Model}}{}))
}

// Create adds a {{.opts.Model.Model}} to the DB. This function is mapped to the
// path POST /{{.opts.Name.URL}}
func (v {{.opts.Name.Resource}}Resource) Create(c buffalo.Context) error {
  // Allocate an empty {{.opts.Model.Model}}
  {{.opts.Model.VarCaseSingular}} := &models.{{.opts.Model.Model}}{}

  // Bind {{.opts.Model.VarCaseSingular}} to the html form elements
  if err := c.Bind({{.opts.Model.VarCaseSingular}}); err != nil {
    return errors.WithStack(err)
  }

  // Get the DB connection from the context
  tx, ok := c.Value("tx").(*pop.Connection)
  if !ok {
    return errors.WithStack(errors.New("no transaction found"))
  }

  // Validate the data from the html form
  verrs, err := tx.ValidateAndCreate({{.opts.Model.VarCaseSingular}})
  if err != nil {
    return errors.WithStack(err)
  }

  if verrs.HasAny() {
    // Make the errors available inside the html template
    c.Set("errors", verrs)

    // Render again the new.html template that the user can
    // correct the input.
    return c.Render(422, r.Auto(c, {{.opts.Model.VarCaseSingular}}))
  }

  // If there are no errors set a success message
  c.Flash().Add("success", "{{.opts.Model.Model}} was created successfully")

  // and redirect to the {{.opts.Name.URL}} index page
  return c.Render(201, r.Auto(c, {{.opts.Model.VarCaseSingular}}))
}

// Edit renders a edit form for a {{.opts.Model.Model}}. This function is
// mapped to the path GET /{{.opts.Name.URL}}/{{"{"}}{{.opts.Name.ParamID}}}/edit
func (v {{.opts.Name.Resource}}Resource) Edit(c buffalo.Context) error {
  // Get the DB connection from the context
  tx, ok := c.Value("tx").(*pop.Connection)
  if !ok {
    return errors.WithStack(errors.New("no transaction found"))
  }

  // Allocate an empty {{.opts.Model.Model}}
  {{.opts.Model.VarCaseSingular}} := &models.{{.opts.Model.Model}}{}

  if err := tx.Find({{.opts.Model.VarCaseSingular}}, c.Param("{{.opts.Name.ParamID}}")); err != nil {
    return c.Error(404, err)
  }

  return c.Render(200, r.Auto(c, {{.opts.Model.VarCaseSingular}}))
}

// Update changes a {{.opts.Model.Model}} in the DB. This function is mapped to
// the path PUT /{{.opts.Name.URL}}/{{"{"}}{{.opts.Name.ParamID}}}
func (v {{.opts.Name.Resource}}Resource) Update(c buffalo.Context) error {
  // Get the DB connection from the context
  tx, ok := c.Value("tx").(*pop.Connection)
  if !ok {
    return errors.WithStack(errors.New("no transaction found"))
  }

  // Allocate an empty {{.opts.Model.Model}}
  {{.opts.Model.VarCaseSingular}} := &models.{{.opts.Model.Model}}{}

  if err := tx.Find({{.opts.Model.VarCaseSingular}}, c.Param("{{.opts.Name.ParamID}}")); err != nil {
    return c.Error(404, err)
  }

  // Bind {{.opts.Model.Model}} to the html form elements
  if err := c.Bind({{.opts.Model.VarCaseSingular}}); err != nil {
    return errors.WithStack(err)
  }

  verrs, err := tx.ValidateAndUpdate({{.opts.Model.VarCaseSingular}})
  if err != nil {
    return errors.WithStack(err)
  }

  if verrs.HasAny() {
    // Make the errors available inside the html template
    c.Set("errors", verrs)

    // Render again the edit.html template that the user can
    // correct the input.
    return c.Render(422, r.Auto(c, {{.opts.Model.VarCaseSingular}}))
  }

  // If there are no errors set a success message
  c.Flash().Add("success", "{{.opts.Model.Model}} was updated successfully")

  // and redirect to the {{.opts.Name.URL}} index page
  return c.Render(200, r.Auto(c, {{.opts.Model.VarCaseSingular}}))
}

// Destroy deletes a {{.opts.Model.Model}} from the DB. This function is mapped
// to the path DELETE /{{.opts.Name.URL}}/{{"{"}}{{.opts.Name.ParamID}}}
func (v {{.opts.Name.Resource}}Resource) Destroy(c buffalo.Context) error {
  // Get the DB connection from the context
  tx, ok := c.Value("tx").(*pop.Connection)
  if !ok {
    return errors.WithStack(errors.New("no transaction found"))
  }

  // Allocate an empty {{.opts.Model.Model}}
  {{.opts.Model.VarCaseSingular}} := &models.{{.opts.Model.Model}}{}

  // To find the {{.opts.Model.Model}} the parameter {{.opts.Name.ParamID}} is used.
  if err := tx.Find({{.opts.Model.VarCaseSingular}}, c.Param("{{.opts.Name.ParamID}}")); err != nil {
    return c.Error(404, err)
  }

  if err := tx.Destroy({{.opts.Model.VarCaseSingular}}); err != nil {
    return errors.WithStack(err)
  }

  // If there are no errors set a flash message
  c.Flash().Add("success", "{{.opts.Model.Model}} was destroyed successfully")

  // Redirect to the {{.opts.Name.URL}} index page
  return c.Render(200, r.Auto(c, {{.opts.Model.VarCaseSingular}}))
}
\"") - packr.PackJSONBytes("../resource/templates", "actions/resource-use_model_test.go.tmpl", "\"cGFja2FnZSBhY3Rpb25zCgppbXBvcnQgKAoJInRlc3RpbmciCgoJImdpdGh1Yi5jb20vc3RyZXRjaHIvdGVzdGlmeS9yZXF1aXJlIgopCnt7IHJhbmdlICRhIDo9IC5hY3Rpb25zIH19CmZ1bmMgKGFzICpBY3Rpb25TdWl0ZSkgVGVzdF97eyQub3B0cy5OYW1lLlJlc291cmNlfX1SZXNvdXJjZV97eyBjYW1lbGl6ZSAkYSB9fSgpIHsKCWFzLkZhaWwoIk5vdCBJbXBsZW1lbnRlZCEiKQp9Cnt7IGVuZCB9fQo=\"") - packr.PackJSONBytes("../resource/templates", "locales/resource-use_model.en-us.yaml.tmpl", "\"LSBpZDogInt7Lm9wdHMuTW9kZWwuVW5kZXJTaW5ndWxhcn19LmNyZWF0ZWQuc3VjY2VzcyIKICB0cmFuc2xhdGlvbjogInt7Lm9wdHMuTW9kZWwuTW9kZWx9fSB3YXMgc3VjY2Vzc2Z1bGx5IGNyZWF0ZWQuIgotIGlkOiAie3sub3B0cy5Nb2RlbC5VbmRlclNpbmd1bGFyfX0udXBkYXRlZC5zdWNjZXNzIgogIHRyYW5zbGF0aW9uOiAie3sub3B0cy5Nb2RlbC5Nb2RlbH19IHdhcyBzdWNjZXNzZnVsbHkgdXBkYXRlZC4iCi0gaWQ6ICJ7ey5vcHRzLk1vZGVsLlVuZGVyU2luZ3VsYXJ9fS5kZXN0cm95ZWQuc3VjY2VzcyIKICB0cmFuc2xhdGlvbjogInt7Lm9wdHMuTW9kZWwuTW9kZWx9fSB3YXMgc3VjY2Vzc2Z1bGx5IGRlc3Ryb3llZC4iCg==\"") - packr.PackJSONBytes("../resource/templates", "templates/model-view-_form.html.tmpl", "\"e3sgcmFuZ2UgJHAgOj0gLm9wdHMuUHJvcHMgLX19Cnt7IGlmIGVxICRwLlR5cGUgInRleHQiIC19fQo8JT0gZi5UZXh0QXJlYVRhZygie3skcC5OYW1lfX0iLCB7cm93czogMTB9KSAlPgp7eyBlbHNlIC19fQp7eyBpZiBlcSAkcC5UeXBlICJib29sIiAtfX0KPCU9IGYuQ2hlY2tib3hUYWcoInt7JHAuTmFtZX19Iiwge3VuY2hlY2tlZDogZmFsc2V9KSAlPgp7eyBlbHNlIC19fQo8JT0gZi5JbnB1dFRhZygie3skcC5OYW1lfX0iKSAlPgp7eyBlbmQgLX19Cnt7IGVuZCAtfX0Ke3sgZW5kIC19fQoKPGJ1dHRvbiBjbGFzcz0iYnRuIGJ0bi1zdWNjZXNzIiByb2xlPSJzdWJtaXQiPlNhdmU8L2J1dHRvbj4K\"") - packr.PackJSONBytes("../resource/templates", "templates/model-view-edit.html.tmpl", "\"PGRpdiBjbGFzcz0icGFnZS1oZWFkZXIiPgogIDxoMT5FZGl0IHt7Lm9wdHMuTW9kZWwuTW9kZWx9fTwvaDE+CjwvZGl2PgoKPCU9IGZvcm1fZm9yKHt7Lm9wdHMuTW9kZWwuVmFyQ2FzZVNpbmd1bGFyfX0sIHthY3Rpb246IHt7Lm9wdHMuTmFtZS5WYXJDYXNlU2luZ3VsYXJ9fVBhdGgoeyB7ey5vcHRzLk5hbWUuUGFyYW1JRH19OiB7ey5vcHRzLk1vZGVsLlZhckNhc2VTaW5ndWxhcn19LklEIH0pLCBtZXRob2Q6ICJQVVQifSkgeyAlPgogIDwlPSBwYXJ0aWFsKCJ7ey5vcHRzLkZpbGVzUGF0aH19L2Zvcm0uaHRtbCIpICU+CiAgPGEgaHJlZj0iPCU9IHt7Lm9wdHMuTmFtZS5WYXJDYXNlU2luZ3VsYXJ9fVBhdGgoeyB7ey5vcHRzLk5hbWUuUGFyYW1JRH19OiB7ey5vcHRzLk1vZGVsLlZhckNhc2VTaW5ndWxhcn19LklEIH0pICU+IiBjbGFzcz0iYnRuIGJ0bi13YXJuaW5nIiBkYXRhLWNvbmZpcm09IkFyZSB5b3Ugc3VyZT8iPkNhbmNlbDwvYT4KPCUgfSAlPgo=\"") - packr.PackJSONBytes("../resource/templates", "templates/model-view-index.html.tmpl", "\"PGRpdiBjbGFzcz0icGFnZS1oZWFkZXIiPgogIDxoMT57ey5vcHRzLk1vZGVsLk1vZGVsUGx1cmFsfX08L2gxPgo8L2Rpdj4KPHVsIGNsYXNzPSJsaXN0LXVuc3R5bGVkIGxpc3QtaW5saW5lIj4KICA8bGk+PGEgaHJlZj0iPCU9IG5ld3t7Lm9wdHMuTmFtZS5SZXNvdXJjZX19UGF0aCgpICU+IiBjbGFzcz0iYnRuIGJ0bi1wcmltYXJ5Ij5DcmVhdGUgTmV3IHt7Lm9wdHMuTW9kZWwuTW9kZWx9fTwvYT48L2xpPgo8L3VsPgoKPHRhYmxlIGNsYXNzPSJ0YWJsZSB0YWJsZS1zdHJpcGVkIj4KICA8dGhlYWQ+CiAge3sgcmFuZ2UgJHAgOj0gLm9wdHMuUHJvcHMgLX19CiAgICB7eyBpZiBuZSAkcC5UeXBlICJ0ZXh0IiAtfX0KICAgIDx0aD57eyAkcC5OYW1lIH19PC90aD4KICAgIHt7IGVuZCAtfX0KICB7eyBlbmQgLX19CiAgICA8dGg+Jm5ic3A7PC90aD4KICA8L3RoZWFkPgogIDx0Ym9keT4KICAgIDwlPSBmb3IgKHt7Lm9wdHMuTW9kZWwuVmFyQ2FzZVNpbmd1bGFyfX0pIGluIHt7Lm9wdHMuTW9kZWwuVmFyQ2FzZVBsdXJhbH19IHsgJT4KICAgICAgPHRyPgogICAgICB7eyByYW5nZSAkbXAgOj0gLm9wdHMuUHJvcHMgLX19CiAgICAgICAge3sgaWYgbmUgJG1wLlR5cGUgInRleHQiIC19fQogICAgICAgIDx0ZD48JT0ge3skLm9wdHMuTW9kZWwuVmFyQ2FzZVNpbmd1bGFyfX0ue3skbXAuTmFtZX19ICU+PC90ZD4KICAgICAgICB7eyBlbmQgLX19CiAgICAgIHt7IGVuZCAtfX0KICAgICAgICA8dGQ+CiAgICAgICAgICA8ZGl2IGNsYXNzPSJwdWxsLXJpZ2h0Ij4KICAgICAgICAgICAgPGEgaHJlZj0iPCU9IHt7Lm9wdHMuTmFtZS5WYXJDYXNlU2luZ3VsYXJ9fVBhdGgoeyB7ey5vcHRzLk5hbWUuUGFyYW1JRH19OiB7ey5vcHRzLk1vZGVsLlZhckNhc2VTaW5ndWxhcn19LklEIH0pICU+IiBjbGFzcz0iYnRuIGJ0bi1pbmZvIj5WaWV3PC9hPgogICAgICAgICAgICA8YSBocmVmPSI8JT0gZWRpdHt7Lm9wdHMuTmFtZS5Nb2RlbH19UGF0aCh7IHt7Lm9wdHMuTmFtZS5QYXJhbUlEfX06IHt7Lm9wdHMuTW9kZWwuVmFyQ2FzZVNpbmd1bGFyfX0uSUQgfSkgJT4iIGNsYXNzPSJidG4gYnRuLXdhcm5pbmciPkVkaXQ8L2E+CiAgICAgICAgICAgIDxhIGhyZWY9IjwlPSB7ey5vcHRzLk5hbWUuVmFyQ2FzZVNpbmd1bGFyfX1QYXRoKHsge3sub3B0cy5OYW1lLlBhcmFtSUR9fToge3sub3B0cy5Nb2RlbC5WYXJDYXNlU2luZ3VsYXJ9fS5JRCB9KSAlPiIgZGF0YS1tZXRob2Q9IkRFTEVURSIgZGF0YS1jb25maXJtPSJBcmUgeW91IHN1cmU/IiBjbGFzcz0iYnRuIGJ0bi1kYW5nZXIiPkRlc3Ryb3k8L2E+CiAgICAgICAgICA8L2Rpdj4KICAgICAgICA8L3RkPgogICAgICA8L3RyPgogICAgPCUgfSAlPgogIDwvdGJvZHk+CjwvdGFibGU+Cgo8ZGl2IGNsYXNzPSJ0ZXh0LWNlbnRlciI+CiAgPCU9IHBhZ2luYXRvcihwYWdpbmF0aW9uKSAlPgo8L2Rpdj4K\"") - packr.PackJSONBytes("../resource/templates", "templates/model-view-new.html.tmpl", "\"PGRpdiBjbGFzcz0icGFnZS1oZWFkZXIiPgogIDxoMT5OZXcge3sub3B0cy5Nb2RlbC5Nb2RlbH19PC9oMT4KPC9kaXY+Cgo8JT0gZm9ybV9mb3Ioe3sub3B0cy5Nb2RlbC5WYXJDYXNlU2luZ3VsYXJ9fSwge2FjdGlvbjoge3sub3B0cy5OYW1lLlZhckNhc2VQbHVyYWx9fVBhdGgoKSwgbWV0aG9kOiAiUE9TVCJ9KSB7ICU+CiAgPCU9IHBhcnRpYWwoInt7Lm9wdHMuRmlsZXNQYXRofX0vZm9ybS5odG1sIikgJT4KICA8YSBocmVmPSI8JT0ge3sub3B0cy5OYW1lLlZhckNhc2VQbHVyYWx9fVBhdGgoKSAlPiIgY2xhc3M9ImJ0biBidG4td2FybmluZyIgZGF0YS1jb25maXJtPSJBcmUgeW91IHN1cmU/Ij5DYW5jZWw8L2E+CjwlIH0gJT4K\"") - packr.PackJSONBytes("../resource/templates", "templates/model-view-show.html.tmpl", "\"PGRpdiBjbGFzcz0icGFnZS1oZWFkZXIiPgogIDxoMT57ey5vcHRzLk1vZGVsLk1vZGVsfX0jU2hvdzwvaDE+CjwvZGl2PgoKPHVsIGNsYXNzPSJsaXN0LXVuc3R5bGVkIGxpc3QtaW5saW5lIj4KICA8bGkgY2xhc3M9Imxpc3QtaW5saW5lLWl0ZW0iPjxhIGhyZWY9IjwlPSB7ey5vcHRzLk5hbWUuVmFyQ2FzZVBsdXJhbH19UGF0aCgpICU+IiBjbGFzcz0iYnRuIGJ0bi1pbmZvIj5CYWNrIHRvIGFsbCB7ey5vcHRzLk1vZGVsLk1vZGVsUGx1cmFsfX08L2E+PC9saT4KICA8bGkgY2xhc3M9Imxpc3QtaW5saW5lLWl0ZW0iPjxhIGhyZWY9IjwlPSBlZGl0e3sub3B0cy5OYW1lLk1vZGVsfX1QYXRoKHsge3sub3B0cy5OYW1lLlBhcmFtSUR9fToge3sub3B0cy5Nb2RlbC5WYXJDYXNlU2luZ3VsYXJ9fS5JRCB9KSU+IiBjbGFzcz0iYnRuIGJ0bi13YXJuaW5nIj5FZGl0PC9hPjwvbGk+CiAgPGxpIGNsYXNzPSJsaXN0LWlubGluZS1pdGVtIj48YSBocmVmPSI8JT0ge3sub3B0cy5OYW1lLlZhckNhc2VTaW5ndWxhcn19UGF0aCh7IHt7Lm9wdHMuTmFtZS5QYXJhbUlEfX06IHt7Lm9wdHMuTW9kZWwuVmFyQ2FzZVNpbmd1bGFyfX0uSUQgfSklPiIgZGF0YS1tZXRob2Q9IkRFTEVURSIgZGF0YS1jb25maXJtPSJBcmUgeW91IHN1cmU/IiBjbGFzcz0iYnRuIGJ0bi1kYW5nZXIiPkRlc3Ryb3k8L2E+CjwvdWw+Cgp7eyByYW5nZSAkcCA6PSAub3B0cy5Qcm9wcyAtfX0KPHA+CiAgPHN0cm9uZz57eyAkcC5OYW1lIH19PC9zdHJvbmc+OiA8JT0ge3skLm9wdHMuTW9kZWwuVmFyQ2FzZVNpbmd1bGFyfX0ue3skcC5OYW1lfX0gJT4KPC9wPgp7eyBlbmQgLX19Cgo=\"") -} diff --git a/runtime/version.go b/runtime/version.go index 33902d1a3..7a0f2d8e3 100644 --- a/runtime/version.go +++ b/runtime/version.go @@ -1,6 +1,5 @@ package runtime // Version is the current version of the buffalo binary -const Version = "v0.12.0" - -// const Version = "development" +// const Version = "v0.12.0" +const Version = "development" From b8c7b087938d6a0986761fa1c68bd1ee392f07b8 Mon Sep 17 00:00:00 2001 From: Stanislas Michalak Date: Fri, 15 Jun 2018 16:29:32 +0200 Subject: [PATCH 2/7] Migrate server.go logger to the app one instead of logrus (#1107) --- server.go | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/server.go b/server.go index 0e36e0689..9fa49dcc2 100644 --- a/server.go +++ b/server.go @@ -11,14 +11,13 @@ import ( "github.com/markbates/refresh/refresh/web" "github.com/markbates/sigtx" "github.com/pkg/errors" - "github.com/sirupsen/logrus" ) // Serve the application at the specified address/port and listen for OS // interrupt and kill signals and will attempt to stop the application // gracefully. This will also start the Worker process, unless WorkerOff is enabled. func (a *App) Serve(srvs ...servers.Server) error { - logrus.Infof("Starting application at %s", a.Options.Host) + a.Logger.Infof("Starting application at %s", a.Options.Host) if len(srvs) == 0 { if strings.HasPrefix(a.Options.Addr, "unix:") { @@ -38,23 +37,23 @@ func (a *App) Serve(srvs ...servers.Server) error { go func() { // gracefully shut down the application when the context is cancelled <-ctx.Done() - logrus.Info("Shutting down application") + a.Logger.Info("Shutting down application") if err := a.Stop(ctx.Err()); err != nil { - logrus.Error(err) + a.Logger.Error(err) } if !a.WorkerOff { // stop the workers - logrus.Info("Shutting down worker") + a.Logger.Info("Shutting down worker") if err := a.Worker.Stop(); err != nil { - logrus.Error(err) + a.Logger.Error(err) } } for _, s := range srvs { if err := s.Shutdown(ctx); err != nil { - logrus.Error(err) + a.Logger.Error(err) } } @@ -86,7 +85,7 @@ func (a *App) Serve(srvs ...servers.Server) error { func (a *App) Stop(err error) error { a.cancel() if err != nil && errors.Cause(err) != context.Canceled { - logrus.Error(err) + a.Logger.Error(err) return err } return nil From 37f0ec0aac93702a6b2477a53bb210484bfc86c9 Mon Sep 17 00:00:00 2001 From: Mark Bates Date: Sat, 16 Jun 2018 11:03:06 -0400 Subject: [PATCH 3/7] upgraded the default node-sass to work on node 10 (#1108) --- generators/assets/webpack/templates/package.json.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/assets/webpack/templates/package.json.tmpl b/generators/assets/webpack/templates/package.json.tmpl index 82d028b2f..ccc1eaa6a 100644 --- a/generators/assets/webpack/templates/package.json.tmpl +++ b/generators/assets/webpack/templates/package.json.tmpl @@ -26,7 +26,7 @@ "file-loader": "~1.1.11", "gopherjs-loader": "^0.0.1", "mini-css-extract-plugin": "^0.4.0", - "node-sass": "~4.8.3", + "node-sass": "~4.9.0", "npm-install-webpack-plugin": "4.0.5", "sass-loader": "~6.0.7", "style-loader": "~0.20.3", From 77c6975cba619a2b2607526151db20ffa02b0e5a Mon Sep 17 00:00:00 2001 From: Mark Bates Date: Sat, 16 Jun 2018 11:33:56 -0400 Subject: [PATCH 4/7] vgo --- Gopkg.toml | 154 +++++++++++++++++- go.mod | 55 +++---- .../github.com/russross/blackfriday/README.md | 149 ++++++++++++----- .../github.com/russross/blackfriday/block.go | 39 ++--- .../github.com/russross/blackfriday/html.go | 30 +--- .../github.com/russross/blackfriday/latex.go | 8 +- .../russross/blackfriday/markdown.go | 14 +- 7 files changed, 329 insertions(+), 120 deletions(-) diff --git a/Gopkg.toml b/Gopkg.toml index d4dbbe955..28c1ea0b8 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -1,4 +1,125 @@ -required = ["github.com/russross/blackfriday"] +# Gopkg.toml example +# +# Refer to https://golang.github.io/dep/docs/Gopkg.toml.html +# for detailed Gopkg.toml documentation. +# +# required = ["github.com/user/thing/cmd/thing"] +# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"] +# +# [[constraint]] +# name = "github.com/user/project" +# version = "1.0.0" +# +# [[constraint]] +# name = "github.com/user/project2" +# branch = "dev" +# source = "github.com/myfork/project2" +# +# [[override]] +# name = "github.com/x/y" +# version = "2.4.0" +# +# [prune] +# non-go = false +# go-tests = true +# unused-packages = true + + +[[constraint]] + name = "github.com/dgrijalva/jwt-go" + version = "3.2.0" + +[[constraint]] + branch = "master" + name = "github.com/dustin/go-humanize" + +[[constraint]] + name = "github.com/fatih/color" + version = "1.7.0" + +[[constraint]] + name = "github.com/gobuffalo/envy" + version = "1.6.3" + +[[constraint]] + name = "github.com/gobuffalo/makr" + version = "1.1.0" + +[[constraint]] + name = "github.com/gobuffalo/packr" + version = "1.11.1" + +[[constraint]] + name = "github.com/gobuffalo/plush" + version = "3.7.5" + +[[constraint]] + name = "github.com/gobuffalo/pop" + version = "4.5.9" + +[[constraint]] + name = "github.com/gobuffalo/tags" + version = "2.0.5" + +[[constraint]] + name = "github.com/gobuffalo/uuid" + version = "2.0.0" + +[[constraint]] + branch = "master" + name = "github.com/gobuffalo/x" + +[[constraint]] + name = "github.com/gorilla/context" + version = "1.1.1" + +[[constraint]] + name = "github.com/gorilla/mux" + version = "1.6.2" + +[[constraint]] + name = "github.com/gorilla/sessions" + version = "1.1.1" + +[[constraint]] + name = "github.com/markbates/deplist" + version = "1.0.0" + +[[constraint]] + name = "github.com/markbates/going" + version = "1.0.0" + +[[constraint]] + name = "github.com/markbates/grift" + version = "1.0.0" + +[[constraint]] + name = "github.com/markbates/inflect" + version = "1.0.0" + +[[constraint]] + name = "github.com/markbates/refresh" + version = "1.4.0" + +[[constraint]] + name = "github.com/markbates/sigtx" + version = "1.0.0" + +[[constraint]] + name = "github.com/markbates/willie" + version = "1.0.0" + +[[constraint]] + name = "github.com/monoculum/formam" + version = "3.0.0" + +[[constraint]] + name = "github.com/nicksnyder/go-i18n" + version = "1.10.0" + +[[constraint]] + name = "github.com/pkg/errors" + version = "0.8.0" [[constraint]] branch = "master" @@ -8,3 +129,34 @@ required = ["github.com/russross/blackfriday"] branch = "master" name = "github.com/shurcooL/github_flavored_markdown" +[[constraint]] + name = "github.com/sirupsen/logrus" + version = "1.0.5" + +[[constraint]] + name = "github.com/spf13/cobra" + version = "0.0.3" + +[[constraint]] + name = "github.com/stretchr/testify" + version = "1.2.2" + +[[constraint]] + branch = "master" + name = "github.com/unrolled/secure" + +[[constraint]] + branch = "master" + name = "golang.org/x/crypto" + +[[constraint]] + branch = "master" + name = "golang.org/x/sync" + +[[constraint]] + name = "gopkg.in/mail.v2" + version = "2.2.0" + +[prune] + go-tests = true + unused-packages = true diff --git a/go.mod b/go.mod index 91e971b86..6da9f1452 100644 --- a/go.mod +++ b/go.mod @@ -1,57 +1,42 @@ module github.com/gobuffalo/buffalo require ( + github.com/ajg/form v0.0.0-20160802194845-cc2954064ec9 github.com/dgrijalva/jwt-go v0.0.0-20180308231308-06ea1031745c github.com/dustin/go-humanize v0.0.0-20180421182945-02af3965c54e github.com/fatih/color v1.7.0 - github.com/fatih/structs v1.0.0 github.com/fsnotify/fsnotify v1.4.7 github.com/go-sql-driver/mysql v1.4.0 - github.com/gobuffalo/envy v1.6.2 + github.com/gobuffalo/envy v1.6.3 github.com/gobuffalo/packr v1.11.1 - github.com/gobuffalo/plush v1.0.0 - github.com/gobuffalo/pop v0.0.0-20180524161724-d5d017d59cf2 - github.com/gobuffalo/tags v1.9.6 - github.com/gobuffalo/validate v1.0.0 + github.com/gobuffalo/plush v0.0.0-20180611194646-6cd5bf0d0c9b + github.com/gobuffalo/pop v0.0.0-20180521154020-9985012f32f5 github.com/gobuffalo/x v0.0.0-20180117215853-11ca13c05abd github.com/gorilla/mux v1.6.2 github.com/gorilla/sessions v1.1.1 - github.com/gorilla/websocket v1.2.0 - github.com/jmoiron/sqlx v0.0.0-20180406164412-2aeb6a910c2b + github.com/jmoiron/sqlx v0.0.0-20180614180643-0dae4fefe7c0 github.com/lib/pq v0.0.0-20180523175426-90697d60dd84 - github.com/markbates/deplist v0.0.0-20170926152145-5ae023fef618 - github.com/markbates/grift v0.0.0-20180319170132-76f93617a788 - github.com/markbates/inflect v0.0.0-20180514174915-dd7de90c06bc + github.com/markbates/deplist v1.0.0 + github.com/markbates/going v1.0.0 + github.com/markbates/grift v1.0.0 + github.com/markbates/hmax v1.0.0 + github.com/markbates/inflect v1.0.0 github.com/markbates/refresh v1.4.0 github.com/markbates/sigtx v1.0.0 - github.com/markbates/validate v1.0.0 - github.com/mattn/go-sqlite3 v1.7.0 - github.com/microcosm-cc/bluemonday v0.0.0-20180327211928-995366fdf961 + github.com/markbates/willie v1.0.0 + github.com/mattn/anko v0.0.5 + github.com/mattn/go-sqlite3 v1.9.0 github.com/mitchellh/go-homedir v0.0.0-20180523094522-3864e76763d9 - github.com/monoculum/formam v0.0.0-20170814190438-f25191ae7744 + github.com/monoculum/formam v0.0.0-20170619223434-99ca9dcbaca6 github.com/nicksnyder/go-i18n v1.10.0 github.com/pelletier/go-toml v1.2.0 - github.com/russross/blackfriday v1.5.1 - github.com/satori/go.uuid v1.2.0 - github.com/sergi/go-diff v1.0.0 - github.com/shurcooL/github_flavored_markdown v0.0.0-20180602233135-8913699a52e3 - github.com/shurcooL/highlight_diff v0.0.0-20170515013008-09bb4053de1b - github.com/shurcooL/highlight_go v0.0.0-20170515013102-78fb10f4a5f8 - github.com/shurcooL/octicon v0.0.0-20180602230221-c42b0e3b24d9 - github.com/shurcooL/sanitized_anchor_name v0.0.0-20170918181015-86672fcb3f95 github.com/sirupsen/logrus v1.0.5 - github.com/sourcegraph/annotate v0.0.0-20160123013949-f4cad6c6324d - github.com/sourcegraph/syntaxhighlight v0.0.0-20170531221838-bd320f5d308e - github.com/spf13/cobra v0.0.3 - github.com/spf13/pflag v1.0.1 - github.com/stretchr/objx v0.1.1 - github.com/stretchr/testify v1.2.2 github.com/unrolled/secure v0.0.0-20180416205222-a1cf62cc2159 - golang.org/x/crypto v0.0.0-20180608092829-8ac0e0d97ce4 - golang.org/x/net v0.0.0-20180530234432-1e491301e022 - golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f - golang.org/x/sys v0.0.0-20180610122900-7c1e4f34a39c - gopkg.in/check.v1 v1.0.0-20161208181325-20d25e280405 - gopkg.in/mail.v2 v2.0.0-20180609202316-c55e3fbae0e2 + golang.org/x/crypto v0.0.0-20180614221331-a8fb68e7206f + golang.org/x/net v0.0.0-20180611182652-db08ff08e862 + golang.org/x/sys v0.0.0-20180616030259-6c888cc515d3 + google.golang.org/appengine v1.1.0 + gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc + gopkg.in/mail.v2 v2.0.0-20180301192024-63235f23494b gopkg.in/yaml.v2 v2.2.1 ) diff --git a/vendor/github.com/russross/blackfriday/README.md b/vendor/github.com/russross/blackfriday/README.md index 0d1ac9a73..e0066b0fc 100644 --- a/vendor/github.com/russross/blackfriday/README.md +++ b/vendor/github.com/russross/blackfriday/README.md @@ -1,4 +1,6 @@ -Blackfriday [![Build Status](https://travis-ci.org/russross/blackfriday.svg?branch=master)](https://travis-ci.org/russross/blackfriday) [![GoDoc](https://godoc.org/github.com/russross/blackfriday?status.svg)](https://godoc.org/github.com/russross/blackfriday) +Blackfriday +[![Build Status][BuildSVG]][BuildURL] +[![Godoc][GodocV2SVG]][GodocV2URL] =========== Blackfriday is a [Markdown][1] processor implemented in [Go][2]. It @@ -8,7 +10,7 @@ punctuation substitutions, etc.), and it is safe for all utf-8 (unicode) input. HTML output is currently supported, along with Smartypants -extensions. An experimental LaTeX output engine is also included. +extensions. It started as a translation from C of [Sundown][3]. @@ -16,26 +18,71 @@ It started as a translation from C of [Sundown][3]. Installation ------------ -Blackfriday is compatible with Go 1. If you are using an older -release of Go, consider using v1.1 of blackfriday, which was based -on the last stable release of Go prior to Go 1. You can find it as a -tagged commit on github. +Blackfriday is compatible with any modern Go release. With Go and git installed: -With Go 1 and git installed: + go get -u gopkg.in/russross/blackfriday.v2 - go get github.com/russross/blackfriday +will download, compile, and install the package into your `$GOPATH` directory +hierarchy. -will download, compile, and install the package into your `$GOPATH` -directory hierarchy. Alternatively, you can achieve the same if you -import it into a project: - import "github.com/russross/blackfriday" +Versions +-------- + +Currently maintained and recommended version of Blackfriday is `v2`. It's being +developed on its own branch: https://github.com/russross/blackfriday/tree/v2 and the +documentation is available at +https://godoc.org/gopkg.in/russross/blackfriday.v2. + +It is `go get`-able via [gopkg.in][6] at `gopkg.in/russross/blackfriday.v2`, +but we highly recommend using package management tool like [dep][7] or +[Glide][8] and make use of semantic versioning. With package management you +should import `github.com/russross/blackfriday` and specify that you're using +version 2.0.0. + +Version 2 offers a number of improvements over v1: + +* Cleaned up API +* A separate call to [`Parse`][4], which produces an abstract syntax tree for + the document +* Latest bug fixes +* Flexibility to easily add your own rendering extensions + +Potential drawbacks: + +* Our benchmarks show v2 to be slightly slower than v1. Currently in the + ballpark of around 15%. +* API breakage. If you can't afford modifying your code to adhere to the new API + and don't care too much about the new features, v2 is probably not for you. +* Several bug fixes are trailing behind and still need to be forward-ported to + v2. See issue [#348](https://github.com/russross/blackfriday/issues/348) for + tracking. + +If you are still interested in the legacy `v1`, you can import it from +`github.com/russross/blackfriday`. Documentation for the legacy v1 can be found +here: https://godoc.org/github.com/russross/blackfriday + +### Known issue with `dep` + +There is a known problem with using Blackfriday v1 _transitively_ and `dep`. +Currently `dep` prioritizes semver versions over anything else, and picks the +latest one, plus it does not apply a `[[constraint]]` specifier to transitively +pulled in packages. So if you're using something that uses Blackfriday v1, but +that something does not use `dep` yet, you will get Blackfriday v2 pulled in and +your first dependency will fail to build. + +There are couple of fixes for it, documented here: +https://github.com/golang/dep/blob/master/docs/FAQ.md#how-do-i-constrain-a-transitive-dependencys-version + +Meanwhile, `dep` team is working on a more general solution to the constraints +on transitive dependencies problem: https://github.com/golang/dep/issues/1124. -and `go get` without parameters. Usage ----- +### v1 + For basic usage, it is as simple as getting your input into a byte slice and calling: @@ -46,34 +93,57 @@ feature set, use this instead: output := blackfriday.MarkdownCommon(input) +### v2 + +For the most sensible markdown processing, it is as simple as getting your input +into a byte slice and calling: + +```go +output := blackfriday.Run(input) +``` + +Your input will be parsed and the output rendered with a set of most popular +extensions enabled. If you want the most basic feature set, corresponding with +the bare Markdown specification, use: + +```go +output := blackfriday.Run(input, blackfriday.WithNoExtensions()) +``` + ### Sanitize untrusted content Blackfriday itself does nothing to protect against malicious content. If you are -dealing with user-supplied markdown, we recommend running blackfriday's output -through HTML sanitizer such as -[Bluemonday](https://github.com/microcosm-cc/bluemonday). +dealing with user-supplied markdown, we recommend running Blackfriday's output +through HTML sanitizer such as [Bluemonday][5]. -Here's an example of simple usage of blackfriday together with bluemonday: +Here's an example of simple usage of Blackfriday together with Bluemonday: -``` go +```go import ( "github.com/microcosm-cc/bluemonday" - "github.com/russross/blackfriday" + "gopkg.in/russross/blackfriday.v2" ) // ... -unsafe := blackfriday.MarkdownCommon(input) +unsafe := blackfriday.Run(input) html := bluemonday.UGCPolicy().SanitizeBytes(unsafe) ``` -### Custom options +### Custom options, v1 If you want to customize the set of options, first get a renderer -(currently either the HTML or LaTeX output engines), then use it to +(currently only the HTML output engine), then use it to call the more general `Markdown` function. For examples, see the implementations of `MarkdownBasic` and `MarkdownCommon` in `markdown.go`. +### Custom options, v2 + +If you want to customize the set of options, use `blackfriday.WithExtensions`, +`blackfriday.WithRenderer` and `blackfriday.WithRefOverride`. + +### `blackfriday-tool` + You can also check out `blackfriday-tool` for a more complete example of how to use it. Download and install it using: @@ -249,7 +319,7 @@ are a few of note: * [github_flavored_markdown](https://godoc.org/github.com/shurcooL/github_flavored_markdown): provides a GitHub Flavored Markdown renderer with fenced code block - highlighting, clickable header anchor links. + highlighting, clickable heading anchor links. It's not customizable, and its goal is to produce HTML output equivalent to the [GitHub Markdown API endpoint](https://developer.github.com/v3/markdown/#render-a-markdown-document-in-raw-mode), @@ -258,27 +328,18 @@ are a few of note: * [markdownfmt](https://github.com/shurcooL/markdownfmt): like gofmt, but for markdown. -* LaTeX output: renders output as LaTeX. This is currently part of the - main Blackfriday repository, but may be split into its own project - in the future. If you are interested in owning and maintaining the - LaTeX output component, please be in touch. - - It renders some basic documents, but is only experimental at this - point. In particular, it does not do any inline escaping, so input - that happens to look like LaTeX code will be passed through without - modification. - -* [Md2Vim](https://github.com/FooSoft/md2vim): transforms markdown files into vimdoc format. +* [LaTeX output](https://bitbucket.org/ambrevar/blackfriday-latex): + renders output as LaTeX. -Todo +TODO ---- * More unit testing -* Improve unicode support. It does not understand all unicode +* Improve Unicode support. It does not understand all Unicode rules (about what constitutes a letter, a punctuation symbol, etc.), so it may fail to detect word boundaries correctly in - some instances. It is safe on all utf-8 input. + some instances. It is safe on all UTF-8 input. License @@ -287,6 +348,16 @@ License [Blackfriday is distributed under the Simplified BSD License](LICENSE.txt) - [1]: http://daringfireball.net/projects/markdown/ "Markdown" - [2]: http://golang.org/ "Go Language" + [1]: https://daringfireball.net/projects/markdown/ "Markdown" + [2]: https://golang.org/ "Go Language" [3]: https://github.com/vmg/sundown "Sundown" + [4]: https://godoc.org/gopkg.in/russross/blackfriday.v2#Parse "Parse func" + [5]: https://github.com/microcosm-cc/bluemonday "Bluemonday" + [6]: https://labix.org/gopkg.in "gopkg.in" + [7]: https://github.com/golang/dep/ "dep" + [8]: https://github.com/Masterminds/glide "Glide" + + [BuildSVG]: https://travis-ci.org/russross/blackfriday.svg?branch=master + [BuildURL]: https://travis-ci.org/russross/blackfriday + [GodocV2SVG]: https://godoc.org/gopkg.in/russross/blackfriday.v2?status.svg + [GodocV2URL]: https://godoc.org/gopkg.in/russross/blackfriday.v2 diff --git a/vendor/github.com/russross/blackfriday/block.go b/vendor/github.com/russross/blackfriday/block.go index 7fc731d54..929638aa4 100644 --- a/vendor/github.com/russross/blackfriday/block.go +++ b/vendor/github.com/russross/blackfriday/block.go @@ -15,6 +15,7 @@ package blackfriday import ( "bytes" + "strings" "unicode" ) @@ -92,7 +93,7 @@ func (p *parser) block(out *bytes.Buffer, data []byte) { // fenced code block: // - // ``` go + // ``` go info string here // func fact(n int) int { // if n <= 1 { // return n @@ -562,7 +563,7 @@ func (*parser) isHRule(data []byte) bool { // and returns the end index if so, or 0 otherwise. It also returns the marker found. // If syntax is not nil, it gets set to the syntax specified in the fence line. // A final newline is mandatory to recognize the fence line, unless newlineOptional is true. -func isFenceLine(data []byte, syntax *string, oldmarker string, newlineOptional bool) (end int, marker string) { +func isFenceLine(data []byte, info *string, oldmarker string, newlineOptional bool) (end int, marker string) { i, size := 0, 0 // skip up to three spaces @@ -598,9 +599,9 @@ func isFenceLine(data []byte, syntax *string, oldmarker string, newlineOptional } // TODO(shurcooL): It's probably a good idea to simplify the 2 code paths here - // into one, always get the syntax, and discard it if the caller doesn't care. - if syntax != nil { - syn := 0 + // into one, always get the info string, and discard it if the caller doesn't care. + if info != nil { + infoLength := 0 i = skipChar(data, i, ' ') if i >= len(data) { @@ -610,14 +611,14 @@ func isFenceLine(data []byte, syntax *string, oldmarker string, newlineOptional return 0, "" } - syntaxStart := i + infoStart := i if data[i] == '{' { i++ - syntaxStart++ + infoStart++ for i < len(data) && data[i] != '}' && data[i] != '\n' { - syn++ + infoLength++ i++ } @@ -627,24 +628,24 @@ func isFenceLine(data []byte, syntax *string, oldmarker string, newlineOptional // strip all whitespace at the beginning and the end // of the {} block - for syn > 0 && isspace(data[syntaxStart]) { - syntaxStart++ - syn-- + for infoLength > 0 && isspace(data[infoStart]) { + infoStart++ + infoLength-- } - for syn > 0 && isspace(data[syntaxStart+syn-1]) { - syn-- + for infoLength > 0 && isspace(data[infoStart+infoLength-1]) { + infoLength-- } i++ } else { - for i < len(data) && !isspace(data[i]) { - syn++ + for i < len(data) && !isverticalspace(data[i]) { + infoLength++ i++ } } - *syntax = string(data[syntaxStart : syntaxStart+syn]) + *info = strings.TrimSpace(string(data[infoStart : infoStart+infoLength])) } i = skipChar(data, i, ' ') @@ -662,8 +663,8 @@ func isFenceLine(data []byte, syntax *string, oldmarker string, newlineOptional // or 0 otherwise. It writes to out if doRender is true, otherwise it has no side effects. // If doRender is true, a final newline is mandatory to recognize the fenced code block. func (p *parser) fencedCodeBlock(out *bytes.Buffer, data []byte, doRender bool) int { - var syntax string - beg, marker := isFenceLine(data, &syntax, "", false) + var infoString string + beg, marker := isFenceLine(data, &infoString, "", false) if beg == 0 || beg >= len(data) { return 0 } @@ -697,7 +698,7 @@ func (p *parser) fencedCodeBlock(out *bytes.Buffer, data []byte, doRender bool) } if doRender { - p.r.BlockCode(out, work.Bytes(), syntax) + p.r.BlockCode(out, work.Bytes(), infoString) } return beg diff --git a/vendor/github.com/russross/blackfriday/html.go b/vendor/github.com/russross/blackfriday/html.go index 2f0ad3b1e..e0a6c69c9 100644 --- a/vendor/github.com/russross/blackfriday/html.go +++ b/vendor/github.com/russross/blackfriday/html.go @@ -255,33 +255,21 @@ func (options *Html) HRule(out *bytes.Buffer) { out.WriteByte('\n') } -func (options *Html) BlockCode(out *bytes.Buffer, text []byte, lang string) { +func (options *Html) BlockCode(out *bytes.Buffer, text []byte, info string) { doubleSpace(out) - // parse out the language names/classes - count := 0 - for _, elt := range strings.Fields(lang) { - if elt[0] == '.' { - elt = elt[1:] - } - if len(elt) == 0 { - continue - } - if count == 0 { - out.WriteString("
")
 	} else {
+		out.WriteString("
")
 	}
-
 	attrEscape(out, text)
 	out.WriteString("
\n")
 }
@@ -620,7 +608,7 @@ func (options *Html) FootnoteRef(out *bytes.Buffer, ref []byte, id int) {
 	out.WriteString(`fnref:`)
 	out.WriteString(options.parameters.FootnoteAnchorPrefix)
 	out.Write(slug)
-	out.WriteString(`">
Date: Tue, 19 Jun 2018 13:55:44 -0500
Subject: [PATCH 5/7] Add txt for templates (#1117)

Had `text` now can do the same thing for `txt`
---
 render/render.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/render/render.go b/render/render.go
index 5df28a4e0..898a7dd5d 100644
--- a/render/render.go
+++ b/render/render.go
@@ -28,6 +28,9 @@ func New(opts Options) *Engine {
 	if _, ok := opts.TemplateEngines["text"]; !ok {
 		opts.TemplateEngines["text"] = plush.BuffaloRenderer
 	}
+	if _, ok := opts.TemplateEngines["txt"]; !ok {
+		opts.TemplateEngines["txt"] = plush.BuffaloRenderer
+	}
 	if _, ok := opts.TemplateEngines["js"]; !ok {
 		opts.TemplateEngines["js"] = JSTemplateEngine
 	}

From f46357b905f004c36967a7807b00802bfffd656b Mon Sep 17 00:00:00 2001
From: Mark Bates 
Date: Wed, 20 Jun 2018 13:29:38 -0400
Subject: [PATCH 6/7] keep toml simple

---
 Gopkg.toml | 154 -----------------------------------------------------
 1 file changed, 154 deletions(-)

diff --git a/Gopkg.toml b/Gopkg.toml
index 28c1ea0b8..82902a5d6 100644
--- a/Gopkg.toml
+++ b/Gopkg.toml
@@ -1,161 +1,7 @@
-# Gopkg.toml example
-#
-# Refer to https://golang.github.io/dep/docs/Gopkg.toml.html
-# for detailed Gopkg.toml documentation.
-#
-# required = ["github.com/user/thing/cmd/thing"]
-# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"]
-#
-# [[constraint]]
-#   name = "github.com/user/project"
-#   version = "1.0.0"
-#
-# [[constraint]]
-#   name = "github.com/user/project2"
-#   branch = "dev"
-#   source = "github.com/myfork/project2"
-#
-# [[override]]
-#   name = "github.com/x/y"
-#   version = "2.4.0"
-#
-# [prune]
-#   non-go = false
-#   go-tests = true
-#   unused-packages = true
-
-
-[[constraint]]
-  name = "github.com/dgrijalva/jwt-go"
-  version = "3.2.0"
-
-[[constraint]]
-  branch = "master"
-  name = "github.com/dustin/go-humanize"
-
-[[constraint]]
-  name = "github.com/fatih/color"
-  version = "1.7.0"
-
-[[constraint]]
-  name = "github.com/gobuffalo/envy"
-  version = "1.6.3"
-
-[[constraint]]
-  name = "github.com/gobuffalo/makr"
-  version = "1.1.0"
-
-[[constraint]]
-  name = "github.com/gobuffalo/packr"
-  version = "1.11.1"
-
-[[constraint]]
-  name = "github.com/gobuffalo/plush"
-  version = "3.7.5"
-
-[[constraint]]
-  name = "github.com/gobuffalo/pop"
-  version = "4.5.9"
-
-[[constraint]]
-  name = "github.com/gobuffalo/tags"
-  version = "2.0.5"
-
-[[constraint]]
-  name = "github.com/gobuffalo/uuid"
-  version = "2.0.0"
-
-[[constraint]]
-  branch = "master"
-  name = "github.com/gobuffalo/x"
-
-[[constraint]]
-  name = "github.com/gorilla/context"
-  version = "1.1.1"
-
-[[constraint]]
-  name = "github.com/gorilla/mux"
-  version = "1.6.2"
-
-[[constraint]]
-  name = "github.com/gorilla/sessions"
-  version = "1.1.1"
-
-[[constraint]]
-  name = "github.com/markbates/deplist"
-  version = "1.0.0"
-
-[[constraint]]
-  name = "github.com/markbates/going"
-  version = "1.0.0"
-
-[[constraint]]
-  name = "github.com/markbates/grift"
-  version = "1.0.0"
-
-[[constraint]]
-  name = "github.com/markbates/inflect"
-  version = "1.0.0"
-
-[[constraint]]
-  name = "github.com/markbates/refresh"
-  version = "1.4.0"
-
-[[constraint]]
-  name = "github.com/markbates/sigtx"
-  version = "1.0.0"
-
-[[constraint]]
-  name = "github.com/markbates/willie"
-  version = "1.0.0"
-
-[[constraint]]
-  name = "github.com/monoculum/formam"
-  version = "3.0.0"
-
-[[constraint]]
-  name = "github.com/nicksnyder/go-i18n"
-  version = "1.10.0"
-
-[[constraint]]
-  name = "github.com/pkg/errors"
-  version = "0.8.0"
-
 [[constraint]]
   branch = "master"
   name = "github.com/russross/blackfriday"
 
-[[constraint]]
-  branch = "master"
-  name = "github.com/shurcooL/github_flavored_markdown"
-
-[[constraint]]
-  name = "github.com/sirupsen/logrus"
-  version = "1.0.5"
-
-[[constraint]]
-  name = "github.com/spf13/cobra"
-  version = "0.0.3"
-
-[[constraint]]
-  name = "github.com/stretchr/testify"
-  version = "1.2.2"
-
-[[constraint]]
-  branch = "master"
-  name = "github.com/unrolled/secure"
-
-[[constraint]]
-  branch = "master"
-  name = "golang.org/x/crypto"
-
-[[constraint]]
-  branch = "master"
-  name = "golang.org/x/sync"
-
-[[constraint]]
-  name = "gopkg.in/mail.v2"
-  version = "2.2.0"
 
 [prune]
   go-tests = true

From a15bbc6f91cec94397583c65523aa69579e3e289 Mon Sep 17 00:00:00 2001
From: Dr Nic Williams 
Date: Thu, 21 Jun 2018 09:56:24 +1000
Subject: [PATCH 7/7] remove whitespace in webpack.config.js (#1120)

---
 .../webpack/templates/webpack.config.js.tmpl       | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/generators/assets/webpack/templates/webpack.config.js.tmpl b/generators/assets/webpack/templates/webpack.config.js.tmpl
index 2f613e260..9ab8ed91b 100644
--- a/generators/assets/webpack/templates/webpack.config.js.tmpl
+++ b/generators/assets/webpack/templates/webpack.config.js.tmpl
@@ -16,22 +16,22 @@ const configurator = {
         './assets/css/application.scss',
       ],
     }
-    
+
     Glob.sync("./assets/*/*.*").forEach((entry) => {
       if (entry === './assets/css/application.scss') {
         return
       }
-      
+
       let key = entry.replace(/(\.\/assets\/(js|css|go)\/)|\.(js|s[ac]ss|go)/g, '')
       if(key.startsWith("_") || (/(js|s[ac]ss|go)$/i).test(entry) == false) {
         return
       }
-      
+
       if( entries[key] == null) {
         entries[key] = [entry]
         return
-      } 
-      
+      }
+
       entries[key].push(entry)
     })
 
@@ -73,7 +73,7 @@ const configurator = {
 
   buildConfig: function(){
     const env = process.env.NODE_ENV || "development";
-    
+
     var config = {
       mode: env,
       entry: configurator.entries(),
@@ -104,4 +104,4 @@ const configurator = {
   }
 }
 
-module.exports = configurator.buildConfig()
\ No newline at end of file
+module.exports = configurator.buildConfig()