add test and cleanup

context.go

@@ -179,12 +179,13 @@ func (c *Ctx) resolveProjectRoot(path string) (string, error) {
 //
 // The second returned string indicates which GOPATH value was used.
 func (c *Ctx) SplitAbsoluteProjectRoot(path string) (string, error) {
-	if path == filepath.Join(c.GOPATH, "src") {
-		return "", errors.Errorf("Initializing a project in $GOPATH/src directly is not supported currently")
-	}
-
 	srcprefix := filepath.Join(c.GOPATH, "src") + string(filepath.Separator)
 	if internal.HasFilepathPrefix(path, srcprefix) {
+		// if path length is shorter than srcprefix then the project is directly within $GOPATH/src
+		if len(path) < len(srcprefix) {
+			return "", errors.New("projects directly within $GOPATH/src are not supported currently")
+		}
+
 		// filepath.ToSlash because we're dealing with an import path now,
 		// not an fs path
 		return filepath.ToSlash(path[len(srcprefix):]), nil

context_test.go

@@ -58,10 +58,16 @@ func TestSplitAbsoluteProjectRoot(t *testing.T) {
 		}
 	}
 
-	// test where it should return error
-	got, err := depCtx.SplitAbsoluteProjectRoot("tra/la/la/la")
+	// test where it should return an error when directly within $GOPATH/src
+	got, err := depCtx.SplitAbsoluteProjectRoot(filepath.Join(depCtx.GOPATH, "src"))
 	if err == nil {
-		t.Fatalf("should have gotten error but did not for tra/la/la/la: %s", got)
+		t.Fatalf("should have gotten an error but did not for %s", got)
+	}
+
+	// test where it should return an error
+	got, err = depCtx.SplitAbsoluteProjectRoot("tra/la/la/la")
+	if err == nil {
+		t.Fatalf("should have gotten an error but did not for tra/la/la/la: %s", got)
 	}
 }