Update to use TOML config

config/client.go

@@ -0,0 +1,5 @@
+package config
+
+type Client struct {
+	IPCPath string
+}

config/config.go

@@ -1,5 +1,46 @@
 package config
 
+import (
+	"log"
+	"os"
+
+	"fmt"
+
+	"path/filepath"
+
+	"path"
+	"runtime"
+
+	"github.com/BurntSushi/toml"
+)
+
 type Config struct {
 	Database Database
+	Client   Client
+}
+
+func NewConfig(environment string) Config {
+	filenameWithExtension := fmt.Sprintf("%s.toml", environment)
+	absolutePath := filepath.Join(ProjectRoot(), "config", "environments", filenameWithExtension)
+	config := parseConfigFile(absolutePath)
+	config.Client.IPCPath = filepath.Join(ProjectRoot(), config.Client.IPCPath)
+	return config
+}
+
+func ProjectRoot() string {
+	var _, filename, _, _ = runtime.Caller(0)
+	return path.Join(path.Dir(filename), "../")
+}
+
+func parseConfigFile(configfile string) Config {
+	var cfg Config
+	_, err := os.Stat(configfile)
+	if err != nil {
+		log.Fatal("Config file is missing: ", configfile)
+	}
+
+	if _, err := toml.DecodeFile(configfile, &cfg); err != nil {
+		log.Fatal(err)
+	}
+	return cfg
 }

config/config_suite_test.go

@@ -0,0 +1,13 @@
+package config_test
+
+import (
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
+
+	"testing"
+)
+
+func TestConfig(t *testing.T) {
+	RegisterFailHandler(Fail)
+	RunSpecs(t, "Config Suite")
+}

config/config_test.go

@@ -0,0 +1,23 @@
+package config_test
+
+import (
+	"path/filepath"
+
+	"github.com/8thlight/vulcanizedb/config"
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
+)
+
+var _ = Describe("Loading the config", func() {
+
+	It("reads the private config using the environment", func() {
+		privateConfig := config.NewConfig("private")
+
+		Expect(privateConfig.Database.Hostname).To(Equal("localhost"))
+		Expect(privateConfig.Database.Name).To(Equal("vulcanize_private"))
+		Expect(privateConfig.Database.Port).To(Equal(5432))
+		expandedPath := filepath.Join(config.ProjectRoot(), "test_data_dir/geth.ipc")
+		Expect(privateConfig.Client.IPCPath).To(Equal(expandedPath))
+	})
+
+})

config/environments/private.toml

@@ -0,0 +1,7 @@
+[database]
+name = "vulcanize_private"
+hostname = "localhost"
+port = 5432
+
+[client]
+ipcPath = "test_data_dir/geth.ipc"

config/private.go

@@ -1,11 +0,0 @@
-package config
-
-func Private() Config {
-	return Config{
-		Database: Database{
-			Name:     "vulcanize_private",
-			Hostname: "localhost",
-			Port:     5432,
-		},
-	}
-}

config/public.go

@@ -1,11 +0,0 @@
-package config
-
-func Public() Config {
-	return Config{
-		Database: Database{
-			Name:     "vulcanize_public",
-			Hostname: "localhost",
-			Port:     5432,
-		},
-	}
-}