Fix subpath builds / pathing

modutils/alias.go

@@ -28,10 +28,10 @@ var (
 	// Get is an alias to DefaultExecutor.Get.
 	Get = DefaultExecutor.Get
 
-	// GetDirE is an alias to DefaultExecutor.GetDirE.
-	GetDirE = DefaultExecutor.DirE
-	// GetDir is an alias to DefaultExecutor.GetDir.
-	GetDir = DefaultExecutor.Dir
+	// DirE is an alias to DefaultExecutor.DirE.
+	DirE = DefaultExecutor.DirE
+	// Dir is an alias to DefaultExecutor.Dir.
+	Dir = DefaultExecutor.Dir
 
 	// BuildE is an alias to DefaultExecutor.BuildE.
 	BuildE = DefaultExecutor.BuildE

modutils/modutils.go

@@ -211,7 +211,7 @@ func (e *Executor) BuildE(filename, name string, parts ...string) error {
 
 	target := "."
 	if len(parts) > 0 {
-		target += path.Join(parts...)
+		target = "./" + path.Join(parts...)
 	}
 
 	if err := e.build(name, dir, target, filename); err != nil {

modutils/modutils_test.go

@@ -62,6 +62,13 @@ var _ = Describe("Modutils", func() {
 				Expect(filepath.Join(dir, "go.mod")).To(BeARegularFile())
 				Expect(filepath.Join(dir, "main.go")).To(BeARegularFile())
 			})
+
+			It("should get the directory of the specified module", func() {
+				dir, err := executor.DirE("example.org/testmod2", "submain")
+				Expect(err).NotTo(HaveOccurred())
+				Expect(dir).To(BeADirectory())
+				Expect(filepath.Join(dir, "main.go")).To(BeARegularFile())
+			})
 		})
 
 		Describe("BuildE", func() {
@@ -74,6 +81,16 @@ var _ = Describe("Modutils", func() {
 
 				Expect(session.Wait(1 * time.Second).Out).To(gbytes.Say("Hello, World!"))
 			})
+
+			It("should build the module via another module and subpath", func() {
+				dstFilename := filepath.Join(GinkgoT().TempDir(), "hello-world")
+				Expect(executor.BuildE(dstFilename, "example.org/testmod2", "submain")).To(Succeed())
+
+				session, err := gexec.Start(exec.Command(dstFilename), GinkgoWriter, GinkgoWriter)
+				Expect(err).NotTo(HaveOccurred())
+
+				Expect(session.Wait(1 * time.Second).Out).To(gbytes.Say("Hello, Submain!"))
+			})
 		})
 	})
 })

testdata/testmod2/submain/main.go

@@ -0,0 +1,7 @@
+package main
+
+import "fmt"
+
+func main() {
+	fmt.Println("Hello, Submain!")
+}