Merge pull request jacobstr#10 from Dalton001/master

fix for using absolute path when root path set
akshat23rustagi · Feb 3, 2016 · 1f51067 · 1f51067
2 parents f1d489f + e6dd07b
commit 1f51067
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/confer.go b/confer.go
@@ -21,9 +21,9 @@ import (
 	"fmt"
 	"path"
 	"path/filepath"
+	"reflect"
 	"strings"
 	"time"
-	"reflect"
 
 	"github.com/kr/pretty"
 	"github.com/spf13/cast"
@@ -231,10 +231,10 @@ func (manager *Config) ReadPaths(paths ...string) error {
 	for _, base_path := range paths {
 		var final_path string
 
-		if filepath.IsAbs(base_path) == false {
+		if !filepath.IsAbs(base_path) {
 			final_path = path.Join(manager.rootPath, base_path)
 		} else {
-			final_path = path.Join(manager.rootPath, base_path)
+			final_path = base_path
 		}
 
 		loaded, err = reader.ReadFile(final_path)

diff --git a/confer_test.go b/confer_test.go
@@ -303,6 +303,13 @@ func TestSpec(t *testing.T) {
 				So(config.GetStringMap("app"), ShouldResemble, application_yaml)
 			})
 
+			Convey("Absolute Path With Root Set", func() {
+				config.SetRootPath("test/fixtures")
+				currentDir, _ := os.Getwd()
+				config.ReadPaths(currentDir + "/test/fixtures/application.yaml")
+				So(config.GetStringMap("app"), ShouldResemble, application_yaml)
+			})
+
 			Convey("Multiple Paths", func() {
 				Convey("With A Missing File", func() {
 					config.ReadPaths("test/fixtures/application.yaml", "test/fixtures/missing.yaml")