Fix abs dest bug (#45)

Author: myshkin5

cmd/root.go

@@ -72,7 +72,7 @@ func rootSetup(cmd *cobra.Command) rootInfo {
 		logs.Panic("Could not get working directory", err)
 	}
 
-	stateFile, _ := os.LookupEnv(stateFileEnvVar)
+	stateFile := os.Getenv(stateFileEnvVar)
 
 	logs.Debugf("Moqueries root info,"+
 		" bulk processing state file: %s,"+

generator/moqgen.go

@@ -149,6 +149,25 @@ func (g *MoqGenerator) Generate(req GenerateRequest) (*dst.File, string, error)
 	return file, destPath, nil
 }
 
+func (g *MoqGenerator) relativePath(workingDir string) (string, error) {
+	wd, err := g.getwdFn()
+	if err != nil {
+		return "", fmt.Errorf("error getting current working directory: %w", err)
+	}
+
+	if workingDir == wd || workingDir == "" {
+		return ".", nil
+	}
+
+	relPath, err := filepath.Rel(wd, workingDir)
+	if err != nil {
+		return "", fmt.Errorf("error getting relative import path from %s to %s: %w",
+			wd, workingDir, err)
+	}
+
+	return relPath, err
+}
+
 func (g *MoqGenerator) outPackagePath(req GenerateRequest, relPath string) (string, error) {
 	destDir := path.Join(relPath, req.DestinationDir, req.Destination)
 	if strings.HasSuffix(destDir, ".go") {
@@ -182,25 +201,6 @@ func initializeFile(pkg string) *dst.File {
 	return file
 }
 
-func (g *MoqGenerator) relativePath(workingDir string) (string, error) {
-	wd, err := g.getwdFn()
-	if err != nil {
-		return "", fmt.Errorf("error getting current working directory: %w", err)
-	}
-
-	if workingDir == wd || workingDir == "" {
-		return ".", nil
-	}
-
-	relPath, err := filepath.Rel(wd, workingDir)
-	if err != nil {
-		return "", fmt.Errorf("error getting relative import path from %s to %s: %w",
-			wd, workingDir, err)
-	}
-
-	return relPath, err
-}
-
 func importPath(imp, relPath string) string {
 	if imp != "." && !strings.HasPrefix(imp, "./") {
 		return imp
@@ -367,5 +367,13 @@ func destinationPath(req GenerateRequest, relPath string) (string, error) {
 		destPath += ".go"
 	}
 
+	if filepath.IsAbs(destPath) {
+		return destPath, nil
+	}
+
+	if filepath.IsAbs(req.DestinationDir) {
+		return filepath.Join(req.DestinationDir, destPath), nil
+	}
+
 	return filepath.Join(relPath, req.DestinationDir, destPath), nil
 }

generator/moqgen_test.go

@@ -348,6 +348,40 @@ func TestMoqGenerator(t *testing.T) {
 				typePath:   ".",
 				destPath:   "file_test.go",
 			},
+			"gives a sane path when destination is an absolute path": {
+				request: generator.GenerateRequest{
+					Types:       types,
+					Export:      false,
+					Destination: "/exactly-here/file_test.go",
+					Package:     "",
+					Import:      ".",
+					TestImport:  false,
+					WorkingDir:  "/some-nice-path",
+				},
+				findPkgDir: "exactly-here",
+				findPkgOut: "thispkg",
+				outPkgPath: "thispkg_test",
+				getwdDir:   "/some-nice-path",
+				typePath:   ".",
+				destPath:   "/exactly-here/file_test.go",
+			},
+			"gives a sane path when destination dir is an absolute path": {
+				request: generator.GenerateRequest{
+					Types:          types,
+					Export:         false,
+					DestinationDir: "/exactly-here",
+					Package:        "",
+					Import:         ".",
+					TestImport:     false,
+					WorkingDir:     "/some-nice-path",
+				},
+				findPkgDir: "exactly-here",
+				findPkgOut: "thispkg",
+				outPkgPath: "thispkg_test",
+				getwdDir:   "/some-nice-path",
+				typePath:   ".",
+				destPath:   "/exactly-here/moq_publicinterface_privateinterface_test.go",
+			},
 			"req working dir not set": {
 				request: generator.GenerateRequest{
 					Types:       types,