[chloggen] use current directory as repo root (open-telemetry#130)

Alex Boten · web-flow · commit 2acdff3badaf · 2022-09-09T18:11:41.000-04:00
This change allows chloggen to find the `unreleased` folder in the current directory, rather than expecting it to be in the module's directory. Also added a validation check for the filename on `new` command.
diff --git a/chloggen/context.go b/chloggen/context.go
@@ -16,6 +16,7 @@ package main
 
 import (
 	"fmt"
+	"os"
 	"path/filepath"
 	"runtime"
 )
@@ -44,10 +45,15 @@ func newChlogContext(rootDir string) chlogContext {
 var defaultCtx = newChlogContext(repoRoot())
 
 func repoRoot() string {
-	return filepath.Dir(thisDir())
+	dir, err := os.Getwd()
+	if err != nil {
+		// This is not expected, but just in case
+		fmt.Println("FAIL: Could not determine current working directory")
+	}
+	return dir
 }
 
-func thisDir() string {
+func moduleDir() string {
 	_, filename, _, ok := runtime.Caller(0)
 	if !ok {
 		// This is not expected, but just in case
diff --git a/chloggen/main.go b/chloggen/main.go
@@ -54,6 +54,9 @@ func main() {
 			fmt.Printf("FAIL: new: %v\n", err)
 			os.Exit(1)
 		}
+		if len(*filename) == 0 {
+			fmt.Printf("FAIL: new: 'filename' is required\n")
+		}
 		if err := initialize(defaultCtx, *filename); err != nil {
 			fmt.Printf("FAIL: new: %v\n", err)
 			os.Exit(1)
@@ -118,7 +121,7 @@ func validate(ctx chlogContext) error {
 			return err
 		}
 	}
-	fmt.Printf("PASS: all files in ./%s/ are valid\n", ctx.unreleasedDir)
+	fmt.Printf("PASS: all files in %s/ are valid\n", ctx.unreleasedDir)
 	return nil
 }
 
diff --git a/chloggen/summary.go b/chloggen/summary.go
@@ -61,7 +61,7 @@ func generateSummary(version string, entries []*Entry) (string, error) {
 }
 
 func (s summary) String() (string, error) {
-	summaryTmpl := filepath.Join(thisDir(), "summary.tmpl")
+	summaryTmpl := filepath.Join(moduleDir(), "summary.tmpl")
 
 	tmpl := template.Must(
 		template.

Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,9 @@ func main() {`
`54`	`54`	`fmt.Printf("FAIL: new: %v\n", err)`
`55`	`55`	`os.Exit(1)`
`56`	`56`	`}`
	`57`	`+ if len(*filename) == 0 {`
	`58`	`+ fmt.Printf("FAIL: new: 'filename' is required\n")`
	`59`	`+ }`
`57`	`60`	`if err := initialize(defaultCtx, *filename); err != nil {`
`58`	`61`	`fmt.Printf("FAIL: new: %v\n", err)`
`59`	`62`	`os.Exit(1)`
`@@ -118,7 +121,7 @@ func validate(ctx chlogContext) error {`
`118`	`121`	`return err`
`119`	`122`	`}`
`120`	`123`	`}`
`121`		`- fmt.Printf("PASS: all files in ./%s/ are valid\n", ctx.unreleasedDir)`
	`124`	`+ fmt.Printf("PASS: all files in %s/ are valid\n", ctx.unreleasedDir)`
`122`	`125`	`return nil`
`123`	`126`	`}`
`124`	`127`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ func generateSummary(version string, entries []*Entry) (string, error) {`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`func (s summary) String() (string, error) {`
`64`		`- summaryTmpl := filepath.Join(thisDir(), "summary.tmpl")`
	`64`	`+ summaryTmpl := filepath.Join(moduleDir(), "summary.tmpl")`
`65`	`65`
`66`	`66`	`tmpl := template.Must(`
`67`	`67`	`template.`