Fix Bazaar behavior

buffalo/cmd/new.go

@@ -28,7 +28,6 @@ var app = newapp.Generator{
 	CIProvider: "none",
 	AsWeb:      true,
 	Docker:     "multi",
-	VCS:        "git",
 	Bootstrap:  3,
 }
 

generators/newapp/generator.go

@@ -27,7 +27,6 @@ type Generator struct {
 	AsWeb       bool   `json:"as_web"`
 	AsAPI       bool   `json:"as_api"`
 	Docker      string `json:"docker"`
-	VCS         string `json:"vcs"`
 	SkipPop     bool   `json:"skip_pop"`
 	SkipWebpack bool   `json:"skip_webpack"`
 	SkipYarn    bool   `json:"skip_yarn"`

generators/newapp/new.go

@@ -1,6 +1,7 @@
 package newapp
 
 import (
+	"fmt"
 	"os"
 	"os/exec"
 	"path/filepath"
@@ -97,9 +98,16 @@ func (a Generator) setupVCS(g *makr.Generator) {
 		return
 	}
 
+	// Create .gitignore or .bzrignore
+	g.Add(makr.NewFile(fmt.Sprintf(".%signore", a.VCS), nVCSIgnore))
 	g.Add(makr.NewCommand(exec.Command(a.VCS, "init")))
-	g.Add(makr.NewCommand(exec.Command(a.VCS, "add", ".")))
-	g.Add(makr.NewCommand(exec.Command(a.VCS, "commit", "-m", "Initial Commit")))
+	args := []string{"add", "."}
+	if a.VCS == "bzr" {
+		// Ensure Bazaar is as quiet as Git
+		args = append(args, "-q")
+	}
+	g.Add(makr.NewCommand(exec.Command(a.VCS, args...)))
+	g.Add(makr.NewCommand(exec.Command(a.VCS, "commit", "-q", "-m", "Initial Commit")))
 }
 
 func (a Generator) setupDocker(root string, data makr.Data) error {
@@ -332,3 +340,19 @@ test:1.8:
   script:
     - buffalo test
 `
+
+const nVCSIgnore = `vendor/
+**/*.log
+**/*.sqlite
+.idea/
+bin/
+tmp/
+node_modules/
+.sass-cache/
+*-packr.go
+public/assets/
+{{ .opts.Name.File }}
+.vscode/
+.grifter/
+.env
+`

meta/app.go

@@ -22,6 +22,7 @@ type App struct {
 	ActionsPkg  string       `json:"actions_path"`
 	ModelsPkg   string       `json:"models_path"`
 	GriftsPkg   string       `json:"grifts_path"`
+	VCS         string       `json:"vcs"`
 	WithPop     bool         `json:"with_pop"`
 	WithDep     bool         `json:"with_dep"`
 	WithWebpack bool         `json:"with_webpack"`
@@ -77,6 +78,11 @@ func New(root string) App {
 	if _, err := os.Stat(filepath.Join(root, "grifts")); err == nil {
 		app.WithGrifts = true
 	}
+	if _, err := os.Stat(filepath.Join(root, ".git")); err == nil {
+		app.VCS = "git"
+	} else if _, err := os.Stat(filepath.Join(root, ".bzr")); err == nil {
+		app.VCS = "bzr"
+	}
 
 	return app
 }