Set defaultDocPath

Author: k1LoW

cmd/diff.go

@@ -44,20 +44,10 @@ var diffCmd = &cobra.Command{
 
 		if configPath == "" && additionalDataPath != "" {
 			fmt.Println("Warning: `--add` option is deprecated. Use `--config`")
-			err = c.LoadConfigFile(additionalDataPath)
-			if err != nil {
-				printError(err)
-				os.Exit(1)
-			}
-		} else {
-			err = c.LoadConfigFile(configPath)
-			if err != nil {
-				printError(err)
-				os.Exit(1)
-			}
+			configPath = additionalDataPath
 		}
 
-		c.LoadArgs(args)
+		err = c.Load(configPath, args)
 		if err != nil {
 			printError(err)
 			os.Exit(1)

cmd/doc.go

@@ -54,20 +54,10 @@ var docCmd = &cobra.Command{
 
 		if configPath == "" && additionalDataPath != "" {
 			fmt.Println("Warning: `--add` option is deprecated. Use `--config`")
-			err = c.LoadConfigFile(additionalDataPath)
-			if err != nil {
-				printError(err)
-				os.Exit(1)
-			}
-		} else {
-			err = c.LoadConfigFile(configPath)
-			if err != nil {
-				printError(err)
-				os.Exit(1)
-			}
+			configPath = additionalDataPath
 		}
 
-		c.LoadArgs(args)
+		err = c.Load(configPath, args)
 		if err != nil {
 			printError(err)
 			os.Exit(1)

cmd/lint.go

@@ -43,13 +43,7 @@ var lintCmd = &cobra.Command{
 			os.Exit(1)
 		}
 
-		err = c.LoadConfigFile(configPath)
-		if err != nil {
-			printError(err)
-			os.Exit(1)
-		}
-
-		c.LoadArgs(args)
+		err = c.Load(configPath, args)
 		if err != nil {
 			printError(err)
 			os.Exit(1)

cmd/out.go

@@ -59,20 +59,10 @@ var outCmd = &cobra.Command{
 
 		if configPath == "" && additionalDataPath != "" {
 			fmt.Println("Warning: `--add` option is deprecated. Use `--config`")
-			err = c.LoadConfigFile(additionalDataPath)
-			if err != nil {
-				printError(err)
-				os.Exit(1)
-			}
-		} else {
-			err = c.LoadConfigFile(configPath)
-			if err != nil {
-				printError(err)
-				os.Exit(1)
-			}
+			configPath = additionalDataPath
 		}
 
-		c.LoadArgs(args)
+		err = c.Load(configPath, args)
 		if err != nil {
 			printError(err)
 			os.Exit(1)

config/config.go

@@ -14,7 +14,8 @@ import (
 	"gopkg.in/yaml.v2"
 )
 
-const configDefaultPath = ".tbls.yml"
+const defaultConfigFilePath = ".tbls.yml"
+const defaultDocPath = "schema"
 
 // Config is tbls config
 type Config struct {
@@ -43,41 +44,69 @@ type AdditionalComment struct {
 
 // NewConfig return Config
 func NewConfig() (*Config, error) {
-	docPath := os.Getenv("TBLS_DOC_PATH")
-	if docPath == "" {
-		docPath = "."
-	}
-
 	c := Config{
-		DSN:     os.Getenv("TBLS_DSN"),
-		DocPath: docPath,
+		DSN:     "",
+		DocPath: "",
 	}
 	return &c, nil
 }
 
+// Load load config with all method
+func (c *Config) Load(configPath string, args []string) error {
+	err := c.LoadConfigFile(configPath)
+	if err != nil {
+		return err
+	}
+
+	err = c.LoadEnviron()
+	if err != nil {
+		return err
+	}
+
+	err = c.LoadArgs(args)
+	if err != nil {
+		return err
+	}
+
+	if c.DocPath == "" {
+		c.DocPath = defaultDocPath
+	}
+
+	return nil
+}
+
+// LoadEnviron load environment variables
+func (c *Config) LoadEnviron() error {
+	dsn := os.Getenv("TBLS_DSN")
+	if dsn != "" {
+		c.DSN = dsn
+	}
+	docPath := os.Getenv("TBLS_DOC_PATH")
+	if docPath != "" {
+		c.DocPath = docPath
+	}
+	return nil
+}
+
 // LoadArgs load args slice
 func (c *Config) LoadArgs(args []string) error {
+	if len(args) > 2 {
+		return errors.WithStack(errors.New("too many arguments"))
+	}
 	if len(args) == 2 {
 		c.DSN = args[0]
 		c.DocPath = args[1]
 	}
-	if len(args) > 2 {
-		return errors.WithStack(errors.New("too many arguments"))
-	}
 	if len(args) == 1 {
-		if c.DSN == "" {
-			c.DSN = args[0]
-		} else {
-			c.DocPath = args[0]
-		}
+		c.DSN = args[0]
 	}
 	return nil
 }
 
 // LoadConfigFile load config file
 func (c *Config) LoadConfigFile(path string) error {
 	if path == "" {
-		path = configDefaultPath
+		path = defaultConfigFilePath
 		if _, err := os.Lstat(path); err != nil {
 			return nil
 		}

config/config_test.go

@@ -8,6 +8,26 @@ import (
 	"github.com/k1LoW/tbls/schema"
 )
 
+func TestLoadDefault(t *testing.T) {
+	configFilepath := filepath.Join(testdataDir(), "empty.yml")
+	config, err := NewConfig()
+	if err != nil {
+		t.Fatal(err)
+	}
+	err = config.Load(configFilepath, []string{})
+	if err != nil {
+		t.Fatal(err)
+	}
+	expected := ""
+	if config.DSN != expected {
+		t.Errorf("actual %v\nwant %v", config.DSN, expected)
+	}
+	expected2 := "schema"
+	if config.DocPath != expected2 {
+		t.Errorf("actual %v\nwant %v", config.DocPath, expected2)
+	}
+}
+
 func TestLoadConfigFile(t *testing.T) {
 	_ = os.Setenv("TBLS_TEST_PG_PASS", "pgpass")
 	_ = os.Setenv("TBLS_TEST_PG_DOC_PATH", "sample/pg")
@@ -54,12 +74,6 @@ func TestParseWithEnvirion(t *testing.T) {
 	}
 }
 
-func testdataDir() string {
-	wd, _ := os.Getwd()
-	dir, _ := filepath.Abs(filepath.Join(filepath.Dir(wd), "testdata"))
-	return dir
-}
-
 func TestMergeAditionalData(t *testing.T) {
 	s := schema.Schema{
 		Name: "testschema",
@@ -123,3 +137,9 @@ func TestMergeAditionalData(t *testing.T) {
 		t.Errorf("actual %v\nwant %v", actual2, expected2)
 	}
 }
+
+func testdataDir() string {
+	wd, _ := os.Getwd()
+	dir, _ := filepath.Abs(filepath.Join(filepath.Dir(wd), "testdata"))
+	return dir
+}

testdata/empty.yml

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