Add default config file name tbls.yml

README.md

@@ -84,7 +84,7 @@ $ docker pull k1low/tbls:latest
 
 ### Document a database
 
-Add `.tbls.yml` file to your repository.
+Add `.tbls.yml` ( or `tbls.yml` ) file to your repository.
 
 ``` yaml
 # .tbls.yml

config/config.go

@@ -18,9 +18,10 @@ import (
 	"github.com/pkg/errors"
 )
 
-const defaultConfigFilePath = ".tbls.yml"
 const defaultDocPath = "dbdoc"
 
+var defaultConfigFilePaths = []string{".tbls.yml", "tbls.yml"}
+
 // DefaultERFormat is the default ER diagram format
 const DefaultERFormat = "png"
 
@@ -42,6 +43,7 @@ type Config struct {
 	Comments    []AdditionalComment  `yaml:"comments"`
 	Dict        dict.Dict            `yaml:"dict"`
 	MergedDict  dict.Dict            `yaml:"-"`
+	root        string
 }
 
 // Format is document format setting
@@ -209,11 +211,18 @@ func (c *Config) LoadEnviron() error {
 // LoadConfigFile load config file
 func (c *Config) LoadConfigFile(path string) error {
 	if path == "" {
-		path = defaultConfigFilePath
-		if _, err := os.Lstat(path); err != nil {
-			return nil
+		for _, p := range defaultConfigFilePaths {
+			if f, err := os.Stat(filepath.Join(c.root, p)); err == nil && !f.IsDir() {
+				if path != "" {
+					return fmt.Errorf("duplicate config file [%s, %s]", path, p)
+				}
+				path = p
+			}
 		}
 	}
+	if path == "" {
+		return nil
+	}
 
 	fullPath, err := filepath.Abs(path)
 	if err != nil {

config/config_test.go

@@ -1,6 +1,7 @@
 package config
 
 import (
+	"fmt"
 	"os"
 	"path/filepath"
 	"testing"
@@ -59,6 +60,17 @@ func TestLoadConfigFile(t *testing.T) {
 	}
 }
 
+func TestDuplicateConfigFile(t *testing.T) {
+	config := &Config{
+		root: filepath.Join(testdataDir(), "config"),
+	}
+	got := config.LoadConfigFile("")
+	want := "duplicate config file [.tbls.yml, tbls.yml]"
+	if fmt.Sprintf("%v", got) != want {
+		t.Errorf("got %v\nwant %v", got, want)
+	}
+}
+
 var tests = []struct {
 	value string
 	want  string

testdata/config/.tbls.yml

@@ -0,0 +1 @@
+---

testdata/config/tbls.yml

@@ -0,0 +1 @@
+---