Use evaluated project root path

context.go

@@ -5,6 +5,7 @@
 package dep
 
 import (
+	"fmt"
 	"log"
 	"os"
 	"path/filepath"
@@ -222,15 +223,26 @@ func (c *Ctx) detectGOPATH(path string) (string, error) {
 // ImportForAbs returns the import path for an absolute project path by trimming the
 // `$GOPATH/src/` prefix.  Returns an error for paths equal to, or without this prefix.
 func (c *Ctx) ImportForAbs(path string) (string, error) {
-	srcprefix := filepath.Join(c.GOPATH, "src") + string(filepath.Separator)
-	if fs.HasFilepathPrefix(path, srcprefix) {
-		if len(path) <= len(srcprefix) {
+
+	gopathEvaluated, err := filepath.EvalSymlinks(c.GOPATH)
+	if err != nil {
+		return "", fmt.Errorf("Error evaluating symlinks in GOPATH %s: %s", c.GOPATH, err.Error())
+	}
+
+	pathEvaluated, err := filepath.EvalSymlinks(path)
+	if err != nil {
+		return "", fmt.Errorf("Error evaluating symlinks in %s: %s", path, err.Error())
+	}
+
+	srcprefix := filepath.Join(gopathEvaluated, "src") + string(filepath.Separator)
+	if fs.HasFilepathPrefix(pathEvaluated, srcprefix) {
+		if len(pathEvaluated) <= len(srcprefix) {
 			return "", errors.New("dep does not currently support using GOPATH/src as the project root")
 		}
 
 		// filepath.ToSlash because we're dealing with an import path now,
 		// not an fs path
-		return filepath.ToSlash(path[len(srcprefix):]), nil
+		return filepath.ToSlash(pathEvaluated[len(srcprefix):]), nil
 	}
 
 	return "", errors.Errorf("%s not in GOPATH", path)

context_test.go

@@ -491,3 +491,32 @@ func TestDetectGOPATH(t *testing.T) {
 		}
 	}
 }
+
+func TestDetectProjectSymlinkedOutsideGOPATH(t *testing.T) {
+	h := test.NewHelper(t)
+	defer h.Cleanup()
+
+	h.TempDir("src")
+
+	h.Setenv("GOPATH", h.Path("."))
+	depCtx := &Ctx{GOPATH: h.Path(".")}
+
+	importPath := "ti/ga/fato/la/večera"
+	h.TempDir(filepath.Join("src", importPath))
+	h.TempDir("symlink/to/project")
+
+	symlinkSrc := h.OriginalPath(filepath.Join("src", importPath))
+	symlinkTarget := h.OriginalPath("symlink/to/project/sym")
+	err := os.Symlink(symlinkSrc, symlinkTarget)
+	if err != nil {
+		t.Errorf("Error creating symlink from %s to %s: %s", symlinkSrc, symlinkTarget, err.Error())
+	}
+
+	got, err := depCtx.ImportForAbs(symlinkTarget)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if got != importPath {
+		t.Fatalf("expected %s, got %s", importPath, got)
+	}
+}

internal/test/test.go

@@ -498,8 +498,21 @@ func (h *Helper) TempDir(path string) {
 }
 
 // Path returns the absolute pathname to file with the temporary
-// directory.
+// directory. Symlinks are evaluated.
 func (h *Helper) Path(name string) string {
+	path := h.OriginalPath(name)
+
+	// Ensure it's the absolute, symlink-less path we're returning
+	abs, err := filepath.EvalSymlinks(path)
+	if err != nil {
+		h.t.Fatalf("%+v", errors.Wrapf(err, "internal testsuite error: could not get absolute path for dir(%q)", path))
+	}
+	return abs
+}
+
+// OriginalPath returns the absolute pathname to file with the temporary
+// directory. Symlinks are NOT evaluated.
+func (h *Helper) OriginalPath(name string) string {
 	if h.tempdir == "" {
 		h.t.Fatalf("%+v", errors.Errorf("internal testsuite error: path(%q) with no tempdir", name))
 	}
@@ -511,12 +524,7 @@ func (h *Helper) Path(name string) string {
 		joined = filepath.Join(h.tempdir, name)
 	}
 
-	// Ensure it's the absolute, symlink-less path we're returning
-	abs, err := filepath.EvalSymlinks(joined)
-	if err != nil {
-		h.t.Fatalf("%+v", errors.Wrapf(err, "internal testsuite error: could not get absolute path for dir(%q)", joined))
-	}
-	return abs
+	return joined
 }
 
 // MustExist fails if path does not exist.