diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
deleted file mode 100644
index bb4e9a03a..000000000
--- a/.github/workflows/release.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-name: Release
-on:
- release:
- types:
- - published
-
-jobs:
- release:
- name: Release
- runs-on: ubuntu-latest
- steps:
- -
- name: Set up Go 1.15
- uses: actions/setup-go@v1
- with:
- go-version: 1.15
- id: go
- -
- name: Checkout Code
- uses: actions/checkout@master
- -
- name: Run GoReleaser
- env:
- GITHUB_TOKEN: ${{ secrets.GORELEASER_GITHUB_TOKEN }}
- uses: goreleaser/goreleaser-action@v1
- with:
- version: latest
- args: release --rm-dist
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index e4ac63566..1cdfe3e5d 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -11,16 +11,21 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
- go-version: [1.15.x, 1.16.x]
- os: [macos-latest, windows-latest, ubuntu-latest]
- env:
- GO111MODULE: on
+ go-version:
+ - '1.15.x'
+ - '1.16.x'
+ os:
+ - 'macos-latest'
+ - 'windows-latest'
+ - 'ubuntu-latest'
+
steps:
- - name: Checkout code
- uses: actions/checkout@v1
+ - uses: actions/checkout@v2
+ - name: Setup Go ${{ matrix.go }}
+ uses: actions/setup-go@v2
with:
- fetch-depth: 1
- path: src/github.com/${{ github.repository }}
+ go-version: ${{ matrix.go-version }}
+
- name: Test
run: |
go mod tidy -v
diff --git a/.goreleaser.yml b/.goreleaser.yml
deleted file mode 100644
index 6e132e7bb..000000000
--- a/.goreleaser.yml
+++ /dev/null
@@ -1,45 +0,0 @@
-builds:
- -
- main: ./buffalo/main.go
- env:
- - CGO_ENABLED=0
- ldflags:
- - -s -w -X "github.com/gobuffalo/buffalo/runtime.Version={{.Tag}}"
- goos:
- - darwin
- - linux
- - windows
- goarch:
- - amd64
- - 386
- - arm
- - arm64
- goarm:
- - 6
- - 7
-archives:
- -
- replacements:
- '386': i386
- darwin: Darwin
- linux: Linux
- windows: Windows
- amd64: x86_64
-checksum:
- name_template: checksums.txt
-snapshot:
- name_template: '{{ .Tag }}-next'
-changelog:
- sort: asc
- filters:
- exclude:
- - '^docs:'
- - '^test:'
-brews:
- -
- name: 'buffalo'
- tap:
- owner: 'gobuffalo'
- name: 'homebrew-tap'
- install: |
- bin.install "buffalo"
diff --git a/buffalo/cmd/build.go b/buffalo/cmd/build.go
deleted file mode 100644
index 9f75d89f7..000000000
--- a/buffalo/cmd/build.go
+++ /dev/null
@@ -1,167 +0,0 @@
-package cmd
-
-import (
- "bytes"
- "context"
- "log"
- "os"
- "os/exec"
- "strings"
- "time"
-
- "github.com/gobuffalo/buffalo/genny/build"
- "github.com/gobuffalo/genny/v2"
- "github.com/gobuffalo/logger"
- "github.com/gobuffalo/meta"
- "github.com/markbates/sigtx"
- "github.com/spf13/cobra"
-)
-
-var buildOptions = struct {
- *build.Options
- SkipAssets bool
- SkipBuildDeps bool
- Debug bool
- Tags string
- SkipTemplateValidation bool
- DryRun bool
- Verbose bool
- bin string
-}{
- Options: &build.Options{
- BuildTime: time.Now(),
- },
-}
-
-var xbuildCmd = &cobra.Command{
- Use: "build",
- Aliases: []string{"b", "bill", "install"},
- Short: "Build the application binary, including bundling of assets (packr & webpack)",
- RunE: func(cmd *cobra.Command, args []string) error {
- ctx, cancel := sigtx.WithCancel(context.Background(), os.Interrupt)
- defer cancel()
-
- pwd, err := os.Getwd()
- if err != nil {
- return err
- }
-
- buildOptions.App = meta.New(pwd)
- if len(buildOptions.bin) > 0 {
- buildOptions.App.Bin = buildOptions.bin
- }
-
- buildOptions.Options.WithAssets = !buildOptions.SkipAssets
- buildOptions.Options.WithBuildDeps = !buildOptions.SkipBuildDeps
-
- run := genny.WetRunner(ctx)
- if buildOptions.DryRun {
- run = genny.DryRunner(ctx)
- }
-
- if buildOptions.Verbose || buildOptions.Debug {
- lg := logger.New(logger.DebugLevel)
- run.Logger = lg
- // plog.Logger = lg
- buildOptions.BuildFlags = append(buildOptions.BuildFlags, "-v")
- }
-
- opts := buildOptions.Options
- opts.BuildVersion = buildVersion(opts.BuildTime.Format(time.RFC3339))
-
- if buildOptions.Tags != "" {
- opts.Tags = append(opts.Tags, buildOptions.Tags)
- }
-
- if !buildOptions.SkipTemplateValidation {
- opts.TemplateValidators = append(opts.TemplateValidators, build.PlushValidator, build.GoTemplateValidator)
- }
-
- if cmd.CalledAs() == "install" {
- opts.GoCommand = "install"
- }
- clean := build.Cleanup(opts)
- // defer clean(run)
- defer func() {
- if err := clean(run); err != nil {
- log.Fatal("build:clean", err)
- }
- }()
- if err := run.WithNew(build.New(opts)); err != nil {
- return err
- }
- return run.Run()
- },
-}
-
-func init() {
- RootCmd.AddCommand(xbuildCmd)
-
- xbuildCmd.Flags().StringVarP(&buildOptions.bin, "output", "o", buildOptions.Bin, "set the name of the binary")
- xbuildCmd.Flags().StringVarP(&buildOptions.Tags, "tags", "t", "", "compile with specific build tags")
- xbuildCmd.Flags().BoolVarP(&buildOptions.ExtractAssets, "extract-assets", "e", false, "extract the assets and put them in a distinct archive")
- xbuildCmd.Flags().BoolVarP(&buildOptions.SkipAssets, "skip-assets", "k", false, "skip running webpack and building assets")
- xbuildCmd.Flags().BoolVarP(&buildOptions.SkipBuildDeps, "skip-build-deps", "", false, "skip building dependencies")
- xbuildCmd.Flags().BoolVarP(&buildOptions.Static, "static", "s", false, "build a static binary using --ldflags '-linkmode external -extldflags \"-static\"'")
- xbuildCmd.Flags().StringVar(&buildOptions.LDFlags, "ldflags", "", "set any ldflags to be passed to the go build")
- xbuildCmd.Flags().BoolVarP(&buildOptions.Verbose, "verbose", "v", false, "print debugging information")
- xbuildCmd.Flags().BoolVar(&buildOptions.DryRun, "dry-run", false, "runs the build 'dry'")
- xbuildCmd.Flags().BoolVar(&buildOptions.SkipTemplateValidation, "skip-template-validation", false, "skip validating templates")
- xbuildCmd.Flags().BoolVar(&buildOptions.CleanAssets, "clean-assets", false, "will delete public/assets before calling webpack")
- xbuildCmd.Flags().StringVarP(&buildOptions.Environment, "environment", "", "development", "set the environment for the binary")
- xbuildCmd.Flags().StringVar(&buildOptions.Mod, "mod", "", "-mod flag for go build")
-}
-
-func buildVersion(version string) string {
- vcs := buildOptions.VCS
-
- if len(vcs) == 0 {
- return version
- }
-
- ctx := context.Background()
- run := genny.WetRunner(ctx)
- if buildOptions.DryRun {
- run = genny.DryRunner(ctx)
- }
-
- _, err := exec.LookPath(vcs)
- if err != nil {
- run.Logger.Warnf("could not find %s; defaulting to version %s", vcs, version)
- return vcs
- }
-
- var cmd *exec.Cmd
- switch vcs {
- case "git":
- // If .git folder does not exist return default version
- if stat, err := os.Stat(".git"); err != nil || !stat.IsDir() {
- run.Logger.Warnf("could not find .git folder; defaulting to version %s", version)
- return version
- }
-
- cmd = exec.Command("git", "rev-parse", "--short", "HEAD")
- case "bzr":
- cmd = exec.Command("bzr", "revno")
- default:
- run.Logger.Warnf("could not find %s; defaulting to version %s", vcs, version)
- return vcs
- }
-
- out := &bytes.Buffer{}
- cmd.Stdout = out
- run.WithRun(func(r *genny.Runner) error {
- return r.Exec(cmd)
- })
-
- if err := run.Run(); err != nil {
- run.Logger.Error(err)
- return version
- }
-
- if out.String() != "" {
- return strings.TrimSpace(out.String())
- }
-
- return version
-}
diff --git a/buffalo/cmd/destroy.go b/buffalo/cmd/destroy.go
deleted file mode 100644
index 1783529ae..000000000
--- a/buffalo/cmd/destroy.go
+++ /dev/null
@@ -1,24 +0,0 @@
-package cmd
-
-import (
- "github.com/gobuffalo/buffalo/buffalo/cmd/destroy"
- "github.com/spf13/cobra"
-)
-
-// DestroyCmd destroys generated code
-var DestroyCmd = &cobra.Command{
- Use: "destroy",
- Short: "Destroy generated components",
- Aliases: []string{"d"},
-}
-
-func init() {
- DestroyCmd.AddCommand(destroy.ResourceCmd)
- DestroyCmd.AddCommand(destroy.ActionCmd)
- DestroyCmd.AddCommand(destroy.MailerCmd)
-
- DestroyCmd.PersistentFlags().BoolVarP(&destroy.YesToAll, "yes", "y", false, "confirms all beforehand")
-
- decorate("destroy", DestroyCmd)
- RootCmd.AddCommand(DestroyCmd)
-}
diff --git a/buffalo/cmd/destroy/action.go b/buffalo/cmd/destroy/action.go
deleted file mode 100644
index e65b4a6d7..000000000
--- a/buffalo/cmd/destroy/action.go
+++ /dev/null
@@ -1,29 +0,0 @@
-package destroy
-
-import (
- "fmt"
-
- "github.com/gobuffalo/flect"
- "github.com/spf13/cobra"
-)
-
-//ActionCmd destroys passed action file
-var ActionCmd = &cobra.Command{
- Use: "action [name]",
- //Example: "resource cars",
- Aliases: []string{"a"},
- Short: "Destroy action files",
- RunE: func(cmd *cobra.Command, args []string) error {
- if len(args) == 0 {
- return fmt.Errorf("you need to provide a valid action file name in order to destroy it")
- }
-
- name := args[0]
-
- //Generated actions keep the same name (not plural).
- fileName := flect.Underscore(name)
-
- removeActions(fileName)
- return nil
- },
-}
diff --git a/buffalo/cmd/destroy/mailer.go b/buffalo/cmd/destroy/mailer.go
deleted file mode 100644
index 0e9269875..000000000
--- a/buffalo/cmd/destroy/mailer.go
+++ /dev/null
@@ -1,48 +0,0 @@
-package destroy
-
-import (
- "fmt"
- "os"
- "path/filepath"
-
- "github.com/gobuffalo/flect"
- "github.com/sirupsen/logrus"
- "github.com/spf13/cobra"
-)
-
-// MailerCmd destroys a passed mailer
-var MailerCmd = &cobra.Command{
- Use: "mailer [name]",
- // Example: "mailer cars",
- Aliases: []string{"l"},
- Short: "Destroy mailer files",
- RunE: func(cmd *cobra.Command, args []string) error {
- if len(args) == 0 {
- return fmt.Errorf("you need to provide a valid mailer name in order to destroy it")
- }
-
- name := args[0]
-
- removeMailer(name)
-
- return nil
- },
-}
-
-func removeMailer(name string) {
- if YesToAll || confirm("Want to remove mailer? (y/N)") {
- mailerFileName := flect.Singularize(flect.Underscore(name))
-
- files := []string{
- filepath.Join("mailers", fmt.Sprintf("%v.go", mailerFileName)),
- filepath.Join("templates/mail", fmt.Sprintf("%v.html", mailerFileName)),
- filepath.Join("templates/mail", fmt.Sprintf("%v.plush.html", mailerFileName)),
- }
-
- for _, f := range files {
- os.Remove(f)
- logrus.Infof("- Deleted %v", f)
- }
-
- }
-}
diff --git a/buffalo/cmd/destroy/resource.go b/buffalo/cmd/destroy/resource.go
deleted file mode 100644
index 3a94328cc..000000000
--- a/buffalo/cmd/destroy/resource.go
+++ /dev/null
@@ -1,129 +0,0 @@
-package destroy
-
-import (
- "bufio"
- "fmt"
- "io/ioutil"
- "os"
- "path/filepath"
- "strings"
-
- "github.com/gobuffalo/flect"
-
- "github.com/sirupsen/logrus"
- "github.com/spf13/cobra"
-)
-
-// YesToAll means not to ask when destroying but simply confirm all beforehand.
-var YesToAll = false
-
-// ResourceCmd destroys a passed resource
-var ResourceCmd = &cobra.Command{
- Use: "resource [name]",
- // Example: "resource cars",
- Aliases: []string{"r"},
- Short: "Destroy resource files",
- RunE: func(cmd *cobra.Command, args []string) error {
- if len(args) == 0 {
- return fmt.Errorf("you need to provide a valid resource name in order to destroy it")
- }
-
- name := args[0]
- fileName := flect.Pluralize(flect.Underscore(name))
-
- removeTemplates(fileName)
- if err := removeActions(fileName); err != nil {
- return err
- }
-
- removeLocales(fileName)
- removeModel(name)
- removeMigrations(fileName)
-
- return nil
- },
-}
-
-func confirm(msg string) bool {
- reader := bufio.NewReader(os.Stdin)
- fmt.Print(msg)
- text, _ := reader.ReadString('\n')
-
- return (text == "y\n" || text == "Y\n")
-}
-
-func removeTemplates(fileName string) {
- if YesToAll || confirm("Want to remove templates? (y/N)") {
- templatesFolder := filepath.Join("templates", fileName)
- logrus.Infof("- Deleted %v folder", templatesFolder)
- os.RemoveAll(templatesFolder)
- }
-}
-
-func removeActions(fileName string) error {
- if YesToAll || confirm("Want to remove actions? (y/N)") {
- logrus.Infof("- Deleted %v", fmt.Sprintf("actions/%v.go", fileName))
- os.Remove(filepath.Join("actions", fmt.Sprintf("%v.go", fileName)))
-
- logrus.Infof("- Deleted %v", fmt.Sprintf("actions/%v_test.go", fileName))
- os.Remove(filepath.Join("actions", fmt.Sprintf("%v_test.go", fileName)))
-
- content, err := ioutil.ReadFile(filepath.Join("actions", "app.go"))
- if err != nil {
- logrus.Warn("error reading app.go content")
- return err
- }
-
- resourceExpression := fmt.Sprintf("app.Resource(\"/%v\", %vResource{})", fileName, flect.Pascalize(fileName))
- newContents := strings.Replace(string(content), resourceExpression, "", -1)
-
- err = ioutil.WriteFile(filepath.Join("actions", "app.go"), []byte(newContents), 0)
- if err != nil {
- logrus.Error("error writing new app.go content")
- return err
- }
-
- logrus.Infof("- Deleted References for %v in actions/app.go", fileName)
- }
-
- return nil
-}
-
-func removeLocales(fileName string) {
- if YesToAll || confirm("Want to remove locales? (y/N)") {
- removeMatch("locales", fmt.Sprintf("%v.*.yaml", fileName))
- }
-}
-
-func removeModel(name string) {
- if YesToAll || confirm("Want to remove model? (y/N)") {
- modelFileName := flect.Singularize(flect.Underscore(name))
-
- os.Remove(filepath.Join("models", fmt.Sprintf("%v.go", modelFileName)))
- os.Remove(filepath.Join("models", fmt.Sprintf("%v_test.go", modelFileName)))
-
- logrus.Infof("- Deleted %v", fmt.Sprintf("models/%v.go", modelFileName))
- logrus.Infof("- Deleted %v", fmt.Sprintf("models/%v_test.go", modelFileName))
- }
-}
-
-func removeMigrations(fileName string) {
- if YesToAll || confirm("Want to remove migrations? (y/N)") {
- removeMatch("migrations", fmt.Sprintf("*_create_%v.up.*", fileName))
- removeMatch("migrations", fmt.Sprintf("*_create_%v.down.*", fileName))
- }
-}
-
-func removeMatch(folder, pattern string) {
- files, err := ioutil.ReadDir(folder)
- if err == nil {
- for _, f := range files {
- matches, _ := filepath.Match(pattern, f.Name())
- if !f.IsDir() && matches {
- path := filepath.Join(folder, f.Name())
- os.Remove(path)
- logrus.Infof("- Deleted %v", path)
- }
- }
- }
-}
diff --git a/buffalo/cmd/dev.go b/buffalo/cmd/dev.go
deleted file mode 100644
index 7aae8e620..000000000
--- a/buffalo/cmd/dev.go
+++ /dev/null
@@ -1,150 +0,0 @@
-package cmd
-
-import (
- "context"
- "fmt"
- "os"
- "os/exec"
- "path/filepath"
- "runtime"
- "strings"
-
- "github.com/fatih/color"
- "github.com/gobuffalo/buffalo/genny/assets/webpack"
- rg "github.com/gobuffalo/buffalo/genny/refresh"
- "github.com/gobuffalo/events"
- "github.com/gobuffalo/genny/v2"
- "github.com/gobuffalo/meta"
- "github.com/markbates/refresh/refresh"
- "github.com/sirupsen/logrus"
- "github.com/spf13/cobra"
- "golang.org/x/sync/errgroup"
-)
-
-func init() {
- events.NamedListen("buffalo:dev", func(e events.Event) {
- if strings.HasPrefix(e.Kind, "refresh:") {
- e.Kind = strings.Replace(e.Kind, "refresh:", "buffalo:dev:", 1)
- events.Emit(e)
- }
- })
-}
-
-var devOptions = struct {
- Debug bool
-}{}
-
-// devCmd represents the dev command
-var devCmd = &cobra.Command{
- Use: "dev",
- Short: "Run the Buffalo app in 'development' mode",
- Long: `Run the Buffalo app in 'development' mode.
-This includes rebuilding the application when files change.
-This behavior can be changed in .buffalo.dev.yml file.`,
- RunE: func(c *cobra.Command, args []string) error {
- if runtime.GOOS == "windows" {
- color.NoColor = true
- }
- defer func() {
- msg := "There was a problem starting the dev server, Please review the troubleshooting docs: %s\n"
- cause := "Unknown"
- if r := recover(); r != nil {
- if err, ok := r.(error); ok {
- cause = err.Error()
- }
- }
- logrus.Errorf(msg, cause)
- }()
- os.Setenv("GO_ENV", "development")
-
- ctx, cancel := context.WithCancel(context.Background())
- defer cancel()
-
- wg, ctx := errgroup.WithContext(ctx)
-
- wg.Go(func() error {
- return startDevServer(ctx, args)
- })
-
- wg.Go(func() error {
- app := meta.New(".")
- if !app.WithNodeJs {
- // No need to run dev script
- return nil
- }
- return runDevScript(ctx, app)
- })
-
- err := wg.Wait()
- if err != context.Canceled {
- return err
- }
- return nil
- },
-}
-
-func runDevScript(ctx context.Context, app meta.App) error {
- tool := "yarnpkg"
- if !app.WithYarn {
- tool = "npm"
- }
-
- if _, err := exec.LookPath(tool); err != nil {
- return fmt.Errorf("could not find %s tool", tool)
- }
-
- // make sure that the node_modules folder is properly "installed"
- if _, err := os.Stat(filepath.Join(app.Root, "node_modules")); err != nil {
- cmd := exec.CommandContext(ctx, tool, "install")
- cmd.Stderr = os.Stderr
- cmd.Stdout = os.Stdout
- if err := cmd.Run(); err != nil {
- return err
- }
- }
-
- cmd := exec.CommandContext(ctx, tool, "run", "dev")
- if _, err := app.NodeScript("dev"); err != nil {
- // Fallback on legacy runner
- cmd = exec.CommandContext(ctx, webpack.BinPath, "--watch")
- }
- cmd.Stderr = os.Stderr
- cmd.Stdout = os.Stdout
- return cmd.Run()
-}
-
-func startDevServer(ctx context.Context, args []string) error {
- app := meta.New(".")
-
- cfgFile := "./.buffalo.dev.yml"
- if _, err := os.Stat(cfgFile); err != nil {
- run := genny.WetRunner(ctx)
- err = run.WithNew(rg.New(&rg.Options{App: app}))
- if err != nil {
- return err
- }
-
- if err := run.Run(); err != nil {
- return err
- }
- }
- c := &refresh.Configuration{}
- if err := c.Load(cfgFile); err != nil {
- return err
- }
- c.Debug = devOptions.Debug
-
- bt := app.BuildTags("development")
- if len(bt) > 0 {
- c.BuildFlags = append(c.BuildFlags, "-tags", bt.String())
- }
- r := refresh.NewWithContext(c, ctx)
- r.CommandFlags = args
- return r.Start()
-}
-
-func init() {
- devCmd.Flags().BoolVarP(&devOptions.Debug, "debug", "d", false, "use delve to debug the app")
- decorate("dev", devCmd)
- RootCmd.AddCommand(devCmd)
-}
diff --git a/buffalo/cmd/events.go b/buffalo/cmd/events.go
deleted file mode 100644
index e725d60a6..000000000
--- a/buffalo/cmd/events.go
+++ /dev/null
@@ -1,10 +0,0 @@
-package cmd
-
-const (
- // EvtSetupStarted is emitted when `buffalo setup` starts
- EvtSetupStarted = "buffalo:setup:started"
- // EvtSetupErr is emitted if `buffalo setup` fails
- EvtSetupErr = "buffalo:setup:err"
- // EvtSetupFinished is emitted when `buffalo setup` finishes
- EvtSetupFinished = "buffalo:setup:finished"
-)
diff --git a/buffalo/cmd/filetests/apiapp.json b/buffalo/cmd/filetests/apiapp.json
deleted file mode 100644
index 071362540..000000000
--- a/buffalo/cmd/filetests/apiapp.json
+++ /dev/null
@@ -1,36 +0,0 @@
-[{
- "path": "actions/app.go",
- "contains": [
- "app.Use(contenttype.Set(\"application/json\"))"
- ],
- "!contains": [
- "app.ServeFiles"
- ]
-}, {
- "path": "actions/home.go",
- "contains": [
- "r.JSON"
- ],
- "!contains": [
- "r.HTML"
- ]
-}, {
- "path": "actions/render.go",
- "contains": [
- "DefaultContentType: \"application/json\","
- ],
- "!contains": [
- "HTMLLayout",
- "TemplatesBox",
- "Helpers"
- ]
-}, {
- "path": "templates",
- "absent": true
-}, {
- "path": "assets",
- "absent": true
-}, {
- "path": "public",
- "absent": true
-}]
diff --git a/buffalo/cmd/filetests/destroy_action_all.json b/buffalo/cmd/filetests/destroy_action_all.json
deleted file mode 100644
index 9a45a02f0..000000000
--- a/buffalo/cmd/filetests/destroy_action_all.json
+++ /dev/null
@@ -1,8 +0,0 @@
-[{
- "path": "actions/ouch.go",
- "absent": true
-},
-{
- "path": "actions/ouch_test.go",
- "absent": true
-}]
\ No newline at end of file
diff --git a/buffalo/cmd/filetests/destroy_mailer_all.json b/buffalo/cmd/filetests/destroy_mailer_all.json
deleted file mode 100644
index 358c1fd42..000000000
--- a/buffalo/cmd/filetests/destroy_mailer_all.json
+++ /dev/null
@@ -1,14 +0,0 @@
-[{
- "path": "mailers/ouch.go",
- "absent": true
- },
- {
- "path": "templates/mail/ouch.html",
- "absent": true
- },
- {
- "path": "templates/mail/ouch.plush.html",
- "absent": true
- }
-
-]
diff --git a/buffalo/cmd/filetests/destroy_model_all.json b/buffalo/cmd/filetests/destroy_model_all.json
deleted file mode 100644
index 858072622..000000000
--- a/buffalo/cmd/filetests/destroy_model_all.json
+++ /dev/null
@@ -1,8 +0,0 @@
-[{
- "path": "models/ouch.go",
- "absent": true
-},
-{
- "path": "models/ouch_test.go",
- "absent": true
-}]
\ No newline at end of file
diff --git a/buffalo/cmd/filetests/destroy_resource_all.json b/buffalo/cmd/filetests/destroy_resource_all.json
deleted file mode 100644
index 5d1cc5d6d..000000000
--- a/buffalo/cmd/filetests/destroy_resource_all.json
+++ /dev/null
@@ -1,27 +0,0 @@
-[{
- "path": "actions/ouches.go",
- "absent": true
- },
- {
- "path": "actions/ouches_test.go",
- "absent": true
- },
- {
- "path": "actions/app.go",
- "!contains": [
- "app.Resource(\"/ouches\", OuchesResource{})"
- ]
- },
- {
- "path": "locales/ouches.en-us.yaml",
- "absent": true
- },
- {
- "path": "models/ouch.go",
- "absent": true
- },
- {
- "path": "models/ouch_test.go",
- "absent": true
- }
-]
diff --git a/buffalo/cmd/filetests/fix_old_app.json b/buffalo/cmd/filetests/fix_old_app.json
deleted file mode 100644
index 6941260d6..000000000
--- a/buffalo/cmd/filetests/fix_old_app.json
+++ /dev/null
@@ -1,22 +0,0 @@
-[{
- "path": "actions/app.go",
- "!contains": [
- "middleware.PopTransaction",
- "ssl.ForceSSL",
- "middleware.ParameterLogger",
- "github.com/gobuffalo/buffalo/middleware",
- "github.com/gobuffalo/buffalo/middleware",
- "github.com/gobuffalo/buffalo/middleware/ssl",
- "github.com/gobuffalo/buffalo/middleware/csrf",
- "github.com/gobuffalo/buffalo/middleware/i18n"
- ],
- "contains": [
- "github.com/gobuffalo/mw-csrf",
- "github.com/gobuffalo/mw-forcessl",
- "github.com/gobuffalo/mw-i18n",
- "github.com/gobuffalo/mw-paramlogger",
- "forcessl.Middleware",
- "popmw.Transaction",
- "paramlogger.ParameterLogger"
- ]
-}]
diff --git a/buffalo/cmd/filetests/generate_action_all.json b/buffalo/cmd/filetests/generate_action_all.json
deleted file mode 100644
index 347e183bb..000000000
--- a/buffalo/cmd/filetests/generate_action_all.json
+++ /dev/null
@@ -1,23 +0,0 @@
-[{
- "path": "actions/comments.go",
- "contains": [
- "func CommentsShow(c buffalo.Context) error {",
- "func CommentsEdit(c buffalo.Context) error {",
- "comments/edit.html",
- "comments/show.html"
- ]
- },
- {
- "path": "actions/app.go",
- "contains": [
- "app.GET(\"/comments/show\", CommentsShow)",
- "app.GET(\"/comments/edit\", CommentsEdit)"
- ]
- },
- {
- "path": "templates/comments/show.plush.html",
- "contains": [
- "Comments#Show
"
- ]
- }
-]
diff --git a/buffalo/cmd/filetests/generate_action_existing.json b/buffalo/cmd/filetests/generate_action_existing.json
deleted file mode 100644
index 9e7c7d598..000000000
--- a/buffalo/cmd/filetests/generate_action_existing.json
+++ /dev/null
@@ -1,19 +0,0 @@
-[{
- "path": "actions/comments.go",
- "contains": [
- "func CommentsShow(c buffalo.Context) error {",
- "func CommentsEdit(c buffalo.Context) error {",
- "func CommentsDestroy(c buffalo.Context) error {",
- "comments/edit.html",
- "comments/destroy.html",
- "comments/show.html"
- ]
-},
-{
- "path": "actions/app.go",
- "contains": [
- "app.GET(\"/comments/destroy\", CommentsDestroy)",
- "app.GET(\"/comments/edit\", CommentsEdit)",
- "app.GET(\"/comments/show\", CommentsShow)"
- ]
-}]
\ No newline at end of file
diff --git a/buffalo/cmd/filetests/generate_action_skip_template.json b/buffalo/cmd/filetests/generate_action_skip_template.json
deleted file mode 100644
index 9457342cd..000000000
--- a/buffalo/cmd/filetests/generate_action_skip_template.json
+++ /dev/null
@@ -1,15 +0,0 @@
-[{
- "path": "actions/users.go",
- "contains": [
- "func UsersCreate(c buffalo.Context) error {"
- ]
- },
- {
- "path": "templates/users/create.html",
- "absent": true
- },
- {
- "path": "templates/users/create.plush.html",
- "absent": true
- }
-]
diff --git a/buffalo/cmd/filetests/generate_action_with_method.json b/buffalo/cmd/filetests/generate_action_with_method.json
deleted file mode 100644
index 0492c6f44..000000000
--- a/buffalo/cmd/filetests/generate_action_with_method.json
+++ /dev/null
@@ -1,19 +0,0 @@
-[{
- "path": "actions/users.go",
- "contains": [
- "func UsersCreate(c buffalo.Context) error {"
- ]
- },
- {
- "path": "templates/users/update.html",
- "absent": true
- },
- {
- "path": "templates/users/update.plush.html",
- "absent": true
- },
- {
- "path": "actions/app.go",
- "contains": ["app.POST(\"/users/update\", UsersUpdate)"]
- }
-]
diff --git a/buffalo/cmd/filetests/generate_mailer.json b/buffalo/cmd/filetests/generate_mailer.json
deleted file mode 100644
index 9785d1e64..000000000
--- a/buffalo/cmd/filetests/generate_mailer.json
+++ /dev/null
@@ -1,30 +0,0 @@
-[{
- "path": "mailers/mailers.go",
- "contains": [
- "github.com/gobuffalo/buffalo/mail",
- "smtp, err = mail.NewSMTPSender(host, port, user, password)"
- ],
- "!contains": [
- "github.com/gobuffalo/x/mail"
- ]
- },
- {
- "path": "templates/mail/layout.plush.html",
- "contains": [
- "templates/mailers/layout.plush.html
"
- ]
- },
- {
- "path": "mailers/welcome_email.go",
- "contains": [
- "err := m.AddBody(r.HTML(\"welcome_email.html\"), render.Data{})"
- ]
- },
- {
- "path": "templates/mail/welcome_email.plush.html",
- "contains": [
- "Welcome Email
",
- "../templates/mail/welcome_email.plush.html
"
- ]
- }
-]
diff --git a/buffalo/cmd/filetests/generate_nested_task.json b/buffalo/cmd/filetests/generate_nested_task.json
deleted file mode 100644
index 2e7e73d66..000000000
--- a/buffalo/cmd/filetests/generate_nested_task.json
+++ /dev/null
@@ -1,10 +0,0 @@
-[{
- "path": "grifts/now.go",
- "contains": [
- "var _ = Namespace(\"nested\", func() {",
- "Namespace(\"task\", func() {",
- "Desc(\"now\", \"Task Description\")",
- "Add(\"now\", func(c *Context) error {",
- "return nil"
- ]
-}]
\ No newline at end of file
diff --git a/buffalo/cmd/filetests/generate_plain_task.json b/buffalo/cmd/filetests/generate_plain_task.json
deleted file mode 100644
index 6af6b59ff..000000000
--- a/buffalo/cmd/filetests/generate_plain_task.json
+++ /dev/null
@@ -1,8 +0,0 @@
-[{
- "path": "grifts/plain_task.go",
- "contains": [
- "var _ = Desc(\"plain_task\", \"Task Description\")",
- "var _ = Add(\"plain_task\", func(c *Context) error {",
- "return nil"
- ]
-}]
\ No newline at end of file
diff --git a/buffalo/cmd/filetests/generate_resource_irregular.json b/buffalo/cmd/filetests/generate_resource_irregular.json
deleted file mode 100644
index 9703402d9..000000000
--- a/buffalo/cmd/filetests/generate_resource_irregular.json
+++ /dev/null
@@ -1,7 +0,0 @@
-[{
- "path": "actions/people.go",
- "contains": [
- "type PeopleResource struct",
- "func (v PeopleResource)"
- ]
-}]
\ No newline at end of file
diff --git a/buffalo/cmd/filetests/generate_resource_nested_api.json b/buffalo/cmd/filetests/generate_resource_nested_api.json
deleted file mode 100644
index 9e59e6011..000000000
--- a/buffalo/cmd/filetests/generate_resource_nested_api.json
+++ /dev/null
@@ -1,20 +0,0 @@
-[{
- "path": "actions/admin_planes.go",
- "contains": [
- "type AdminPlanesResource struct",
- "func (v AdminPlanesResource)",
- "tx.Find(plane, c.Param(\"admin_plane_id\"))"
- ]
- },
- {
- "path": "actions/admin_planes_test.go",
- "contains": [
- "package actions",
- "Test_AdminPlanesResource_List"
- ]
- },
- {
- "path": "locales/admin/planes.en-us.yaml",
- "absent": true
- }
-]
diff --git a/buffalo/cmd/filetests/generate_resource_nested_model_name_api.json b/buffalo/cmd/filetests/generate_resource_nested_model_name_api.json
deleted file mode 100644
index 6faab3ff1..000000000
--- a/buffalo/cmd/filetests/generate_resource_nested_model_name_api.json
+++ /dev/null
@@ -1,25 +0,0 @@
-[{
- "path": "actions/admin_users.go",
- "contains": [
- "type AdminUsersResource struct",
- "func (v AdminUsersResource)"
- ]
- },
- {
- "path": "actions/admin_users_test.go",
- "contains": [
- "package actions",
- "Test_AdminUsersResource_List"
- ]
- },
- {
- "path": "locales/admin/users.en-us.yaml",
- "absent": true
- },
- {
- "path": "models/admin_user.go",
- "contains": [
- "type AdminUser struct"
- ]
- }
-]
diff --git a/buffalo/cmd/filetests/generate_resource_nested_model_name_web.json b/buffalo/cmd/filetests/generate_resource_nested_model_name_web.json
deleted file mode 100644
index f16bd5aff..000000000
--- a/buffalo/cmd/filetests/generate_resource_nested_model_name_web.json
+++ /dev/null
@@ -1,34 +0,0 @@
-[{
- "path": "actions/admin_users.go",
- "contains": [
- "type AdminUsersResource struct",
- "func (v AdminUsersResource)"
- ]
- },
- {
- "path": "actions/admin_users_test.go",
- "contains": [
- "package actions",
- "Test_AdminUsersResource_List"
- ]
- },
- {
- "path": "locales/admin/users.en-us.yaml",
- "contains": [
- "translation: \"AdminUser was successfully created.\""
- ]
- },
- {
- "path": "templates/admin/users/_form.plush.html",
- "contains": [
- ""
- ]
- },
- {
- "path": "models/admin_user.go",
- "contains": [
- "type AdminUser struct"
- ]
- }
-
-]
diff --git a/buffalo/cmd/filetests/generate_resource_nested_web.json b/buffalo/cmd/filetests/generate_resource_nested_web.json
deleted file mode 100644
index 11e04d498..000000000
--- a/buffalo/cmd/filetests/generate_resource_nested_web.json
+++ /dev/null
@@ -1,40 +0,0 @@
-[{
- "path": "actions/admin_planes.go",
- "contains": [
- "type AdminPlanesResource struct",
- "func (v AdminPlanesResource)",
- "tx.Find(plane, c.Param(\"admin_plane_id\"))"
- ]
- },
- {
- "path": "actions/admin_planes_test.go",
- "contains": [
- "package actions",
- "Test_AdminPlanesResource_List"
- ]
- },
- {
- "path": "locales/admin/planes.en-us.yaml",
- "contains": [
- "translation: \"Plane was successfully created.\""
- ]
- },
- {
- "path": "templates/admin/planes/_form.plush.html",
- "contains": [
- ""
- ]
- },
- {
- "path": "templates/admin/planes/index.plush.html",
- "contains": [
- "newAdminPlanesPath()"
- ]
- },
- {
- "path": "templates/admin/planes/show.plush.html",
- "contains": [
- "editAdminPlanePath({ admin_plane_id: plane.ID })"
- ]
- }
-]
diff --git a/buffalo/cmd/filetests/generate_resource_plural.json b/buffalo/cmd/filetests/generate_resource_plural.json
deleted file mode 100644
index 748432895..000000000
--- a/buffalo/cmd/filetests/generate_resource_plural.json
+++ /dev/null
@@ -1,23 +0,0 @@
-[{
- "path": "actions/cars.go",
- "contains": [
- "func (v CarsResource) List(c buffalo.Context) error {",
- "func (v CarsResource) Destroy(c buffalo.Context) error {",
- "type CarsResource struct {"
- ]
- },
- {
- "path": "actions/app.go",
- "contains": [
- "app.Resource(\"/cars\", CarsResource{})"
- ]
- },
- {
- "path": "actions/cars_test.go",
- "contains": [
- "func (as *ActionSuite) Test_CarsResource_List",
- "func (as *ActionSuite) Test_CarsResource_Show",
- "func (as *ActionSuite) Test_CarsResource_Create"
- ]
- }
-]
diff --git a/buffalo/cmd/filetests/generate_resource_singular.json b/buffalo/cmd/filetests/generate_resource_singular.json
deleted file mode 100644
index 1e8300ae4..000000000
--- a/buffalo/cmd/filetests/generate_resource_singular.json
+++ /dev/null
@@ -1,23 +0,0 @@
-[{
- "path": "actions/users.go",
- "contains": [
- "func (v UsersResource) List(c buffalo.Context) error {",
- "func (v UsersResource) Destroy(c buffalo.Context) error {",
- "type UsersResource struct {"
- ]
- },
- {
- "path": "actions/app.go",
- "contains": [
- "app.Resource(\"/users\", UsersResource{})"
- ]
- },
- {
- "path": "actions/users_test.go",
- "contains": [
- "func (as *ActionSuite) Test_UsersResource_List",
- "func (as *ActionSuite) Test_UsersResource_Show",
- "func (as *ActionSuite) Test_UsersResource_Create"
- ]
- }
-]
diff --git a/buffalo/cmd/filetests/generate_underscore.json b/buffalo/cmd/filetests/generate_underscore.json
deleted file mode 100644
index 830e375e4..000000000
--- a/buffalo/cmd/filetests/generate_underscore.json
+++ /dev/null
@@ -1,7 +0,0 @@
-[{
- "path": "actions/person_events.go",
- "contains": [
- "c.Render(http.StatusOK, r.Auto(c, personEvents))",
- "c.Render(http.StatusOK, r.Auto(c, personEvent))"
- ]
-}]
diff --git a/buffalo/cmd/filetests/goth.json b/buffalo/cmd/filetests/goth.json
deleted file mode 100644
index 70035fef0..000000000
--- a/buffalo/cmd/filetests/goth.json
+++ /dev/null
@@ -1,29 +0,0 @@
-[{
- "path": "actions/auth.go",
- "contains": [
- "github.com/markbates/goth/providers/facebook",
- "github.com/markbates/goth/providers/twitter",
- "github.com/markbates/goth/providers/linkedin",
- "github.com/markbates/goth/providers/github",
- "FACEBOOK_KEY",
- "FACEBOOK_SECRET",
- "TWITTER_KEY",
- "TWITTER_SECRET",
- "GITHUB_KEY",
- "GITHUB_SECRET",
- "LINKEDIN_KEY",
- "LINKEDIN_SECRET"
- ],
- "!contains": [
- "app := App().Group(\"/auth\")",
- "github.com/markbates/goth/providers/yammer",
- "buffalo.WrapHandlerFunc(gothic.BeginAuthHandler)"
- ]
-}, {
- "path": "actions/app.go",
- "contains": [
- "auth := app.Group(\"/auth\")",
- "auth.GET(\"/{provider}\", buffalo.WrapHandlerFunc(gothic.BeginAuthHandler))",
- "auth.GET(\"/{provider}/callback\", AuthCallback)"
- ]
-}]
diff --git a/buffalo/cmd/filetests/new_travis.json b/buffalo/cmd/filetests/new_travis.json
deleted file mode 100644
index 7917878fe..000000000
--- a/buffalo/cmd/filetests/new_travis.json
+++ /dev/null
@@ -1,16 +0,0 @@
-[{
- "path": ".travis.yml",
- "contains": [
- "language: go",
- "1.11.x",
- "go_import_path:"
- ]
-}, {
- "path": "database.yml",
- "contains": [
- "dialect: \"sqlite3\"",
- "development:",
- "production:",
- "test:"
- ]
-}]
diff --git a/buffalo/cmd/filetests/no_assets_build.json b/buffalo/cmd/filetests/no_assets_build.json
deleted file mode 100644
index 543063d71..000000000
--- a/buffalo/cmd/filetests/no_assets_build.json
+++ /dev/null
@@ -1,6 +0,0 @@
-[
- {
- "path": "bin/assets.zip",
- "absent": true
- }
-]
\ No newline at end of file
diff --git a/buffalo/cmd/filetests/resource_model_migration.json b/buffalo/cmd/filetests/resource_model_migration.json
deleted file mode 100644
index 04e1f8172..000000000
--- a/buffalo/cmd/filetests/resource_model_migration.json
+++ /dev/null
@@ -1,6 +0,0 @@
-[{
- "path": "models/user.go",
- "contains": [
- "type User struct {"
- ]
-}]
\ No newline at end of file
diff --git a/buffalo/cmd/filetests/resource_skip_model.json b/buffalo/cmd/filetests/resource_skip_model.json
deleted file mode 100644
index 346b7caa4..000000000
--- a/buffalo/cmd/filetests/resource_skip_model.json
+++ /dev/null
@@ -1,13 +0,0 @@
-[{
- "path": "models/admin.go",
- "absent": true
-},{
- "path": "models/admin_test.go",
- "absent": true
-},{
- "path": "migrations/*_create_admins.up.fizz",
- "absent": true
-},{
- "path": "migrations/*_create_admins.down.fizz",
- "absent": true
-}]
\ No newline at end of file
diff --git a/buffalo/cmd/filetests/resource_use_model.json b/buffalo/cmd/filetests/resource_use_model.json
deleted file mode 100644
index 15bfd9b71..000000000
--- a/buffalo/cmd/filetests/resource_use_model.json
+++ /dev/null
@@ -1,19 +0,0 @@
-[{
- "path": "actions/admins.go",
- "contains": [
- "users := &models.Users{}"
- ]
- },
- {
- "path": "models/admin.go",
- "absent": true
-},{
- "path": "models/admin_test.go",
- "absent": true
-},{
- "path": "migrations/*_create_admins.up.fizz",
- "absent": true
-},{
- "path": "migrations/*_create_admins.down.fizz",
- "absent": true
-}]
\ No newline at end of file
diff --git a/buffalo/cmd/filetests/skip_dep.json b/buffalo/cmd/filetests/skip_dep.json
deleted file mode 100644
index 4fca4aa80..000000000
--- a/buffalo/cmd/filetests/skip_dep.json
+++ /dev/null
@@ -1,10 +0,0 @@
-[{
- "path": "vendor/",
- "absent": true
-}, {
- "path": "Gopkg.toml",
- "absent": true
-}, {
- "path": "Gopkg.lock",
- "absent": true
-}]
diff --git a/buffalo/cmd/fix.go b/buffalo/cmd/fix.go
deleted file mode 100644
index 368c15ff5..000000000
--- a/buffalo/cmd/fix.go
+++ /dev/null
@@ -1,27 +0,0 @@
-package cmd
-
-import (
- "fmt"
-
- "github.com/gobuffalo/buffalo/buffalo/cmd/fix"
- "github.com/gobuffalo/buffalo/runtime"
- "github.com/spf13/cobra"
-)
-
-// fixCmd represents the info command
-var fixCmd = &cobra.Command{
- Use: "fix",
- Aliases: []string{"update"},
- Short: fmt.Sprintf("Attempt to fix a Buffalo application's API to match version %s", runtime.Version),
- RunE: func(cmd *cobra.Command, args []string) error {
- return fix.Run()
- },
-}
-
-func init() {
- decorate("fix", RootCmd)
- decorate("update", RootCmd)
-
- fixCmd.Flags().BoolVarP(&fix.YesToAll, "y", "y", false, "update all without asking for confirmation")
- RootCmd.AddCommand(fixCmd)
-}
diff --git a/buffalo/cmd/fix/deprecations.go b/buffalo/cmd/fix/deprecations.go
deleted file mode 100644
index 1ad7e68cd..000000000
--- a/buffalo/cmd/fix/deprecations.go
+++ /dev/null
@@ -1,58 +0,0 @@
-package fix
-
-import (
- "bytes"
- "fmt"
- "io/ioutil"
- "os"
- "path/filepath"
-)
-
-// DeprecrationsCheck will either log, or fix, deprecated items in the application
-func DeprecrationsCheck(r *Runner) error {
- fmt.Println("~~~ Checking for deprecations ~~~")
- b, err := ioutil.ReadFile("main.go")
- if err != nil {
- return err
- }
- if bytes.Contains(b, []byte("app.Start")) {
- r.Warnings = append(r.Warnings, "app.Start has been removed in v0.11.0. Use app.Serve Instead. [main.go]")
- }
-
- return filepath.Walk(filepath.Join(r.App.Root, "actions"), func(path string, info os.FileInfo, _ error) error {
- if info.IsDir() {
- return nil
- }
-
- if filepath.Ext(path) != ".go" {
- return nil
- }
-
- b, err := ioutil.ReadFile(path)
- if err != nil {
- return err
- }
- if bytes.Contains(b, []byte("Websocket()")) {
- r.Warnings = append(r.Warnings, fmt.Sprintf("buffalo.Context#Websocket has been deprecated in v0.11.0, and removed in v0.12.0. Use github.com/gorilla/websocket directly. [%s]", path))
- }
- if bytes.Contains(b, []byte("meta.Name")) {
- r.Warnings = append(r.Warnings, fmt.Sprintf("meta.Name has been deprecated in v0.11.0, and removed in v0.12.0. Use github.com/markbates/inflect.Name directly. [%s]", path))
- }
- if bytes.Contains(b, []byte("generators.Find(")) {
- r.Warnings = append(r.Warnings, fmt.Sprintf("generators.Find(string) has been deprecated in v0.11.0, and removed in v0.12.0. Use generators.FindByBox() instead. [%s]", path))
- }
- // i18n middleware changes in v0.11.1
- if bytes.Contains(b, []byte("T.CookieName")) {
- b = bytes.Replace(b, []byte("T.CookieName"), []byte("T.LanguageExtractorOptions[\"CookieName\"]"), -1)
- }
- if bytes.Contains(b, []byte("T.SessionName")) {
- b = bytes.Replace(b, []byte("T.SessionName"), []byte("T.LanguageExtractorOptions[\"SessionName\"]"), -1)
- }
- if bytes.Contains(b, []byte("T.LanguageFinder=")) || bytes.Contains(b, []byte("T.LanguageFinder ")) {
- r.Warnings = append(r.Warnings, fmt.Sprintf("i18n.Translator#LanguageFinder has been deprecated in v0.11.1, and has been removed in v0.12.0. Use i18n.Translator#LanguageExtractors instead. [%s]", path))
- }
- ioutil.WriteFile(path, b, 0664)
-
- return nil
- })
-}
diff --git a/buffalo/cmd/fix/docker.go b/buffalo/cmd/fix/docker.go
deleted file mode 100644
index f1c24c8fa..000000000
--- a/buffalo/cmd/fix/docker.go
+++ /dev/null
@@ -1,38 +0,0 @@
-package fix
-
-import (
- "context"
- "fmt"
- "path/filepath"
- "regexp"
- "strings"
-
- "github.com/gobuffalo/buffalo/runtime"
- "github.com/gobuffalo/genny/v2"
-)
-
-func fixDocker(r *Runner) error {
- app := r.App
- if !app.WithDocker {
- return nil
- }
- fmt.Println("~~~ Upgrading Dockerfile ~~~")
- run := genny.WetRunner(context.Background())
- run.WithRun(func(r *genny.Runner) error {
- dk, err := r.FindFile(filepath.Join(app.Root, "Dockerfile"))
- if err != nil {
- return err
- }
-
- ex := regexp.MustCompile(`(v[0-9.][\S]+)`)
- lines := strings.Split(dk.String(), "\n")
- for i, l := range lines {
- if strings.HasPrefix(strings.ToLower(l), "from gobuffalo/buffalo") {
- l = ex.ReplaceAllString(l, runtime.Version)
- lines[i] = l
- }
- }
- return r.File(genny.NewFileS(dk.Name(), strings.Join(lines, "\n")))
- })
- return run.Run()
-}
diff --git a/buffalo/cmd/fix/fix.go b/buffalo/cmd/fix/fix.go
deleted file mode 100644
index e28abc2d5..000000000
--- a/buffalo/cmd/fix/fix.go
+++ /dev/null
@@ -1,104 +0,0 @@
-package fix
-
-import (
- "bufio"
- "fmt"
- "os"
- "path/filepath"
- "strings"
-
- "github.com/BurntSushi/toml"
-)
-
-// YesToAll will be used by the command to skip the questions
-var YesToAll bool
-
-var replace = map[string]string{
- "github.com/gobuffalo/buffalo-plugins": "github.com/gobuffalo/buffalo/plugins",
- "github.com/gobuffalo/genny": "github.com/gobuffalo/genny/v2",
- "github.com/gobuffalo/pop": "github.com/gobuffalo/pop/v5",
- "github.com/gobuffalo/pop/nulls": "github.com/gobuffalo/nulls",
- "github.com/gobuffalo/uuid": "github.com/gofrs/uuid",
- "github.com/markbates/pop": "github.com/gobuffalo/pop/v5",
- "github.com/markbates/validate": "github.com/gobuffalo/validate/v3",
- "github.com/markbates/willie": "github.com/gobuffalo/httptest",
- "github.com/satori/go.uuid": "github.com/gofrs/uuid",
- "github.com/shurcooL/github_flavored_markdown": "github.com/gobuffalo/github_flavored_markdown",
- "github.com/gobuffalo/validate": "github.com/gobuffalo/validate/v3",
- "github.com/gobuffalo/validate/validators": "github.com/gobuffalo/validate/v3/validators",
- "github.com/gobuffalo/suite": "github.com/gobuffalo/suite/v3",
- "github.com/gobuffalo/buffalo-pop/": "github.com/gobuffalo/buffalo-pop/v2",
- "github.com/gobuffalo/buffalo-pop/pop/popmw": "github.com/gobuffalo/buffalo-pop/v2/pop/popmw",
- "github.com/gobuffalo/plush": "github.com/gobuffalo/plush/v4",
-}
-
-var ic = ImportConverter{
- Data: replace,
-}
-
-var mr = MiddlewareTransformer{
- PackagesReplacement: map[string]string{
- "github.com/gobuffalo/buffalo/middleware/basicauth": "github.com/gobuffalo/mw-basicauth",
- "github.com/gobuffalo/buffalo/middleware/csrf": "github.com/gobuffalo/mw-csrf",
- "github.com/gobuffalo/buffalo/middleware/i18n": "github.com/gobuffalo/mw-i18n",
- "github.com/gobuffalo/buffalo/middleware/ssl": "github.com/gobuffalo/mw-forcessl",
- "github.com/gobuffalo/buffalo/middleware/tokenauth": "github.com/gobuffalo/mw-tokenauth",
- },
-
- Aliases: map[string]string{
- "github.com/gobuffalo/mw-basicauth": "basicauth",
- "github.com/gobuffalo/mw-contenttype": "contenttype",
- "github.com/gobuffalo/mw-csrf": "csrf",
- "github.com/gobuffalo/mw-forcessl": "forcessl",
- "github.com/gobuffalo/mw-i18n": "i18n",
- "github.com/gobuffalo/mw-paramlogger": "paramlogger",
- "github.com/gobuffalo/mw-tokenauth": "tokenauth",
- },
-}
-
-var checks = []Check{
- PackrClean,
- ic.Process,
- mr.transformPackages,
- WebpackCheck,
- PackageJSONCheck,
- AddPackageJSONScripts,
- installTools,
- DeprecrationsCheck,
- fixDocker,
- encodeApp,
- Plugins{}.RemoveOld,
- Plugins{}.CleanCache,
- Plugins{}.Reinstall,
- Plush,
-}
-
-func encodeApp(r *Runner) error {
- p := filepath.Join("config", "buffalo-app.toml")
- if _, err := os.Stat(p); err == nil {
- return nil
- }
- os.MkdirAll(filepath.Dir(p), 0755)
- f, err := os.Create(p)
- if err != nil {
- return err
- }
- if err := toml.NewEncoder(f).Encode(r.App); err != nil {
- return err
- }
- return nil
-}
-
-func ask(q string) bool {
- if YesToAll {
- return true
- }
-
- fmt.Printf("? %s [y/n]\n", q)
-
- reader := bufio.NewReader(os.Stdin)
- text, _ := reader.ReadString('\n')
-
- text = strings.ToLower(strings.TrimSpace(text))
- return text == "y" || text == "yes"
-}
diff --git a/buffalo/cmd/fix/imports.go b/buffalo/cmd/fix/imports.go
deleted file mode 100644
index ac127ff54..000000000
--- a/buffalo/cmd/fix/imports.go
+++ /dev/null
@@ -1,136 +0,0 @@
-package fix
-
-import (
- "fmt"
- "go/ast"
- "go/parser"
- "go/token"
- "os"
- "path/filepath"
- "strconv"
- "strings"
-
- "golang.org/x/tools/go/ast/astutil"
-)
-
-// ImportConverter will changes imports from a -> b
-type ImportConverter struct {
- Data map[string]string
-}
-
-// Process will walk all the .go files in an application, excluding ./vendor.
-// It will then attempt to convert any old import paths to any new import paths
-// used by this version Buffalo.
-func (c ImportConverter) Process(r *Runner) error {
- fmt.Println("~~~ Rewriting Imports ~~~")
-
- return filepath.Walk(".", c.processFile)
-
-}
-
-func (c ImportConverter) processFile(p string, info os.FileInfo, err error) error {
- er := onlyRelevantFiles(p, info, err, func(p string) error {
- return c.rewriteFile(p)
- })
-
- return er
-}
-
-func (c ImportConverter) rewriteFile(name string) error {
-
- // create an empty fileset.
- fset := token.NewFileSet()
-
- // parse the .go file.
- // we are parsing the entire file with comments, so we don't lose anything
- // if we need to write it back out.
- f, err := parser.ParseFile(fset, name, nil, parser.ParseComments)
- if err != nil {
- e := err.Error()
- msg := "expected 'package', found 'EOF'"
- if e[len(e)-len(msg):] == msg {
- return nil
- }
- return err
- }
-
- changed := false
- for key, value := range c.Data {
- if !astutil.DeleteImport(fset, f, key) {
- continue
- }
-
- astutil.AddImport(fset, f, value)
- changed = true
- }
-
- commentsChanged, err := c.handleFileComments(f)
- if err != nil {
- return err
- }
-
- changed = changed || commentsChanged
-
- // if no change occurred, then we don't need to write to disk, just return.
- if !changed {
- return nil
- }
-
- // since the imports changed, resort them.
- ast.SortImports(fset, f)
-
- // create a temporary file, this easily avoids conflicts.
- temp, err := writeTempResult(name, fset, f)
- if err != nil {
- return err
- }
-
- // rename the .temp to .go
- return os.Rename(temp, name)
-}
-
-func (c ImportConverter) handleFileComments(f *ast.File) (bool, error) {
- change := false
-
- for _, cg := range f.Comments {
- for _, cl := range cg.List {
- if !strings.HasPrefix(cl.Text, "// import \"") {
- continue
- }
-
- // trim off extra comment stuff
- ctext := cl.Text
- ctext = strings.TrimPrefix(ctext, "// import")
- ctext = strings.TrimSpace(ctext)
-
- // unquote the comment import path value
- ctext, err := strconv.Unquote(ctext)
- if err != nil {
- return false, err
- }
-
- // match the comment import path with the given replacement map
- if ctext, ok := c.match(ctext); ok {
- cl.Text = "// import " + strconv.Quote(ctext)
- change = true
- }
-
- }
- }
-
- return change, nil
-}
-
-// match takes an import path and replacement map.
-func (c ImportConverter) match(importpath string) (string, bool) {
- for key, value := range c.Data {
- if !strings.HasPrefix(importpath, key) {
- continue
- }
-
- result := strings.Replace(importpath, key, value, 1)
- return result, true
- }
-
- return importpath, false
-}
diff --git a/buffalo/cmd/fix/middleware.go b/buffalo/cmd/fix/middleware.go
deleted file mode 100644
index 681942825..000000000
--- a/buffalo/cmd/fix/middleware.go
+++ /dev/null
@@ -1,161 +0,0 @@
-package fix
-
-import (
- "go/ast"
- "go/parser"
- "go/printer"
- "go/token"
- "io/ioutil"
- "os"
- "path/filepath"
- "strings"
-
- "golang.org/x/tools/go/ast/astutil"
-)
-
-//MiddlewareTransformer moves from our old middleware package to new one
-type MiddlewareTransformer struct {
- PackagesReplacement map[string]string
- Aliases map[string]string
-}
-
-func (mw MiddlewareTransformer) transformPackages(r *Runner) error {
- return filepath.Walk(".", mw.processFile)
-}
-
-func (mw MiddlewareTransformer) processFile(p string, fi os.FileInfo, err error) error {
- er := onlyRelevantFiles(p, fi, err, func(p string) error {
- if err := mw.rewriteMiddlewareUses(p); err != nil {
- return err
- }
-
- fset, f, err := buildASTFor(p)
- if err != nil {
- if e := err.Error(); strings.Contains(e, "expected 'package', found 'EOF'") {
- return nil
- }
-
- return err
- }
-
- //Replacing mw packages
- for old, new := range mw.PackagesReplacement {
- deleted := astutil.DeleteImport(fset, f, old)
- if deleted {
- astutil.AddNamedImport(fset, f, mw.Aliases[new], new)
- }
- }
-
- if err := mw.addMissingRootMiddlewareImports(fset, f, p); err != nil {
- return err
- }
-
- ast.SortImports(fset, f)
-
- temp, err := writeTempResult(p, fset, f)
- if err != nil {
- return err
- }
-
- // rename the .temp to .go
- return os.Rename(temp, p)
- })
-
- return er
-}
-
-func (mw MiddlewareTransformer) addMissingRootMiddlewareImports(fset *token.FileSet, f *ast.File, p string) error {
- read, err := ioutil.ReadFile(p)
- if err != nil {
- return err
- }
-
- content := string(read)
-
- astutil.DeleteImport(fset, f, "github.com/gobuffalo/buffalo/middleware")
- if strings.Contains(content, "paramlogger.ParameterLogger") {
- astutil.AddNamedImport(fset, f, "paramlogger", "github.com/gobuffalo/mw-paramlogger")
- }
-
- if strings.Contains(content, "popmw.Transaction") {
- astutil.AddImport(fset, f, "github.com/gobuffalo/buffalo-pop/v2/pop/popmw")
- }
-
- if strings.Contains(content, "contenttype.Add") || strings.Contains(content, "contenttype.Set") {
- astutil.AddNamedImport(fset, f, "contenttype", "github.com/gobuffalo/mw-contenttype")
- }
-
- return ioutil.WriteFile(p, []byte(content), 0)
-}
-
-func (mw MiddlewareTransformer) rewriteMiddlewareUses(p string) error {
- read, err := ioutil.ReadFile(p)
- if err != nil {
- return err
- }
-
- newContents := string(read)
- newContents = strings.Replace(newContents, "middleware.SetContentType", "contenttype.Set", -1)
- newContents = strings.Replace(newContents, "middleware.AddContentType", "contenttype.Add", -1)
- newContents = strings.Replace(newContents, "middleware.ParameterLogger", "paramlogger.ParameterLogger", -1)
- newContents = strings.Replace(newContents, "middleware.PopTransaction", "popmw.Transaction", -1)
- newContents = strings.Replace(newContents, "ssl.ForceSSL", "forcessl.Middleware", -1)
-
- err = ioutil.WriteFile(p, []byte(newContents), 0)
- return err
-}
-
-func writeTempResult(name string, fset *token.FileSet, f *ast.File) (string, error) {
- temp := name + ".temp"
- w, err := os.Create(temp)
- if err != nil {
- return "", err
- }
-
- // write changes to .temp file, and include proper formatting.
- err = (&printer.Config{Mode: printer.TabIndent | printer.UseSpaces, Tabwidth: 8}).Fprint(w, fset, f)
- if err != nil {
- return "", err
- }
-
- // close the writer
- err = w.Close()
- if err != nil {
- return "", err
- }
-
- return temp, nil
-}
-
-func buildASTFor(p string) (*token.FileSet, *ast.File, error) {
- fset := token.NewFileSet()
- f, err := parser.ParseFile(fset, p, nil, parser.ParseComments)
- return fset, f, err
-}
-
-//onlyRelevantFiles processes only .go files excluding folders like node_modules and vendor.
-func onlyRelevantFiles(p string, fi os.FileInfo, err error, fn func(p string) error) error {
- if err != nil {
- return err
- }
-
- if fi.IsDir() {
- base := filepath.Base(p)
- if strings.HasPrefix(base, "_") {
- return filepath.SkipDir
- }
- for _, n := range []string{"vendor", "node_modules", ".git"} {
- if base == n {
- return filepath.SkipDir
- }
- }
- return nil
- }
-
- ext := filepath.Ext(p)
- if ext != ".go" {
- return nil
- }
-
- return fn(p)
-}
diff --git a/buffalo/cmd/fix/npm.go b/buffalo/cmd/fix/npm.go
deleted file mode 100644
index 9d1aab499..000000000
--- a/buffalo/cmd/fix/npm.go
+++ /dev/null
@@ -1,145 +0,0 @@
-package fix
-
-import (
- "bytes"
- "encoding/json"
- "fmt"
- "html/template"
- "io/ioutil"
- "os"
- "os/exec"
- "path/filepath"
-
- "github.com/gobuffalo/buffalo/genny/assets/webpack"
-)
-
-// AddPackageJSONScripts rewrites the package.json file
-// to add dev and build scripts if there are missing.
-func AddPackageJSONScripts(r *Runner) error {
- if !r.App.WithWebpack {
- return nil
- }
- fmt.Println("~~~ Patching package.json to add dev and build scripts ~~~")
-
- b, err := ioutil.ReadFile("package.json")
- if err != nil {
- return err
- }
-
- needRewrite := false
- packageJSON := map[string]interface{}{}
- if err := json.Unmarshal(b, &packageJSON); err != nil {
- return fmt.Errorf("could not rewrite package.json: %s", err.Error())
- }
-
- if _, ok := packageJSON["scripts"]; !ok {
- needRewrite = true
- // Add scripts
- packageJSON["scripts"] = map[string]string{
- "dev": "webpack --watch",
- "build": "webpack -p --progress",
- }
- } else {
- // Add missing scripts
- scripts, ok := packageJSON["scripts"].(map[string]interface{})
- if !ok {
- return fmt.Errorf("could not rewrite package.json: invalid scripts section")
- }
- if _, ok := scripts["dev"]; !ok {
- needRewrite = true
- scripts["dev"] = "webpack --watch"
- }
- if _, ok := scripts["build"]; !ok {
- needRewrite = true
- scripts["build"] = "webpack -p --progress"
- }
- packageJSON["scripts"] = scripts
- }
-
- if needRewrite {
- b, err = json.MarshalIndent(packageJSON, "", " ")
- if err != nil {
- return fmt.Errorf("could not rewrite package.json: %s", err.Error())
- }
-
- ioutil.WriteFile("package.json", b, 0644)
- } else {
- fmt.Println("~~~ package.json doesn't need to be patched, skipping. ~~~")
- }
-
- return nil
-}
-
-// PackageJSONCheck will compare the current default Buffalo
-// package.json against the applications package.json. If they are
-// different you have the option to overwrite the existing package.json
-// file with the new one.
-func PackageJSONCheck(r *Runner) error {
- fmt.Println("~~~ Checking package.json ~~~")
-
- if !r.App.WithWebpack {
- return nil
- }
-
- box := webpack.Templates
-
- f, err := box.FindString("package.json.tmpl")
- if err != nil {
- return err
- }
-
- tmpl, err := template.New("package.json").Parse(f)
- if err != nil {
- return err
- }
-
- bb := &bytes.Buffer{}
- err = tmpl.Execute(bb, map[string]interface{}{
- "opts": &webpack.Options{
- App: r.App,
- },
- })
- if err != nil {
- return err
- }
-
- b, err := ioutil.ReadFile("package.json")
- if err != nil {
- return err
- }
-
- if string(b) == bb.String() {
- return nil
- }
-
- if !ask("Your package.json file is different from the latest Buffalo template.\nWould you like to REPLACE yours with the latest template?") {
- fmt.Println("\tskipping package.json")
- return nil
- }
-
- pf, err := os.Create("package.json")
- if err != nil {
- return err
- }
- _, err = pf.Write(bb.Bytes())
- if err != nil {
- return err
- }
- err = pf.Close()
- if err != nil {
- return err
- }
-
- os.RemoveAll(filepath.Join(r.App.Root, "node_modules"))
- var cmd *exec.Cmd
- if r.App.WithYarn {
- cmd = exec.Command("yarnpkg", "install")
- } else {
- cmd = exec.Command("npm", "install")
- }
-
- cmd.Stdin = os.Stdin
- cmd.Stdout = os.Stdout
- cmd.Stderr = os.Stderr
- return cmd.Run()
-}
diff --git a/buffalo/cmd/fix/packr.go b/buffalo/cmd/fix/packr.go
deleted file mode 100644
index 5fb976b03..000000000
--- a/buffalo/cmd/fix/packr.go
+++ /dev/null
@@ -1,9 +0,0 @@
-package fix
-
-import "github.com/gobuffalo/packr/v2/packr2/cmd/fix"
-
-// PackrClean will remove any packr files
-func PackrClean(r *Runner) error {
- fix.YesToAll = YesToAll
- return fix.Run()
-}
diff --git a/buffalo/cmd/fix/plugins.go b/buffalo/cmd/fix/plugins.go
deleted file mode 100644
index 1eb404fc9..000000000
--- a/buffalo/cmd/fix/plugins.go
+++ /dev/null
@@ -1,75 +0,0 @@
-package fix
-
-import (
- "context"
- "fmt"
- "os"
- "path"
- "strings"
-
- cmdPlugins "github.com/gobuffalo/buffalo/buffalo/cmd/plugins"
- "github.com/gobuffalo/buffalo/genny/plugins/install"
- "github.com/gobuffalo/buffalo/internal/takeon/github.com/markbates/errx"
- "github.com/gobuffalo/buffalo/plugins"
- "github.com/gobuffalo/buffalo/plugins/plugdeps"
- "github.com/gobuffalo/genny/v2"
- "github.com/gobuffalo/meta"
-)
-
-//Plugins fixes the plugin configuration of the project by
-//manipulating the plugins .toml file.
-type Plugins struct{}
-
-//CleanCache cleans the plugins cache folder by removing it
-func (pf Plugins) CleanCache(r *Runner) error {
- fmt.Println("~~~ Cleaning plugins cache ~~~")
- os.RemoveAll(plugins.CachePath)
- return nil
-}
-
-//Reinstall installs latest versions of the plugins
-func (pf Plugins) Reinstall(r *Runner) error {
- plugs, err := plugdeps.List(r.App)
- if err != nil && (errx.Unwrap(err) != plugdeps.ErrMissingConfig) {
- return err
- }
-
- run := genny.WetRunner(context.Background())
- gg, err := install.New(&install.Options{
- App: r.App,
- Plugins: plugs.List(),
- })
- if err != nil {
- return err
- }
-
- run.WithGroup(gg)
-
- fmt.Println("~~~ Reinstalling plugins ~~~")
- return run.Run()
-}
-
-//RemoveOld removes old and deprecated plugins
-func (pf Plugins) RemoveOld(r *Runner) error {
- fmt.Println("~~~ Removing old plugins ~~~")
-
- run := genny.WetRunner(context.Background())
- app := meta.New(".")
- plugs, err := plugdeps.List(app)
- if err != nil && (errx.Unwrap(err) != plugdeps.ErrMissingConfig) {
- return err
- }
-
- a := strings.TrimSpace("github.com/gobuffalo/buffalo-pop")
- bin := path.Base(a)
- plugs.Remove(plugdeps.Plugin{
- Binary: bin,
- GoGet: a,
- })
-
- fmt.Println("~~~ Removing github.com/gobuffalo/buffalo-pop plugin ~~~")
-
- run.WithRun(cmdPlugins.NewEncodePluginsRunner(app, plugs))
-
- return run.Run()
-}
diff --git a/buffalo/cmd/fix/plush.go b/buffalo/cmd/fix/plush.go
deleted file mode 100644
index 88f27d056..000000000
--- a/buffalo/cmd/fix/plush.go
+++ /dev/null
@@ -1,62 +0,0 @@
-package fix
-
-import (
- "fmt"
- "io"
- "os"
- "path/filepath"
- "strings"
-)
-
-// Plush will update foo.html templates to foo.plush.html templates
-func Plush(r *Runner) error {
- templatesDir := filepath.Join(r.App.Root, "templates")
- if _, err := os.Stat(templatesDir); os.IsNotExist(err) {
- // Skip if the templates dir doesn't exist (e.g. API apps)
- return nil
- }
- fmt.Println("~~~ Adding .plush extension to .html/.js/.md files ~~~")
- return filepath.Walk(templatesDir, func(p string, info os.FileInfo, err error) error {
- if err != nil {
- return err
- }
-
- if info.IsDir() {
- return nil
- }
-
- dir := filepath.Dir(p)
- base := filepath.Base(p)
-
- var exts []string
- ext := filepath.Ext(base)
- for len(ext) != 0 {
- if ext == ".plush" || ext == ".fizz" {
- return nil
- }
- exts = append([]string{ext}, exts...)
- base = strings.TrimSuffix(base, ext)
- ext = filepath.Ext(base)
- }
- exts = append([]string{".plush"}, exts...)
-
- pn := filepath.Join(dir, base+strings.Join(exts, ""))
-
- fn, err := os.Create(pn)
- if err != nil {
- return err
- }
- defer fn.Close()
-
- fo, err := os.Open(p)
- if err != nil {
- return err
- }
- defer fo.Close()
- _, err = io.Copy(fn, fo)
-
- defer os.Remove(p)
-
- return err
- })
-}
diff --git a/buffalo/cmd/fix/runner.go b/buffalo/cmd/fix/runner.go
deleted file mode 100644
index dbbf49369..000000000
--- a/buffalo/cmd/fix/runner.go
+++ /dev/null
@@ -1,59 +0,0 @@
-package fix
-
-import (
- "fmt"
- "os"
- "os/exec"
-
- "github.com/gobuffalo/buffalo/runtime"
- "github.com/gobuffalo/meta"
-)
-
-// Check interface for runnable checker functions
-type Check func(*Runner) error
-
-// Runner will run all compatible checks
-type Runner struct {
- App meta.App
- Warnings []string
-}
-
-// Run all compatible checks
-func Run() error {
- fmt.Printf("! This updater will attempt to update your application to Buffalo version: %s\n", runtime.Version)
- if !ask("Do you wish to continue?") {
- fmt.Println("~~~ cancelling update ~~~")
- return nil
- }
-
- r := &Runner{
- App: meta.New("."),
- Warnings: []string{},
- }
-
- defer func() {
- if len(r.Warnings) == 0 {
- return
- }
-
- fmt.Println("\n\n----------------------------")
- fmt.Printf("!!! (%d) Warnings Were Found !!!\n\n", len(r.Warnings))
- for _, w := range r.Warnings {
- fmt.Printf("[WARNING]: %s\n", w)
- }
- }()
-
- for _, c := range checks {
- if r.App.WithModules {
- cmd := exec.Command("go", "mod", "tidy")
- cmd.Stderr = os.Stderr
- if err := cmd.Run(); err != nil {
- return err
- }
- }
- if err := c(r); err != nil {
- return err
- }
- }
- return nil
-}
diff --git a/buffalo/cmd/fix/tools.go b/buffalo/cmd/fix/tools.go
deleted file mode 100644
index 81806c5b4..000000000
--- a/buffalo/cmd/fix/tools.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package fix
-
-import (
- "context"
- "fmt"
- "os/exec"
-
- "github.com/gobuffalo/genny/v2"
-)
-
-var rTools = []string{}
-
-func installTools(r *Runner) error {
- fmt.Println("~~~ Installing required tools ~~~")
- run := genny.WetRunner(context.Background())
- g := genny.New()
- app := r.App
- if app.WithPop {
- rTools = append(rTools, "github.com/gobuffalo/buffalo-pop/v2")
- }
- for _, t := range rTools {
- g.Command(exec.Command("go", "get", t))
- }
- run.With(g)
- return run.Run()
-}
diff --git a/buffalo/cmd/fix/webpack.go b/buffalo/cmd/fix/webpack.go
deleted file mode 100644
index 9774a5255..000000000
--- a/buffalo/cmd/fix/webpack.go
+++ /dev/null
@@ -1,69 +0,0 @@
-package fix
-
-import (
- "bytes"
- "fmt"
- "html/template"
- "io/ioutil"
- "os"
-
- "github.com/gobuffalo/buffalo/genny/assets/webpack"
-)
-
-// WebpackCheck will compare the current default Buffalo
-// webpack.config.js against the applications webpack.config.js. If they are
-// different you have the option to overwrite the existing webpack.config.js
-// file with the new one.
-func WebpackCheck(r *Runner) error {
- fmt.Println("~~~ Checking webpack.config.js ~~~")
-
- if !r.App.WithWebpack {
- return nil
- }
-
- box := webpack.Templates
-
- f, err := box.FindString("webpack.config.js.tmpl")
- if err != nil {
- return err
- }
-
- tmpl, err := template.New("webpack").Parse(f)
- if err != nil {
- return err
- }
-
- bb := &bytes.Buffer{}
- err = tmpl.Execute(bb, map[string]interface{}{
- "opts": &webpack.Options{
- App: r.App,
- },
- })
- if err != nil {
- return err
- }
-
- b, err := ioutil.ReadFile("webpack.config.js")
- if err != nil {
- return err
- }
-
- if string(b) == bb.String() {
- return nil
- }
-
- if !ask("Your webpack.config.js file is different from the latest Buffalo template.\nWould you like to replace yours with the latest template?") {
- fmt.Println("\tSkipping webpack.config.js")
- return nil
- }
-
- wf, err := os.Create("webpack.config.js")
- if err != nil {
- return err
- }
- _, err = wf.Write(bb.Bytes())
- if err != nil {
- return err
- }
- return wf.Close()
-}
diff --git a/buffalo/cmd/generate.go b/buffalo/cmd/generate.go
deleted file mode 100644
index 984858229..000000000
--- a/buffalo/cmd/generate.go
+++ /dev/null
@@ -1,22 +0,0 @@
-package cmd
-
-import (
- "github.com/gobuffalo/buffalo/buffalo/cmd/generate"
- "github.com/spf13/cobra"
-)
-
-var generateCmd = &cobra.Command{
- Use: "generate",
- Short: "Generate application components",
- Aliases: []string{"g"},
-}
-
-func init() {
- generateCmd.AddCommand(generate.ResourceCmd)
- generateCmd.AddCommand(generate.ActionCmd)
- generateCmd.AddCommand(generate.TaskCmd)
- generateCmd.AddCommand(generate.MailCmd)
- decorate("generate", generateCmd)
-
- RootCmd.AddCommand(generateCmd)
-}
diff --git a/buffalo/cmd/generate/action.go b/buffalo/cmd/generate/action.go
deleted file mode 100644
index e8fc2fe70..000000000
--- a/buffalo/cmd/generate/action.go
+++ /dev/null
@@ -1,58 +0,0 @@
-package generate
-
-import (
- "context"
- "fmt"
-
- "github.com/gobuffalo/buffalo/genny/actions"
- "github.com/gobuffalo/genny/v2"
- "github.com/gobuffalo/logger"
- "github.com/spf13/cobra"
-)
-
-var actionOptions = struct {
- *actions.Options
- dryRun bool
- verbose bool
-}{
- Options: &actions.Options{},
-}
-
-//ActionCmd is the cmd that generates actions.
-var ActionCmd = &cobra.Command{
- Use: "action [name] [handler name...]",
- Aliases: []string{"a", "actions"},
- Short: "Generate new action(s)",
- RunE: func(cmd *cobra.Command, args []string) error {
- if len(args) == 0 {
- return fmt.Errorf("you must provide a name")
- }
- actionOptions.Name = args[0]
- if len(args) == 1 {
- return fmt.Errorf("you must provide at least one action name")
- }
- actionOptions.Actions = args[1:]
-
- ctx := context.Background()
- run := genny.WetRunner(ctx)
-
- if actionOptions.dryRun {
- run = genny.DryRunner(ctx)
- }
-
- if actionOptions.verbose {
- run.Logger = logger.New(logger.DebugLevel)
- }
-
- opts := actionOptions.Options
- run.WithNew(actions.New(opts))
- return run.Run()
- },
-}
-
-func init() {
- ActionCmd.Flags().BoolVarP(&actionOptions.SkipTemplates, "skip-template", "", false, "skip generation of templates for action(s)")
- ActionCmd.Flags().BoolVarP(&actionOptions.dryRun, "dry-run", "d", false, "dry run")
- ActionCmd.Flags().BoolVarP(&actionOptions.verbose, "verbose", "v", false, "verbosely run the generator")
- ActionCmd.Flags().StringVarP(&actionOptions.Method, "method", "m", "GET", "change the HTTP method for the generate action(s)")
-}
diff --git a/buffalo/cmd/generate/mailer.go b/buffalo/cmd/generate/mailer.go
deleted file mode 100644
index e23122532..000000000
--- a/buffalo/cmd/generate/mailer.go
+++ /dev/null
@@ -1,53 +0,0 @@
-package generate
-
-import (
- "context"
-
- "github.com/gobuffalo/buffalo/genny/mail"
- "github.com/gobuffalo/flect/name"
- "github.com/gobuffalo/genny/v2"
- "github.com/gobuffalo/genny/v2/gogen"
- "github.com/gobuffalo/meta"
- "github.com/spf13/cobra"
-)
-
-var mailOptions = struct {
- dryRun bool
- *mail.Options
-}{
- Options: &mail.Options{},
-}
-
-// MailCmd for generating mailers
-var MailCmd = &cobra.Command{
- Use: "mailer [name]",
- Short: "Generate a new mailer for Buffalo",
- RunE: func(cmd *cobra.Command, args []string) error {
- mailOptions.App = meta.New(".")
- mailOptions.Name = name.New(args[0])
- gg, err := mail.New(mailOptions.Options)
- if err != nil {
- return err
- }
-
- run := genny.WetRunner(context.Background())
- if mailOptions.dryRun {
- run = genny.DryRunner(context.Background())
- }
-
- g, err := gogen.Fmt(mailOptions.App.Root)
- if err != nil {
- return err
- }
- run.With(g)
-
- gg.With(run)
- return run.Run()
-
- },
-}
-
-func init() {
- MailCmd.Flags().BoolVarP(&mailOptions.dryRun, "dry-run", "d", false, "dry run of the generator")
- MailCmd.Flags().BoolVar(&mailOptions.SkipInit, "skip-init", false, "skip initializing mailers/")
-}
diff --git a/buffalo/cmd/generate/resource.go b/buffalo/cmd/generate/resource.go
deleted file mode 100644
index fc6ed11cf..000000000
--- a/buffalo/cmd/generate/resource.go
+++ /dev/null
@@ -1,99 +0,0 @@
-package generate
-
-import (
- "context"
- "fmt"
-
- "github.com/gobuffalo/attrs"
- "github.com/gobuffalo/buffalo/genny/resource"
- "github.com/gobuffalo/genny/v2"
- "github.com/gobuffalo/logger"
- "github.com/spf13/cobra"
-)
-
-var resourceOptions = struct {
- *resource.Options
- Verbose bool
- DryRun bool
-}{
- Options: &resource.Options{},
-}
-
-// ResourceCmd generates a new actions/resource file and a stub test.
-var ResourceCmd = &cobra.Command{
- Use: "resource [name]",
- Example: resourceExamples,
- Aliases: []string{"r"},
- Short: "Generate a new actions/resource file",
- RunE: func(cmd *cobra.Command, args []string) error {
- if len(args) == 0 {
- return fmt.Errorf("you must supply a name")
- }
- ctx := context.Background()
- run := genny.WetRunner(ctx)
- if resourceOptions.DryRun {
- run = genny.DryRunner(ctx)
- }
-
- if resourceOptions.Verbose {
- lg := logger.New(logger.DebugLevel)
- run.Logger = lg
- }
-
- if len(resourceOptions.Name) == 0 {
- resourceOptions.Name = args[0]
- }
- if len(args) > 1 {
- ats, err := attrs.ParseArgs(args[1:]...)
- if err != nil {
- return err
- }
- resourceOptions.Attrs = ats
- }
-
- if err := run.WithNew(resource.New(resourceOptions.Options)); err != nil {
- return err
- }
- return run.Run()
- },
-}
-
-func init() {
- ResourceCmd.Flags().BoolVarP(&resourceOptions.SkipMigration, "skip-migration", "s", false, "tells resource generator not-to add model migration")
- ResourceCmd.Flags().BoolVarP(&resourceOptions.SkipModel, "skip-model", "", false, "tells resource generator not to generate model nor migrations")
- ResourceCmd.Flags().BoolVarP(&resourceOptions.SkipTemplates, "skip-templates", "", false, "tells resource generator not to generate templates for the resource")
- ResourceCmd.Flags().StringVarP(&resourceOptions.Model, "use-model", "", "", "tells resource generator to reference an existing model in generated code")
- ResourceCmd.Flags().StringVarP(&resourceOptions.Name, "name", "n", "", "allows to define a different model name for the resource being generated.")
- ResourceCmd.Flags().BoolVarP(&resourceOptions.DryRun, "dry-run", "d", false, "dry run")
- ResourceCmd.Flags().BoolVarP(&resourceOptions.Verbose, "verbose", "v", false, "verbosely print out the go get commands")
-}
-
-const resourceExamples = `$ buffalo g resource users
-Generates:
-
-- actions/users.go
-- actions/users_test.go
-- models/user.go
-- models/user_test.go
-- migrations/2016020216301234_create_users.up.fizz
-- migrations/2016020216301234_create_users.down.fizz
-
-$ buffalo g resource users --skip-migration
-Generates:
-
-- actions/users.go
-- actions/users_test.go
-- models/user.go
-- models/user_test.go
-
-$ buffalo g resource users --skip-model
-Generates:
-
-- actions/users.go
-- actions/users_test.go
-
-$ buffalo g resource users --use-model users
-Generates:
-
-- actions/users.go
-- actions/users_test.go`
diff --git a/buffalo/cmd/generate/task.go b/buffalo/cmd/generate/task.go
deleted file mode 100644
index e54e8d1c1..000000000
--- a/buffalo/cmd/generate/task.go
+++ /dev/null
@@ -1,52 +0,0 @@
-package generate
-
-import (
- "context"
- "os"
-
- "github.com/gobuffalo/buffalo/genny/grift"
- "github.com/gobuffalo/genny/v2"
- "github.com/gobuffalo/genny/v2/gogen"
- "github.com/spf13/cobra"
-)
-
-var taskOptions = struct {
- dryRun bool
- *grift.Options
-}{
- Options: &grift.Options{},
-}
-
-//TaskCmd is the command called with the generate grift cli.
-var TaskCmd = &cobra.Command{
- Use: "task [name]",
- Aliases: []string{"t", "grift"},
- Short: "Generate a grift task",
- RunE: func(cmd *cobra.Command, args []string) error {
- run := genny.WetRunner(context.Background())
- if taskOptions.dryRun {
- run = genny.DryRunner(context.Background())
- }
-
- opts := taskOptions.Options
- opts.Args = args
- g, err := grift.New(opts)
- if err != nil {
- return err
- }
- run.With(g)
-
- pwd, _ := os.Getwd()
- g, err = gogen.Fmt(pwd)
- if err != nil {
- return err
- }
- run.With(g)
-
- return run.Run()
- },
-}
-
-func init() {
- TaskCmd.Flags().BoolVarP(&taskOptions.dryRun, "dry-run", "d", false, "dry run of the generator")
-}
diff --git a/buffalo/cmd/info.go b/buffalo/cmd/info.go
deleted file mode 100644
index d9423e6f9..000000000
--- a/buffalo/cmd/info.go
+++ /dev/null
@@ -1,63 +0,0 @@
-package cmd
-
-import (
- "context"
- "os/exec"
- "time"
-
- "github.com/gobuffalo/buffalo/genny/info"
- "github.com/gobuffalo/clara/v2/genny/rx"
- "github.com/gobuffalo/genny/v2"
- "github.com/gobuffalo/meta"
- "github.com/spf13/cobra"
-)
-
-var infoOptions = struct {
- Clara *rx.Options
- Info *info.Options
-}{
- Clara: &rx.Options{},
- Info: &info.Options{},
-}
-
-// infoCmd represents the info command
-var infoCmd = &cobra.Command{
- Use: "info",
- Short: "Print diagnostic information (useful for debugging)",
- RunE: func(cmd *cobra.Command, args []string) error {
- ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
- defer cancel()
-
- run := genny.WetRunner(ctx)
-
- _, err := run.LookPath("clara")
- if err == nil {
- // use the clara binary if available
- run.WithRun(func(r *genny.Runner) error {
- return r.Exec(exec.Command("clara"))
- })
- } else {
- // no clara binary, so use the one bundled with buffalo
- copts := infoOptions.Clara
- if err := run.WithNew(rx.New(copts)); err != nil {
- return err
- }
- }
-
- iopts := infoOptions.Info
- if err := run.WithNew(info.New(iopts)); err != nil {
- return err
- }
-
- return run.Run()
- },
-}
-
-func init() {
- app := meta.New(".")
- infoOptions.Clara.App = app
- infoOptions.Info.App = app
-
- decorate("info", RootCmd)
- RootCmd.AddCommand(infoCmd)
-}
diff --git a/buffalo/cmd/internal/integration/build_test.go b/buffalo/cmd/internal/integration/build_test.go
deleted file mode 100644
index aac009c49..000000000
--- a/buffalo/cmd/internal/integration/build_test.go
+++ /dev/null
@@ -1,83 +0,0 @@
-// +build integration_test
-
-package integration
-
-import (
- "os"
- "path/filepath"
- "testing"
-
- "github.com/stretchr/testify/require"
-)
-
-// Test_New_Build_Nominal creates a new nominal
-// app and then builds it
-func Test_New_Build_Nominal(t *testing.T) {
- r := require.New(t)
- args := []string{
- "new",
- "build_nominal",
- "--skip-pop",
- "--skip-webpack",
- "--vcs=none",
- }
- err := call(args, func(tdir string) {
- ad := filepath.Join(tdir, "build_nominal")
- r.DirExists(ad)
- os.Chdir(ad)
-
- args = []string{"build"}
- err := exec(args)
- r.NoError(err)
- })
- r.NoError(err)
-
-}
-
-// Test_New_Build_Api creates a new API
-// app and then builds it
-func Test_New_Build_Api(t *testing.T) {
- r := require.New(t)
- args := []string{
- "new",
- "build_api",
- "--skip-pop",
- "--api",
- "--vcs=none",
- }
- err := call(args, func(tdir string) {
- ad := filepath.Join(tdir, "build_api")
- r.DirExists(ad)
- os.Chdir(ad)
-
- args = []string{"build"}
- err := exec(args)
- r.NoError(err)
- })
- r.NoError(err)
-
-}
-func Test_New_Build_Sqlite(t *testing.T) {
- r := require.New(t)
-
- args := []string{
- "new",
- "build_sqlite",
- "--db-type=sqlite3",
- "--skip-webpack",
- "--vcs=none",
- }
-
- err := call(args, func(tdir string) {
- ad := filepath.Join(tdir, "build_sqlite")
- r.DirExists(ad)
- r.FileExists(filepath.Join(ad, "database.yml"))
- os.Chdir(ad)
-
- args = []string{"build"}
- err := exec(args)
- r.NoError(err)
- })
- r.NoError(err)
-
-}
diff --git a/buffalo/cmd/internal/integration/integration_test.go b/buffalo/cmd/internal/integration/integration_test.go
deleted file mode 100644
index 422230ea1..000000000
--- a/buffalo/cmd/internal/integration/integration_test.go
+++ /dev/null
@@ -1,67 +0,0 @@
-// +build integration_test
-
-package integration
-
-import (
- "os"
- "path/filepath"
-
- "github.com/gobuffalo/buffalo/buffalo/cmd"
- "github.com/gobuffalo/envy"
- "github.com/gobuffalo/packr/v2/jam"
- "github.com/markbates/safe"
-)
-
-func call(args []string, fn func(dir string)) error {
- jam.Clean()
- defer jam.Clean()
- ogp, err := envy.MustGet("GOPATH")
- defer envy.MustSet("GOPATH", ogp)
- gp := os.TempDir()
- err = envy.MustSet("GOPATH", gp)
- if err != nil {
- return err
- }
-
- if err != nil {
- return err
- }
- if fn == nil {
- if err := exec(args); err != nil {
- return err
- }
- }
- tdir := filepath.Join(gp, "src", "github.com", "gobuffalo", "testapp")
- defer os.RemoveAll(tdir)
- if err != nil {
- return err
- }
- if err := os.RemoveAll(tdir); err != nil {
- return err
- }
- if err := os.MkdirAll(tdir, 0755); err != nil {
- return err
- }
-
- pwd, err := os.Getwd()
- if err != nil {
- return err
- }
- os.Chdir(tdir)
- os.Setenv("PWD", tdir)
- defer os.Chdir(pwd)
- defer os.Setenv("PWD", pwd)
-
- if err := exec(args); err != nil {
- return err
- }
- return safe.Run(func() {
- fn(tdir)
- })
-}
-
-func exec(args []string) error {
- c := cmd.RootCmd
- c.SetArgs(args)
- return c.Execute()
-}
diff --git a/buffalo/cmd/internal/integration/new_test.go b/buffalo/cmd/internal/integration/new_test.go
deleted file mode 100644
index 93e63b21c..000000000
--- a/buffalo/cmd/internal/integration/new_test.go
+++ /dev/null
@@ -1,43 +0,0 @@
-// +build integration_test
-
-package integration
-
-import (
- "fmt"
- "strings"
- "testing"
-
- "github.com/gobuffalo/pop/v5"
- "github.com/stretchr/testify/require"
-)
-
-func Test_NewCmd_NoName(t *testing.T) {
- err := call([]string{"new"}, nil)
- r := require.New(t)
- r.Error(err)
- r.EqualError(err, "you must enter a name for your new application")
-}
-
-func Test_NewCmd_InvalidDBType(t *testing.T) {
- args := []string{
- "new",
- "coke",
- "--db-type",
- "a",
- }
- err := call(args, nil)
- r := require.New(t)
- r.Error(err)
- r.EqualError(err, fmt.Sprintf(`unknown dialect "a" expecting one of %s`, strings.Join(pop.AvailableDialects, ", ")))
-}
-
-func Test_NewCmd_ForbiddenAppName(t *testing.T) {
- args := []string{
- "new",
- "buffalo",
- }
- err := call(args, nil)
- r := require.New(t)
- r.Error(err)
- r.EqualError(err, "name buffalo is not allowed, try a different application name")
-}
diff --git a/buffalo/cmd/new.go b/buffalo/cmd/new.go
deleted file mode 100644
index b58819482..000000000
--- a/buffalo/cmd/new.go
+++ /dev/null
@@ -1,349 +0,0 @@
-package cmd
-
-import (
- "bufio"
- "bytes"
- "context"
- "fmt"
- "os"
- "os/exec"
- "os/user"
- "path/filepath"
- "strings"
-
- pop "github.com/gobuffalo/buffalo-pop/v2/genny/newapp"
- "github.com/gobuffalo/buffalo/genny/assets/standard"
- "github.com/gobuffalo/buffalo/genny/assets/webpack"
- "github.com/gobuffalo/buffalo/genny/ci"
- "github.com/gobuffalo/buffalo/genny/docker"
- "github.com/gobuffalo/buffalo/genny/newapp/api"
- "github.com/gobuffalo/buffalo/genny/newapp/core"
- "github.com/gobuffalo/buffalo/genny/newapp/web"
- "github.com/gobuffalo/buffalo/genny/refresh"
- "github.com/gobuffalo/buffalo/genny/vcs"
- "github.com/gobuffalo/buffalo/internal/takeon/github.com/markbates/errx"
- "github.com/gobuffalo/envy"
- fname "github.com/gobuffalo/flect/name"
- "github.com/gobuffalo/genny/v2"
- "github.com/gobuffalo/genny/v2/gogen"
- "github.com/gobuffalo/logger"
- "github.com/gobuffalo/meta"
- "github.com/gobuffalo/packr/v2/plog"
- "github.com/gobuffalo/plush/v4"
- "github.com/sirupsen/logrus"
- "github.com/spf13/cobra"
- "github.com/spf13/pflag"
- "github.com/spf13/viper"
-)
-
-type newAppOptions struct {
- Options *core.Options
- Module string
- Force bool
- Verbose bool
- DryRun bool
-}
-
-func parseNewOptions(args []string) (newAppOptions, error) {
- nopts := newAppOptions{
- Force: viper.GetBool("force"),
- Verbose: viper.GetBool("verbose"),
- DryRun: viper.GetBool("dry-run"),
- Module: viper.GetString("module"),
- }
-
- if len(args) == 0 {
- return nopts, fmt.Errorf("you must enter a name for your new application")
- }
- if configError != nil {
- return nopts, configError
- }
-
- pwd, err := os.Getwd()
- if err != nil {
- return nopts, err
- }
- app := meta.New(pwd)
- app.WithGrifts = true
- app.Name = fname.New(args[0])
- app.Bin = filepath.Join("bin", app.Name.String())
-
- if app.Name.String() == "." {
- app.Name = fname.New(filepath.Base(app.Root))
- } else {
- app.Root = filepath.Join(app.Root, app.Name.File().String())
- }
-
- if len(nopts.Module) == 0 {
- aa := meta.New(app.Root)
- app.PackageRoot(aa.PackagePkg)
- } else {
- app.PackageRoot(nopts.Module)
- }
-
- app.AsAPI = viper.GetBool("api")
- app.VCS = viper.GetString("vcs")
-
- app.WithPop = !viper.GetBool("skip-pop")
- app.WithWebpack = !viper.GetBool("skip-webpack")
- app.WithYarn = !viper.GetBool("skip-yarn")
- app.WithNodeJs = app.WithWebpack
- app.AsWeb = !app.AsAPI
-
- if app.AsAPI {
- app.WithWebpack = false
- app.WithYarn = false
- app.WithNodeJs = false
- }
-
- opts := &core.Options{}
-
- x := viper.GetString("docker")
- if len(x) > 0 && x != "none" {
- opts.Docker = &docker.Options{
- Style: x,
- }
- app.WithDocker = true
- }
-
- x = viper.GetString("ci-provider")
- if len(x) > 0 && x != "none" {
- opts.CI = &ci.Options{
- Provider: x,
- DBType: viper.GetString("db-type"),
- }
- }
-
- if len(app.VCS) > 0 && app.VCS != "none" {
- opts.VCS = &vcs.Options{
- Provider: app.VCS,
- }
- }
-
- if app.WithPop {
- d := viper.GetString("db-type")
- if d == "sqlite3" {
- app.WithSQLite = true
- }
-
- opts.Pop = &pop.Options{
- Prefix: app.Name.File().String(),
- Dialect: d,
- }
- }
-
- opts.Refresh = &refresh.Options{}
-
- opts.App = app
- nopts.Options = opts
- return nopts, nil
-}
-
-var configError error
-
-var newCmd = &cobra.Command{
- Use: "new [name]",
- Short: "Creates a new Buffalo application",
- RunE: func(cmd *cobra.Command, args []string) error {
- // Restore default values after usage (useful for testing)
- defer func() {
- cmd.Flags().Visit(func(f *pflag.Flag) {
- f.Value.Set(f.DefValue)
- })
- viper.BindPFlags(cmd.Flags())
- }()
-
- nopts, err := parseNewOptions(args)
- if err != nil {
- return err
- }
-
- opts := nopts.Options
- app := opts.App
-
- ctx := context.Background()
-
- run := genny.WetRunner(ctx)
- lg := logger.New(logger.DebugLevel)
- run.Logger = lg
- if nopts.Verbose {
- plog.Logger = lg
- }
-
- if nopts.DryRun {
- run = genny.DryRunner(ctx)
- }
- run.Root = app.Root
- if nopts.Force {
- os.RemoveAll(app.Root)
- }
-
- var gg *genny.Group
-
- if app.AsAPI {
- gg, err = api.New(&api.Options{
- Options: opts,
- })
- } else {
- wo := &web.Options{
- Options: opts,
- }
- if app.WithWebpack {
- wo.Webpack = &webpack.Options{}
- } else {
- wo.Standard = &standard.Options{}
- }
- gg, err = web.New(wo)
- }
- if err != nil {
- if errx.Unwrap(err) == core.ErrNotInGoPath {
- return notInGoPath(app)
- }
- return err
- }
-
- g := genny.New()
- g.Command(exec.Command("go", "mod", "tidy"))
- gg.Add(g)
-
- g = genny.New()
- g.RunFn(func(r *genny.Runner) error {
- deps, err := exec.Command("go", "list", "-f", "{{if not (or .Main .Indirect)}}{{.Path}}{{end}}", "-m", "all").Output()
- if err != nil {
- return err
- }
-
- scanner := bufio.NewScanner(bytes.NewReader(deps))
- for scanner.Scan() {
- if err := exec.Command("go", "get", scanner.Text()).Run(); err != nil {
- return err
- }
- }
-
- if err := scanner.Err(); err != nil {
- return err
- }
-
- return nil
- })
- gg.Add(g)
-
- g = genny.New()
- g.Command(exec.Command("go", "mod", "tidy"))
- gg.Add(g)
-
- run.WithGroup(gg)
-
- if err := run.WithNew(gogen.Fmt(app.Root)); err != nil {
- return err
- }
-
- // setup VCS last
- if opts.VCS != nil {
- // add the VCS generator
- if err := run.WithNew(vcs.New(opts.VCS)); err != nil {
- return err
- }
- }
-
- if err := run.Run(); err != nil {
- return err
- }
-
- run.Logger.Infof("Congratulations! Your application, %s, has been successfully built!", app.Name)
- run.Logger.Infof("You can find your new application at: %v", app.Root)
- run.Logger.Info("Please read the README.md file in your new application for next steps on running your application.")
- return nil
- },
-}
-
-func currentUser() (string, error) {
- if _, err := exec.LookPath("git"); err == nil {
- if b, err := exec.Command("git", "config", "github.user").Output(); err == nil {
- return string(b), nil
- }
- }
- u, err := user.Current()
- if err != nil {
- return "", err
- }
- username := u.Username
- if t := strings.Split(username, `\`); len(t) > 0 {
- username = t[len(t)-1]
- }
- return username, nil
-}
-
-func notInGoPath(app meta.App) error {
- username, err := currentUser()
- if err != nil {
- return err
- }
- pwd, _ := os.Getwd()
- t, err := plush.Render(notInGoWorkspace, plush.NewContextWith(map[string]interface{}{
- "name": app.Name,
- "gopath": envy.GoPath(),
- "current": pwd,
- "username": username,
- }))
- if err != nil {
- return err
- }
- logrus.Error(t)
- os.Exit(-1)
- return nil
-}
-
-func init() {
- decorate("new", newCmd)
- RootCmd.AddCommand(newCmd)
- newCmd.Flags().Bool("api", false, "skip all front-end code and configure for an API server")
- newCmd.Flags().BoolP("force", "f", false, "delete and remake if the app already exists")
- newCmd.Flags().BoolP("dry-run", "d", false, "dry run")
- newCmd.Flags().BoolP("verbose", "v", false, "verbosely print out the go get commands")
- newCmd.Flags().Bool("skip-pop", false, "skips adding pop/soda to your app")
- newCmd.Flags().Bool("skip-webpack", false, "skips adding Webpack to your app")
- newCmd.Flags().Bool("skip-yarn", false, "use npm instead of yarn for frontend dependencies management")
- newCmd.Flags().String("db-type", "postgres", fmt.Sprintf("specify the type of database you want to use [%s]", strings.Join(pop.AvailableDialects, ", ")))
- newCmd.Flags().String("docker", "multi", "specify the type of Docker file to generate [none, multi, standard]")
- newCmd.Flags().String("ci-provider", "none", "specify the type of ci file you would like buffalo to generate [none, travis, gitlab-ci, circleci]")
- newCmd.Flags().String("vcs", "git", "specify the Version control system you would like to use [none, git, bzr]")
- newCmd.Flags().String("module", "", "specify the root module (package) name. [defaults to 'automatic']")
- viper.BindPFlags(newCmd.Flags())
- cfgFile := newCmd.PersistentFlags().String("config", "", "config file (default is $HOME/.buffalo.yaml)")
- skipConfig := newCmd.Flags().Bool("skip-config", false, "skips using the config file")
- cobra.OnInitialize(initConfig(skipConfig, cfgFile))
-}
-
-func initConfig(skipConfig *bool, cfgFile *string) func() {
- return func() {
- if *skipConfig {
- return
- }
-
- var err error
- if *cfgFile != "" { // enable ability to specify config file via flag
- viper.SetConfigFile(*cfgFile)
- // Will error only if the --config flag is used
- if err = viper.ReadInConfig(); err != nil {
- configError = err
- }
- } else {
- viper.SetConfigName(".buffalo") // name of config file (without extension)
- viper.AddConfigPath("$HOME") // adding home directory as first search path
- viper.AutomaticEnv() // read in environment variables that match
- viper.ReadInConfig()
- }
-
- }
-}
-
-const notInGoWorkspace = `Oops! It would appear that you are not in your Go Workspace.
-
-Your $GOPATH is set to "<%= gopath %>".
-
-You are currently in "<%= current %>".
-
-The standard location for putting Go projects is something along the lines of "$GOPATH/src/github.com/<%= username %>/<%= name %>" (adjust accordingly).
-
-We recommend you go to "$GOPATH/src/github.com/<%= username %>/" and try "buffalo new <%= name %>" again.`
diff --git a/buffalo/cmd/new_test.go b/buffalo/cmd/new_test.go
deleted file mode 100644
index 1d619dd05..000000000
--- a/buffalo/cmd/new_test.go
+++ /dev/null
@@ -1 +0,0 @@
-package cmd
diff --git a/buffalo/cmd/plugins.go b/buffalo/cmd/plugins.go
deleted file mode 100644
index 44b699346..000000000
--- a/buffalo/cmd/plugins.go
+++ /dev/null
@@ -1,36 +0,0 @@
-package cmd
-
-import (
- pluginscmd "github.com/gobuffalo/buffalo/buffalo/cmd/plugins"
- "github.com/gobuffalo/buffalo/plugins"
- "github.com/markbates/oncer"
- "github.com/sirupsen/logrus"
- "github.com/spf13/cobra"
-)
-
-func init() {
- RootCmd.AddCommand(pluginscmd.PluginsCmd)
-}
-
-var _plugs plugins.List
-
-func plugs() plugins.List {
- oncer.Do("buffalo/cmd/plugins", func() {
- var err error
- _plugs, err = plugins.Available()
- if err != nil {
- _plugs = plugins.List{}
- logrus.Errorf("error loading plugins %s", err)
- }
- })
- return _plugs
-}
-
-func decorate(name string, cmd *cobra.Command) {
- pugs := plugs()
- for _, c := range pugs[name] {
- anywhereCommands = append(anywhereCommands, c.Name)
- cc := plugins.Decorate(c)
- cmd.AddCommand(cc)
- }
-}
diff --git a/buffalo/cmd/plugins/add.go b/buffalo/cmd/plugins/add.go
deleted file mode 100644
index b2e075fc3..000000000
--- a/buffalo/cmd/plugins/add.go
+++ /dev/null
@@ -1,68 +0,0 @@
-package plugins
-
-import (
- "context"
- "os"
- "path"
- "strings"
-
- "github.com/gobuffalo/buffalo/genny/add"
- "github.com/gobuffalo/buffalo/internal/takeon/github.com/markbates/errx"
- "github.com/gobuffalo/buffalo/plugins/plugdeps"
- "github.com/gobuffalo/genny/v2"
- "github.com/gobuffalo/meta"
- "github.com/spf13/cobra"
-)
-
-var addOptions = struct {
- dryRun bool
- buildTags []string
-}{}
-
-var addCmd = &cobra.Command{
- Use: "add",
- Short: "adds plugins to config/buffalo-plugins.toml",
- RunE: func(cmd *cobra.Command, args []string) error {
- run := genny.WetRunner(context.Background())
- if addOptions.dryRun {
- run = genny.DryRunner(context.Background())
- }
-
- app := meta.New(".")
- plugs, err := plugdeps.List(app)
- if err != nil && (errx.Unwrap(err) != plugdeps.ErrMissingConfig) {
- return err
- }
-
- tags := app.BuildTags("", addOptions.buildTags...)
- for _, a := range args {
- a = strings.TrimSpace(a)
- bin := path.Base(a)
- plug := plugdeps.Plugin{
- Binary: bin,
- GoGet: a,
- Tags: tags,
- }
- if _, err := os.Stat(a); err == nil {
- plug.Local = a
- plug.GoGet = ""
- }
- plugs.Add(plug)
- }
- g, err := add.New(&add.Options{
- App: app,
- Plugins: plugs.List(),
- })
- if err != nil {
- return err
- }
- run.With(g)
-
- return run.Run()
- },
-}
-
-func init() {
- addCmd.Flags().BoolVarP(&addOptions.dryRun, "dry-run", "d", false, "dry run")
- addCmd.Flags().StringSliceVarP(&addOptions.buildTags, "tags", "t", []string{}, "build tags")
-}
diff --git a/buffalo/cmd/plugins/available.go b/buffalo/cmd/plugins/available.go
deleted file mode 100644
index a95078d00..000000000
--- a/buffalo/cmd/plugins/available.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package plugins
-
-import (
- "github.com/gobuffalo/buffalo/plugins/plugcmds"
- "github.com/spf13/cobra"
-)
-
-// Available used to manage all of the available commands
-// for the plugins
-var Available = plugcmds.NewAvailable()
-
-// PluginsCmd is the "root" command for the plugin features.
-var PluginsCmd = &cobra.Command{
- Use: "plugins",
- Short: "tools for working with buffalo plugins",
-}
-
-func init() {
- PluginsCmd.AddCommand(addCmd)
- PluginsCmd.AddCommand(listCmd)
- PluginsCmd.AddCommand(removeCmd)
- PluginsCmd.AddCommand(installCmd)
- PluginsCmd.AddCommand(cacheCmd)
-
- Available.ListenFor("buffalo:setup:.+", Listen)
-}
diff --git a/buffalo/cmd/plugins/cache.go b/buffalo/cmd/plugins/cache.go
deleted file mode 100644
index 2fda606c8..000000000
--- a/buffalo/cmd/plugins/cache.go
+++ /dev/null
@@ -1,22 +0,0 @@
-package plugins
-
-import (
- "github.com/gobuffalo/buffalo/buffalo/cmd/plugins/internal/cache"
- "github.com/spf13/cobra"
-)
-
-// cacheCmd represents the cache command
-var cacheCmd = &cobra.Command{
- Use: "cache",
- Short: "commands for managing the plugins cache",
- RunE: func(cmd *cobra.Command, args []string) error {
- return cache.ListCmd.RunE(cmd, args)
- },
-}
-
-func init() {
- cacheCmd.AddCommand(cache.CleanCmd)
- cacheCmd.AddCommand(cache.ListCmd)
- cacheCmd.AddCommand(cache.BuildCmd)
- PluginsCmd.AddCommand(cacheCmd)
-}
diff --git a/buffalo/cmd/plugins/encode.go b/buffalo/cmd/plugins/encode.go
deleted file mode 100644
index f44d165e5..000000000
--- a/buffalo/cmd/plugins/encode.go
+++ /dev/null
@@ -1,22 +0,0 @@
-package plugins
-
-import (
- "bytes"
-
- "github.com/gobuffalo/buffalo/plugins/plugdeps"
- "github.com/gobuffalo/genny/v2"
- "github.com/gobuffalo/meta"
-)
-
-// NewEncodePluginsRunner will return a runner that will encode the plugins file
-func NewEncodePluginsRunner(app meta.App, plugs *plugdeps.Plugins) func(r *genny.Runner) error {
- return func(r *genny.Runner) error {
- p := plugdeps.ConfigPath(app)
- bb := &bytes.Buffer{}
- if err := plugs.Encode(bb); err != nil {
- return err
- }
-
- return r.File(genny.NewFile(p, bb))
- }
-}
diff --git a/buffalo/cmd/plugins/install.go b/buffalo/cmd/plugins/install.go
deleted file mode 100644
index 98a6abdd2..000000000
--- a/buffalo/cmd/plugins/install.go
+++ /dev/null
@@ -1,85 +0,0 @@
-package plugins
-
-import (
- "bytes"
- "context"
- "io"
- "os"
- "path"
- "strings"
-
- "github.com/gobuffalo/buffalo/genny/plugins/install"
- "github.com/gobuffalo/buffalo/internal/takeon/github.com/markbates/errx"
- "github.com/gobuffalo/buffalo/plugins/plugdeps"
- "github.com/gobuffalo/genny/v2"
- "github.com/gobuffalo/logger"
- "github.com/gobuffalo/meta"
- "github.com/spf13/cobra"
-)
-
-var installOptions = struct {
- dryRun bool
- vendor bool
- verbose bool
-}{}
-
-var installCmd = &cobra.Command{
- Use: "install",
- Short: "installs plugins listed in config/buffalo-plugins.toml",
- RunE: func(cmd *cobra.Command, args []string) error {
- run := genny.WetRunner(context.Background())
- if installOptions.dryRun {
- run = genny.DryRunner(context.Background())
- if installOptions.vendor {
- run.FileFn = func(f genny.File) (genny.File, error) {
- bb := &bytes.Buffer{}
- if _, err := io.Copy(bb, f); err != nil {
- return f, err
- }
- return genny.NewFile(f.Name(), bb), nil
- }
- }
- }
-
- app := meta.New(".")
- plugs, err := plugdeps.List(app)
- if err != nil && (errx.Unwrap(err) != plugdeps.ErrMissingConfig) {
- return err
- }
-
- for _, a := range args {
- a = strings.TrimSpace(a)
- bin := path.Base(a)
- plug := plugdeps.Plugin{
- Binary: bin,
- GoGet: a,
- }
- if _, err := os.Stat(a); err == nil {
- plug.Local = a
- plug.GoGet = ""
- }
- plugs.Add(plug)
- }
- gg, err := install.New(&install.Options{
- App: app,
- Plugins: plugs.List(),
- Vendor: installOptions.vendor,
- })
- if err != nil {
- return err
- }
- run.WithGroup(gg)
-
- if installOptions.verbose {
- run.Logger = logger.New(logger.DebugLevel)
- }
-
- return run.Run()
- },
-}
-
-func init() {
- installCmd.Flags().BoolVarP(&installOptions.dryRun, "dry-run", "d", false, "dry run")
- installCmd.Flags().BoolVarP(&installOptions.verbose, "verbose", "v", false, "turn on verbose logging")
- installCmd.Flags().BoolVar(&installOptions.vendor, "vendor", false, "will install plugin binaries into ./plugins [WINDOWS not currently supported]")
-}
diff --git a/buffalo/cmd/plugins/internal/cache/build.go b/buffalo/cmd/plugins/internal/cache/build.go
deleted file mode 100644
index 3d6378c64..000000000
--- a/buffalo/cmd/plugins/internal/cache/build.go
+++ /dev/null
@@ -1,19 +0,0 @@
-package cache
-
-import (
- "os"
-
- "github.com/gobuffalo/buffalo/plugins"
- "github.com/spf13/cobra"
-)
-
-// BuildCmd rebuilds the plugins cache
-var BuildCmd = &cobra.Command{
- Use: "build",
- Short: "rebuilds the plugins cache",
- RunE: func(cmd *cobra.Command, args []string) error {
- os.RemoveAll(plugins.CachePath)
- _, err := plugins.Available()
- return err
- },
-}
diff --git a/buffalo/cmd/plugins/internal/cache/clean.go b/buffalo/cmd/plugins/internal/cache/clean.go
deleted file mode 100644
index 013cd0fb7..000000000
--- a/buffalo/cmd/plugins/internal/cache/clean.go
+++ /dev/null
@@ -1,18 +0,0 @@
-package cache
-
-import (
- "os"
-
- "github.com/gobuffalo/buffalo/plugins"
- "github.com/spf13/cobra"
-)
-
-// CleanCmd cleans the plugins cache
-var CleanCmd = &cobra.Command{
- Use: "clean",
- Short: "cleans the plugins cache",
- RunE: func(cmd *cobra.Command, args []string) error {
- os.RemoveAll(plugins.CachePath)
- return nil
- },
-}
diff --git a/buffalo/cmd/plugins/internal/cache/list.go b/buffalo/cmd/plugins/internal/cache/list.go
deleted file mode 100644
index 47f77b095..000000000
--- a/buffalo/cmd/plugins/internal/cache/list.go
+++ /dev/null
@@ -1,34 +0,0 @@
-package cache
-
-import (
- "encoding/json"
- "fmt"
- "io/ioutil"
-
- "github.com/gobuffalo/buffalo/plugins"
- "github.com/spf13/cobra"
-)
-
-// ListCmd displays the contents of the plugin cache
-var ListCmd = &cobra.Command{
- Use: "list",
- Short: "displays the contents of the plugin cache",
- RunE: func(cmd *cobra.Command, args []string) error {
- b, err := ioutil.ReadFile(plugins.CachePath)
- if err != nil {
- return err
- }
- m := map[string]interface{}{}
- err = json.Unmarshal(b, &m)
- if err != nil {
- return err
- }
- is, err := json.MarshalIndent(m, "", " ")
- if err != nil {
- return err
- }
-
- fmt.Println(string(is))
- return nil
- },
-}
diff --git a/buffalo/cmd/plugins/list.go b/buffalo/cmd/plugins/list.go
deleted file mode 100644
index 69cca8573..000000000
--- a/buffalo/cmd/plugins/list.go
+++ /dev/null
@@ -1,57 +0,0 @@
-package plugins
-
-import (
- "bytes"
- "fmt"
- "os"
- "path/filepath"
- "sort"
- "text/tabwriter"
-
- pluginsin "github.com/gobuffalo/buffalo/plugins"
- "github.com/spf13/cobra"
-)
-
-var listCmd = &cobra.Command{
- Use: "list",
- Short: "a list of installed buffalo plugins",
- RunE: func(cmd *cobra.Command, args []string) error {
- list, err := pluginsin.Available()
- if err != nil {
- return err
- }
-
- var cmds pluginsin.Commands
-
- for _, l := range list {
- cmds = append(cmds, l...)
- }
-
- sort.Slice(cmds, func(i, j int) bool {
- c1 := cmds[i]
- c2 := cmds[j]
-
- return c1.Name+c1.Name < c2.Name+c2.Name
- })
-
- w := tabwriter.NewWriter(os.Stdout, 0, 0, 1, ' ', tabwriter.Debug)
- fmt.Fprintln(w, "Bin\tCommand\tDescription")
- fmt.Fprintln(w, "---\t---\t---")
-
- for _, c := range cmds {
- if c.Name == "" {
- continue
- }
- sb := &bytes.Buffer{}
- sb.WriteString("buffalo ")
- if c.BuffaloCommand != "root" {
- sb.WriteString(c.BuffaloCommand)
- sb.WriteString(" ")
- }
- sb.WriteString(c.Name)
- fmt.Fprintf(w, "%s\t%s\t%s\n", filepath.Base(c.Binary), sb.String(), c.Description)
- }
-
- return w.Flush()
- },
-}
diff --git a/buffalo/cmd/plugins/listen.go b/buffalo/cmd/plugins/listen.go
deleted file mode 100644
index 21d09a8ea..000000000
--- a/buffalo/cmd/plugins/listen.go
+++ /dev/null
@@ -1,35 +0,0 @@
-package plugins
-
-import (
- "context"
-
- "github.com/gobuffalo/buffalo/genny/plugins/install"
- "github.com/gobuffalo/buffalo/plugins"
- "github.com/gobuffalo/events"
- "github.com/gobuffalo/genny/v2"
-)
-
-// Listen is listener for plugin events pipeline
-func Listen(e events.Event) error {
- if e.Kind != "buffalo:setup:started" {
- return nil
- }
-
- run := genny.WetRunner(context.Background())
-
- opts := &install.Options{}
- gg, err := install.New(opts)
- if err != nil {
- return err
- }
- run.WithGroup(gg)
- payload := e.Payload
- payload["plugins"] = opts.Plugins
- events.EmitPayload(plugins.EvtSetupStarted, payload)
- if err := run.Run(); err != nil {
- events.EmitError(plugins.EvtSetupErr, err, payload)
- return err
- }
- events.EmitPayload(plugins.EvtSetupFinished, payload)
- return nil
-}
diff --git a/buffalo/cmd/plugins/remove.go b/buffalo/cmd/plugins/remove.go
deleted file mode 100644
index dde541bf7..000000000
--- a/buffalo/cmd/plugins/remove.go
+++ /dev/null
@@ -1,56 +0,0 @@
-package plugins
-
-import (
- "context"
- "fmt"
- "path"
- "strings"
-
- "github.com/gobuffalo/buffalo/internal/takeon/github.com/markbates/errx"
- "github.com/gobuffalo/buffalo/plugins/plugdeps"
- "github.com/gobuffalo/genny/v2"
- "github.com/gobuffalo/meta"
- "github.com/spf13/cobra"
-)
-
-var removeOptions = struct {
- dryRun bool
- vendor bool
-}{}
-
-var removeCmd = &cobra.Command{
- Use: "remove",
- Short: "removes plugin from config/buffalo-plugins.toml",
- RunE: func(cmd *cobra.Command, args []string) error {
- if len(args) == 0 {
- return fmt.Errorf("you must specify at least one package")
- }
- run := genny.WetRunner(context.Background())
- if removeOptions.dryRun {
- run = genny.DryRunner(context.Background())
- }
-
- app := meta.New(".")
- plugs, err := plugdeps.List(app)
- if err != nil && (errx.Unwrap(err) != plugdeps.ErrMissingConfig) {
- return err
- }
-
- for _, a := range args {
- a = strings.TrimSpace(a)
- bin := path.Base(a)
- plugs.Remove(plugdeps.Plugin{
- Binary: bin,
- GoGet: a,
- })
- }
-
- run.WithRun(NewEncodePluginsRunner(app, plugs))
- return run.Run()
- },
-}
-
-func init() {
- removeCmd.Flags().BoolVarP(&removeOptions.dryRun, "dry-run", "d", false, "dry run")
- removeCmd.Flags().BoolVar(&removeOptions.vendor, "vendor", false, "will install plugin binaries into ./plugins [WINDOWS not currently supported]")
-}
diff --git a/buffalo/cmd/root.go b/buffalo/cmd/root.go
deleted file mode 100644
index 9d4ada248..000000000
--- a/buffalo/cmd/root.go
+++ /dev/null
@@ -1,82 +0,0 @@
-package cmd
-
-import (
- "fmt"
- "os"
- "strings"
-
- "github.com/gobuffalo/buffalo"
- "github.com/sirupsen/logrus"
- "github.com/spf13/cobra"
-)
-
-var anywhereCommands = []string{"new", "version", "info", "help"}
-
-// RootCmd is the hook for all of the other commands in the buffalo binary.
-var RootCmd = &cobra.Command{
- SilenceErrors: true,
- Use: "buffalo",
- Short: "Build Buffalo applications with ease",
- PersistentPreRunE: func(cmd *cobra.Command, args []string) error {
- if err := buffalo.LoadPlugins(); err != nil {
- return err
- }
- isFreeCommand := false
- for _, freeCmd := range anywhereCommands {
- if freeCmd == cmd.Name() {
- isFreeCommand = true
- }
- }
-
- if isFreeCommand {
- return nil
- }
-
- if !insideBuffaloProject() {
- return fmt.Errorf("you need to be inside your buffalo project path to run this command")
- }
-
- return nil
- },
-}
-
-// Execute adds all child commands to the root command sets flags appropriately.
-// This is called by main.main(). It only needs to happen once to the rootCmd.
-func Execute() {
- if err := RootCmd.Execute(); err != nil {
- if strings.Contains(err.Error(), dbNotFound) || strings.Contains(err.Error(), popNotFound) {
- logrus.Errorf(popInstallInstructions)
- os.Exit(-1)
- }
- logrus.Errorf("Error: %s", err)
- if strings.Contains(err.Error(), dbNotFound) || strings.Contains(err.Error(), popNotFound) {
- fmt.Println(popInstallInstructions)
- os.Exit(-1)
- }
- os.Exit(-1)
- }
-}
-
-const dbNotFound = `unknown command "db"`
-const popNotFound = `unknown command "pop"`
-const popInstallInstructions = `Pop support has been moved to the https://github.com/gobuffalo/buffalo-pop plugin.
-
-!! PLEASE READ PLUGIN DOCUMENTATION - https://gobuffalo.io/en/docs/plugins
-
-Buffalo Plugins Installation*:
-
- $ buffalo plugins install github.com/gobuffalo/buffalo-pop
-
-`
-
-func init() {
- decorate("root", RootCmd)
-}
-
-func insideBuffaloProject() bool {
- if _, err := os.Stat(".buffalo.dev.yml"); err != nil {
- return false
- }
-
- return true
-}
diff --git a/buffalo/cmd/routes.go b/buffalo/cmd/routes.go
deleted file mode 100644
index 100317901..000000000
--- a/buffalo/cmd/routes.go
+++ /dev/null
@@ -1,19 +0,0 @@
-package cmd
-
-import (
- grifts "github.com/markbates/grift/cmd"
- "github.com/spf13/cobra"
-)
-
-func init() {
- decorate("routes", routesCmd)
- RootCmd.AddCommand(routesCmd)
-}
-
-var routesCmd = &cobra.Command{
- Use: "routes",
- Short: "Print all defined routes",
- RunE: func(c *cobra.Command, args []string) error {
- return grifts.Run("buffalo task", []string{"routes"})
- },
-}
diff --git a/buffalo/cmd/setup.go b/buffalo/cmd/setup.go
deleted file mode 100644
index f85520f73..000000000
--- a/buffalo/cmd/setup.go
+++ /dev/null
@@ -1,178 +0,0 @@
-package cmd
-
-import (
- "bytes"
- "fmt"
- "os"
- "os/exec"
- "strings"
-
- "github.com/gobuffalo/events"
- "github.com/gobuffalo/meta"
- "github.com/sirupsen/logrus"
- "github.com/spf13/cobra"
-)
-
-var setupOptions = struct {
- verbose bool
- dropDatabases bool
-}{}
-
-type setupCheck func(meta.App) error
-
-var setupCmd = &cobra.Command{
- Use: "setup",
- Short: "Setup a newly created, or recently checked out application.",
- Long: `Setup runs through checklist to make sure dependencies are setup correctly.
-
-Asset Pipeline (if used):
-* Runs "npm install" or "yarn install" to install asset dependencies.
-
-Database (if used):
-* Runs "buffalo db create -a" to create databases.
-* Runs "buffalo db migrate" to run database migrations.
-* Runs "buffalo task db:seed" to seed the database (if the task exists).
-
-Tests:
-* Runs "buffalo test" to confirm the application's tests are running properly.
-`,
- RunE: func(cmd *cobra.Command, args []string) error {
- app := meta.New(".")
- payload := events.Payload{
- "app": app,
- }
- events.EmitPayload(EvtSetupStarted, payload)
- for _, check := range []setupCheck{assetCheck, databaseCheck, testCheck} {
- err := check(app)
- if err != nil {
- events.EmitError(EvtSetupErr, err, payload)
- return err
- }
- }
- events.EmitPayload(EvtSetupFinished, payload)
- return nil
- },
-}
-
-func testCheck(meta.App) error {
- err := run(exec.Command("buffalo", "test"))
- if err != nil {
- return fmt.Errorf("We encountered the following error when trying to run your applications tests:\n%s", err)
- }
- return nil
-}
-
-func databaseCheck(app meta.App) error {
- if !app.WithPop {
- return nil
- }
- for _, check := range []setupCheck{dbCreateCheck, dbMigrateCheck, dbSeedCheck} {
- err := check(app)
- if err != nil {
- return err
- }
- }
- return nil
-}
-
-func dbCreateCheck(meta.App) error {
- if setupOptions.dropDatabases {
- err := run(exec.Command("buffalo", "pop", "drop", "-a"))
- if err != nil {
- return fmt.Errorf("We encountered an error when trying to drop your application's databases. Please check to make sure that your database server is running and that the username and passwords found in the database.yml are properly configured and set up on your database server.\n %s", err)
- }
- }
- err := run(exec.Command("buffalo", "pop", "create", "-a"))
- if err != nil {
- return fmt.Errorf("We encountered an error when trying to create your application's databases. Please check to make sure that your database server is running and that the username and passwords found in the database.yml are properly configured and set up on your database server.\n %s", err)
- }
- return nil
-}
-
-func dbMigrateCheck(meta.App) error {
- err := run(exec.Command("buffalo", "pop", "migrate"))
- if err != nil {
- return fmt.Errorf("We encountered the following error when trying to migrate your database:\n%s", err)
- }
- return nil
-}
-
-func dbSeedCheck(meta.App) error {
- cmd := exec.Command("buffalo", "t", "list")
- out, err := cmd.Output()
- if err != nil {
- // no tasks configured, so return
- return nil
- }
- if bytes.Contains(out, []byte("db:seed")) {
- err := run(exec.Command("buffalo", "task", "db:seed"))
- if err != nil {
- return fmt.Errorf("We encountered the following error when trying to seed your database:\n%s", err)
- }
- }
- return nil
-}
-
-func assetCheck(app meta.App) error {
- if !app.WithWebpack {
- return nil
- }
- if app.WithYarn {
- return yarnCheck(app)
- }
- return npmCheck(app)
-}
-
-func npmCheck(app meta.App) error {
- err := nodeCheck(app)
- if err != nil {
- return err
- }
- err = run(exec.Command("npm", "install", "--no-progress"))
- if err != nil {
- return fmt.Errorf("We encountered the following error when trying to install your asset dependencies using npm:\n%s", err)
- }
- return nil
-}
-
-func yarnCheck(app meta.App) error {
- if err := nodeCheck(app); err != nil {
- return err
- }
- if _, err := exec.LookPath("yarnpkg"); err != nil {
- err := run(exec.Command("npm", "install", "-g", "yarn"))
- if err != nil {
- return fmt.Errorf("This application require yarn, and we could not find it installed on your system. We tried to install it for you, but ran into the following error:\n%s", err)
- }
- }
- if err := run(exec.Command("yarnpkg", "install", "--no-progress")); err != nil {
- return fmt.Errorf("We encountered the following error when trying to install your asset dependencies using yarn:\n%s", err)
- }
- return nil
-}
-
-func nodeCheck(meta.App) error {
- if _, err := exec.LookPath("node"); err != nil {
- return fmt.Errorf("this application requires node, and we could not find it installed on your system please install node and try again")
- }
- if _, err := exec.LookPath("npm"); err != nil {
- return fmt.Errorf("this application requires npm, and we could not find it installed on your system please install npm and try again")
- }
- return nil
-}
-
-func run(cmd *exec.Cmd) error {
- logrus.Infof("--> %s", strings.Join(cmd.Args, " "))
- cmd.Stdin = os.Stdin
- cmd.Stderr = os.Stderr
- cmd.Stdout = os.Stdout
- return cmd.Run()
-}
-
-func init() {
- setupCmd.Flags().BoolVarP(&setupOptions.verbose, "verbose", "v", false, "run with verbose output")
- setupCmd.Flags().BoolVarP(&setupOptions.dropDatabases, "drop", "d", false, "drop existing databases")
-
- decorate("setup", setupCmd)
- RootCmd.AddCommand(setupCmd)
-}
diff --git a/buffalo/cmd/task.go b/buffalo/cmd/task.go
deleted file mode 100644
index 198d18516..000000000
--- a/buffalo/cmd/task.go
+++ /dev/null
@@ -1,25 +0,0 @@
-package cmd
-
-import (
- grifts "github.com/markbates/grift/cmd"
- "github.com/spf13/cobra"
-)
-
-// task command is a forward to grift tasks
-var taskCommand = &cobra.Command{
- Use: "task",
- Aliases: []string{"t", "tasks"},
- Short: "Run grift tasks",
- DisableFlagParsing: true,
- RunE: func(c *cobra.Command, args []string) error {
- return grifts.Run("buffalo task", args)
- },
- PersistentPreRunE: func(cmd *cobra.Command, args []string) error {
- return nil
- },
-}
-
-func init() {
- decorate("task", taskCommand)
- RootCmd.AddCommand(taskCommand)
-}
diff --git a/buffalo/cmd/test.go b/buffalo/cmd/test.go
deleted file mode 100644
index 509f01fab..000000000
--- a/buffalo/cmd/test.go
+++ /dev/null
@@ -1,241 +0,0 @@
-package cmd
-
-import (
- "bytes"
- "fmt"
- "io"
- "os"
- "os/exec"
- "path/filepath"
- "strings"
-
- "github.com/gobuffalo/envy"
- "github.com/gobuffalo/meta"
- "github.com/sirupsen/logrus"
-
- "github.com/gobuffalo/pop/v5"
- "github.com/spf13/cobra"
-)
-
-var forceMigrations = false
-
-func init() {
- decorate("test", testCmd)
- RootCmd.AddCommand(testCmd)
-}
-
-var testCmd = &cobra.Command{
- Use: "test",
- Short: "Run the tests for the Buffalo app. Use --force-migrations to skip schema load.",
- DisableFlagParsing: true,
- RunE: func(c *cobra.Command, args []string) error {
- os.Setenv("GO_ENV", "test")
- if _, err := os.Stat("database.yml"); err == nil {
- // there's a database
- test, err := pop.Connect("test")
- if err != nil {
- return err
- }
-
- // drop the test db:
- test.Dialect.DropDB()
-
- // create the test db:
- err = test.Dialect.CreateDB()
- if err != nil {
- return err
- }
-
- // Read and remove --force-migrations flag from args:
- forceMigrations = strings.Contains(strings.Join(args, ""), "--force-migrations")
- args = cutArg("--force-migrations", args)
- if forceMigrations {
- fm, err := pop.NewFileMigrator("./migrations", test)
-
- if err != nil {
- return err
- }
-
- if err := fm.Up(); err != nil {
- return err
- }
-
- return testRunner(args)
- }
-
- if schema := findSchema(); schema != nil {
- err = test.Dialect.LoadSchema(schema)
- if err != nil {
- return err
- }
- }
- }
- return testRunner(args)
- },
-}
-
-func findSchema() io.Reader {
- if f, err := os.Open(filepath.Join("migrations", "schema.sql")); err == nil {
- return f
- }
- if dev, err := pop.Connect("development"); err == nil {
- schema := &bytes.Buffer{}
- if err = dev.Dialect.DumpSchema(schema); err == nil {
- return schema
- }
- }
-
- if test, err := pop.Connect("test"); err == nil {
- fm, err := pop.NewFileMigrator("./migrations", test)
- if err != nil {
- return nil
- }
-
- if err := fm.Up(); err == nil {
- return nil
- }
- }
- return nil
-}
-
-func testRunner(args []string) error {
- var mFlag bool
- var query string
-
- commandArgs := []string{}
- packageArgs := []string{}
-
- var lastArg string
- for index, arg := range args {
- switch arg {
- case "-run", "-m":
- query = args[index+1]
- mFlag = true
- case "-v", "-timeout":
- commandArgs = append(commandArgs, arg)
- default:
- if lastArg == "-timeout" {
- commandArgs = append(commandArgs, arg)
- } else if lastArg != "-run" && lastArg != "-m" {
- packageArgs = append(packageArgs, arg)
- }
- }
-
- lastArg = arg
- }
-
- cmd := newTestCmd(commandArgs)
- if mFlag {
- return mFlagRunner{
- query: query,
- args: commandArgs,
- pargs: packageArgs,
- }.Run()
- }
-
- pkgs, err := testPackages(packageArgs)
- if err != nil {
- return err
- }
-
- cmd.Args = append(cmd.Args, pkgs...)
- logrus.Info(strings.Join(cmd.Args, " "))
- return cmd.Run()
-}
-
-type mFlagRunner struct {
- query string
- args []string
- pargs []string
-}
-
-func (m mFlagRunner) Run() error {
- app := meta.New(".")
- pwd, _ := os.Getwd()
- defer os.Chdir(pwd)
-
- pkgs, err := testPackages(m.pargs)
- if err != nil {
- return err
- }
-
- var errs bool
- for _, p := range pkgs {
- os.Chdir(pwd)
-
- if p == app.PackagePkg {
- continue
- }
-
- p = strings.TrimPrefix(p, app.PackagePkg+string(filepath.Separator))
- os.Chdir(p)
-
- cmd := newTestCmd(m.args)
- if hasTestify(p) {
- cmd.Args = append(cmd.Args, "-testify.m", m.query)
- } else {
- cmd.Args = append(cmd.Args, "-run", m.query)
- }
-
- logrus.Info(strings.Join(cmd.Args, " "))
-
- if err := cmd.Run(); err != nil {
- errs = true
- }
- }
- if errs {
- return fmt.Errorf("errors running tests")
- }
- return nil
-}
-
-func hasTestify(p string) bool {
- cmd := exec.Command("go", "test", "-thisflagdoesntexist")
- b, _ := cmd.Output()
- return bytes.Contains(b, []byte("-testify.m"))
-}
-
-func testPackages(givenArgs []string) ([]string, error) {
- // If there are args, then assume these are the packages to test.
- //
- // Instead of always returning all packages from 'go list ./...', just
- // return the given packages in this case
- if len(givenArgs) > 0 {
- return givenArgs, nil
- }
-
- args := []string{}
- out, err := exec.Command(envy.Get("GO_BIN", "go"), "list", "./...").Output()
- if err != nil {
- return args, err
- }
- pkgs := bytes.Split(bytes.TrimSpace(out), []byte("\n"))
- for _, p := range pkgs {
- if !strings.Contains(string(p), "/vendor/") {
- args = append(args, string(p))
- }
- }
- return args, nil
-}
-
-func newTestCmd(args []string) *exec.Cmd {
- cargs := []string{"test", "-p", "1"}
- app := meta.New(".")
- cargs = append(cargs, "-tags", app.BuildTags("development").String())
- cargs = append(cargs, args...)
- cmd := exec.Command(envy.Get("GO_BIN", "go"), cargs...)
- cmd.Stdin = os.Stdin
- cmd.Stdout = os.Stdout
- cmd.Stderr = os.Stderr
- return cmd
-}
-
-func cutArg(arg string, args []string) []string {
- for i, v := range args {
- if v == arg {
- return append(args[:i], args[i+1:]...)
- }
- }
-
- return args
-}
diff --git a/buffalo/cmd/test_test.go b/buffalo/cmd/test_test.go
deleted file mode 100644
index 3e23b29dd..000000000
--- a/buffalo/cmd/test_test.go
+++ /dev/null
@@ -1,27 +0,0 @@
-package cmd
-
-import (
- "reflect"
- "testing"
-)
-
-func Test_CutArg(t *testing.T) {
- var tests = []struct {
- arg string
- args []string
- expected []string
- }{
- {"b", []string{"a", "b", "c"}, []string{"a", "c"}},
- {"--is-not-in-args", []string{"a", "b", "c"}, []string{"a", "b", "c"}},
- {"--foo", []string{"--foo", "--bar", "--baz"}, []string{"--bar", "--baz"}},
- {"--force-migrations", []string{"./actions/", "--force-migrations"}, []string{"./actions/"}},
- {"--force-migrations", []string{"./actions/", "--force-migrations", "-m", "Test_HomeHandler"}, []string{"./actions/", "-m", "Test_HomeHandler"}},
- }
-
- for _, tt := range tests {
- result := cutArg(tt.arg, tt.args)
- if !reflect.DeepEqual(result, tt.expected) {
- t.Errorf("got %s, want %s when cutting %s from %s", result, tt.expected, tt.arg, tt.args)
- }
- }
-}
\ No newline at end of file
diff --git a/buffalo/cmd/version.go b/buffalo/cmd/version.go
deleted file mode 100644
index 927a514dc..000000000
--- a/buffalo/cmd/version.go
+++ /dev/null
@@ -1,40 +0,0 @@
-package cmd
-
-import (
- "encoding/json"
- "os"
-
- "github.com/gobuffalo/buffalo/runtime"
- "github.com/sirupsen/logrus"
- "github.com/spf13/cobra"
-)
-
-var jsonOutput bool
-
-func init() {
- decorate("version", versionCmd)
- versionCmd.Flags().BoolVar(&jsonOutput, "json", false, "Print information in json format")
-
- RootCmd.AddCommand(versionCmd)
-}
-
-var versionCmd = &cobra.Command{
- Use: "version",
- Short: "Print the version information",
- Run: func(c *cobra.Command, args []string) {
- if jsonOutput {
- build := runtime.BuildInfo{}
- build.Version = runtime.Version
- enc := json.NewEncoder(os.Stderr)
- enc.SetIndent("", " ")
- enc.Encode(build)
- return
- }
-
- logrus.Infof("Buffalo version is: %s", runtime.Version)
- },
- // needed to override the root level pre-run func
- PersistentPreRunE: func(c *cobra.Command, args []string) error {
- return nil
- },
-}
diff --git a/buffalo/cmd/version_test.go b/buffalo/cmd/version_test.go
deleted file mode 100644
index 5da3c1a63..000000000
--- a/buffalo/cmd/version_test.go
+++ /dev/null
@@ -1,30 +0,0 @@
-package cmd
-
-import (
- "testing"
-
- "github.com/stretchr/testify/require"
-)
-
-func Test_VersionCmd(t *testing.T) {
- r := require.New(t)
-
- c := RootCmd
- c.SetArgs([]string{
- "version",
- })
- err := c.Execute()
- r.NoError(err)
-}
-
-func Test_VersionJSONCmd(t *testing.T) {
- r := require.New(t)
-
- c := RootCmd
- c.SetArgs([]string{
- "version",
- "--json",
- })
- err := c.Execute()
- r.NoError(err)
-}
diff --git a/buffalo/main.go b/buffalo/main.go
deleted file mode 100644
index 325c65e05..000000000
--- a/buffalo/main.go
+++ /dev/null
@@ -1,9 +0,0 @@
-package main
-
-import (
- "github.com/gobuffalo/buffalo/buffalo/cmd"
-)
-
-func main() {
- cmd.Execute()
-}
diff --git a/genny/actions/_fixtures/inputs/clean/actions/app.go b/genny/actions/_fixtures/inputs/clean/actions/app.go
deleted file mode 100644
index ebfc56cd1..000000000
--- a/genny/actions/_fixtures/inputs/clean/actions/app.go
+++ /dev/null
@@ -1,18 +0,0 @@
-package actions
-
-import (
- "github.com/gobuffalo/buffalo"
-)
-
-var app *buffalo.App
-
-func App() *buffalo.App {
- if app == nil {
- app = buffalo.New(buffalo.Options{})
- app.GET("/", HomeHandler)
-
- app.ServeFiles("/", assetsBox) // serve files from the public directory
- }
-
- return app
-}
diff --git a/genny/actions/_fixtures/inputs/existing/actions/app.go.tmpl b/genny/actions/_fixtures/inputs/existing/actions/app.go.tmpl
deleted file mode 100644
index 6f8b7caa5..000000000
--- a/genny/actions/_fixtures/inputs/existing/actions/app.go.tmpl
+++ /dev/null
@@ -1,19 +0,0 @@
-package actions
-
-import (
- "github.com/gobuffalo/buffalo"
-)
-
-var app *buffalo.App
-
-func App() *buffalo.App {
- if app == nil {
- app = buffalo.New(buffalo.Options{})
- app.GET("/", HomeHandler)
-
- app.GET("/user/edit", UserEdit)
- app.ServeFiles("/", assetsBox) // serve files from the public directory
- }
-
- return app
-}
diff --git a/genny/actions/_fixtures/inputs/existing/actions/user.go.tmpl b/genny/actions/_fixtures/inputs/existing/actions/user.go.tmpl
deleted file mode 100644
index b02820733..000000000
--- a/genny/actions/_fixtures/inputs/existing/actions/user.go.tmpl
+++ /dev/null
@@ -1,13 +0,0 @@
-package actions
-
-import (
- "net/http"
-
- "github.com/gobuffalo/buffalo"
-)
-
-// UserEdit default implementation.
-func UserEdit(c buffalo.Context) error {
- // custom existing work
- return c.Render(http.StatusOK, r.HTML("user/edit.html"))
-}
diff --git a/genny/actions/_fixtures/inputs/existing/actions/user_test.go.tmpl b/genny/actions/_fixtures/inputs/existing/actions/user_test.go.tmpl
deleted file mode 100644
index 2a72d205a..000000000
--- a/genny/actions/_fixtures/inputs/existing/actions/user_test.go.tmpl
+++ /dev/null
@@ -1,6 +0,0 @@
-package actions
-
-func (as *ActionSuite) Test_User_Edit() {
- // custom test work
- as.Fail("Not Implemented!")
-}
diff --git a/genny/actions/_fixtures/inputs/existing/templates/user/edit.plush.html b/genny/actions/_fixtures/inputs/existing/templates/user/edit.plush.html
deleted file mode 100644
index 90780ea5a..000000000
--- a/genny/actions/_fixtures/inputs/existing/templates/user/edit.plush.html
+++ /dev/null
@@ -1 +0,0 @@
-User#Edit
\ No newline at end of file
diff --git a/genny/actions/_fixtures/outputs/clean/actions/app.go.tmpl b/genny/actions/_fixtures/outputs/clean/actions/app.go.tmpl
deleted file mode 100644
index 26fe0fe6d..000000000
--- a/genny/actions/_fixtures/outputs/clean/actions/app.go.tmpl
+++ /dev/null
@@ -1,19 +0,0 @@
-package actions
-
-import (
- "github.com/gobuffalo/buffalo"
-)
-
-var app *buffalo.App
-
-func App() *buffalo.App {
- if app == nil {
- app = buffalo.New(buffalo.Options{})
- app.GET("/", HomeHandler)
-
- app.GET("/user/index", UserIndex)
- app.ServeFiles("/", assetsBox) // serve files from the public directory
- }
-
- return app
-}
diff --git a/genny/actions/_fixtures/outputs/clean/actions/user.go.tmpl b/genny/actions/_fixtures/outputs/clean/actions/user.go.tmpl
deleted file mode 100644
index c24f36ade..000000000
--- a/genny/actions/_fixtures/outputs/clean/actions/user.go.tmpl
+++ /dev/null
@@ -1,12 +0,0 @@
-package actions
-
-import (
- "net/http"
-
- "github.com/gobuffalo/buffalo"
-)
-
-// UserIndex default implementation.
-func UserIndex(c buffalo.Context) error {
- return c.Render(http.StatusOK, r.HTML("user/index.html"))
-}
diff --git a/genny/actions/_fixtures/outputs/clean/actions/user_test.go.tmpl b/genny/actions/_fixtures/outputs/clean/actions/user_test.go.tmpl
deleted file mode 100644
index 69949f7d1..000000000
--- a/genny/actions/_fixtures/outputs/clean/actions/user_test.go.tmpl
+++ /dev/null
@@ -1,5 +0,0 @@
-package actions
-
-func (as *ActionSuite) Test_User_Index() {
- as.Fail("Not Implemented!")
-}
diff --git a/genny/actions/_fixtures/outputs/clean/templates/user/index.plush.html b/genny/actions/_fixtures/outputs/clean/templates/user/index.plush.html
deleted file mode 100644
index a400e2f5d..000000000
--- a/genny/actions/_fixtures/outputs/clean/templates/user/index.plush.html
+++ /dev/null
@@ -1 +0,0 @@
-User#Index
diff --git a/genny/actions/_fixtures/outputs/existing/actions/app.go.tmpl b/genny/actions/_fixtures/outputs/existing/actions/app.go.tmpl
deleted file mode 100644
index 0af30d6f5..000000000
--- a/genny/actions/_fixtures/outputs/existing/actions/app.go.tmpl
+++ /dev/null
@@ -1,20 +0,0 @@
-package actions
-
-import (
- "github.com/gobuffalo/buffalo"
-)
-
-var app *buffalo.App
-
-func App() *buffalo.App {
- if app == nil {
- app = buffalo.New(buffalo.Options{})
- app.GET("/", HomeHandler)
-
- app.GET("/user/edit", UserEdit)
- app.GET("/user/show", UserShow)
- app.ServeFiles("/", assetsBox) // serve files from the public directory
- }
-
- return app
-}
diff --git a/genny/actions/_fixtures/outputs/existing/actions/user.go.tmpl b/genny/actions/_fixtures/outputs/existing/actions/user.go.tmpl
deleted file mode 100644
index 194804594..000000000
--- a/genny/actions/_fixtures/outputs/existing/actions/user.go.tmpl
+++ /dev/null
@@ -1,18 +0,0 @@
-package actions
-
-import (
- "net/http"
-
- "github.com/gobuffalo/buffalo"
-)
-
-// UserEdit default implementation.
-func UserEdit(c buffalo.Context) error {
- // custom existing work
- return c.Render(http.StatusOK, r.HTML("user/edit.html"))
-}
-
-// UserShow default implementation.
-func UserShow(c buffalo.Context) error {
- return c.Render(http.StatusOK, r.HTML("user/show.html"))
-}
diff --git a/genny/actions/_fixtures/outputs/existing/actions/user_test.go.tmpl b/genny/actions/_fixtures/outputs/existing/actions/user_test.go.tmpl
deleted file mode 100644
index f3a9f8b1b..000000000
--- a/genny/actions/_fixtures/outputs/existing/actions/user_test.go.tmpl
+++ /dev/null
@@ -1,10 +0,0 @@
-package actions
-
-func (as *ActionSuite) Test_User_Edit() {
- // custom test work
- as.Fail("Not Implemented!")
-}
-
-func (as *ActionSuite) Test_User_Show() {
- as.Fail("Not Implemented!")
-}
diff --git a/genny/actions/_fixtures/outputs/existing/templates/user/edit.plush.html b/genny/actions/_fixtures/outputs/existing/templates/user/edit.plush.html
deleted file mode 100644
index 90780ea5a..000000000
--- a/genny/actions/_fixtures/outputs/existing/templates/user/edit.plush.html
+++ /dev/null
@@ -1 +0,0 @@
-User#Edit
\ No newline at end of file
diff --git a/genny/actions/_fixtures/outputs/existing/templates/user/show.plush.html b/genny/actions/_fixtures/outputs/existing/templates/user/show.plush.html
deleted file mode 100644
index ba61b250d..000000000
--- a/genny/actions/_fixtures/outputs/existing/templates/user/show.plush.html
+++ /dev/null
@@ -1 +0,0 @@
-User#Show
\ No newline at end of file
diff --git a/genny/actions/_fixtures/outputs/multi/actions/app.go.tmpl b/genny/actions/_fixtures/outputs/multi/actions/app.go.tmpl
deleted file mode 100644
index 137b3a9d9..000000000
--- a/genny/actions/_fixtures/outputs/multi/actions/app.go.tmpl
+++ /dev/null
@@ -1,20 +0,0 @@
-package actions
-
-import (
- "github.com/gobuffalo/buffalo"
-)
-
-var app *buffalo.App
-
-func App() *buffalo.App {
- if app == nil {
- app = buffalo.New(buffalo.Options{})
- app.GET("/", HomeHandler)
-
- app.GET("/user/show", UserShow)
- app.GET("/user/edit", UserEdit)
- app.ServeFiles("/", assetsBox) // serve files from the public directory
- }
-
- return app
-}
diff --git a/genny/actions/_fixtures/outputs/multi/actions/user.go.tmpl b/genny/actions/_fixtures/outputs/multi/actions/user.go.tmpl
deleted file mode 100644
index 79689d17c..000000000
--- a/genny/actions/_fixtures/outputs/multi/actions/user.go.tmpl
+++ /dev/null
@@ -1,17 +0,0 @@
-package actions
-
-import (
- "net/http"
-
- "github.com/gobuffalo/buffalo"
-)
-
-// UserShow default implementation.
-func UserShow(c buffalo.Context) error {
- return c.Render(http.StatusOK, r.HTML("user/show.html"))
-}
-
-// UserEdit default implementation.
-func UserEdit(c buffalo.Context) error {
- return c.Render(http.StatusOK, r.HTML("user/edit.html"))
-}
diff --git a/genny/actions/_fixtures/outputs/multi/actions/user_test.go.tmpl b/genny/actions/_fixtures/outputs/multi/actions/user_test.go.tmpl
deleted file mode 100644
index 39313628d..000000000
--- a/genny/actions/_fixtures/outputs/multi/actions/user_test.go.tmpl
+++ /dev/null
@@ -1,9 +0,0 @@
-package actions
-
-func (as *ActionSuite) Test_User_Show() {
- as.Fail("Not Implemented!")
-}
-
-func (as *ActionSuite) Test_User_Edit() {
- as.Fail("Not Implemented!")
-}
diff --git a/genny/actions/_fixtures/outputs/multi/templates/user/edit.plush.html b/genny/actions/_fixtures/outputs/multi/templates/user/edit.plush.html
deleted file mode 100644
index 90780ea5a..000000000
--- a/genny/actions/_fixtures/outputs/multi/templates/user/edit.plush.html
+++ /dev/null
@@ -1 +0,0 @@
-User#Edit
\ No newline at end of file
diff --git a/genny/actions/_fixtures/outputs/multi/templates/user/show.plush.html b/genny/actions/_fixtures/outputs/multi/templates/user/show.plush.html
deleted file mode 100644
index ba61b250d..000000000
--- a/genny/actions/_fixtures/outputs/multi/templates/user/show.plush.html
+++ /dev/null
@@ -1 +0,0 @@
-User#Show
\ No newline at end of file
diff --git a/genny/actions/actions-packr.go b/genny/actions/actions-packr.go
deleted file mode 100644
index 22612f6c7..000000000
--- a/genny/actions/actions-packr.go
+++ /dev/null
@@ -1,8 +0,0 @@
-// +build !skippackr
-// Code generated by github.com/gobuffalo/packr/v2. DO NOT EDIT.
-
-// You can use the "packr clean" command to clean up this,
-// and any other packr generated files.
-package actions
-
-import _ "github.com/gobuffalo/buffalo/packrd"
diff --git a/genny/actions/actions.go b/genny/actions/actions.go
deleted file mode 100644
index 20678aa49..000000000
--- a/genny/actions/actions.go
+++ /dev/null
@@ -1,84 +0,0 @@
-package actions
-
-import (
- "fmt"
- "strings"
-
- "github.com/gobuffalo/flect/name"
- "github.com/gobuffalo/genny/v2"
- "github.com/gobuffalo/genny/v2/gogen"
- "github.com/gobuffalo/packr/v2"
-)
-
-var box = packr.New("github.com/gobuffalo/buffalo/genny/actions/templates", "../actions/templates")
-
-// New returns a new generator for build actions on a Buffalo app
-func New(opts *Options) (*genny.Generator, error) {
- g := genny.New()
-
- if err := opts.Validate(); err != nil {
- return g, err
- }
-
- g.RunFn(construct(opts))
- return g, nil
-}
-
-func construct(opts *Options) genny.RunFn {
- return func(r *genny.Runner) error {
- pres := &presenter{
- Name: name.New(opts.Name),
- Data: data{},
- Helpers: data{},
- Options: opts,
- }
-
- if err := buildActions(pres)(r); err != nil {
- return err
- }
-
- if err := buildTests(pres)(r); err != nil {
- return err
- }
-
- if err := updateApp(pres)(r); err != nil {
- return err
- }
-
- if !opts.SkipTemplates {
- if err := buildTemplates(pres)(r); err != nil {
- return err
- }
- }
- return nil
- }
-}
-
-func transform(pres *presenter, f genny.File) (genny.File, error) {
- pres.Data["actions"] = pres.Actions
- pres.Data["name"] = pres.Name
- t := gogen.TemplateTransformer(pres.Data, pres.Helpers)
- return t.Transform(f)
-}
-
-func updateApp(pres *presenter) genny.RunFn {
- return func(r *genny.Runner) error {
- f, err := r.FindFile("actions/app.go")
- if err != nil {
- return err
- }
- var lines []string
- body := f.String()
- for _, a := range pres.Actions {
- e := fmt.Sprintf("app.%s(\"/%s/%s\", %s%s)", strings.ToUpper(pres.Options.Method), pres.Name.Underscore(), a.Underscore(), pres.Name.Pascalize(), a.Pascalize())
- if !strings.Contains(body, e) {
- lines = append(lines, e)
- }
- }
- f, err = gogen.AddInsideBlock(f, "app == nil", strings.Join(lines, "\n\t\t"))
- if err != nil {
- return err
- }
- return r.File(f)
- }
-}
diff --git a/genny/actions/actions_test.go b/genny/actions/actions_test.go
deleted file mode 100644
index 9c9ce4ce3..000000000
--- a/genny/actions/actions_test.go
+++ /dev/null
@@ -1,165 +0,0 @@
-package actions
-
-import (
- "fmt"
- "strings"
- "testing"
-
- "github.com/gobuffalo/genny/v2"
- "github.com/gobuffalo/genny/v2/gentest"
- packr "github.com/gobuffalo/packr/v2"
- "github.com/google/go-cmp/cmp"
- "github.com/stretchr/testify/require"
-)
-
-func compare(a, b string) bool {
- a = strings.TrimSpace(a)
- a = strings.Replace(a, "\r", "", -1)
- b = strings.TrimSpace(b)
- b = strings.Replace(b, "\r", "", -1)
- a = strings.TrimSpace(a)
- b = strings.TrimSpace(b)
- res := cmp.Equal(a, b)
- if !res {
- fmt.Println(cmp.Diff(a, b))
- }
- return res
-}
-
-func runner() *genny.Runner {
- run := gentest.NewRunner()
- run.Disk.AddBox(packr.New("actions/start/test", "../actions/_fixtures/inputs/clean"))
- return run
-}
-
-func Test_New(t *testing.T) {
- r := require.New(t)
-
- g, err := New(&Options{
- Name: "user",
- Actions: []string{"index"},
- })
- r.NoError(err)
-
- run := runner()
- run.With(g)
-
- r.NoError(run.Run())
-
- res := run.Results()
-
- r.Len(res.Commands, 0)
- // r.Len(res.Files, 4)
-
- box := packr.New("genny/actions/Test_New", "../actions/_fixtures/outputs/clean")
-
- files := []string{"actions/user.go.tmpl", "actions/app.go.tmpl", "actions/user_test.go.tmpl", "templates/user/index.plush.html"}
-
- for _, s := range files {
- x, err := box.FindString(s)
- r.NoError(err)
- f, err := res.Find(strings.TrimSuffix(s, ".tmpl"))
- r.NoError(err)
- fmt.Printf("\nfile %s", s)
- r.True(compare(x, f.String()))
- }
-}
-
-func Test_New_Multi(t *testing.T) {
- r := require.New(t)
-
- g, err := New(&Options{
- Name: "user",
- Actions: []string{"show", "edit"},
- })
- r.NoError(err)
-
- run := runner()
- run.With(g)
-
- err = run.Run()
- r.NoError(err)
-
- res := run.Results()
-
- r.Len(res.Commands, 0)
-
- box := packr.New("genny/actions/Test_New_Multi", "../actions/_fixtures/outputs/multi")
-
- files := []string{"actions/user.go.tmpl", "actions/app.go.tmpl", "actions/user_test.go.tmpl", "templates/user/show.plush.html", "templates/user/edit.plush.html"}
-
- for _, s := range files {
- x, err := box.FindString(s)
- r.NoError(err)
- f, err := res.Find(strings.TrimSuffix(s, ".tmpl"))
- r.NoError(err)
- fmt.Printf("\nfile %s", f)
- r.True(compare(x, f.String()))
- }
-}
-
-func Test_New_Multi_Existing(t *testing.T) {
- r := require.New(t)
-
- g, err := New(&Options{
- Name: "user",
- Actions: []string{"show", "edit"},
- })
- r.NoError(err)
-
- run := gentest.NewRunner()
- ins := packr.New("Test_New_Multi_Existing_input", "../actions/_fixtures/inputs/existing")
- for _, n := range ins.List() {
- x, err := ins.FindString(n)
- r.NoError(err)
- n = strings.TrimSuffix(n, ".tmpl")
- run.Disk.Add(genny.NewFileS(n, x))
- }
- run.With(g)
-
- err = run.Run()
- r.NoError(err)
-
- res := run.Results()
-
- r.Len(res.Commands, 0)
-
- box := packr.New("genny/actions/Test_New_Multi_Existing", "../actions/_fixtures/outputs/existing")
-
- files := []string{"actions/user.go.tmpl", "actions/app.go.tmpl", "actions/user_test.go.tmpl", "templates/user/show.plush.html", "templates/user/edit.plush.html"}
-
- for _, s := range files {
- x, err := box.FindString(s)
- r.NoError(err)
- f, err := res.Find(strings.TrimSuffix(s, ".tmpl"))
- r.NoError(err)
- r.True(compare(x, f.String()))
- }
-}
-
-func Test_New_SkipTemplates(t *testing.T) {
- r := require.New(t)
-
- g, err := New(&Options{
- Name: "user",
- Actions: []string{"index"},
- SkipTemplates: true,
- })
- r.NoError(err)
-
- run := runner()
- run.With(g)
-
- r.NoError(run.Run())
-
- res := run.Results()
-
- r.Len(res.Commands, 0)
-
- files := []string{"templates/user/index.html"}
-
- for _, s := range files {
- _, err := res.Find(s)
- r.Error(err)
- }
-}
diff --git a/genny/actions/build_actions.go b/genny/actions/build_actions.go
deleted file mode 100644
index daa2a4eed..000000000
--- a/genny/actions/build_actions.go
+++ /dev/null
@@ -1,83 +0,0 @@
-package actions
-
-import (
- "fmt"
- "strings"
-
- "github.com/gobuffalo/flect/name"
- "github.com/gobuffalo/genny/v2"
-)
-
-// buildActions is the top level action builder
-// it determines whether to build a new actions/foo.go file
-// or append to an existing one
-func buildActions(pres *presenter) genny.RunFn {
- return func(r *genny.Runner) error {
- fn := fmt.Sprintf("actions/%s.go", pres.Name.File())
- xf, err := r.FindFile(fn)
- if err != nil {
- return buildNewActions(fn, pres)(r)
- }
- if err := appendActions(xf, pres)(r); err != nil {
- return err
- }
-
- return nil
- }
-}
-
-// buildNewActions builds a brand new actions/foo.go file
-// and files it with actions
-func buildNewActions(fn string, pres *presenter) genny.RunFn {
- return func(r *genny.Runner) error {
- for _, a := range pres.Options.Actions {
- pres.Actions = append(pres.Actions, name.New(a))
- }
-
- h, err := box.FindString("actions_header.go.tmpl")
- if err != nil {
- return err
- }
- a, err := box.FindString("actions.go.tmpl")
- if err != nil {
- return err
- }
-
- f := genny.NewFileS(fn+".tmpl", h+a)
-
- f, err = transform(pres, f)
- if err != nil {
- return err
- }
- return r.File(f)
- }
-}
-
-// appendActions appends *only* actions that don't exist in
-// actions/foo.go. if the action already exists it is not touched.
-func appendActions(f genny.File, pres *presenter) genny.RunFn {
- return func(r *genny.Runner) error {
- body := f.String()
- for _, ac := range pres.Options.Actions {
- a := name.New(ac)
- x := fmt.Sprintf("func %s%s", pres.Name.Pascalize(), a.Pascalize())
- if strings.Contains(body, x) {
- continue
- }
- pres.Actions = append(pres.Actions, a)
- }
-
- a, err := box.FindString("actions.go.tmpl")
- if err != nil {
- return err
- }
-
- f = genny.NewFileS(f.Name()+".tmpl", f.String()+a)
-
- f, err = transform(pres, f)
- if err != nil {
- return err
- }
- return r.File(f)
- }
-}
diff --git a/genny/actions/build_templates.go b/genny/actions/build_templates.go
deleted file mode 100644
index 1fe50ca88..000000000
--- a/genny/actions/build_templates.go
+++ /dev/null
@@ -1,29 +0,0 @@
-package actions
-
-import (
- "fmt"
-
- "github.com/gobuffalo/genny/v2"
-)
-
-func buildTemplates(pres *presenter) genny.RunFn {
- return func(r *genny.Runner) error {
- f, err := box.FindString("view.plush.html.tmpl")
- if err != nil {
- return err
- }
- for _, a := range pres.Actions {
- pres.Data["action"] = a
- fn := fmt.Sprintf("templates/%s/%s.plush.html.tmpl", pres.Name.Folder(), a.File())
- xf := genny.NewFileS(fn, f)
- xf, err = transform(pres, xf)
- if err != nil {
- return err
- }
- if err := r.File(xf); err != nil {
- return err
- }
- }
- return nil
- }
-}
diff --git a/genny/actions/build_tests.go b/genny/actions/build_tests.go
deleted file mode 100644
index c1dadc90d..000000000
--- a/genny/actions/build_tests.go
+++ /dev/null
@@ -1,61 +0,0 @@
-package actions
-
-import (
- "fmt"
-
- "github.com/gobuffalo/genny/v2"
-)
-
-// buildTests is the top level action/test builder
-// it determines whether to build a new actions/foo_test.go file
-// or append to an existing one
-func buildTests(pres *presenter) genny.RunFn {
- return func(r *genny.Runner) error {
- fn := fmt.Sprintf("actions/%s_test.go", pres.Name.File())
- xf, err := r.FindFile(fn)
- if err != nil {
- return buildNewTests(fn, pres)(r)
- }
- return appendTests(xf, pres)(r)
- }
-}
-
-// buildNewTests builds a brand new actions/foo_test.go file
-// and files it with tests
-func buildNewTests(fn string, pres *presenter) genny.RunFn {
- return func(r *genny.Runner) error {
- h, err := box.FindString("tests_header.go.tmpl")
- if err != nil {
- return err
- }
- a, err := box.FindString("test.go.tmpl")
- if err != nil {
- return err
- }
-
- f := genny.NewFileS(fn+".tmpl", h+a)
-
- f, err = transform(pres, f)
- if err != nil {
- return err
- }
- return r.File(f)
- }
-}
-
-// appendTests appends *only* tests that don't exist in
-// actions/foo_test.go. if the test already exists it is not touched.
-func appendTests(f genny.File, pres *presenter) genny.RunFn {
- return func(r *genny.Runner) error {
- a, err := box.FindString("test.go.tmpl")
- if err != nil {
- return err
- }
- f := genny.NewFileS(f.Name()+".tmpl", f.String()+a)
- f, err = transform(pres, f)
- if err != nil {
- return err
- }
- return r.File(f)
- }
-}
diff --git a/genny/actions/options.go b/genny/actions/options.go
deleted file mode 100644
index f929d390f..000000000
--- a/genny/actions/options.go
+++ /dev/null
@@ -1,36 +0,0 @@
-package actions
-
-import (
- "fmt"
-
- "github.com/gobuffalo/meta"
-)
-
-// Options for the actions generator
-type Options struct {
- App meta.App
- Name string
- Actions []string
- Method string
- SkipTemplates bool
-}
-
-// Validate that options are usuable
-func (opts *Options) Validate() error {
- if len(opts.Name) == 0 {
- return fmt.Errorf("you must provide a name")
- }
-
- if len(opts.Actions) == 0 {
- return fmt.Errorf("you must provide at least one action name")
- }
-
- if opts.App.IsZero() {
- opts.App = meta.New(".")
- }
-
- if len(opts.Method) == 0 {
- opts.Method = "GET"
- }
- return nil
-}
diff --git a/genny/actions/options_test.go b/genny/actions/options_test.go
deleted file mode 100644
index df1fd7f6d..000000000
--- a/genny/actions/options_test.go
+++ /dev/null
@@ -1,24 +0,0 @@
-package actions
-
-import (
- "testing"
-
- "github.com/stretchr/testify/require"
-)
-
-func Test_Options_Validate(t *testing.T) {
- r := require.New(t)
-
- opts := &Options{}
- err := opts.Validate()
- r.Error(err)
-
- opts.Name = "user"
-
- err = opts.Validate()
- r.Error(err)
-
- opts.Actions = []string{"index", "show"}
- err = opts.Validate()
- r.NoError(err)
-}
diff --git a/genny/actions/presenter.go b/genny/actions/presenter.go
deleted file mode 100644
index aac5e9cd6..000000000
--- a/genny/actions/presenter.go
+++ /dev/null
@@ -1,13 +0,0 @@
-package actions
-
-import "github.com/gobuffalo/flect/name"
-
-type data map[string]interface{}
-
-type presenter struct {
- Name name.Ident
- Actions []name.Ident
- Helpers data
- Data data
- Options *Options
-}
diff --git a/genny/actions/templates/actions.go.tmpl b/genny/actions/templates/actions.go.tmpl
deleted file mode 100644
index b9219344f..000000000
--- a/genny/actions/templates/actions.go.tmpl
+++ /dev/null
@@ -1,6 +0,0 @@
-{{ range $action := .actions }}
-// {{$.name.Pascalize}}{{$action.Pascalize}} default implementation.
-func {{$.name.Pascalize}}{{$action.Pascalize}}(c buffalo.Context) error {
- return c.Render(http.StatusOK, r.HTML("{{$.name.File}}/{{$action.File}}.html"))
-}
-{{end}}
diff --git a/genny/actions/templates/actions_header.go.tmpl b/genny/actions/templates/actions_header.go.tmpl
deleted file mode 100644
index 214a6a3fa..000000000
--- a/genny/actions/templates/actions_header.go.tmpl
+++ /dev/null
@@ -1,7 +0,0 @@
-package actions
-
-import (
- "net/http"
-
- "github.com/gobuffalo/buffalo"
-)
diff --git a/genny/actions/templates/test.go.tmpl b/genny/actions/templates/test.go.tmpl
deleted file mode 100644
index 1aa743a12..000000000
--- a/genny/actions/templates/test.go.tmpl
+++ /dev/null
@@ -1,5 +0,0 @@
-{{ range $action := .actions}}
-func (as *ActionSuite) Test_{{$.name.Pascalize}}_{{$action.Pascalize}}() {
- as.Fail("Not Implemented!")
-}
-{{end}}
diff --git a/genny/actions/templates/tests_header.go.tmpl b/genny/actions/templates/tests_header.go.tmpl
deleted file mode 100644
index 0f3a37f39..000000000
--- a/genny/actions/templates/tests_header.go.tmpl
+++ /dev/null
@@ -1 +0,0 @@
-package actions
diff --git a/genny/actions/templates/view.plush.html.tmpl b/genny/actions/templates/view.plush.html.tmpl
deleted file mode 100644
index fce499d7b..000000000
--- a/genny/actions/templates/view.plush.html.tmpl
+++ /dev/null
@@ -1 +0,0 @@
-{{.name.Pascalize}}#{{.action.Pascalize}}
diff --git a/genny/add/add.go b/genny/add/add.go
deleted file mode 100644
index 76095ea2d..000000000
--- a/genny/add/add.go
+++ /dev/null
@@ -1,30 +0,0 @@
-package add
-
-import (
- "bytes"
- "path/filepath"
-
- "github.com/gobuffalo/buffalo/plugins/plugdeps"
- "github.com/gobuffalo/genny/v2"
-)
-
-// New add plugin to the config file
-func New(opts *Options) (*genny.Generator, error) {
- g := genny.New()
-
- if err := opts.Validate(); err != nil {
- return g, err
- }
-
- bb := &bytes.Buffer{}
- plugs := plugdeps.New()
- plugs.Add(opts.Plugins...)
- if err := plugs.Encode(bb); err != nil {
- return g, err
- }
-
- cpath := filepath.Join(opts.App.Root, "config", "buffalo-plugins.toml")
- g.File(genny.NewFile(cpath, bb))
-
- return g, nil
-}
diff --git a/genny/add/add_test.go b/genny/add/add_test.go
deleted file mode 100644
index 673d0c48d..000000000
--- a/genny/add/add_test.go
+++ /dev/null
@@ -1,50 +0,0 @@
-package add
-
-import (
- "bytes"
- "go/build"
- "path/filepath"
- "strings"
- "testing"
-
- "github.com/gobuffalo/buffalo/plugins/plugdeps"
- "github.com/gobuffalo/genny/v2"
- "github.com/gobuffalo/genny/v2/gentest"
- "github.com/gobuffalo/meta"
- "github.com/stretchr/testify/require"
-)
-
-func Test_New(t *testing.T) {
- r := require.New(t)
-
- g, err := New(&Options{
- App: meta.New("."),
- Plugins: []plugdeps.Plugin{
- {Binary: "buffalo-pop", GoGet: "github.com/gobuffalo/buffalo-pop/v2"},
- {Binary: "buffalo-hello.rb", Local: "./plugins/buffalo-hello.rb"},
- },
- })
- r.NoError(err)
-
- run := gentest.NewRunner()
- c := build.Default
- run.Disk.Add(genny.NewFile(filepath.Join(c.GOPATH, "bin", "buffalo-pop"), &bytes.Buffer{}))
-
- run.With(g)
-
- r.NoError(run.Run())
-
- res := run.Results()
-
- ecmds := []string{}
- r.Len(res.Commands, len(ecmds))
- for i, c := range res.Commands {
- r.Equal(ecmds[i], strings.Join(c.Args, " "))
- }
-
- efiles := []string{"bin/buffalo-pop", "config/buffalo-plugins.toml"}
- r.Len(res.Files, len(efiles))
- for i, f := range res.Files {
- r.True(strings.HasSuffix(f.Name(), efiles[i]))
- }
-}
diff --git a/genny/add/options.go b/genny/add/options.go
deleted file mode 100644
index 23b62d611..000000000
--- a/genny/add/options.go
+++ /dev/null
@@ -1,40 +0,0 @@
-package add
-
-import (
- "os"
-
- "github.com/gobuffalo/buffalo/internal/takeon/github.com/markbates/errx"
- "github.com/gobuffalo/buffalo/plugins/plugdeps"
- "github.com/gobuffalo/meta"
-)
-
-// Options container for passing needed info for
-// adding plugins to the config file.
-type Options struct {
- App meta.App
- Plugins []plugdeps.Plugin
-}
-
-// Validate that options are usuable
-func (opts *Options) Validate() error {
- if opts.App.IsZero() {
- pwd, err := os.Getwd()
- if err != nil {
- return err
- }
- opts.App = meta.New(pwd)
- }
- if len(opts.Plugins) == 0 {
- plugs, err := plugdeps.List(opts.App)
- if err != nil && (errx.Unwrap(err) != plugdeps.ErrMissingConfig) {
- return err
- }
- opts.Plugins = plugs.List()
- }
-
- for i, p := range opts.Plugins {
- p.Tags = opts.App.BuildTags("", p.Tags...)
- opts.Plugins[i] = p
- }
- return nil
-}
diff --git a/genny/add/options_test.go b/genny/add/options_test.go
deleted file mode 100644
index 30ee6fa84..000000000
--- a/genny/add/options_test.go
+++ /dev/null
@@ -1,15 +0,0 @@
-package add
-
-import (
- "testing"
-
- "github.com/stretchr/testify/require"
-)
-
-func Test_Options_Validate(t *testing.T) {
- r := require.New(t)
-
- opts := &Options{}
- err := opts.Validate()
- r.NoError(err)
-}
diff --git a/genny/assets/standard/options.go b/genny/assets/standard/options.go
deleted file mode 100644
index 45cd717b5..000000000
--- a/genny/assets/standard/options.go
+++ /dev/null
@@ -1,4 +0,0 @@
-package standard
-
-// Options for generating a new standard set of assets
-type Options struct{}
diff --git a/genny/assets/standard/standard-packr.go b/genny/assets/standard/standard-packr.go
deleted file mode 100644
index e23057120..000000000
--- a/genny/assets/standard/standard-packr.go
+++ /dev/null
@@ -1,8 +0,0 @@
-// +build !skippackr
-// Code generated by github.com/gobuffalo/packr/v2. DO NOT EDIT.
-
-// You can use the "packr clean" command to clean up this,
-// and any other packr generated files.
-package standard
-
-import _ "github.com/gobuffalo/buffalo/packrd"
diff --git a/genny/assets/standard/standard.go b/genny/assets/standard/standard.go
deleted file mode 100644
index 8bcfc14a4..000000000
--- a/genny/assets/standard/standard.go
+++ /dev/null
@@ -1,35 +0,0 @@
-package standard
-
-import (
- "strings"
- "text/template"
-
- "github.com/gobuffalo/genny/v2"
- "github.com/gobuffalo/genny/v2/gogen"
- "github.com/gobuffalo/packr/v2"
-)
-
-// New generator for creating basic asset files
-func New(opts *Options) (*genny.Generator, error) {
- g := genny.New()
- g.Box(packr.New("buffalo:genny:assets:standard", "../standard/templates"))
-
- data := map[string]interface{}{}
- h := template.FuncMap{}
- t := gogen.TemplateTransformer(data, h)
- g.Transformer(t)
-
- g.RunFn(func(r *genny.Runner) error {
- f, err := r.FindFile("templates/application.plush.html")
- if err != nil {
- return err
- }
-
- s := strings.Replace(f.String(), "", "\n"+bs4, 1)
- return r.File(genny.NewFileS(f.Name(), s))
- })
-
- return g, nil
-}
-
-const bs4 = ``
diff --git a/genny/assets/standard/standard_test.go b/genny/assets/standard/standard_test.go
deleted file mode 100644
index 9a7d2a87c..000000000
--- a/genny/assets/standard/standard_test.go
+++ /dev/null
@@ -1,60 +0,0 @@
-package standard
-
-import (
- "testing"
-
- "github.com/gobuffalo/genny/v2"
- "github.com/gobuffalo/genny/v2/gentest"
- "github.com/stretchr/testify/require"
-)
-
-func Test_New(t *testing.T) {
- r := require.New(t)
-
- g, err := New(&Options{})
- r.NoError(err)
-
- run := gentest.NewRunner()
- run.Disk.Add(genny.NewFileS("templates/application.plush.html", layout))
- run.LookPathFn = func(s string) (string, error) {
- return s, nil
- }
-
- run.With(g)
-
- r.NoError(run.Run())
-
- res := run.Results()
- r.Len(res.Commands, 0)
-
- files := []string{
- "public/assets/application.css",
- "public/assets/application.js",
- "public/assets/buffalo.css",
- "public/assets/images/favicon.ico",
- "public/assets/images/logo.svg",
- "templates/application.plush.html",
- }
-
- r.Len(res.Files, len(files))
- for i, f := range res.Files {
- r.Equal(files[i], f.Name())
- }
-
- layout, ferr := res.Find("templates/application.plush.html")
- r.NoError(ferr)
-
- r.Contains(layout.String(), "href=\"https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css\"")
-}
-
-const layout = `
-
-
- Buffalo - Foo
- <%= stylesheetTag("buffalo.css") %>
- <%= stylesheetTag("application.css") %>
-
-
-
-
-`
diff --git a/genny/assets/standard/templates/public/assets/application.css.tmpl b/genny/assets/standard/templates/public/assets/application.css.tmpl
deleted file mode 100644
index e69de29bb..000000000
diff --git a/genny/assets/standard/templates/public/assets/application.js.tmpl b/genny/assets/standard/templates/public/assets/application.js.tmpl
deleted file mode 100644
index e69de29bb..000000000
diff --git a/genny/assets/standard/templates/public/assets/buffalo.css.tmpl b/genny/assets/standard/templates/public/assets/buffalo.css.tmpl
deleted file mode 100644
index 4cc761f6e..000000000
--- a/genny/assets/standard/templates/public/assets/buffalo.css.tmpl
+++ /dev/null
@@ -1,118 +0,0 @@
-.container {
- min-width: 320px;
-}
-
-header {
- background-color: #62a5ee;
- padding: 10px 20px;
- box-sizing: border-box;
-}
-
-.logo img {
- width: 80px;
-}
-
-.titles h1 {
- font-size: 30px;
- font-weight: 300;
- color: white;
- margin-bottom: 13px;
- margin-top: 5px;
-}
-
-.titles h2 {
- font-weight: 300;
- font-size: 18px;
- display: inline-block;
- margin: 0;
-}
-
-.titles a {
- color: white;
- text-decoration: underline;
-}
-
-.titles i {
- margin-right: 5px;
- text-decoration: none;
-}
-
-.titles .documentation {
- margin-left: 28px;
-}
-
-.subtitle {
- color: white;
- margin: 0;
- padding: 13px 0;
- background-color: #2a3543;
- margin-bottom: 20px;
-}
-
-.subtitle h3 {
- font-size: 22px;
- font-weight: 400;
- margin: 0;
-}
-
-table {
- font-size: 14px;
-}
-
-table.table tbody tr td {
- border-top: 0;
- padding: 10px;
-}
-
-.foot {
- text-align: right;
- color: #c5c5c5;
- font-weight: 300;
-}
-
-.foot a {
- color: #8b8b8b;
- text-decoration: underline;
-}
-
-.centered {
- text-align: center;
-}
-
-@media all and (max-width: 770px) {
- .titles h1 {
- font-size: 25px;
- margin: 15px 0 5px 0;
- }
-}
-
-@media all and (max-width: 640px) {
- .titles h1 {
- font-size: 23px;
- margin: 15px 0 5px 0;
- }
- .titles h2 {
- font-size: 15px;
- }
- .titles .documentation {
- margin-left: 10px;
- }
-}
-
-@media all and (max-width: 530px) {
- .titles h1 {
- font-size: 20px;
- margin: 5px 0;
- }
- .logo {
- padding: 0
- }
- .logo img {
- width: 100%
- }
- .titles .documentation {
- margin-left: 0px;
- margin-top: 5px;
- display: block;
- }
-}
diff --git a/genny/assets/standard/templates/public/assets/images/favicon.ico.tmpl b/genny/assets/standard/templates/public/assets/images/favicon.ico.tmpl
deleted file mode 100644
index 463b634a7..000000000
Binary files a/genny/assets/standard/templates/public/assets/images/favicon.ico.tmpl and /dev/null differ
diff --git a/genny/assets/standard/templates/public/assets/images/logo.svg.tmpl b/genny/assets/standard/templates/public/assets/images/logo.svg.tmpl
deleted file mode 100644
index 0d1f29ef7..000000000
--- a/genny/assets/standard/templates/public/assets/images/logo.svg.tmpl
+++ /dev/null
@@ -1,721 +0,0 @@
-
-
-
-
diff --git a/genny/assets/webpack/options.go b/genny/assets/webpack/options.go
deleted file mode 100644
index 57dfadc0d..000000000
--- a/genny/assets/webpack/options.go
+++ /dev/null
@@ -1,18 +0,0 @@
-package webpack
-
-import (
- "github.com/gobuffalo/meta"
-)
-
-// Options for creating a new webpack setup
-type Options struct {
- meta.App
-}
-
-// Validate options
-func (opts *Options) Validate() error {
- if opts.App.IsZero() {
- opts.App = meta.New(".")
- }
- return nil
-}
diff --git a/genny/assets/webpack/templates/-dot-babelrc.tmpl b/genny/assets/webpack/templates/-dot-babelrc.tmpl
deleted file mode 100644
index 1320b9a32..000000000
--- a/genny/assets/webpack/templates/-dot-babelrc.tmpl
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "presets": ["@babel/preset-env"]
-}
diff --git a/genny/assets/webpack/templates/assets/css/_buffalo.scss.tmpl b/genny/assets/webpack/templates/assets/css/_buffalo.scss.tmpl
deleted file mode 100644
index 3cef17420..000000000
--- a/genny/assets/webpack/templates/assets/css/_buffalo.scss.tmpl
+++ /dev/null
@@ -1,133 +0,0 @@
-.container {
- min-width: 320px;
-}
-
-header {
- background-color: #62a5ee;
- padding: 10px 20px;
- box-sizing: border-box;
-}
-
-.logo {
- img {
- width: 80px;
- }
-}
-
-.titles {
- h1 {
- font-size: 30px;
- font-weight: 300;
- color: white;
- margin-bottom: 13px;
- margin-top: 5px;
- }
-
- h2 {
- font-weight: 300;
- font-size: 18px;
- display: inline-block;
- margin: 0;
- }
-
- a {
- color: white;
- text-decoration: underline;
- }
-
- i {
- margin-right: 5px;
- text-decoration: none;
- }
-
- .documentation {
- margin-left: 28px;
- }
-}
-
-.subtitle {
- color: white;
- margin: 0;
- padding: 13px 0;
- background-color: #2a3543;
- margin-bottom: 20px;
-
- h3 {
- font-size: 22px;
- font-weight: 400;
- margin: 0;
- }
-}
-
-table {
- font-size: 14px;
-
- &.table tbody tr td {
- border-top: 0;
- padding: 10px;
- }
-}
-
-.foot {
- text-align: right;
- color: #c5c5c5;
- font-weight: 300;
-
- a {
- color: #8b8b8b;
- text-decoration: underline;
- }
-}
-
-.centered {
- text-align: center;
-}
-
-@media all and (max-width: 770px) {
- .titles {
- h1 {
- font-size: 25px;
- margin: 15px 0 5px 0;
- }
- }
-}
-
-@media all and (max-width: 640px) {
- .titles {
- h1 {
- font-size: 23px;
- margin: 15px 0 5px 0;
- }
-
- h2 {
- font-size: 15px;
- }
-
- .documentation {
- margin-left: 10px;
- }
- }
-}
-
-@media all and (max-width: 530px) {
- .titles {
- h1 {
- font-size: 20px;
- margin: 5px 0;
- }
-
- .documentation {
- margin-left: 0px;
- margin-top: 5px;
- display: block;
- }
- }
-
- .logo {
- padding: 0;
-
- img {
- width: 100%
- }
- }
-}
diff --git a/genny/assets/webpack/templates/assets/css/application.scss.tmpl b/genny/assets/webpack/templates/assets/css/application.scss.tmpl
deleted file mode 100644
index 265400fa1..000000000
--- a/genny/assets/webpack/templates/assets/css/application.scss.tmpl
+++ /dev/null
@@ -1,4 +0,0 @@
-@import "~bootstrap/scss/bootstrap.scss";
-@import "~@fortawesome/fontawesome-free/css/all.min.css";
-
-@import "buffalo";
diff --git a/genny/assets/webpack/templates/assets/images/favicon.ico.tmpl b/genny/assets/webpack/templates/assets/images/favicon.ico.tmpl
deleted file mode 100644
index 463b634a7..000000000
Binary files a/genny/assets/webpack/templates/assets/images/favicon.ico.tmpl and /dev/null differ
diff --git a/genny/assets/webpack/templates/assets/images/logo.svg b/genny/assets/webpack/templates/assets/images/logo.svg
deleted file mode 100644
index 0d1f29ef7..000000000
--- a/genny/assets/webpack/templates/assets/images/logo.svg
+++ /dev/null
@@ -1,721 +0,0 @@
-
-
-
-
diff --git a/genny/assets/webpack/templates/assets/js/application.js.tmpl b/genny/assets/webpack/templates/assets/js/application.js.tmpl
deleted file mode 100644
index 4374b72f0..000000000
--- a/genny/assets/webpack/templates/assets/js/application.js.tmpl
+++ /dev/null
@@ -1,7 +0,0 @@
-require("expose-loader?$!expose-loader?jQuery!jquery");
-require("bootstrap/dist/js/bootstrap.bundle.js");
-require("@fortawesome/fontawesome-free/js/all.js");
-
-$(() => {
-
-});
diff --git a/genny/assets/webpack/templates/package.json.tmpl b/genny/assets/webpack/templates/package.json.tmpl
deleted file mode 100644
index 23475a61d..000000000
--- a/genny/assets/webpack/templates/package.json.tmpl
+++ /dev/null
@@ -1,46 +0,0 @@
-{
- "name": "buffalo",
- "version": "1.0.0",
- "main": "index.js",
- "license": "MIT",
- "scripts": {
- "dev": "webpack --watch",
- "build": "webpack -p --progress"
- },
- "repository": "github.com/gobuffalo/buffalo",
- "dependencies": {
- "bootstrap": "4.5.0",
- "popper.js": "^1.16.1",
- "@fortawesome/fontawesome-free": "^5.12.0",
- "jquery": "3.5.1",
- "jquery-ujs": "~1.2.2"
- },
- "devDependencies": {
- "@babel/cli": "^7.8.4",
- "@babel/core": "^7.9.0",
- "@babel/preset-env": "^7.9.5",
-
- "autoprefixer": "^9.7.6",
- "babel-loader": "^8.1.0",
- "css-loader": "~3.5.1",
- "expose-loader": "~0.7.5",
- "file-loader": "~6.0.0",
- "gopherjs-loader": "^0.0.1",
- "postcss-loader": "^3.0.0",
- "sass-loader": "~8.0.2",
- "style-loader": "~1.1.3",
- "url-loader": "~4.1.0",
- "node-sass": "~4.13.1",
-
- "npm-install-webpack-plugin": "4.0.5",
- "terser-webpack-plugin": "~2.3.1",
- "mini-css-extract-plugin": "^0.9.0",
- "webpack-clean-obsolete-chunks": "^0.4.0",
- "copy-webpack-plugin": "~5.1.1",
-
- "webpack": "~4.42.1",
- "webpack-cli": "^3.3.10",
- "webpack-livereload-plugin": "~2.3.0",
- "webpack-manifest-plugin": "~2.2.0"
- }
-}
diff --git a/genny/assets/webpack/templates/postcss.config.js.tmpl b/genny/assets/webpack/templates/postcss.config.js.tmpl
deleted file mode 100644
index cff57b574..000000000
--- a/genny/assets/webpack/templates/postcss.config.js.tmpl
+++ /dev/null
@@ -1,5 +0,0 @@
-module.exports = {
- plugins: [
- require('autoprefixer')
- ]
- }
diff --git a/genny/assets/webpack/templates/public/assets/-dot-keep.tmpl b/genny/assets/webpack/templates/public/assets/-dot-keep.tmpl
deleted file mode 100644
index e69de29bb..000000000
diff --git a/genny/assets/webpack/templates/webpack.config.js.tmpl b/genny/assets/webpack/templates/webpack.config.js.tmpl
deleted file mode 100644
index 74ac691ec..000000000
--- a/genny/assets/webpack/templates/webpack.config.js.tmpl
+++ /dev/null
@@ -1,117 +0,0 @@
-const Webpack = require("webpack");
-const Glob = require("glob");
-const CopyWebpackPlugin = require("copy-webpack-plugin");
-const MiniCssExtractPlugin = require("mini-css-extract-plugin");
-const ManifestPlugin = require("webpack-manifest-plugin");
-const CleanObsoleteChunks = require("webpack-clean-obsolete-chunks");
-const TerserPlugin = require("terser-webpack-plugin");
-const LiveReloadPlugin = require("webpack-livereload-plugin");
-
-const configurator = {
- entries: function(){
- var entries = {
- application: [
- './node_modules/jquery-ujs/src/rails.js',
- './assets/css/application.scss',
- ],
- }
-
- Glob.sync("./assets/*/*.*").forEach((entry) => {
- if (entry === './assets/css/application.scss') {
- return
- }
-
- let key = entry.replace(/(\.\/assets\/(src|js|css|go)\/)|\.(ts|js|s[ac]ss|go)/g, '')
- if(key.startsWith("_") || (/(ts|js|s[ac]ss|go)$/i).test(entry) == false) {
- return
- }
-
- if( entries[key] == null) {
- entries[key] = [entry]
- return
- }
-
- entries[key].push(entry)
- })
- return entries
- },
-
- plugins() {
- var plugins = [
- new Webpack.ProvidePlugin({$: "jquery",jQuery: "jquery"}),
- new MiniCssExtractPlugin({filename: "[name].[contenthash].css"}),
- new CopyWebpackPlugin([{from: "./assets",to: ""}], {copyUnmodified: true,ignore: ["css/**", "js/**", "src/**"] }),
- new Webpack.LoaderOptionsPlugin({minimize: true,debug: false}),
- new ManifestPlugin({fileName: "manifest.json"}),
- new CleanObsoleteChunks()
- ];
-
- return plugins
- },
-
- moduleOptions: function() {
- return {
- rules: [
- {
- test: /\.s[ac]ss$/,
- use: [
- MiniCssExtractPlugin.loader,
- { loader: "css-loader", options: {sourceMap: true}},
- { loader: "postcss-loader", options: {sourceMap: true}},
- { loader: "sass-loader", options: {sourceMap: true}}
- ]
- },
- { test: /\.tsx?$/, use: "ts-loader", exclude: /node_modules/},
- { test: /\.jsx?$/,loader: "babel-loader",exclude: /node_modules/ },
- { test: /\.(woff|woff2|ttf|svg)(\?v=\d+\.\d+\.\d+)?$/,use: "url-loader"},
- { test: /\.eot(\?v=\d+\.\d+\.\d+)?$/,use: "file-loader" },
- { test: require.resolve("jquery"),use: "expose-loader?jQuery!expose-loader?$"},
- { test: /\.go$/, use: "gopherjs-loader"}
- ]
- }
- },
-
- buildConfig: function(){
- // NOTE: If you are having issues with this not being set "properly", make
- // sure your GO_ENV is set properly as `buffalo build` overrides NODE_ENV
- // with whatever GO_ENV is set to or "development".
- const env = process.env.NODE_ENV || "development";
-
- var config = {
- mode: env,
- entry: configurator.entries(),
- output: {filename: "[name].[hash].js", path: `${__dirname}/public/assets`},
- plugins: configurator.plugins(),
- module: configurator.moduleOptions(),
- resolve: {
- extensions: ['.ts', '.js', '.json']
- }
- }
-
- if( env === "development" ){
- config.plugins.push(new LiveReloadPlugin({appendScriptTag: true}))
- return config
- }
-
- const terser = new TerserPlugin({
- terserOptions: {
- compress: {},
- mangle: {
- keep_fnames: true
- },
- output: {
- comments: false,
- },
- },
- extractComments: false,
- })
-
- config.optimization = {
- minimizer: [terser]
- }
-
- return config
- }
-}
-
-module.exports = configurator.buildConfig()
diff --git a/genny/assets/webpack/webpack-packr.go b/genny/assets/webpack/webpack-packr.go
deleted file mode 100644
index 7370ca82b..000000000
--- a/genny/assets/webpack/webpack-packr.go
+++ /dev/null
@@ -1,8 +0,0 @@
-// +build !skippackr
-// Code generated by github.com/gobuffalo/packr/v2. DO NOT EDIT.
-
-// You can use the "packr clean" command to clean up this,
-// and any other packr generated files.
-package webpack
-
-import _ "github.com/gobuffalo/buffalo/packrd"
diff --git a/genny/assets/webpack/webpack.go b/genny/assets/webpack/webpack.go
deleted file mode 100644
index 0525a6318..000000000
--- a/genny/assets/webpack/webpack.go
+++ /dev/null
@@ -1,102 +0,0 @@
-package webpack
-
-import (
- "fmt"
- "os/exec"
- "path/filepath"
- "runtime"
-
- "github.com/gobuffalo/genny/v2"
- "github.com/gobuffalo/genny/v2/gogen"
- "github.com/gobuffalo/packr/v2"
-)
-
-// BinPath is the path to the local install of webpack
-var BinPath = func() string {
- s := filepath.Join("node_modules", ".bin", "webpack")
- if runtime.GOOS == "windows" {
- s += ".cmd"
- }
- return s
-}()
-
-// Templates used for generating webpack
-// (exported mostly for the "fix" command)
-var Templates = packr.New("github.com/gobuffalo/buffalo/genny/assets/webpack", "../webpack/templates")
-
-// New generator for creating webpack asset files
-func New(opts *Options) (*genny.Generator, error) {
- g := genny.New()
-
- if err := opts.Validate(); err != nil {
- return g, err
- }
-
- g.RunFn(func(r *genny.Runner) error {
- if opts.App.WithYarn {
- if _, err := r.LookPath("yarnpkg"); err == nil {
- return nil
- }
- // If yarn is not installed, it still can be installed with npm.
- }
- if _, err := r.LookPath("npm"); err != nil {
- return fmt.Errorf("could not find npm executable")
- }
- return nil
- })
-
- g.Box(Templates)
-
- data := map[string]interface{}{
- "opts": opts,
- }
- t := gogen.TemplateTransformer(data, gogen.TemplateHelpers)
- g.Transformer(t)
- g.Transformer(genny.Dot())
-
- g.RunFn(func(r *genny.Runner) error {
- return installPkgs(r, opts)
- })
-
- return g, nil
-}
-
-func installPkgs(r *genny.Runner, opts *Options) error {
- command := "yarnpkg"
-
- if !opts.App.WithYarn {
- command = "npm"
- } else {
- if err := installYarn(r); err != nil {
- return err
- }
- }
- args := []string{"install", "--no-progress", "--save"}
-
- c := exec.Command(command, args...)
- c.Stdout = yarnWriter{
- fn: r.Logger.Debug,
- }
- c.Stderr = yarnWriter{
- fn: r.Logger.Debug,
- }
- return r.Exec(c)
-}
-
-type yarnWriter struct {
- fn func(...interface{})
-}
-
-func (y yarnWriter) Write(p []byte) (int, error) {
- y.fn(string(p))
- return len(p), nil
-}
-
-func installYarn(r *genny.Runner) error {
- // if there's no yarn, install it!
- if _, err := r.LookPath("yarnpkg"); err == nil {
- return nil
- }
- yargs := []string{"install", "-g", "yarn"}
- return r.Exec(exec.Command("npm", yargs...))
-}
diff --git a/genny/assets/webpack/webpack_test.go b/genny/assets/webpack/webpack_test.go
deleted file mode 100644
index 3f8dfb862..000000000
--- a/genny/assets/webpack/webpack_test.go
+++ /dev/null
@@ -1,93 +0,0 @@
-package webpack
-
-import (
- "strings"
- "testing"
-
- "github.com/gobuffalo/genny/v2"
- "github.com/gobuffalo/genny/v2/gentest"
- "github.com/gobuffalo/meta"
- "github.com/stretchr/testify/require"
-)
-
-func runner() *genny.Runner {
- run := gentest.NewRunner()
- run.Disk.Add(genny.NewFileS("templates/application.plush.html", layout))
- run.LookPathFn = func(s string) (string, error) {
- return s, nil
- }
- return run
-}
-
-func Test_Webpack_New(t *testing.T) {
- r := require.New(t)
-
- g, err := New(&Options{})
- r.NoError(err)
-
- run := runner()
-
- run.With(g)
- r.NoError(run.Run())
-
- res := run.Results()
-
- r.Len(res.Commands, 1)
- c := res.Commands[0]
- r.Equal("npm install --no-progress --save", strings.Join(c.Args, " "))
-
- files := []string{
- ".babelrc",
- "assets/css/_buffalo.scss",
- "assets/css/application.scss",
- "assets/images/favicon.ico",
- "assets/images/logo.svg",
- "assets/js/application.js",
- "package.json",
- "postcss.config.js",
- "public/assets/.keep",
- "templates/application.plush.html",
- "webpack.config.js",
- }
- r.Len(res.Files, len(files))
- for i, f := range res.Files {
- r.Equal(files[i], f.Name())
- }
-
- f, err := res.Find("package.json")
- r.NoError(err)
- r.Contains(f.String(), `"bootstrap": "4.`)
-
-}
-
-func Test_Webpack_New_WithYarn(t *testing.T) {
- r := require.New(t)
-
- g, err := New(&Options{
- App: meta.App{WithYarn: true},
- })
- r.NoError(err)
-
- run := runner()
- run.With(g)
- r.NoError(run.Run())
-
- res := run.Results()
- r.Len(res.Commands, 1)
- r.Len(res.Files, 11)
-
- c := res.Commands[0]
- r.Equal("yarnpkg install --no-progress --save", strings.Join(c.Args, " "))
-}
-
-const layout = `
-
-
- Buffalo - Foo
- <%= stylesheetTag("buffalo.css") %>
- <%= stylesheetTag("application.css") %>
-
-
-
-
-`
diff --git a/genny/build/_fixtures/coke/README.md b/genny/build/_fixtures/coke/README.md
deleted file mode 100644
index b01f313a8..000000000
--- a/genny/build/_fixtures/coke/README.md
+++ /dev/null
@@ -1,35 +0,0 @@
-# Welcome to Buffalo!
-
-Thank you for choosing Buffalo for your web development needs.
-
-## Database Setup
-
-It looks like you chose to set up your application using a postgres database! Fantastic!
-
-The first thing you need to do is open up the "database.yml" file and edit it to use the correct usernames, passwords, hosts, etc... that are appropriate for your environment.
-
-You will also need to make sure that **you** start/install the database of your choice. Buffalo **won't** install and start postgres for you.
-
-### Create Your Databases
-
-Ok, so you've edited the "database.yml" file and started postgres, now Buffalo can create the databases in that file for you:
-
- $ buffalo pop create -a
-
-## Starting the Application
-
-Buffalo ships with a command that will watch your application and automatically rebuild the Go binary and any assets for you. To do that run the "buffalo dev" command:
-
- $ buffalo dev
-
-If you point your browser to [http://127.0.0.1:3000](http://127.0.0.1:3000) you should see a "Welcome to Buffalo!" page.
-
-**Congratulations!** You now have your Buffalo application up and running.
-
-## What Next?
-
-We recommend you heading over to [http://gobuffalo.io](http://gobuffalo.io) and reviewing all of the great documentation there.
-
-Good luck!
-
-[Powered by Buffalo](http://gobuffalo.io)
diff --git a/genny/build/_fixtures/coke/actions/actions_test.go b/genny/build/_fixtures/coke/actions/actions_test.go
deleted file mode 100644
index 73118ef07..000000000
--- a/genny/build/_fixtures/coke/actions/actions_test.go
+++ /dev/null
@@ -1,24 +0,0 @@
-package actions
-
-import (
- "testing"
-
- "github.com/gobuffalo/packr/v2"
- "github.com/gobuffalo/suite"
-)
-
-type ActionSuite struct {
- *suite.Action
-}
-
-func Test_ActionSuite(t *testing.T) {
- action, err := suite.NewActionWithFixtures(App(), packr.New("../fixtures", "../fixtures"))
- if err != nil {
- t.Fatal(err)
- }
-
- as := &ActionSuite{
- Action: action,
- }
- suite.Run(t, as)
-}
diff --git a/genny/build/_fixtures/coke/actions/app.go b/genny/build/_fixtures/coke/actions/app.go
deleted file mode 100644
index 07595f5dd..000000000
--- a/genny/build/_fixtures/coke/actions/app.go
+++ /dev/null
@@ -1,90 +0,0 @@
-package actions
-
-import (
- "github.com/gobuffalo/buffalo"
- "github.com/gobuffalo/buffalo-pop/v2/pop/popmw"
- "github.com/gobuffalo/envy"
- csrf "github.com/gobuffalo/mw-csrf"
- forcessl "github.com/gobuffalo/mw-forcessl"
- i18n "github.com/gobuffalo/mw-i18n"
- paramlogger "github.com/gobuffalo/mw-paramlogger"
- "github.com/gobuffalo/packr/v2"
- "github.com/markbates/coke/models"
- "github.com/unrolled/secure"
-)
-
-// ENV is used to help switch settings based on where the
-// application is being run. Default is "development".
-var ENV = envy.Get("GO_ENV", "development")
-var app *buffalo.App
-var T *i18n.Translator
-
-// App is where all routes and middleware for buffalo
-// should be defined. This is the nerve center of your
-// application.
-//
-// Routing, middleware, groups, etc... are declared TOP -> DOWN.
-// This means if you add a middleware to `app` *after* declaring a
-// group, that group will NOT have that new middleware. The same
-// is true of resource declarations as well.
-//
-// It also means that routes are checked in the order they are declared.
-// `ServeFiles` is a CATCH-ALL route, so it should always be
-// placed last in the route declarations, as it will prevent routes
-// declared after it to never be called.
-func App() *buffalo.App {
- if app == nil {
- app = buffalo.New(buffalo.Options{
- Env: ENV,
- SessionName: "_coke_session",
- })
-
- // Automatically redirect to SSL
- app.Use(forceSSL())
-
- // Log request parameters (filters apply).
- app.Use(paramlogger.ParameterLogger)
-
- // Protect against CSRF attacks. https://www.owasp.org/index.php/Cross-Site_Request_Forgery_(CSRF)
- // Remove to disable this.
- app.Use(csrf.New)
-
- // Wraps each request in a transaction.
- // c.Value("tx").(*pop.Connection)
- // Remove to disable this.
- app.Use(popmw.Transaction(models.DB))
-
- // Setup and use translations:
- app.Use(translations())
-
- app.GET("/", HomeHandler)
-
- app.ServeFiles("/", assetsBox) // serve files from the public directory
- }
-
- return app
-}
-
-// translations will load locale files, set up the translator `actions.T`,
-// and will return a middleware to use to load the correct locale for each
-// request.
-// for more information: https://gobuffalo.io/en/docs/localization
-func translations() buffalo.MiddlewareFunc {
- var err error
- if T, err = i18n.New(packr.New("../locales", "../locales"), "en-US"); err != nil {
- app.Stop(err)
- }
- return T.Middleware()
-}
-
-// forceSSL will return a middleware that will redirect an incoming request
-// if it is not HTTPS. "http://example.com" => "https://example.com".
-// This middleware does **not** enable SSL. for your application. To do that
-// we recommend using a proxy: https://gobuffalo.io/en/docs/proxy
-// for more information: https://github.com/unrolled/secure/
-func forceSSL() buffalo.MiddlewareFunc {
- return forcessl.Middleware(secure.Options{
- SSLRedirect: ENV == "production",
- SSLProxyHeaders: map[string]string{"X-Forwarded-Proto": "https"},
- })
-}
diff --git a/genny/build/_fixtures/coke/actions/home.go b/genny/build/_fixtures/coke/actions/home.go
deleted file mode 100644
index b1e903198..000000000
--- a/genny/build/_fixtures/coke/actions/home.go
+++ /dev/null
@@ -1,13 +0,0 @@
-package actions
-
-import (
- "net/http"
-
- "github.com/gobuffalo/buffalo"
-)
-
-// HomeHandler is a default handler to serve up
-// a home page.
-func HomeHandler(c buffalo.Context) error {
- return c.Render(http.StatusOK, r.HTML("index.html"))
-}
diff --git a/genny/build/_fixtures/coke/actions/home_test.go b/genny/build/_fixtures/coke/actions/home_test.go
deleted file mode 100644
index 04d750a04..000000000
--- a/genny/build/_fixtures/coke/actions/home_test.go
+++ /dev/null
@@ -1,9 +0,0 @@
-package actions
-
-import "net/http"
-
-func (as *ActionSuite) Test_HomeHandler() {
- res := as.HTML("/").Get()
- as.Equal(http.StatusOK, res.Code)
- as.Contains(res.Body.String(), "Welcome to Buffalo")
-}
diff --git a/genny/build/_fixtures/coke/actions/render.go b/genny/build/_fixtures/coke/actions/render.go
deleted file mode 100644
index 55789a659..000000000
--- a/genny/build/_fixtures/coke/actions/render.go
+++ /dev/null
@@ -1,27 +0,0 @@
-package actions
-
-import (
- "github.com/gobuffalo/buffalo/render"
- "github.com/gobuffalo/packr/v2"
-)
-
-var r *render.Engine
-var assetsBox = packr.NewBox("app:assets", "../public")
-
-func init() {
- r = render.New(render.Options{
- // HTML layout to be used for all HTML requests:
- HTMLLayout: "application.plush.html",
-
- // Box containing all of the templates:
- TemplatesBox: packr.New("../templates", "../templates"),
- AssetsBox: assetsBox,
-
- // Add template helpers here:
- Helpers: render.Helpers{
- // uncomment for non-Bootstrap form helpers:
- // "form": plush.FormHelper,
- // "form_for": plush.FormForHelper,
- },
- })
-}
diff --git a/genny/build/_fixtures/coke/assets/css/_buffalo.scss b/genny/build/_fixtures/coke/assets/css/_buffalo.scss
deleted file mode 100644
index 350270fd9..000000000
--- a/genny/build/_fixtures/coke/assets/css/_buffalo.scss
+++ /dev/null
@@ -1,118 +0,0 @@
-.container {
- min-width: 320px;
-}
-
-header {
- background-color: #62a5ee;
- padding: 10px 20px;
- box-sizing: border-box;
-}
-
-.logo img {
- width: 80px;
-}
-
-.titles h1 {
- font-size: 30px;
- font-weight: 300;
- color: white;
- margin-bottom: 13px;
- margin-top: 5px;
-}
-
-.titles h2 {
- font-weight: 300;
- font-size: 18px;
- display: inline-block;
- margin: 0;
-}
-
-.titles a {
- color: white;
- text-decoration: underline;
-}
-
-.titles i {
- margin-right: 5px;
- text-decoration: none;
-}
-
-.titles .documentation {
- margin-left: 28px;
-}
-
-.subtitle {
- color: white;
- margin: 0;
- padding: 13px 0;
- background-color: #2a3543;
- margin-bottom: 20px;
-}
-
-.subtitle h3 {
- font-size: 22px;
- font-weight: 400;
- margin: 0;
-}
-
-table {
- font-size: 14px;
-}
-
-table.table tbody tr td {
- border-top: 0;
- padding: 10px;
-}
-
-.foot {
- text-align: right;
- color: #c5c5c5;
- font-weight: 300;
-}
-
-.foot a {
- color: #8b8b8b;
- text-decoration: underline;
-}
-
-.centered {
- text-align: center;
-}
-
-@media all and (max-width: 770px) {
- .titles h1 {
- font-size: 25px;
- margin: 15px 0 5px 0;
- }
-}
-
-@media all and (max-width: 640px) {
- .titles h1 {
- font-size: 23px;
- margin: 15px 0 5px 0;
- }
- .titles h2 {
- font-size: 15px;
- }
- .titles .documentation {
- margin-left: 10px;
- }
-}
-
-@media all and (max-width: 530px) {
- .titles h1 {
- font-size: 20px;
- margin: 5px 0;
- }
- .logo {
- padding: 0
- }
- .logo img {
- width: 100%
- }
- .titles .documentation {
- margin-left: 0px;
- margin-top: 5px;
- display: block;
- }
-}
\ No newline at end of file
diff --git a/genny/build/_fixtures/coke/assets/css/application.scss b/genny/build/_fixtures/coke/assets/css/application.scss
deleted file mode 100644
index 3c5a40304..000000000
--- a/genny/build/_fixtures/coke/assets/css/application.scss
+++ /dev/null
@@ -1,4 +0,0 @@
-@import "~bootstrap/scss/bootstrap.scss";
-@import "~font-awesome/css/font-awesome.css";
-
-@import "buffalo"
\ No newline at end of file
diff --git a/genny/build/_fixtures/coke/assets/images/favicon.ico b/genny/build/_fixtures/coke/assets/images/favicon.ico
deleted file mode 100644
index 463b634a7..000000000
Binary files a/genny/build/_fixtures/coke/assets/images/favicon.ico and /dev/null differ
diff --git a/genny/build/_fixtures/coke/assets/images/logo.svg b/genny/build/_fixtures/coke/assets/images/logo.svg
deleted file mode 100644
index 0d1f29ef7..000000000
--- a/genny/build/_fixtures/coke/assets/images/logo.svg
+++ /dev/null
@@ -1,721 +0,0 @@
-
-
-
-
diff --git a/genny/build/_fixtures/coke/assets/js/application.js b/genny/build/_fixtures/coke/assets/js/application.js
deleted file mode 100644
index 9b457c511..000000000
--- a/genny/build/_fixtures/coke/assets/js/application.js
+++ /dev/null
@@ -1,5 +0,0 @@
-require("expose-loader?$!expose-loader?jQuery!jquery");
-require("bootstrap/dist/js/bootstrap.bundle.js");
-$(() => {
-
-});
diff --git a/genny/build/_fixtures/coke/config/buffalo-app.toml b/genny/build/_fixtures/coke/config/buffalo-app.toml
deleted file mode 100644
index e3e1c3cba..000000000
--- a/genny/build/_fixtures/coke/config/buffalo-app.toml
+++ /dev/null
@@ -1,12 +0,0 @@
-name = "coke"
-bin = "bin/coke"
-vcs = "git"
-with_pop = true
-with_sqlite = false
-with_dep = false
-with_webpack = true
-with_yarn = true
-with_docker = true
-with_grifts = false
-as_web = true
-as_api = false
diff --git a/genny/build/_fixtures/coke/config/buffalo-plugins.toml b/genny/build/_fixtures/coke/config/buffalo-plugins.toml
deleted file mode 100644
index c17b4e7bb..000000000
--- a/genny/build/_fixtures/coke/config/buffalo-plugins.toml
+++ /dev/null
@@ -1,7 +0,0 @@
-[[plugin]]
- binary = "buffalo-docker"
- go_get = "github.com/gobuffalo/buffalo-docker"
-
-[[plugin]]
- binary = "buffalo-pop"
- go_get = "github.com/gobuffalo/buffalo-pop"
diff --git a/genny/build/_fixtures/coke/config/database.yml b/genny/build/_fixtures/coke/config/database.yml
deleted file mode 100644
index 6d1d7e796..000000000
--- a/genny/build/_fixtures/coke/config/database.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-development:
- dialect: postgres
- database: coke_development
- user: postgres
- password: postgres
- host: 127.0.0.1
- pool: 5
-
-test:
- url: {{envOr "TEST_DATABASE_URL" "postgres://postgres:postgres@127.0.0.1:5432/coke_test?sslmode=disable"}}
-
-production:
- url: {{envOr "DATABASE_URL" "postgres://postgres:postgres@127.0.0.1:5432/coke_production?sslmode=disable"}}
diff --git a/genny/build/_fixtures/coke/fixtures/sample.toml b/genny/build/_fixtures/coke/fixtures/sample.toml
deleted file mode 100644
index b9281d496..000000000
--- a/genny/build/_fixtures/coke/fixtures/sample.toml
+++ /dev/null
@@ -1,32 +0,0 @@
-[[scenario]]
-name = "lots of widgets"
-
- [[scenario.table]]
- name = "widgets"
-
- [[scenario.table.row]]
- id = "<%= uuidNamed("widget") %>"
- name = "This is widget #1"
- body = "some widget body"
- created_at = "<%= now() %>"
- updated_at = "<%= now() %>"
-
- [[scenario.table.row]]
- id = "<%= uuid() %>"
- name = "This is widget #2"
- body = "some widget body"
- created_at = "<%= now() %>"
- updated_at = "<%= now() %>"
-
- [[scenario.table]]
- name = "users"
-
- [[scenario.table.row]]
- id = "<%= uuid() %>"
- name = "Mark Bates"
- admin = true
- age = 41
- widget_id = "<%= uuidNamed("widget") %>"
- created_at = "<%= now() %>"
- updated_at = "<%= now() %>"
-
diff --git a/genny/build/_fixtures/coke/grifts/db.go b/genny/build/_fixtures/coke/grifts/db.go
deleted file mode 100644
index 1164b41f6..000000000
--- a/genny/build/_fixtures/coke/grifts/db.go
+++ /dev/null
@@ -1,15 +0,0 @@
-package grifts
-
-import (
- "github.com/markbates/grift/grift"
-)
-
-var _ = grift.Namespace("db", func() {
-
- grift.Desc("seed", "Seeds a database")
- grift.Add("seed", func(c *grift.Context) error {
- // Add DB seeding stuff here
- return nil
- })
-
-})
diff --git a/genny/build/_fixtures/coke/grifts/init.go b/genny/build/_fixtures/coke/grifts/init.go
deleted file mode 100644
index 73c0c3939..000000000
--- a/genny/build/_fixtures/coke/grifts/init.go
+++ /dev/null
@@ -1,10 +0,0 @@
-package grifts
-
-import (
- "github.com/gobuffalo/buffalo"
- "github.com/markbates/coke/actions"
-)
-
-func init() {
- buffalo.Grifts(actions.App())
-}
diff --git a/genny/build/_fixtures/coke/inflections.json b/genny/build/_fixtures/coke/inflections.json
deleted file mode 100644
index ef0214f3a..000000000
--- a/genny/build/_fixtures/coke/inflections.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "singular": "plural"
-}
diff --git a/genny/build/_fixtures/coke/locales/all.en-us.yaml b/genny/build/_fixtures/coke/locales/all.en-us.yaml
deleted file mode 100644
index 6514e2100..000000000
--- a/genny/build/_fixtures/coke/locales/all.en-us.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-# For more information on using i18n see: https://github.com/nicksnyder/go-i18n
-- id: welcome_greeting
- translation: "Welcome to Buffalo (EN)"
diff --git a/genny/build/_fixtures/coke/main.go b/genny/build/_fixtures/coke/main.go
deleted file mode 100644
index 147f1013e..000000000
--- a/genny/build/_fixtures/coke/main.go
+++ /dev/null
@@ -1,38 +0,0 @@
-package main
-
-import (
- "log"
-
- "github.com/markbates/coke/actions"
-)
-
-// main is the starting point for your Buffalo application.
-// You can feel free and add to this `main` method, change
-// what it does, etc...
-// All we ask is that, at some point, you make sure to
-// call `app.Serve()`, unless you don't want to start your
-// application that is. :)
-func main() {
- app := actions.App()
- if err := app.Serve(); err != nil {
- log.Fatal(err)
- }
-}
-
-/*
-# Notes about `main.go`
-
-## SSL Support
-
-We recommend placing your application behind a proxy, such as
-Apache or Nginx and letting them do the SSL heavy lifting
-for you. https://gobuffalo.io/en/docs/proxy
-
-## Buffalo Build
-
-When `buffalo build` is run to compile your binary, this `main`
-function will be at the heart of that binary. It is expected
-that your `main` function will start your application using
-the `app.Serve()` method.
-
-*/
diff --git a/genny/build/_fixtures/coke/models/models.go b/genny/build/_fixtures/coke/models/models.go
deleted file mode 100644
index 69b6747a8..000000000
--- a/genny/build/_fixtures/coke/models/models.go
+++ /dev/null
@@ -1,22 +0,0 @@
-package models
-
-import (
- "log"
-
- "github.com/gobuffalo/envy"
- "github.com/gobuffalo/pop/v5"
-)
-
-// DB is a connection to your database to be used
-// throughout your application.
-var DB *pop.Connection
-
-func init() {
- var err error
- env := envy.Get("GO_ENV", "development")
- DB, err = pop.Connect(env)
- if err != nil {
- log.Fatal(err)
- }
- pop.Debug = env == "development"
-}
diff --git a/genny/build/_fixtures/coke/models/models_test.go b/genny/build/_fixtures/coke/models/models_test.go
deleted file mode 100644
index c8cb6199f..000000000
--- a/genny/build/_fixtures/coke/models/models_test.go
+++ /dev/null
@@ -1,24 +0,0 @@
-package models_test
-
-import (
- "testing"
-
- "github.com/gobuffalo/packr/v2"
- "github.com/gobuffalo/suite"
-)
-
-type ModelSuite struct {
- *suite.Model
-}
-
-func Test_ModelSuite(t *testing.T) {
- model, err := suite.NewModelWithFixtures(packr.New("../fixtures", "../fixtures"))
- if err != nil {
- t.Fatal(err)
- }
-
- as := &ModelSuite{
- Model: model,
- }
- suite.Run(t, as)
-}
diff --git a/genny/build/_fixtures/coke/package.json b/genny/build/_fixtures/coke/package.json
deleted file mode 100644
index c1ca5e7e0..000000000
--- a/genny/build/_fixtures/coke/package.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
- "name": "buffalo",
- "version": "1.0.0",
- "main": "index.js",
- "license": "MIT",
- "scripts": {
- "dev": "webpack --watch",
- "build": "webpack -p --progress"
- },
- "repository": "github.com/gobuffalo/buffalo",
- "dependencies": {
- "@fortawesome/fontawesome-free": "^5.12.0",
- "bootstrap": "4.5.2",
- "jquery": "3.5.1",
- "jquery-ujs": "~1.2.2",
- "popper.js": "^1.16.1"
- },
- "devDependencies": {
- "@babel/core": "^7.9.0",
- "@babel/preset-env": "^7.9.5",
- "babel-loader": "^8.1.0",
- "copy-webpack-plugin": "~6.1.0",
- "css-loader": "~3.5.1",
- "expose-loader": "~0.7.5",
- "file-loader": "~6.0.0",
- "gopherjs-loader": "^0.0.1",
- "mini-css-extract-plugin": "^0.11.0",
- "node-sass": "~4.14.1",
- "npm-install-webpack-plugin": "4.0.5",
- "sass-loader": "~8.0.2",
- "style-loader": "~1.1.3",
- "terser-webpack-plugin": "~4.1.0",
- "url-loader": "~4.1.0",
- "webpack": "~4.42.1",
- "webpack-clean-obsolete-chunks": "^0.4.0",
- "webpack-cli": "^4.0.0-beta.8",
- "webpack-livereload-plugin": "~2.3.0",
- "webpack-manifest-plugin": "~2.2.0"
- }
-}
diff --git a/genny/build/_fixtures/coke/public/assets/.keep b/genny/build/_fixtures/coke/public/assets/.keep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/genny/build/_fixtures/coke/public/robots.txt b/genny/build/_fixtures/coke/public/robots.txt
deleted file mode 100644
index 1f53798bb..000000000
--- a/genny/build/_fixtures/coke/public/robots.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-User-agent: *
-Disallow: /
diff --git a/genny/build/_fixtures/coke/templates/_flash.html b/genny/build/_fixtures/coke/templates/_flash.html
deleted file mode 100644
index adc4b27ba..000000000
--- a/genny/build/_fixtures/coke/templates/_flash.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
- <%= for (k, messages) in flash { %>
- <%= for (msg) in messages { %>
-
- <%= msg %>
-
-
- <% } %>
- <% } %>
-
-
- <%= partial("flash.html") %>
- <%= yield %>
-
-
- <%= javascriptTag("application.js") %>
-
-
diff --git a/genny/build/_fixtures/coke/templates/index.html b/genny/build/_fixtures/coke/templates/index.html
deleted file mode 100644
index 320a5860f..000000000
--- a/genny/build/_fixtures/coke/templates/index.html
+++ /dev/null
@@ -1,64 +0,0 @@
-
-
-
-
-
 %>assets/images/logo.svg)
-
-
-
<%= t("welcome_greeting") %>
-
-
-
-
-
-
-
-
-
-
-
- | METHOD |
- PATH |
- NAME |
- HANDLER |
-
-
-
-
- <%= for (r) in routes { %>
-
- |
- <%= r.Method %>
- |
-
- <%= if (r.Method != "GET" || r.Path ~= "{") { %>
- <%= r.Path %>
- <% } else { %>
- <%= r.Path %>
- <% } %>
- |
-
- <%= r.PathName %>
- |
- <%= r.HandlerName %> |
-
- <% } %>
-
-
-
-
-
-
templates/mailers/layout.plush.html
-
-<%= yield %>
diff --git a/genny/mail/mail-packr.go b/genny/mail/mail-packr.go
deleted file mode 100644
index 5f3e353ab..000000000
--- a/genny/mail/mail-packr.go
+++ /dev/null
@@ -1,8 +0,0 @@
-// +build !skippackr
-// Code generated by github.com/gobuffalo/packr/v2. DO NOT EDIT.
-
-// You can use the "packr clean" command to clean up this,
-// and any other packr generated files.
-package mail
-
-import _ "github.com/gobuffalo/buffalo/packrd"
diff --git a/genny/mail/mail.go b/genny/mail/mail.go
deleted file mode 100644
index 3a2afc489..000000000
--- a/genny/mail/mail.go
+++ /dev/null
@@ -1,86 +0,0 @@
-package mail
-
-import (
- "text/template"
-
- "github.com/gobuffalo/genny/v2"
- "github.com/gobuffalo/genny/v2/gogen"
- "github.com/gobuffalo/packr/v2"
-)
-
-// New mailer generator. It will init the mailers directory if it doesn't already exist
-func New(opts *Options) (*genny.Group, error) {
- gg := &genny.Group{}
-
- if err := opts.Validate(); err != nil {
- return gg, err
- }
-
- if !opts.SkipInit {
- g, err := initGenerator(opts)
- if err != nil {
- return gg, err
- }
- gg.Add(g)
- }
-
- g := genny.New()
- h := template.FuncMap{}
- data := map[string]interface{}{
- "opts": opts,
- }
- t := gogen.TemplateTransformer(data, h)
- g.Transformer(t)
-
- fn := opts.Name.File().String()
- g.File(genny.NewFileS("mailers/"+fn+".go.tmpl", mailerTmpl))
- g.File(genny.NewFileS("templates/mail/"+fn+".plush.html.tmpl", mailTmpl))
- gg.Add(g)
-
- return gg, nil
-}
-
-func initGenerator(opts *Options) (*genny.Generator, error) {
- g := genny.New()
-
- g.Box(packr.New("github.com/gobuffalo/buffalo/genny/mail/init/templates", "../mail/init/templates"))
- h := template.FuncMap{}
- data := map[string]interface{}{
- "opts": opts,
- }
- t := gogen.TemplateTransformer(data, h)
- g.Transformer(t)
-
- g.Should = func(r *genny.Runner) bool {
- _, err := r.FindFile("mailers/mailers.go")
- return err != nil
- }
- opts.Name.Titleize()
- return g, nil
-}
-
-const mailerTmpl = `package mailers
-
-import (
- "github.com/gobuffalo/buffalo/render"
- "github.com/gobuffalo/buffalo/mail"
-)
-
-func Send{{.opts.Name.Resource}}() error {
- m := mail.NewMessage()
-
- // fill in with your stuff:
- m.Subject = "{{.opts.Name.Titleize}}"
- m.From = ""
- m.To = []string{}
- err := m.AddBody(r.HTML("{{.opts.Name.File}}.html"), render.Data{})
- if err != nil {
- return err
- }
- return smtp.Send(m)
-}
-`
-
-const mailTmpl = `{{.opts.Name.Titleize}}
-
-../templates/mail/{{.opts.Name.File}}.plush.html
`
diff --git a/genny/mail/mail_test.go b/genny/mail/mail_test.go
deleted file mode 100644
index a84121320..000000000
--- a/genny/mail/mail_test.go
+++ /dev/null
@@ -1,66 +0,0 @@
-package mail
-
-import (
- "testing"
-
- "github.com/gobuffalo/flect/name"
- "github.com/gobuffalo/genny/v2"
- "github.com/gobuffalo/genny/v2/gentest"
- "github.com/stretchr/testify/require"
-)
-
-func Test_New_NoMailers(t *testing.T) {
- r := require.New(t)
- gg, err := New(&Options{Name: name.New("foo")})
- r.NoError(err)
-
- run := gentest.NewRunner()
- gg.With(run)
- r.NoError(run.Run())
-
- res := run.Results()
- r.Len(res.Commands, 0)
- r.Len(res.Files, 4)
-
- f := res.Files[0]
- r.Equal("mailers/foo.go", f.Name())
- body := f.String()
- r.Contains(body, `err := m.AddBody(r.HTML("foo.html"), render.Data{})`)
-
- f = res.Files[1]
- r.Equal("mailers/mailers.go", f.Name())
-
- f = res.Files[2]
- r.Equal("templates/mail/foo.plush.html", f.Name())
- body = f.String()
- r.Contains(body, `../templates/mail/foo.plush.html
`)
-
- f = res.Files[3]
- r.Equal("templates/mail/layout.plush.html", f.Name())
-}
-
-func Test_New_WithMailers(t *testing.T) {
- r := require.New(t)
-
- run := gentest.NewRunner()
- run.Disk.Add(genny.NewFileS("mailers/mailers.go", ""))
-
- gg, err := New(&Options{Name: name.New("foo")})
- r.NoError(err)
- gg.With(run)
- r.NoError(run.Run())
-
- res := run.Results()
- r.Len(res.Commands, 0)
- r.Len(res.Files, 3)
-
- f := res.Files[0]
- r.Equal("mailers/foo.go", f.Name())
- body := f.String()
- r.Contains(body, `err := m.AddBody(r.HTML("foo.html"), render.Data{})`)
-
- f = res.Files[2]
- r.Equal("templates/mail/foo.plush.html", f.Name())
- body = f.String()
- r.Contains(body, `../templates/mail/foo.plush.html
`)
-}
diff --git a/genny/mail/options.go b/genny/mail/options.go
deleted file mode 100644
index abd7bd01e..000000000
--- a/genny/mail/options.go
+++ /dev/null
@@ -1,27 +0,0 @@
-package mail
-
-import (
- "fmt"
-
- "github.com/gobuffalo/flect/name"
- "github.com/gobuffalo/meta"
-)
-
-// Options needed to create a new mailer
-type Options struct {
- App meta.App `json:"app"`
- Name name.Ident `json:"name"`
- SkipInit bool `json:"skip_init"`
-}
-
-// Validate options are useful
-func (opts *Options) Validate() error {
- if opts.App.IsZero() {
- opts.App = meta.New(".")
- }
-
- if len(opts.Name.String()) == 0 {
- return fmt.Errorf("you must supply a name for your mailer")
- }
- return nil
-}
diff --git a/genny/newapp/api/api-packr.go b/genny/newapp/api/api-packr.go
deleted file mode 100644
index 488d9b971..000000000
--- a/genny/newapp/api/api-packr.go
+++ /dev/null
@@ -1,8 +0,0 @@
-// +build !skippackr
-// Code generated by github.com/gobuffalo/packr/v2. DO NOT EDIT.
-
-// You can use the "packr clean" command to clean up this,
-// and any other packr generated files.
-package api
-
-import _ "github.com/gobuffalo/buffalo/packrd"
diff --git a/genny/newapp/api/api.go b/genny/newapp/api/api.go
deleted file mode 100644
index 8e5bfa875..000000000
--- a/genny/newapp/api/api.go
+++ /dev/null
@@ -1,37 +0,0 @@
-package api
-
-import (
- "html/template"
-
- "github.com/gobuffalo/buffalo/genny/newapp/core"
- "github.com/gobuffalo/genny/v2"
- "github.com/gobuffalo/genny/v2/gogen"
- "github.com/gobuffalo/packr/v2"
-)
-
-// New generator for creating a Buffalo API application
-func New(opts *Options) (*genny.Group, error) {
- if err := opts.Validate(); err != nil {
- return nil, err
- }
-
- gg, err := core.New(opts.Options)
- if err != nil {
- return gg, err
- }
-
- g := genny.New()
- data := map[string]interface{}{
- "opts": opts,
- }
-
- helpers := template.FuncMap{}
-
- t := gogen.TemplateTransformer(data, helpers)
- g.Transformer(t)
- g.Box(packr.New("buffalo:genny:newapp:api", "../api/templates"))
-
- gg.Add(g)
-
- return gg, nil
-}
diff --git a/genny/newapp/api/api_test.go b/genny/newapp/api/api_test.go
deleted file mode 100644
index 4b9f26347..000000000
--- a/genny/newapp/api/api_test.go
+++ /dev/null
@@ -1,104 +0,0 @@
-package api
-
-import (
- "strings"
- "testing"
-
- "github.com/gobuffalo/buffalo/genny/newapp/core"
- "github.com/gobuffalo/envy"
- "github.com/gobuffalo/genny/v2/gentest"
- "github.com/gobuffalo/meta"
- "github.com/stretchr/testify/require"
-)
-
-func init() {
- // normalize command output
- envy.Set("GO_BIN", "go")
-}
-
-func Test_New(t *testing.T) {
- r := require.New(t)
-
- app := meta.Named("api", ".")
- (&app).PackageRoot("api")
- app.WithModules = false
- app.AsAPI = true
- app.AsWeb = false
-
- gg, err := New(&Options{
- Options: &core.Options{
- App: app,
- },
- })
- r.NoError(err)
-
- run := gentest.NewRunner()
- run.WithGroup(gg)
-
- r.NoError(run.Run())
-
- res := run.Results()
-
- cmds := []string{
- "go mod init api",
- }
- r.Len(res.Commands, len(cmds))
-
- for i, c := range res.Commands {
- r.Equal(cmds[i], strings.Join(c.Args, " "))
- }
-
- expected := commonExpected
- for _, e := range expected {
- _, err = res.Find(e)
- r.NoError(err)
- }
-
- f, err := res.Find("actions/render.go")
- r.NoError(err)
- r.Contains(f.String(), `DefaultContentType: "application/json",`)
-
- f, err = res.Find("actions/home.go")
- r.NoError(err)
- r.Contains(f.String(), `return c.Render(http.StatusOK, r.JSON(map[string]string{"message": "Welcome to Buffalo!"}))`)
-
- f, err = res.Find("actions/app.go")
- r.NoError(err)
- r.Contains(f.String(), `i18n "github.com/gobuffalo/mw-i18n"`)
- r.Contains(f.String(), `var T *i18n.Translator`)
- r.Contains(f.String(), `func translations() buffalo.MiddlewareFunc {`)
-
- f, err = res.Find("locales/all.en-us.yaml")
- r.NoError(err)
- r.Contains(f.String(), `translation: "Welcome to Buffalo (EN)"`)
-
- unexpected := []string{
- "Dockerfile",
- "database.yml",
- "models/models.go",
- "go.mod",
- ".buffalo.dev.yml",
- "assets/css/application.scss.css",
- "public/assets/application.js",
- }
-
- for _, u := range unexpected {
- _, err = res.Find(u)
- r.Error(err)
- }
-}
-
-var commonExpected = []string{
- "main.go",
- "actions/app.go",
- "actions/actions_test.go",
- "actions/render.go",
- "actions/home.go",
- "actions/home_test.go",
- "fixtures/sample.toml",
- "grifts/init.go",
- ".codeclimate.yml",
- ".env",
- "inflections.json",
- "README.md",
-}
diff --git a/genny/newapp/api/options.go b/genny/newapp/api/options.go
deleted file mode 100644
index 286c643ca..000000000
--- a/genny/newapp/api/options.go
+++ /dev/null
@@ -1,18 +0,0 @@
-package api
-
-import (
- "github.com/gobuffalo/buffalo/genny/newapp/core"
-)
-
-// Options for API applications
-type Options struct {
- *core.Options
-}
-
-// Validate that options are usuable
-func (opts *Options) Validate() error {
- if opts.Options == nil {
- opts.Options = &core.Options{}
- }
- return opts.Options.Validate()
-}
diff --git a/genny/newapp/api/options_test.go b/genny/newapp/api/options_test.go
deleted file mode 100644
index 778f64ec1..000000000
--- a/genny/newapp/api/options_test.go
+++ /dev/null
@@ -1 +0,0 @@
-package api
diff --git a/genny/newapp/api/templates/actions/app.go.tmpl b/genny/newapp/api/templates/actions/app.go.tmpl
deleted file mode 100644
index c5bbe8f0c..000000000
--- a/genny/newapp/api/templates/actions/app.go.tmpl
+++ /dev/null
@@ -1,95 +0,0 @@
-package actions
-
-import (
- "github.com/gobuffalo/envy"
- "github.com/gobuffalo/buffalo"
- forcessl "github.com/gobuffalo/mw-forcessl"
- paramlogger "github.com/gobuffalo/mw-paramlogger"
- "github.com/unrolled/secure"
- i18n "github.com/gobuffalo/mw-i18n"
-
- {{ if .opts.App.WithPop }}
- "{{.opts.App.ModelsPkg}}"
- "github.com/gobuffalo/buffalo-pop/v2/pop/popmw"
- {{ end -}}
-
- "github.com/rs/cors"
- "github.com/gobuffalo/x/sessions"
- contenttype "github.com/gobuffalo/mw-contenttype"
-)
-
-// ENV is used to help switch settings based on where the
-// application is being run. Default is "development".
-var ENV = envy.Get("GO_ENV", "development")
-var app *buffalo.App
-var T *i18n.Translator
-
-// App is where all routes and middleware for buffalo
-// should be defined. This is the nerve center of your
-// application.
-//
-// Routing, middleware, groups, etc... are declared TOP -> DOWN.
-// This means if you add a middleware to `app` *after* declaring a
-// group, that group will NOT have that new middleware. The same
-// is true of resource declarations as well.
-//
-// It also means that routes are checked in the order they are declared.
-// `ServeFiles` is a CATCH-ALL route, so it should always be
-// placed last in the route declarations, as it will prevent routes
-// declared after it to never be called.
-func App() *buffalo.App {
- if app == nil {
- app = buffalo.New(buffalo.Options{
- Env: ENV,
- SessionStore: sessions.Null{},
- PreWares: []buffalo.PreWare{
- cors.Default().Handler,
- },
- SessionName: "_{{.opts.App.Name.File}}_session",
- })
-
- // Automatically redirect to SSL
- app.Use(forceSSL())
-
- // Log request parameters (filters apply).
- app.Use(paramlogger.ParameterLogger)
-
- // Set the request content type to JSON
- app.Use(contenttype.Set("application/json"))
-
- {{ if .opts.App.WithPop }}
- // Wraps each request in a transaction.
- // c.Value("tx").(*pop.Connection)
- // Remove to disable this.
- app.Use(popmw.Transaction(models.DB))
- {{ end }}
-
- app.GET("/", HomeHandler)
- }
-
- return app
-}
-
-// translations will load locale files, set up the translator `actions.T`,
-// and will return a middleware to use to load the correct locale for each
-// request.
-// for more information: https://gobuffalo.io/en/docs/localization
-func translations() buffalo.MiddlewareFunc {
- var err error
- if T, err = i18n.New(packr.New("app:locales", "../locales"), "en-US"); err != nil {
- app.Stop(err)
- }
- return T.Middleware()
-}
-
-// forceSSL will return a middleware that will redirect an incoming request
-// if it is not HTTPS. "http://example.com" => "https://example.com".
-// This middleware does **not** enable SSL. for your application. To do that
-// we recommend using a proxy: https://gobuffalo.io/en/docs/proxy
-// for more information: https://github.com/unrolled/secure/
-func forceSSL() buffalo.MiddlewareFunc {
- return forcessl.Middleware(secure.Options{
- SSLRedirect: ENV == "production",
- SSLProxyHeaders: map[string]string{"X-Forwarded-Proto": "https"},
- })
-}
diff --git a/genny/newapp/api/templates/actions/home.go.tmpl b/genny/newapp/api/templates/actions/home.go.tmpl
deleted file mode 100644
index 8ef5cd430..000000000
--- a/genny/newapp/api/templates/actions/home.go.tmpl
+++ /dev/null
@@ -1,13 +0,0 @@
-package actions
-
-import (
- "net/http"
-
- "github.com/gobuffalo/buffalo"
-)
-
-// HomeHandler is a default handler to serve up
-// a home page.
-func HomeHandler(c buffalo.Context) error {
- return c.Render(http.StatusOK, r.JSON(map[string]string{"message": "Welcome to Buffalo!"}))
-}
diff --git a/genny/newapp/api/templates/actions/home_test.go.tmpl b/genny/newapp/api/templates/actions/home_test.go.tmpl
deleted file mode 100644
index d5cf583de..000000000
--- a/genny/newapp/api/templates/actions/home_test.go.tmpl
+++ /dev/null
@@ -1,10 +0,0 @@
-package actions
-
-import "net/http"
-
-func (as *ActionSuite) Test_HomeHandler() {
- res := as.JSON("/").Get()
-
- as.Equal(http.StatusOK, res.Code)
- as.Contains(res.Body.String(), "Welcome to Buffalo")
-}
diff --git a/genny/newapp/api/templates/actions/render.go.tmpl b/genny/newapp/api/templates/actions/render.go.tmpl
deleted file mode 100644
index 5ea169e52..000000000
--- a/genny/newapp/api/templates/actions/render.go.tmpl
+++ /dev/null
@@ -1,13 +0,0 @@
-package actions
-
-import (
- "github.com/gobuffalo/buffalo/render"
-)
-
-var r *render.Engine
-
-func init() {
- r = render.New(render.Options{
- DefaultContentType: "application/json",
- })
-}
diff --git a/genny/newapp/api/templates/locales/all.en-us.yaml.tmpl b/genny/newapp/api/templates/locales/all.en-us.yaml.tmpl
deleted file mode 100644
index 6514e2100..000000000
--- a/genny/newapp/api/templates/locales/all.en-us.yaml.tmpl
+++ /dev/null
@@ -1,3 +0,0 @@
-# For more information on using i18n see: https://github.com/nicksnyder/go-i18n
-- id: welcome_greeting
- translation: "Welcome to Buffalo (EN)"
diff --git a/genny/newapp/core/core-packr.go b/genny/newapp/core/core-packr.go
deleted file mode 100644
index 190c8a13d..000000000
--- a/genny/newapp/core/core-packr.go
+++ /dev/null
@@ -1,8 +0,0 @@
-// +build !skippackr
-// Code generated by github.com/gobuffalo/packr/v2. DO NOT EDIT.
-
-// You can use the "packr clean" command to clean up this,
-// and any other packr generated files.
-package core
-
-import _ "github.com/gobuffalo/buffalo/packrd"
diff --git a/genny/newapp/core/core.go b/genny/newapp/core/core.go
deleted file mode 100644
index 7c902827b..000000000
--- a/genny/newapp/core/core.go
+++ /dev/null
@@ -1,92 +0,0 @@
-package core
-
-import (
- pop "github.com/gobuffalo/buffalo-pop/v2/genny/newapp"
- "github.com/gobuffalo/buffalo/genny/ci"
- "github.com/gobuffalo/buffalo/genny/docker"
- "github.com/gobuffalo/buffalo/genny/plugins/install"
- "github.com/gobuffalo/buffalo/genny/refresh"
- "github.com/gobuffalo/buffalo/internal/takeon/github.com/markbates/errx"
- "github.com/gobuffalo/buffalo/plugins/plugdeps"
- "github.com/gobuffalo/genny/v2"
- "github.com/gobuffalo/meta"
-)
-
-// New generator for creating a Buffalo application
-func New(opts *Options) (*genny.Group, error) {
- gg := &genny.Group{}
-
- // add the root generator
- g, err := rootGenerator(opts)
- if err != nil {
- return gg, err
- }
- gg.Add(g)
-
- app := opts.App
-
- plugs, err := plugdeps.List(app)
- if err != nil && (errx.Unwrap(err) != plugdeps.ErrMissingConfig) {
- return nil, err
- }
-
- if opts.Docker != nil {
- // add the docker generator
- g, err = docker.New(opts.Docker)
- if err != nil {
- return gg, err
- }
- gg.Add(g)
- }
-
- if opts.Pop != nil {
- // add the pop generator
- gg2, err := pop.New(opts.Pop)
- if err != nil {
- return gg, err
- }
- gg.Merge(gg2)
-
- // add the plugin
- plugs.Add(plugdeps.Plugin{
- Binary: "buffalo-pop",
- GoGet: "github.com/gobuffalo/buffalo-pop/v2",
- })
- }
-
- if opts.CI != nil {
- // add the CI generator
- g, err = ci.New(opts.CI)
- if err != nil {
- return gg, err
- }
- gg.Add(g)
- }
-
- if opts.Refresh != nil {
- g, err = refresh.New(opts.Refresh)
- if err != nil {
- return gg, err
- }
- gg.Add(g)
- }
-
- // ---
-
- // install all of the plugins
- iopts := &install.Options{
- App: app,
- Plugins: plugs.List(),
- }
- if app.WithSQLite {
- iopts.Tags = meta.BuildTags{"sqlite"}
- }
-
- ig, err := install.New(iopts)
- if err != nil {
- return gg, err
- }
- gg.Merge(ig)
-
- return gg, nil
-}
diff --git a/genny/newapp/core/core_test.go b/genny/newapp/core/core_test.go
deleted file mode 100644
index 78c2eb359..000000000
--- a/genny/newapp/core/core_test.go
+++ /dev/null
@@ -1,104 +0,0 @@
-package core
-
-import (
- "testing"
-
- "github.com/gobuffalo/buffalo/genny/docker"
- "github.com/gobuffalo/envy"
- "github.com/gobuffalo/genny/v2/gentest"
- "github.com/gobuffalo/meta"
- "github.com/stretchr/testify/require"
-)
-
-func init() {
- // normalize command output
- envy.Set("GO_BIN", "go")
-}
-
-func Test_New(t *testing.T) {
- r := require.New(t)
- envy.Temp(func() {
- envy.Set(envy.GO111MODULE, "on")
-
- app := meta.Named("coke", ".")
- (&app).PackageRoot("coke")
- app.WithModules = true
-
- gg, err := New(&Options{
- App: app,
- })
- r.NoError(err)
-
- run := gentest.NewRunner()
- run.WithGroup(gg)
-
- r.NoError(run.Run())
-
- res := run.Results()
-
- cmds := []string{
- "go mod init coke",
- }
- r.NoError(gentest.CompareCommands(cmds, res.Commands))
-
- expected := commonExpected
- for _, e := range expected {
- _, err = res.Find(e)
- r.NoError(err)
- }
-
- unexpected := []string{
- "Dockerfile",
- "database.yml",
- "models/models.go",
- ".buffalo.dev.yml",
- "assets/css/application.scss.css",
- "public/assets/application.js",
- }
- for _, u := range unexpected {
- _, err = res.Find(u)
- r.Error(err)
- }
-
- })
-}
-
-func Test_New_Docker(t *testing.T) {
- r := require.New(t)
-
- app := meta.New(".")
- app.WithModules = false
-
- gg, err := New(&Options{
- Docker: &docker.Options{},
- })
- r.NoError(err)
-
- run := gentest.NewRunner()
- run.WithGroup(gg)
-
- r.NoError(run.Run())
-
- res := run.Results()
-
- expected := append(commonExpected, "Dockerfile")
- for _, e := range expected {
- _, err := res.Find(e)
- r.NoError(err)
- }
-}
-
-var commonExpected = []string{
- "main.go",
- "actions/app.go",
- "actions/actions_test.go",
- "actions/render.go",
- "actions/home.go",
- "actions/home_test.go",
- "fixtures/sample.toml",
- "grifts/init.go",
- ".codeclimate.yml",
- ".env",
- "inflections.json",
- "README.md",
-}
diff --git a/genny/newapp/core/errors.go b/genny/newapp/core/errors.go
deleted file mode 100644
index 854ce7521..000000000
--- a/genny/newapp/core/errors.go
+++ /dev/null
@@ -1,6 +0,0 @@
-package core
-
-import "fmt"
-
-// ErrNotInGoPath is thrown when not using go modules outside of GOPATH
-var ErrNotInGoPath = fmt.Errorf("currently not in a $GOPATH")
diff --git a/genny/newapp/core/options.go b/genny/newapp/core/options.go
deleted file mode 100644
index 9ed4c344b..000000000
--- a/genny/newapp/core/options.go
+++ /dev/null
@@ -1,100 +0,0 @@
-package core
-
-import (
- "fmt"
- "regexp"
- "strings"
-
- "github.com/gobuffalo/buffalo-pop/v2/genny/newapp"
- "github.com/gobuffalo/buffalo/genny/ci"
- "github.com/gobuffalo/buffalo/genny/docker"
- "github.com/gobuffalo/buffalo/genny/refresh"
- "github.com/gobuffalo/buffalo/genny/vcs"
- "github.com/gobuffalo/buffalo/runtime"
- "github.com/gobuffalo/meta"
-)
-
-// Options for a new Buffalo application
-type Options struct {
- App meta.App
- Docker *docker.Options
- Pop *newapp.Options
- CI *ci.Options
- VCS *vcs.Options
- Refresh *refresh.Options
- Version string
- ForbiddenNames []string
-}
-
-// Validate that options are usuable
-func (opts *Options) Validate() error {
- if opts.App.IsZero() {
- opts.App = meta.New(".")
- }
-
- if len(opts.Version) == 0 {
- opts.Version = runtime.Version
- }
-
- if opts.Pop != nil {
- if err := opts.Pop.Validate(); err != nil {
- return err
- }
- opts.Pop.Root = opts.App.Root
- }
-
- if opts.CI != nil {
- if opts.CI.App.IsZero() {
- opts.CI.App = opts.App
- }
- if err := opts.CI.Validate(); err != nil {
- return err
- }
- }
-
- if opts.Refresh != nil {
- if opts.Refresh.App.IsZero() {
- opts.Refresh.App = opts.App
- }
- if err := opts.Refresh.Validate(); err != nil {
- return err
- }
- }
-
- if opts.VCS != nil {
- if opts.VCS.App.IsZero() {
- opts.VCS.App = opts.App
- }
- if err := opts.VCS.Validate(); err != nil {
- return err
- }
- }
-
- name := strings.ToLower(opts.App.Name.String())
- for _, n := range opts.ForbiddenNames {
- rx, err := regexp.Compile(n)
- if err != nil {
- return err
- }
- if rx.MatchString(name) {
- return fmt.Errorf("name %s is not allowed, try a different application name", opts.App.Name)
- }
- }
-
- keywords := []string{"buffalo", "test", "dev"}
- for _, kw := range keywords {
- if name != kw {
- continue
- }
-
- return fmt.Errorf("name %s is not allowed, try a different application name", opts.App.Name)
- }
-
- if !nameRX.MatchString(name) {
- return fmt.Errorf("name %s is not allowed, application name can only contain [a-Z0-9-_]", opts.App.Name)
- }
-
- return nil
-}
-
-var nameRX = regexp.MustCompile(`^[\w-]+$`)
diff --git a/genny/newapp/core/options_test.go b/genny/newapp/core/options_test.go
deleted file mode 100644
index a8964c825..000000000
--- a/genny/newapp/core/options_test.go
+++ /dev/null
@@ -1,36 +0,0 @@
-package core
-
-import (
- "testing"
-
- "github.com/gobuffalo/flect/name"
- "github.com/gobuffalo/meta"
- "github.com/stretchr/testify/require"
-)
-
-func Test_Options_Validate(t *testing.T) {
- r := require.New(t)
-
- app := meta.New(".")
- app.Name = name.New("buffalo")
-
- opts := &Options{
- App: app,
- }
-
- err := opts.Validate()
- r.Error(err)
-
- opts.App.Name = name.New("coke")
- err = opts.Validate()
- r.NoError(err)
-
- opts.App.Name = name.New("#$(@#)")
- err = opts.Validate()
- r.Error(err)
-
- opts.App.Name = name.New("coke")
- err = opts.Validate()
- r.NoError(err)
-
-}
diff --git a/genny/newapp/core/root.go b/genny/newapp/core/root.go
deleted file mode 100644
index afa7aea43..000000000
--- a/genny/newapp/core/root.go
+++ /dev/null
@@ -1,48 +0,0 @@
-package core
-
-import (
- "html/template"
- "os/exec"
-
- "github.com/BurntSushi/toml"
- "github.com/gobuffalo/genny/v2"
- "github.com/gobuffalo/genny/v2/gogen"
- "github.com/gobuffalo/packr/v2"
-)
-
-func rootGenerator(opts *Options) (*genny.Generator, error) {
- g := genny.New()
-
- // validate opts
- if err := opts.Validate(); err != nil {
- return g, err
- }
-
- g.Command(exec.Command("go", "mod", "init", opts.App.PackagePkg))
-
- g.Transformer(genny.Dot())
-
- // add common templates
- if err := g.Box(packr.New("buffalo:genny:newapp:core", "../core/templates")); err != nil {
- return g, err
- }
-
- data := map[string]interface{}{
- "opts": opts,
- }
-
- helpers := template.FuncMap{}
-
- t := gogen.TemplateTransformer(data, helpers)
- g.Transformer(t)
-
- g.RunFn(func(r *genny.Runner) error {
- f := genny.NewFile("config/buffalo-app.toml", nil)
- if err := toml.NewEncoder(f).Encode(opts.App); err != nil {
- return err
- }
- return r.File(f)
- })
-
- return g, nil
-}
diff --git a/genny/newapp/core/templates/-dot-codeclimate.yml.tmpl b/genny/newapp/core/templates/-dot-codeclimate.yml.tmpl
deleted file mode 100644
index bef69009f..000000000
--- a/genny/newapp/core/templates/-dot-codeclimate.yml.tmpl
+++ /dev/null
@@ -1,23 +0,0 @@
-version: "2"
-checks:
- method-lines:
- config:
- threshold: 100
-plugins:
- fixme:
- enabled: true
- gofmt:
- enabled: true
- golint:
- enabled: true
- govet:
- enabled: true
-exclude_patterns:
- - grifts/**/*
- - "**/*_test.go"
- - "*_test.go"
- - "**_test.go"
- - logs/*
- - public/*
- - templates/*
- - "**/node_modules/"
diff --git a/genny/newapp/core/templates/-dot-env.tmpl b/genny/newapp/core/templates/-dot-env.tmpl
deleted file mode 100644
index 6dedde674..000000000
--- a/genny/newapp/core/templates/-dot-env.tmpl
+++ /dev/null
@@ -1,9 +0,0 @@
-# This .env file was generated by buffalo, add here the env variables you need
-# buffalo to load into the ENV on application startup so your application works correctly.
-# To add variables use KEY=VALUE format, you can later retrieve this in your application
-# by using os.Getenv("KEY").
-#
-# Example:
-# DATABASE_PASSWORD=XXXXXXXXX
-# SESSION_SECRET=XXXXXXXXX
-# SMTP_SERVER=XXXXXXXXX
diff --git a/genny/newapp/core/templates/README.md.tmpl b/genny/newapp/core/templates/README.md.tmpl
deleted file mode 100644
index cb5c4f428..000000000
--- a/genny/newapp/core/templates/README.md.tmpl
+++ /dev/null
@@ -1,38 +0,0 @@
-# Welcome to Buffalo!
-
-Thank you for choosing Buffalo for your web development needs.
-
-{{ if .opts.App.WithPop -}}
-## Database Setup
-
-It looks like you chose to set up your application using a database! Fantastic!
-
-The first thing you need to do is open up the "database.yml" file and edit it to use the correct usernames, passwords, hosts, etc... that are appropriate for your environment.
-
-You will also need to make sure that **you** start/install the database of your choice. Buffalo **won't** install and start it for you.
-
-### Create Your Databases
-
-Ok, so you've edited the "database.yml" file and started your database, now Buffalo can create the databases in that file for you:
-
- $ buffalo pop create -a
-
-{{end -}}
-
-## Starting the Application
-
-Buffalo ships with a command that will watch your application and automatically rebuild the Go binary and any assets for you. To do that run the "buffalo dev" command:
-
- $ buffalo dev
-
-If you point your browser to [http://127.0.0.1:3000](http://127.0.0.1:3000) you should see a "Welcome to Buffalo!" page.
-
-**Congratulations!** You now have your Buffalo application up and running.
-
-## What Next?
-
-We recommend you heading over to [http://gobuffalo.io](http://gobuffalo.io) and reviewing all of the great documentation there.
-
-Good luck!
-
-[Powered by Buffalo](http://gobuffalo.io)
diff --git a/genny/newapp/core/templates/actions/actions_test.go.tmpl b/genny/newapp/core/templates/actions/actions_test.go.tmpl
deleted file mode 100644
index 82bfe1e3f..000000000
--- a/genny/newapp/core/templates/actions/actions_test.go.tmpl
+++ /dev/null
@@ -1,24 +0,0 @@
-package actions
-
-import (
- "testing"
-
- "github.com/gobuffalo/packr/v2"
- "github.com/gobuffalo/suite"
-)
-
-type ActionSuite struct {
- *suite.Action
-}
-
-func Test_ActionSuite(t *testing.T) {
- action, err := suite.NewActionWithFixtures(App(), packr.New("Test_ActionSuite", "../fixtures"))
- if err != nil {
- t.Fatal(err)
- }
-
- as := &ActionSuite{
- Action: action,
- }
- suite.Run(t, as)
-}
diff --git a/genny/newapp/core/templates/actions/app.go.tmpl b/genny/newapp/core/templates/actions/app.go.tmpl
deleted file mode 100644
index 985876b31..000000000
--- a/genny/newapp/core/templates/actions/app.go.tmpl
+++ /dev/null
@@ -1,58 +0,0 @@
-package actions
-
-import (
- "github.com/gobuffalo/buffalo"
- "github.com/gobuffalo/envy"
- forcessl "github.com/gobuffalo/mw-forcessl"
- paramlogger "github.com/gobuffalo/mw-paramlogger"
- "github.com/unrolled/secure"
-)
-
-// ENV is used to help switch settings based on where the
-// application is being run. Default is "development".
-var ENV = envy.Get("GO_ENV", "development")
-var app *buffalo.App
-
-// App is where all routes and middleware for buffalo
-// should be defined. This is the nerve center of your
-// application.
-//
-// Routing, middleware, groups, etc... are declared TOP -> DOWN.
-// This means if you add a middleware to `app` *after* declaring a
-// group, that group will NOT have that new middleware. The same
-// is true of resource declarations as well.
-//
-// It also means that routes are checked in the order they are declared.
-// `ServeFiles` is a CATCH-ALL route, so it should always be
-// placed last in the route declarations, as it will ensure routes
-// declared after it will never be called.
-func App() *buffalo.App {
- if app == nil {
- app = buffalo.New(buffalo.Options{
- Env: ENV,
- SessionName: "_{{.opts.App.Name.File}}_session",
- })
-
- // Automatically redirect to SSL
- app.Use(forceSSL())
-
- // Log request parameters (filters apply).
- app.Use(paramlogger.ParameterLogger)
-
- app.GET("/", HomeHandler)
- }
-
- return app
-}
-
-// forceSSL will return a middleware that will redirect an incoming request
-// if it is not HTTPS. "http://example.com" => "https://example.com".
-// This middleware does **not** enable SSL. for your application. To do that
-// we recommend using a proxy: https://gobuffalo.io/en/docs/proxy
-// for more information: https://github.com/unrolled/secure/
-func forceSSL() buffalo.MiddlewareFunc {
- return forcessl.Middleware(secure.Options{
- SSLRedirect: ENV == "production",
- SSLProxyHeaders: map[string]string{"X-Forwarded-Proto": "https"},
- })
-}
diff --git a/genny/newapp/core/templates/actions/home.go.tmpl b/genny/newapp/core/templates/actions/home.go.tmpl
deleted file mode 100644
index efc4eee95..000000000
--- a/genny/newapp/core/templates/actions/home.go.tmpl
+++ /dev/null
@@ -1,13 +0,0 @@
-package actions
-
-import (
- "net/http"
-
- "github.com/gobuffalo/buffalo"
-)
-
-// HomeHandler is a default handler to serve up
-// a home page.
-func HomeHandler(c buffalo.Context) error {
- return c.Render(http.StatusOK, r.String("Hello from Buffalo"))
-}
diff --git a/genny/newapp/core/templates/actions/home_test.go.tmpl b/genny/newapp/core/templates/actions/home_test.go.tmpl
deleted file mode 100644
index 08065ebdb..000000000
--- a/genny/newapp/core/templates/actions/home_test.go.tmpl
+++ /dev/null
@@ -1,10 +0,0 @@
-package actions
-
-import "net/http"
-
-func (as *ActionSuite) Test_HomeHandler() {
- res := as.HTML("/").Get()
-
- as.Equal(http.StatusOK, res.Code)
- as.Contains(res.Body.String(), "Welcome to Buffalo")
-}
diff --git a/genny/newapp/core/templates/actions/render.go.tmpl b/genny/newapp/core/templates/actions/render.go.tmpl
deleted file mode 100644
index 5079adab5..000000000
--- a/genny/newapp/core/templates/actions/render.go.tmpl
+++ /dev/null
@@ -1,11 +0,0 @@
-package actions
-
-import (
- "github.com/gobuffalo/buffalo/render"
-)
-
-var r *render.Engine
-
-func init() {
- r = render.New(render.Options{})
-}
diff --git a/genny/newapp/core/templates/fixtures/sample.toml.tmpl b/genny/newapp/core/templates/fixtures/sample.toml.tmpl
deleted file mode 100644
index b9281d496..000000000
--- a/genny/newapp/core/templates/fixtures/sample.toml.tmpl
+++ /dev/null
@@ -1,32 +0,0 @@
-[[scenario]]
-name = "lots of widgets"
-
- [[scenario.table]]
- name = "widgets"
-
- [[scenario.table.row]]
- id = "<%= uuidNamed("widget") %>"
- name = "This is widget #1"
- body = "some widget body"
- created_at = "<%= now() %>"
- updated_at = "<%= now() %>"
-
- [[scenario.table.row]]
- id = "<%= uuid() %>"
- name = "This is widget #2"
- body = "some widget body"
- created_at = "<%= now() %>"
- updated_at = "<%= now() %>"
-
- [[scenario.table]]
- name = "users"
-
- [[scenario.table.row]]
- id = "<%= uuid() %>"
- name = "Mark Bates"
- admin = true
- age = 41
- widget_id = "<%= uuidNamed("widget") %>"
- created_at = "<%= now() %>"
- updated_at = "<%= now() %>"
-
diff --git a/genny/newapp/core/templates/grifts/init.go.tmpl b/genny/newapp/core/templates/grifts/init.go.tmpl
deleted file mode 100644
index 423a7eaf3..000000000
--- a/genny/newapp/core/templates/grifts/init.go.tmpl
+++ /dev/null
@@ -1,10 +0,0 @@
-package grifts
-
-import (
- "github.com/gobuffalo/buffalo"
- "{{ .opts.App.ActionsPkg }}"
-)
-
-func init() {
- buffalo.Grifts(actions.App())
-}
diff --git a/genny/newapp/core/templates/inflections.json.tmpl b/genny/newapp/core/templates/inflections.json.tmpl
deleted file mode 100644
index ef0214f3a..000000000
--- a/genny/newapp/core/templates/inflections.json.tmpl
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "singular": "plural"
-}
diff --git a/genny/newapp/core/templates/main.go.tmpl b/genny/newapp/core/templates/main.go.tmpl
deleted file mode 100644
index de000e5ec..000000000
--- a/genny/newapp/core/templates/main.go.tmpl
+++ /dev/null
@@ -1,38 +0,0 @@
-package main
-
-import (
- "log"
-
- "{{ .opts.App.ActionsPkg }}"
-)
-
-// main is the starting point for your Buffalo application.
-// You can feel free and add to this `main` method, change
-// what it does, etc...
-// All we ask is that, at some point, you make sure to
-// call `app.Serve()`, unless you don't want to start your
-// application that is. :)
-func main() {
- app := actions.App()
- if err := app.Serve(); err != nil {
- log.Fatal(err)
- }
-}
-
-/*
-# Notes about `main.go`
-
-## SSL Support
-
-We recommend placing your application behind a proxy, such as
-Apache or Nginx and letting them do the SSL heavy lifting
-for you. https://gobuffalo.io/en/docs/proxy
-
-## Buffalo Build
-
-When `buffalo build` is run to compile your binary, this `main`
-function will be at the heart of that binary. It is expected
-that your `main` function will start your application using
-the `app.Serve()` method.
-
-*/
diff --git a/genny/newapp/web/options.go b/genny/newapp/web/options.go
deleted file mode 100644
index 559cfe12c..000000000
--- a/genny/newapp/web/options.go
+++ /dev/null
@@ -1,51 +0,0 @@
-package web
-
-import (
- "fmt"
-
- "github.com/gobuffalo/buffalo/genny/assets/standard"
- "github.com/gobuffalo/buffalo/genny/assets/webpack"
- "github.com/gobuffalo/buffalo/genny/newapp/core"
-)
-
-// Options for a web app
-type Options struct {
- *core.Options
- Webpack *webpack.Options
- Standard *standard.Options
-}
-
-// Validate that options are usuable
-func (opts *Options) Validate() error {
- if opts.Options == nil {
- opts.Options = &core.Options{}
- }
-
- if err := opts.Options.Validate(); err != nil {
- return err
- }
-
- if opts.Docker != nil {
- if opts.Docker.App.IsZero() {
- opts.Docker.App = opts.App
- }
- if err := opts.Docker.Validate(); err != nil {
- return err
- }
- }
-
- if opts.Webpack != nil {
- if opts.Webpack.App.IsZero() {
- opts.Webpack.App = opts.App
- }
- if err := opts.Webpack.Validate(); err != nil {
- return err
- }
- }
-
- if opts.Standard != nil && opts.Webpack != nil {
- return fmt.Errorf("you can not use both webpack and standard generators")
- }
-
- return nil
-}
diff --git a/genny/newapp/web/options_test.go b/genny/newapp/web/options_test.go
deleted file mode 100644
index efb389526..000000000
--- a/genny/newapp/web/options_test.go
+++ /dev/null
@@ -1 +0,0 @@
-package web
diff --git a/genny/newapp/web/templates/actions/app.go.tmpl b/genny/newapp/web/templates/actions/app.go.tmpl
deleted file mode 100644
index d32d5568b..000000000
--- a/genny/newapp/web/templates/actions/app.go.tmpl
+++ /dev/null
@@ -1,96 +0,0 @@
-package actions
-
-import (
- "github.com/gobuffalo/envy"
- "github.com/gobuffalo/buffalo"
- forcessl "github.com/gobuffalo/mw-forcessl"
- paramlogger "github.com/gobuffalo/mw-paramlogger"
- "github.com/unrolled/secure"
-
- {{ if .opts.App.WithPop }}
- "{{.opts.App.ModelsPkg}}"
- "github.com/gobuffalo/buffalo-pop/v2/pop/popmw"
- {{ end -}}
-
- csrf "github.com/gobuffalo/mw-csrf"
- i18n "github.com/gobuffalo/mw-i18n"
- "github.com/gobuffalo/packr/v2"
-)
-
-// ENV is used to help switch settings based on where the
-// application is being run. Default is "development".
-var ENV = envy.Get("GO_ENV", "development")
-var app *buffalo.App
-var T *i18n.Translator
-
-// App is where all routes and middleware for buffalo
-// should be defined. This is the nerve center of your
-// application.
-//
-// Routing, middleware, groups, etc... are declared TOP -> DOWN.
-// This means if you add a middleware to `app` *after* declaring a
-// group, that group will NOT have that new middleware. The same
-// is true of resource declarations as well.
-//
-// It also means that routes are checked in the order they are declared.
-// `ServeFiles` is a CATCH-ALL route, so it should always be
-// placed last in the route declarations, as it will prevent routes
-// declared after it to never be called.
-func App() *buffalo.App {
- if app == nil {
- app = buffalo.New(buffalo.Options{
- Env: ENV,
- SessionName: "_{{.opts.App.Name.File}}_session",
- })
-
- // Automatically redirect to SSL
- app.Use(forceSSL())
-
- // Log request parameters (filters apply).
- app.Use(paramlogger.ParameterLogger)
-
- // Protect against CSRF attacks. https://www.owasp.org/index.php/Cross-Site_Request_Forgery_(CSRF)
- // Remove to disable this.
- app.Use(csrf.New)
-
- {{ if .opts.App.WithPop }}
- // Wraps each request in a transaction.
- // c.Value("tx").(*pop.Connection)
- // Remove to disable this.
- app.Use(popmw.Transaction(models.DB))
- {{ end }}
-
- // Setup and use translations:
- app.Use(translations())
-
- app.GET("/", HomeHandler)
-
- app.ServeFiles("/", assetsBox) // serve files from the public directory
- }
-
- return app
-}
-
-// translations will load locale files, set up the translator `actions.T`,
-// and will return a middleware to use to load the correct locale for each
-// request.
-// for more information: https://gobuffalo.io/en/docs/localization
-func translations() buffalo.MiddlewareFunc {
- var err error
- if T, err = i18n.New(packr.New("app:locales", "../locales"), "en-US"); err != nil {
- app.Stop(err)
- }
- return T.Middleware()
-}
-
-// forceSSL will return a middleware that will redirect an incoming request
-// if it is not HTTPS. "http://example.com" => "https://example.com".
-// This middleware does **not** enable SSL. for your application. To do that
-// we recommend using a proxy: https://gobuffalo.io/en/docs/proxy
-// for more information: https://github.com/unrolled/secure/
-func forceSSL() buffalo.MiddlewareFunc {
- return forcessl.Middleware(secure.Options{
- SSLRedirect: ENV == "production",
- SSLProxyHeaders: map[string]string{"X-Forwarded-Proto": "https"},
- })
-}
diff --git a/genny/newapp/web/templates/actions/home.go.tmpl b/genny/newapp/web/templates/actions/home.go.tmpl
deleted file mode 100644
index 151df6db8..000000000
--- a/genny/newapp/web/templates/actions/home.go.tmpl
+++ /dev/null
@@ -1,13 +0,0 @@
-package actions
-
-import (
- "net/http"
-
- "github.com/gobuffalo/buffalo"
-)
-
-// HomeHandler is a default handler to serve up
-// a home page.
-func HomeHandler(c buffalo.Context) error {
- return c.Render(http.StatusOK, r.HTML("index.html"))
-}
diff --git a/genny/newapp/web/templates/actions/home_test.go.tmpl b/genny/newapp/web/templates/actions/home_test.go.tmpl
deleted file mode 100644
index 08065ebdb..000000000
--- a/genny/newapp/web/templates/actions/home_test.go.tmpl
+++ /dev/null
@@ -1,10 +0,0 @@
-package actions
-
-import "net/http"
-
-func (as *ActionSuite) Test_HomeHandler() {
- res := as.HTML("/").Get()
-
- as.Equal(http.StatusOK, res.Code)
- as.Contains(res.Body.String(), "Welcome to Buffalo")
-}
diff --git a/genny/newapp/web/templates/actions/render.go.tmpl b/genny/newapp/web/templates/actions/render.go.tmpl
deleted file mode 100644
index 7256d3449..000000000
--- a/genny/newapp/web/templates/actions/render.go.tmpl
+++ /dev/null
@@ -1,28 +0,0 @@
-package actions
-
-import (
- "github.com/gobuffalo/packr/v2"
- "github.com/gobuffalo/buffalo/render"
-)
-
-var r *render.Engine
-var assetsBox = packr.New("app:assets", "../public")
-
-func init() {
- r = render.New(render.Options{
- // HTML layout to be used for all HTML requests:
- HTMLLayout: "application.plush.html",
-
- // Box containing all of the templates:
- TemplatesBox: packr.New("app:templates", "../templates"),
- AssetsBox: assetsBox,
-
- // Add template helpers here:
- Helpers: render.Helpers{
- // for non-bootstrap form helpers uncomment the lines
- // below and import "github.com/gobuffalo/helpers/forms"
- // forms.FormKey: forms.Form,
- // forms.FormForKey: forms.FormFor,
- },
- })
-}
diff --git a/genny/newapp/web/templates/locales/all.en-us.yaml.tmpl b/genny/newapp/web/templates/locales/all.en-us.yaml.tmpl
deleted file mode 100644
index 6514e2100..000000000
--- a/genny/newapp/web/templates/locales/all.en-us.yaml.tmpl
+++ /dev/null
@@ -1,3 +0,0 @@
-# For more information on using i18n see: https://github.com/nicksnyder/go-i18n
-- id: welcome_greeting
- translation: "Welcome to Buffalo (EN)"
diff --git a/genny/newapp/web/templates/public/robots.txt.tmpl b/genny/newapp/web/templates/public/robots.txt.tmpl
deleted file mode 100644
index 1f53798bb..000000000
--- a/genny/newapp/web/templates/public/robots.txt.tmpl
+++ /dev/null
@@ -1,2 +0,0 @@
-User-agent: *
-Disallow: /
diff --git a/genny/newapp/web/templates/templates/_flash.plush.html.tmpl b/genny/newapp/web/templates/templates/_flash.plush.html.tmpl
deleted file mode 100644
index adc4b27ba..000000000
--- a/genny/newapp/web/templates/templates/_flash.plush.html.tmpl
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
- <%= for (k, messages) in flash { %>
- <%= for (msg) in messages { %>
-
- <%= msg %>
-
-
- <% } %>
- <% } %>
-
-
- <%= partial("flash.html") %>
- <%= yield %>
-
-
- <%= javascriptTag("application.js") %>
-
-
diff --git a/genny/newapp/web/templates/templates/index.plush.html.tmpl b/genny/newapp/web/templates/templates/index.plush.html.tmpl
deleted file mode 100644
index 9f429382f..000000000
--- a/genny/newapp/web/templates/templates/index.plush.html.tmpl
+++ /dev/null
@@ -1,64 +0,0 @@
-
-
-
-
-
-
-
-
<%= t("welcome_greeting") %>
-
-
-
-
-
-
-
-
-
-
-
- | METHOD |
- PATH |
- NAME |
- HANDLER |
-
-
-
-
- <%= for (r) in routes { %>
-
- |
- <%= r.Method %>
- |
-
- <%= if (r.Method != "GET" || r.Path ~= "{") {
- return r.Path
- } else {
- return linkTo(r.Path, {body: r.Path})
- } %>
- |
-
- <%= r.PathName %>
- |
- <%= r.HandlerName %> |
-
- <% } %>
-
-
-
-
-
-
-
Edit Widget
-
-
-<%= formFor(widget, {action: widgetPath({ widget_id: widget.ID }), method: "PUT"}) { %>
- <%= partial("widgets/form.html") %>
- <%= linkTo(widgetPath({ widget_id: widget.ID }), {class: "btn btn-warning", "data-confirm": "Are you sure?", body: "Cancel"}) %>
-<% } %>
diff --git a/genny/resource/_fixtures/default/templates/widgets/index.plush.html b/genny/resource/_fixtures/default/templates/widgets/index.plush.html
deleted file mode 100644
index 5d328e62e..000000000
--- a/genny/resource/_fixtures/default/templates/widgets/index.plush.html
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
Widgets
-
- <%= linkTo(newWidgetsPath(), {class: "btn btn-primary"}) { %>
- Create New Widget
- <% } %>
-
-
-
- | Name |
- |
-
-
- <%= for (widget) in widgets { %>
-
- | <%= widget.Name %> |
-
-
- <%= linkTo(widgetPath({ widget_id: widget.ID }), {class: "btn btn-info", body: "View"}) %>
- <%= linkTo(editWidgetPath({ widget_id: widget.ID }), {class: "btn btn-warning", body: "Edit"}) %>
- <%= linkTo(widgetPath({ widget_id: widget.ID }), {class: "btn btn-danger", "data-method": "DELETE", "data-confirm": "Are you sure?", body: "Destroy"}) %>
-
- |
-
- <% } %>
-
-
-
-
- <%= paginator(pagination) %>
-
diff --git a/genny/resource/_fixtures/default/templates/widgets/new.plush.html b/genny/resource/_fixtures/default/templates/widgets/new.plush.html
deleted file mode 100644
index 743430c1f..000000000
--- a/genny/resource/_fixtures/default/templates/widgets/new.plush.html
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
New Widget
-
-
-<%= formFor(widget, {action: widgetsPath(), method: "POST"}) { %>
- <%= partial("widgets/form.html") %>
- <%= linkTo(widgetsPath(), {class: "btn btn-warning", "data-confirm": "Are you sure?", body: "Cancel"}) %>
-<% } %>
diff --git a/genny/resource/_fixtures/default/templates/widgets/show.plush.html b/genny/resource/_fixtures/default/templates/widgets/show.plush.html
deleted file mode 100644
index 434b2f404..000000000
--- a/genny/resource/_fixtures/default/templates/widgets/show.plush.html
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
Widget Details
-
-
- <%= linkTo(widgetsPath(), {class: "btn btn-info"}) { %>
- Back to all Widgets
- <% } %>
- <%= linkTo(editWidgetPath({ widget_id: widget.ID }), {class: "btn btn-warning", body: "Edit"}) %>
- <%= linkTo(widgetPath({ widget_id: widget.ID }), {class: "btn btn-danger", "data-method": "DELETE", "data-confirm": "Are you sure?", body: "Destroy"}) %>
-
-
- -
-
-
<%= widget.Name %>
-
- -
-
-
<%= widget.Desc %>
-
-
diff --git a/genny/resource/_fixtures/nested/actions/admin_widgets.go.tmpl b/genny/resource/_fixtures/nested/actions/admin_widgets.go.tmpl
deleted file mode 100644
index 9dd73cb40..000000000
--- a/genny/resource/_fixtures/nested/actions/admin_widgets.go.tmpl
+++ /dev/null
@@ -1,260 +0,0 @@
-package actions
-
-import (
-
- "fmt"
- "net/http"
- "github.com/gobuffalo/buffalo"
- "github.com/gobuffalo/pop/v5"
- "github.com/gobuffalo/x/responder"
- "github.com/markbates/coke/models"
-)
-
-// 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 (Widget)
-// DB Table: Plural (widgets)
-// Resource: Plural (AdminWidgets)
-// Path: Plural (/admin/widgets)
-// View Template Folder: Plural (/templates/admin/widgets/)
-
-// AdminWidgetsResource is the resource for the Widget model
-type AdminWidgetsResource struct{
- buffalo.Resource
-}
-
-// List gets all Widgets. This function is mapped to the path
-// GET /admin/widgets
-func (v AdminWidgetsResource) List(c buffalo.Context) error {
- // Get the DB connection from the context
- tx, ok := c.Value("tx").(*pop.Connection)
- if !ok {
- return fmt.Errorf("no transaction found")
- }
-
- widgets := &models.Widgets{}
-
- // 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 Widgets from the DB
- if err := q.All(widgets); err != nil {
- return err
- }
-
- return responder.Wants("html", func (c buffalo.Context) error {
- // Add the paginator to the context so it can be used in the template.
- c.Set("pagination", q.Paginator)
-
- c.Set("widgets", widgets)
- return c.Render(http.StatusOK, r.HTML("/admin/widgets/index.plush.html"))
- }).Wants("json", func (c buffalo.Context) error {
- return c.Render(200, r.JSON(widgets))
- }).Wants("xml", func (c buffalo.Context) error {
- return c.Render(200, r.XML(widgets))
- }).Respond(c)
-}
-
-// Show gets the data for one Widget. This function is mapped to
-// the path GET /admin/widgets/{admin_widget_id}
-func (v AdminWidgetsResource) Show(c buffalo.Context) error {
- // Get the DB connection from the context
- tx, ok := c.Value("tx").(*pop.Connection)
- if !ok {
- return fmt.Errorf("no transaction found")
- }
-
- // Allocate an empty Widget
- widget := &models.Widget{}
-
- // To find the Widget the parameter admin_widget_id is used.
- if err := tx.Find(widget, c.Param("admin_widget_id")); err != nil {
- return c.Error(http.StatusNotFound, err)
- }
-
- return responder.Wants("html", func (c buffalo.Context) error {
- c.Set("widget", widget)
-
- return c.Render(http.StatusOK, r.HTML("/admin/widgets/show.plush.html"))
- }).Wants("json", func (c buffalo.Context) error {
- return c.Render(200, r.JSON(widget))
- }).Wants("xml", func (c buffalo.Context) error {
- return c.Render(200, r.XML(widget))
- }).Respond(c)
-}
-
-// New renders the form for creating a new Widget.
-// This function is mapped to the path GET /admin/widgets/new
-func (v AdminWidgetsResource) New(c buffalo.Context) error {
- c.Set("widget", &models.Widget{})
-
- return c.Render(http.StatusOK, r.HTML("/admin/widgets/new.plush.html"))
-}
-
-// Create adds a Widget to the DB. This function is mapped to the
-// path POST /admin/widgets
-func (v AdminWidgetsResource) Create(c buffalo.Context) error {
- // Allocate an empty Widget
- widget := &models.Widget{}
-
- // Bind widget to the html form elements
- if err := c.Bind(widget); err != nil {
- return err
- }
-
- // Get the DB connection from the context
- tx, ok := c.Value("tx").(*pop.Connection)
- if !ok {
- return fmt.Errorf("no transaction found")
- }
-
- // Validate the data from the html form
- verrs, err := tx.ValidateAndCreate(widget)
- if err != nil {
- return err
- }
-
- if verrs.HasAny() {
- return responder.Wants("html", func (c buffalo.Context) error {
- // 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.
- c.Set("widget", widget)
-
- return c.Render(http.StatusUnprocessableEntity, r.HTML("/admin/widgets/new.plush.html"))
- }).Wants("json", func (c buffalo.Context) error {
- return c.Render(http.StatusUnprocessableEntity, r.JSON(verrs))
- }).Wants("xml", func (c buffalo.Context) error {
- return c.Render(http.StatusUnprocessableEntity, r.XML(verrs))
- }).Respond(c)
- }
-
- return responder.Wants("html", func (c buffalo.Context) error {
- // If there are no errors set a success message
- c.Flash().Add("success", T.Translate(c, "widget.created.success"))
-
- // and redirect to the show page
- return c.Redirect(http.StatusSeeOther, "/admin/widgets/%v", widget.ID)
- }).Wants("json", func (c buffalo.Context) error {
- return c.Render(http.StatusCreated, r.JSON(widget))
- }).Wants("xml", func (c buffalo.Context) error {
- return c.Render(http.StatusCreated, r.XML(widget))
- }).Respond(c)
-}
-
-// Edit renders a edit form for a Widget. This function is
-// mapped to the path GET /admin/widgets/{admin_widget_id}/edit
-func (v AdminWidgetsResource) Edit(c buffalo.Context) error {
- // Get the DB connection from the context
- tx, ok := c.Value("tx").(*pop.Connection)
- if !ok {
- return fmt.Errorf("no transaction found")
- }
-
- // Allocate an empty Widget
- widget := &models.Widget{}
-
- if err := tx.Find(widget, c.Param("admin_widget_id")); err != nil {
- return c.Error(http.StatusNotFound, err)
- }
-
- c.Set("widget", widget)
- return c.Render(http.StatusOK, r.HTML("/admin/widgets/edit.plush.html"))
-}
-
-// Update changes a Widget in the DB. This function is mapped to
-// the path PUT /admin/widgets/{admin_widget_id}
-func (v AdminWidgetsResource) Update(c buffalo.Context) error {
- // Get the DB connection from the context
- tx, ok := c.Value("tx").(*pop.Connection)
- if !ok {
- return fmt.Errorf("no transaction found")
- }
-
- // Allocate an empty Widget
- widget := &models.Widget{}
-
- if err := tx.Find(widget, c.Param("admin_widget_id")); err != nil {
- return c.Error(http.StatusNotFound, err)
- }
-
- // Bind Widget to the html form elements
- if err := c.Bind(widget); err != nil {
- return err
- }
-
- verrs, err := tx.ValidateAndUpdate(widget)
- if err != nil {
- return err
- }
-
- if verrs.HasAny() {
- return responder.Wants("html", func (c buffalo.Context) error {
- // 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.
- c.Set("widget", widget)
-
- return c.Render(http.StatusUnprocessableEntity, r.HTML("/admin/widgets/edit.plush.html"))
- }).Wants("json", func (c buffalo.Context) error {
- return c.Render(http.StatusUnprocessableEntity, r.JSON(verrs))
- }).Wants("xml", func (c buffalo.Context) error {
- return c.Render(http.StatusUnprocessableEntity, r.XML(verrs))
- }).Respond(c)
- }
-
- return responder.Wants("html", func (c buffalo.Context) error {
- // If there are no errors set a success message
- c.Flash().Add("success", T.Translate(c, "widget.updated.success"))
-
- // and redirect to the show page
- return c.Redirect(http.StatusSeeOther, "/admin/widgets/%v", widget.ID)
- }).Wants("json", func (c buffalo.Context) error {
- return c.Render(http.StatusOK, r.JSON(widget))
- }).Wants("xml", func (c buffalo.Context) error {
- return c.Render(http.StatusOK, r.XML(widget))
- }).Respond(c)
-}
-
-// Destroy deletes a Widget from the DB. This function is mapped
-// to the path DELETE /admin/widgets/{admin_widget_id}
-func (v AdminWidgetsResource) Destroy(c buffalo.Context) error {
- // Get the DB connection from the context
- tx, ok := c.Value("tx").(*pop.Connection)
- if !ok {
- return fmt.Errorf("no transaction found")
- }
-
- // Allocate an empty Widget
- widget := &models.Widget{}
-
- // To find the Widget the parameter admin_widget_id is used.
- if err := tx.Find(widget, c.Param("admin_widget_id")); err != nil {
- return c.Error(http.StatusNotFound, err)
- }
-
- if err := tx.Destroy(widget); err != nil {
- return err
- }
-
- return responder.Wants("html", func (c buffalo.Context) error {
- // If there are no errors set a flash message
- c.Flash().Add("success", T.Translate(c, "widget.destroyed.success"))
-
- // Redirect to the index page
- return c.Redirect(http.StatusSeeOther, "/admin/widgets")
- }).Wants("json", func (c buffalo.Context) error {
- return c.Render(http.StatusOK, r.JSON(widget))
- }).Wants("xml", func (c buffalo.Context) error {
- return c.Render(http.StatusOK, r.XML(widget))
- }).Respond(c)
-}
diff --git a/genny/resource/_fixtures/nested/actions/admin_widgets_test.go.tmpl b/genny/resource/_fixtures/nested/actions/admin_widgets_test.go.tmpl
deleted file mode 100644
index fe4f33caa..000000000
--- a/genny/resource/_fixtures/nested/actions/admin_widgets_test.go.tmpl
+++ /dev/null
@@ -1,29 +0,0 @@
-package actions
-
-func (as *ActionSuite) Test_AdminWidgetsResource_List() {
- as.Fail("Not Implemented!")
-}
-
-func (as *ActionSuite) Test_AdminWidgetsResource_Show() {
- as.Fail("Not Implemented!")
-}
-
-func (as *ActionSuite) Test_AdminWidgetsResource_Create() {
- as.Fail("Not Implemented!")
-}
-
-func (as *ActionSuite) Test_AdminWidgetsResource_Update() {
- as.Fail("Not Implemented!")
-}
-
-func (as *ActionSuite) Test_AdminWidgetsResource_Destroy() {
- as.Fail("Not Implemented!")
-}
-
-func (as *ActionSuite) Test_AdminWidgetsResource_New() {
- as.Fail("Not Implemented!")
-}
-
-func (as *ActionSuite) Test_AdminWidgetsResource_Edit() {
- as.Fail("Not Implemented!")
-}
diff --git a/genny/resource/_fixtures/nested/actions/app.go.tmpl b/genny/resource/_fixtures/nested/actions/app.go.tmpl
deleted file mode 100644
index 39e7ba6be..000000000
--- a/genny/resource/_fixtures/nested/actions/app.go.tmpl
+++ /dev/null
@@ -1,11 +0,0 @@
-package actions
-
-import "github.com/gobuffalo/buffalo"
-
-func App() *buffalo.App {
- if app == nil {
- app.Resource("/admin/widgets", AdminWidgetsResource{})
- app.ServeFiles("/", assetsBox) // serve files from the public directory
- }
- return app
-}
diff --git a/genny/resource/_fixtures/nested/locales/admin/widgets.en-us.yaml b/genny/resource/_fixtures/nested/locales/admin/widgets.en-us.yaml
deleted file mode 100644
index 49f5a96bf..000000000
--- a/genny/resource/_fixtures/nested/locales/admin/widgets.en-us.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-- id: "widget.created.success"
- translation: "Widget was successfully created."
-- id: "widget.updated.success"
- translation: "Widget was successfully updated."
-- id: "widget.destroyed.success"
- translation: "Widget was successfully destroyed."
diff --git a/genny/resource/_fixtures/nested/templates/admin/widgets/_form.plush.html b/genny/resource/_fixtures/nested/templates/admin/widgets/_form.plush.html
deleted file mode 100644
index 61bcef1ff..000000000
--- a/genny/resource/_fixtures/nested/templates/admin/widgets/_form.plush.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<%= f.InputTag("Name") %>
-<%= f.TextAreaTag("Desc", {rows: 10}) %>
-
diff --git a/genny/resource/_fixtures/nested/templates/admin/widgets/edit.plush.html b/genny/resource/_fixtures/nested/templates/admin/widgets/edit.plush.html
deleted file mode 100644
index 40d76b106..000000000
--- a/genny/resource/_fixtures/nested/templates/admin/widgets/edit.plush.html
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
Edit Widget
-
-
-<%= formFor(widget, {action: adminWidgetPath({ admin_widget_id: widget.ID }), method: "PUT"}) { %>
- <%= partial("admin/widgets/form.html") %>
- <%= linkTo(adminWidgetPath({ admin_widget_id: widget.ID }), {class: "btn btn-warning", "data-confirm": "Are you sure?", body: "Cancel"}) %>
-<% } %>
diff --git a/genny/resource/_fixtures/nested/templates/admin/widgets/index.plush.html b/genny/resource/_fixtures/nested/templates/admin/widgets/index.plush.html
deleted file mode 100644
index f57f8302a..000000000
--- a/genny/resource/_fixtures/nested/templates/admin/widgets/index.plush.html
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
Widgets
-
- <%= linkTo(newAdminWidgetsPath(), {class: "btn btn-primary"}) { %>
- Create New Widget
- <% } %>
-
-
-
- | Name |
- |
-
-
- <%= for (widget) in widgets { %>
-
- | <%= widget.Name %> |
-
-
- <%= linkTo(adminWidgetPath({ admin_widget_id: widget.ID }), {class: "btn btn-info", body: "View"}) %>
- <%= linkTo(editAdminWidgetPath({ admin_widget_id: widget.ID }), {class: "btn btn-warning", body: "Edit"}) %>
- <%= linkTo(adminWidgetPath({ admin_widget_id: widget.ID }), {class: "btn btn-danger", "data-method": "DELETE", "data-confirm": "Are you sure?", body: "Destroy"}) %>
-
- |
-
- <% } %>
-
-
-
-
- <%= paginator(pagination) %>
-
diff --git a/genny/resource/_fixtures/nested/templates/admin/widgets/new.plush.html b/genny/resource/_fixtures/nested/templates/admin/widgets/new.plush.html
deleted file mode 100644
index 55fbbc73a..000000000
--- a/genny/resource/_fixtures/nested/templates/admin/widgets/new.plush.html
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
New Widget
-
-
-<%= formFor(widget, {action: adminWidgetsPath(), method: "POST"}) { %>
- <%= partial("admin/widgets/form.html") %>
- <%= linkTo(adminWidgetsPath(), {class: "btn btn-warning", "data-confirm": "Are you sure?", body: "Cancel"}) %>
-<% } %>
diff --git a/genny/resource/_fixtures/nested/templates/admin/widgets/show.plush.html b/genny/resource/_fixtures/nested/templates/admin/widgets/show.plush.html
deleted file mode 100644
index a2ea675dc..000000000
--- a/genny/resource/_fixtures/nested/templates/admin/widgets/show.plush.html
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
Widget Details
-
-
- <%= linkTo(adminWidgetsPath(), {class: "btn btn-info"}) { %>
- Back to all Widgets
- <% } %>
- <%= linkTo(editAdminWidgetPath({ admin_widget_id: widget.ID }), {class: "btn btn-warning", body: "Edit"}) %>
- <%= linkTo(adminWidgetPath({ admin_widget_id: widget.ID }), {class: "btn btn-danger", "data-method": "DELETE", "data-confirm": "Are you sure?", body: "Destroy"}) %>
-
-
- -
-
-
<%= widget.Name %>
-
- -
-
-
<%= widget.Desc %>
-
-
diff --git a/genny/resource/actions.go b/genny/resource/actions.go
deleted file mode 100644
index 9d947d77b..000000000
--- a/genny/resource/actions.go
+++ /dev/null
@@ -1,40 +0,0 @@
-package resource
-
-import (
- "fmt"
-
- "github.com/gobuffalo/flect/name"
- "github.com/gobuffalo/genny/v2"
- "github.com/gobuffalo/genny/v2/gogen"
-)
-
-func addResource(pres presenter) genny.RunFn {
- return func(r *genny.Runner) error {
- f, err := r.FindFile("actions/app.go")
- if err != nil {
- return err
- }
- stmt := fmt.Sprintf("app.Resource(\"/%s\", %sResource{})", pres.Name.URL(), pres.Name.Resource())
- f, err = gogen.AddInsideBlock(f, "if app == nil {", stmt)
- if err != nil {
- return err
- }
- return r.File(f)
- }
-}
-
-func actions(opts *Options) []name.Ident {
- actions := []name.Ident{
- name.New("list"),
- name.New("show"),
- name.New("create"),
- name.New("update"),
- name.New("destroy"),
- }
-
- if opts.App.AsWeb {
- actions = append(actions, name.New("new"), name.New("edit"))
- }
-
- return actions
-}
diff --git a/genny/resource/models.go b/genny/resource/models.go
deleted file mode 100644
index 4c3adbe1c..000000000
--- a/genny/resource/models.go
+++ /dev/null
@@ -1,35 +0,0 @@
-package resource
-
-import (
- "os/exec"
-
- "github.com/gobuffalo/flect/name"
- "github.com/gobuffalo/genny/v2"
-)
-
-func modelCommand(model name.Ident, opts *Options) *exec.Cmd {
- args := opts.Attrs.Slice()
- mn := model.Singularize().Underscore().String()
- args = append([]string{"pop", "g", "model", mn}, args...)
-
- if opts.SkipMigration {
- args = append(args, "--skip-migration")
- }
-
- return exec.Command("buffalo-pop", args...)
-}
-
-func installPop(opts *Options) genny.RunFn {
- return func(r *genny.Runner) error {
- if opts.SkipModel {
- return nil
- }
- if _, err := r.LookPath("buffalo-pop"); err != nil {
- c := exec.Command("go", "get", "github.com/gobuffalo/buffalo-pop/v2")
- if err := r.Exec(c); err != nil {
- return err
- }
- }
- return r.Exec(modelCommand(name.New(opts.Model), opts))
- }
-}
diff --git a/genny/resource/options.go b/genny/resource/options.go
deleted file mode 100644
index 2b9f69924..000000000
--- a/genny/resource/options.go
+++ /dev/null
@@ -1,46 +0,0 @@
-package resource
-
-import (
- "fmt"
- "strings"
-
- "github.com/gobuffalo/attrs"
- "github.com/gobuffalo/meta"
-)
-
-// Options for generating a new resource
-type Options struct {
- App meta.App `json:"app"`
- Name string `json:"name"`
- Model string `json:"model"`
- SkipMigration bool `json:"skip_migration"`
- SkipModel bool `json:"skip_model"`
- SkipTemplates bool `json:"skip_templates"`
- Attrs attrs.Attrs `json:"props"`
-}
-
-// Validate that options are usuable
-func (opts *Options) Validate() error {
- if opts.App.IsZero() {
- opts.App = meta.New(".")
- }
-
- if len(opts.Name) == 0 {
- return fmt.Errorf("you must provide a name")
- }
-
- if len(opts.Model) == 0 {
- opts.Model = opts.Name
- }
-
- if strings.Contains(opts.Model, "/") {
- parts := strings.Split(opts.Model, "/")
- opts.Model = parts[len(parts)-1]
- }
-
- if opts.App.AsAPI {
- opts.SkipTemplates = true
- }
-
- return nil
-}
diff --git a/genny/resource/options_test.go b/genny/resource/options_test.go
deleted file mode 100644
index 83c5fe520..000000000
--- a/genny/resource/options_test.go
+++ /dev/null
@@ -1,20 +0,0 @@
-package resource
-
-import (
- "testing"
-
- "github.com/stretchr/testify/require"
-)
-
-func Test_Options_Validate(t *testing.T) {
- r := require.New(t)
-
- opts := &Options{}
- err := opts.Validate()
- r.Error(err)
-
- opts.Name = "coke"
-
- err = opts.Validate()
- r.NoError(err)
-}
diff --git a/genny/resource/presenter.go b/genny/resource/presenter.go
deleted file mode 100644
index 2c254bd51..000000000
--- a/genny/resource/presenter.go
+++ /dev/null
@@ -1,14 +0,0 @@
-package resource
-
-import (
- "github.com/gobuffalo/attrs"
- "github.com/gobuffalo/flect/name"
- "github.com/gobuffalo/meta"
-)
-
-type presenter struct {
- App meta.App
- Name name.Ident
- Model name.Ident
- Attrs attrs.Attrs
-}
diff --git a/genny/resource/resource-packr.go b/genny/resource/resource-packr.go
deleted file mode 100644
index 385b06d4e..000000000
--- a/genny/resource/resource-packr.go
+++ /dev/null
@@ -1,8 +0,0 @@
-// +build !skippackr
-// Code generated by github.com/gobuffalo/packr/v2. DO NOT EDIT.
-
-// You can use the "packr clean" command to clean up this,
-// and any other packr generated files.
-package resource
-
-import _ "github.com/gobuffalo/buffalo/packrd"
diff --git a/genny/resource/resource.go b/genny/resource/resource.go
deleted file mode 100644
index fcd56eab8..000000000
--- a/genny/resource/resource.go
+++ /dev/null
@@ -1,69 +0,0 @@
-package resource
-
-import (
- "text/template"
-
- "github.com/gobuffalo/flect"
- "github.com/gobuffalo/flect/name"
- "github.com/gobuffalo/genny/v2"
- "github.com/gobuffalo/genny/v2/gogen"
- "github.com/gobuffalo/packd"
- "github.com/gobuffalo/packr/v2"
-)
-
-// New resource generator
-func New(opts *Options) (*genny.Generator, error) {
- g := genny.New()
-
- if err := opts.Validate(); err != nil {
- return g, err
- }
-
- if !opts.SkipTemplates {
- core := packr.New("github.com/gobuffalo/buffalo/@v0.15.4/genny/resource/templates/core", "../resource/templates/core")
-
- if err := g.Box(core); err != nil {
- return g, err
- }
- }
-
- var abox packd.Box
- if opts.SkipModel {
- abox = packr.New("github.com/gobuffalo/buffalo/@v0.15.4/genny/resource/templates/standard", "../resource/templates/standard")
- } else {
- abox = packr.New("github.com/gobuffalo/buffalo/@v0.15.4/genny/resource/templates/use_model", "../resource/templates/use_model")
- }
-
- if err := g.Box(abox); err != nil {
- return g, err
- }
-
- pres := presenter{
- App: opts.App,
- Name: name.New(opts.Name),
- Model: name.New(opts.Model),
- Attrs: opts.Attrs,
- }
- x := pres.Name.Resource().File().String()
- folder := pres.Name.Folder().Pluralize().String()
- g.Transformer(genny.Replace("resource-name", x))
- g.Transformer(genny.Replace("resource-use_model", x))
- g.Transformer(genny.Replace("folder-name", folder))
-
- data := map[string]interface{}{
- "opts": pres,
- "actions": actions(opts),
- "folder": folder,
- }
- helpers := template.FuncMap{
- "camelize": func(s string) string {
- return flect.Camelize(s)
- },
- }
- g.Transformer(gogen.TemplateTransformer(data, helpers))
-
- g.RunFn(installPop(opts))
-
- g.RunFn(addResource(pres))
- return g, nil
-}
diff --git a/genny/resource/resource_test.go b/genny/resource/resource_test.go
deleted file mode 100644
index a208e3dc5..000000000
--- a/genny/resource/resource_test.go
+++ /dev/null
@@ -1,256 +0,0 @@
-package resource
-
-import (
- "fmt"
- "path"
- "path/filepath"
- "strings"
- "testing"
-
- "github.com/gobuffalo/attrs"
- "github.com/gobuffalo/flect/name"
- "github.com/gobuffalo/genny/v2"
- "github.com/gobuffalo/genny/v2/gentest"
- "github.com/gobuffalo/meta"
- packr "github.com/gobuffalo/packr/v2"
- "github.com/stretchr/testify/require"
-)
-
-type pass struct {
- Name string
- Options Options
-}
-
-func runner() *genny.Runner {
- run := gentest.NewRunner()
- box := packr.New("./_fixtures/coke", "./_fixtures/coke")
- box.Walk(func(path string, file packr.File) error {
- path = strings.TrimSuffix(path, ".tmpl")
- run.Disk.Add(genny.NewFile(path, file))
- return nil
- })
- return run
-}
-
-func Test_New(t *testing.T) {
- ats, err := attrs.ParseArgs("name", "desc:nulls.Text")
- if err != nil {
- t.Fatal(err)
- }
-
- table := []pass{
- {"default", Options{Name: "widget", Attrs: ats}},
- {"nested", Options{Name: "admin/widget", Attrs: ats}},
- }
-
- app := meta.New(".")
- app.PackageRoot("github.com/markbates/coke")
-
- for _, tt := range table {
- t.Run(tt.Name, func(st *testing.T) {
- tt.Options.App = app
- r := require.New(st)
- g, err := New(&tt.Options)
- r.NoError(err)
-
- run := runner()
- run.With(g)
- r.NoError(run.Run())
-
- res := run.Results()
-
- r.Len(res.Commands, 1)
-
- c := res.Commands[0]
- r.Equal("buffalo-pop pop g model widget name desc:nulls.Text", strings.Join(c.Args, " "))
-
- r.Len(res.Files, 9)
-
- nn := name.New(tt.Options.Name).Pluralize().String()
- actions := []string{"_form", "index", "show", "new", "edit"}
- for _, s := range actions {
- p := path.Join("templates", nn, s+".plush.html")
- _, err = res.Find(p)
- r.NoError(err)
- }
-
- exp := packr.Folder(filepath.Join("_fixtures", tt.Name))
- gentest.CompareFiles(exp.List(), res.Files)
-
- for _, n := range exp.List() {
- n = strings.Replace(n, "\\", "/", -1)
- f, err := res.Find(strings.TrimSuffix(n, ".tmpl"))
- r.NoError(err)
- s, err := exp.FindString(n)
- r.NoError(err)
-
- clean := func(s string) string {
- s = strings.TrimSpace(s)
- s = strings.Replace(s, "\n", "", -1)
- s = strings.Replace(s, "\t", "", -1)
- s = strings.Replace(s, "\r", "", -1)
- return s
- }
- r.Equal(clean(s), clean(f.String()))
- }
-
- })
- }
-}
-
-func Test_New_SkipTemplates(t *testing.T) {
- ats, err := attrs.ParseArgs("name", "desc:nulls.Text")
- if err != nil {
- t.Fatal(err)
- }
- table := []pass{
- {"default", Options{Name: "widget", Attrs: ats}},
- {"nested", Options{Name: "admin/widget", Attrs: ats}},
- }
-
- app := meta.New(".")
- app.PackageRoot("github.com/markbates/coke")
-
- for _, tt := range table {
- t.Run(tt.Name, func(st *testing.T) {
- tt.Options.App = app
- tt.Options.SkipTemplates = true
- r := require.New(st)
- g, err := New(&tt.Options)
- r.NoError(err)
-
- run := runner()
- run.With(g)
- r.NoError(run.Run())
-
- res := run.Results()
-
- r.Len(res.Commands, 1)
-
- for _, s := range []string{"_form", "edit", "index", "new", "show"} {
- p := path.Join("templates", tt.Name, s+".html")
- _, err = res.Find(p)
- r.Error(err)
- }
-
- r.Len(res.Files, 3)
- })
- }
-}
-
-func Test_New_API(t *testing.T) {
- ats, err := attrs.ParseArgs("name", "desc:nulls.Text")
- if err != nil {
- t.Fatal(err)
- }
- table := []pass{
- {"default", Options{Name: "widget", Attrs: ats}},
- {"nested", Options{Name: "admin/widget", Attrs: ats}},
- }
-
- app := meta.New(".")
- app.PackageRoot("github.com/markbates/coke")
- app.AsAPI = true
-
- for _, tt := range table {
- t.Run(tt.Name, func(st *testing.T) {
- tt.Options.App = app
- r := require.New(st)
- g, err := New(&tt.Options)
- r.NoError(err)
-
- run := runner()
- run.With(g)
- r.NoError(run.Run())
-
- res := run.Results()
-
- r.Len(res.Commands, 1)
-
- nn := name.New(tt.Options.Name).Pluralize().String()
- for _, s := range []string{"_form", "edit", "index", "new", "show"} {
- p := path.Join("templates", nn, s+".html")
- _, err = res.Find(p)
- r.Error(err)
- }
-
- r.Len(res.Files, 3)
- })
- }
-}
-
-func Test_New_UseModel(t *testing.T) {
- r := require.New(t)
-
- ats, err := attrs.ParseArgs("name", "desc:nulls.Text")
- r.NoError(err)
-
- app := meta.New(".")
- app.PackageRoot("github.com/markbates/coke")
-
- opts := &Options{
- App: app,
- Name: "Widget",
- Model: "User",
- Attrs: ats,
- }
- g, err := New(opts)
- r.NoError(err)
-
- run := runner()
- run.With(g)
- r.NoError(run.Run())
-
- res := run.Results()
-
- r.Len(res.Commands, 1)
-
- c := res.Commands[0]
- r.Equal("buffalo-pop pop g model user name desc:nulls.Text", strings.Join(c.Args, " "))
-
- r.Len(res.Files, 9)
-
- for _, s := range []string{"_form", "edit", "index", "new", "show"} {
- p := path.Join("templates", "widgets", s+".plush.html")
- _, err = res.Find(p)
- r.NoError(err)
- }
-
- f, err := res.Find("actions/widgets.go")
- r.NoError(err)
- r.Contains(f.String(), "users := &models.Users{}")
-
-}
-
-func Test_New_SkipModel(t *testing.T) {
- r := require.New(t)
-
- app := meta.New(".")
- app.PackageRoot("github.com/markbates/coke")
-
- opts := &Options{
- App: app,
- Name: "Widget",
- SkipModel: true,
- }
-
- g, err := New(opts)
- r.NoError(err)
-
- run := runner()
- run.With(g)
- r.NoError(run.Run())
-
- res := run.Results()
-
- r.Len(res.Commands, 0)
- r.Len(res.Files, 9)
-
- f, err := res.Find("actions/widgets.go")
- r.NoError(err)
- actions := []string{"List", "Show", "Create", "Update", "Destroy", "New", "Edit"}
- for _, action := range actions {
- r.Contains(f.String(), fmt.Sprintf("func (v WidgetsResource) %v(c buffalo.Context) error {", action))
- }
-
-}
diff --git a/genny/resource/templates/core/locales/folder-name.en-us.yaml.tmpl b/genny/resource/templates/core/locales/folder-name.en-us.yaml.tmpl
deleted file mode 100644
index 5fbdf0c50..000000000
--- a/genny/resource/templates/core/locales/folder-name.en-us.yaml.tmpl
+++ /dev/null
@@ -1,6 +0,0 @@
-- id: "{{.opts.Model.Singularize.Underscore}}.created.success"
- translation: "{{.opts.Model.Proper}} was successfully created."
-- id: "{{.opts.Model.Singularize.Underscore}}.updated.success"
- translation: "{{.opts.Model.Proper}} was successfully updated."
-- id: "{{.opts.Model.Singularize.Underscore}}.destroyed.success"
- translation: "{{.opts.Model.Proper}} was successfully destroyed."
diff --git a/genny/resource/templates/core/templates/folder-name/_form.plush.html.tmpl b/genny/resource/templates/core/templates/folder-name/_form.plush.html.tmpl
deleted file mode 100644
index 11aa4adad..000000000
--- a/genny/resource/templates/core/templates/folder-name/_form.plush.html.tmpl
+++ /dev/null
@@ -1,13 +0,0 @@
-{{ range $p := .opts.Attrs -}}
-{{ if eq $p.CommonType "text" -}}
-<%= f.TextAreaTag("{{$p.Name.Pascalize}}", {rows: 10}) %>
-{{ else -}}
-{{ if eq $p.CommonType "bool" -}}
-<%= f.CheckboxTag("{{$p.Name.Pascalize}}", {unchecked: false}) %>
-{{ else -}}
-<%= f.InputTag("{{$p.Name.Pascalize}}") %>
-{{ end -}}
-{{ end -}}
-{{ end -}}
-
-
diff --git a/genny/resource/templates/core/templates/folder-name/edit.plush.html.tmpl b/genny/resource/templates/core/templates/folder-name/edit.plush.html.tmpl
deleted file mode 100644
index 062a451c5..000000000
--- a/genny/resource/templates/core/templates/folder-name/edit.plush.html.tmpl
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
Edit {{.opts.Model.Proper}}
-
-
-<%= formFor({{.opts.Model.VarCaseSingle}}, {action: {{.opts.Name.VarCaseSingle}}Path({ {{.opts.Name.ParamID}}: {{.opts.Model.VarCaseSingle}}.ID }), method: "PUT"}) { %>
- <%= partial("{{.folder}}/form.html") %>
- <%= linkTo({{.opts.Name.VarCaseSingle}}Path({ {{.opts.Name.ParamID}}: {{.opts.Model.VarCaseSingle}}.ID }), {class: "btn btn-warning", "data-confirm": "Are you sure?", body: "Cancel"}) %>
-<% } %>
diff --git a/genny/resource/templates/core/templates/folder-name/index.plush.html.tmpl b/genny/resource/templates/core/templates/folder-name/index.plush.html.tmpl
deleted file mode 100644
index bd133ed4f..000000000
--- a/genny/resource/templates/core/templates/folder-name/index.plush.html.tmpl
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
{{.opts.Model.Group}}
-
- <%= linkTo(new{{.opts.Name.Resource}}Path(), {class: "btn btn-primary"}) { %>
- Create New {{.opts.Model.Proper}}
- <% } %>
-
-
-
- {{ range $p := .opts.Attrs -}}
- {{- if ne $p.CommonType "text" -}}
- | {{ $p.Name.Pascalize }} |
- {{- end -}}
- {{- end }}
- |
-
-
- <%= for ({{.opts.Model.VarCaseSingle}}) in {{.opts.Model.VarCasePlural}} { %>
-
- {{ range $mp := .opts.Attrs -}}
- {{- if ne $mp.CommonType "text" -}}
- | <%= {{$.opts.Model.VarCaseSingle}}.{{$mp.Name.Pascalize}} %> |
- {{- end -}}
- {{- end }}
-
-
- <%= linkTo({{.opts.Name.VarCaseSingle}}Path({ {{.opts.Name.ParamID}}: {{.opts.Model.VarCaseSingle}}.ID }), {class: "btn btn-info", body: "View"}) %>
- <%= linkTo(edit{{.opts.Name.Proper}}Path({ {{.opts.Name.ParamID}}: {{.opts.Model.VarCaseSingle}}.ID }), {class: "btn btn-warning", body: "Edit"}) %>
- <%= linkTo({{.opts.Name.VarCaseSingle}}Path({ {{.opts.Name.ParamID}}: {{.opts.Model.VarCaseSingle}}.ID }), {class: "btn btn-danger", "data-method": "DELETE", "data-confirm": "Are you sure?", body: "Destroy"}) %>
-
- |
-
- <% } %>
-
-
-
-
- <%= paginator(pagination) %>
-
diff --git a/genny/resource/templates/core/templates/folder-name/new.plush.html.tmpl b/genny/resource/templates/core/templates/folder-name/new.plush.html.tmpl
deleted file mode 100644
index 775e4a2a8..000000000
--- a/genny/resource/templates/core/templates/folder-name/new.plush.html.tmpl
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
New {{.opts.Model.Proper}}
-
-
-<%= formFor({{.opts.Model.VarCaseSingle}}, {action: {{.opts.Name.VarCasePlural}}Path(), method: "POST"}) { %>
- <%= partial("{{.folder}}/form.html") %>
- <%= linkTo({{.opts.Name.VarCasePlural}}Path(), {class: "btn btn-warning", "data-confirm": "Are you sure?", body: "Cancel"}) %>
-<% } %>
diff --git a/genny/resource/templates/core/templates/folder-name/show.plush.html.tmpl b/genny/resource/templates/core/templates/folder-name/show.plush.html.tmpl
deleted file mode 100644
index 657f5a837..000000000
--- a/genny/resource/templates/core/templates/folder-name/show.plush.html.tmpl
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
{{.opts.Model.Proper}} Details
-
-
- <%= linkTo({{.opts.Name.VarCasePlural}}Path(), {class: "btn btn-info"}) { %>
- Back to all {{.opts.Model.Group}}
- <% } %>
- <%= linkTo(edit{{.opts.Name.Proper}}Path({ {{.opts.Name.ParamID}}: {{.opts.Model.VarCaseSingle}}.ID }), {class: "btn btn-warning", body: "Edit"}) %>
- <%= linkTo({{.opts.Name.VarCaseSingle}}Path({ {{.opts.Name.ParamID}}: {{.opts.Model.VarCaseSingle}}.ID }), {class: "btn btn-danger", "data-method": "DELETE", "data-confirm": "Are you sure?", body: "Destroy"}) %>
-
-