test: add extra tests to cmd and format (#58)

princjef · Dec 24, 2021 · 08e0e91 · 08e0e91
1 parent 070df04
commit 08e0e91
Show file tree

Hide file tree

Showing 31 changed files with 1,063 additions and 25 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 /coverage.txt
 /gomarkdoc
 /bin/
+README-test.md
diff --git a/cmd/gomarkdoc/README.md b/cmd/gomarkdoc/README.md
@@ -15,7 +15,7 @@ See https://github.com/princjef/gomarkdoc for full documentation of this tool\.
 - [type PackageSpec](<#type-packagespec>)
 
 
-## type [PackageSpec](<https://github.com/princjef/gomarkdoc/blob/master/cmd/gomarkdoc/command.go#L31-L45>)
+## type [PackageSpec](<https://github.com/princjef/gomarkdoc/blob/master/cmd/gomarkdoc/command.go#L30-L44>)
 
 PackageSpec defines the data available to the \-\-output option's template\. Information is recomputed for each package generated\.
 

diff --git a/cmd/gomarkdoc/command.go b/cmd/gomarkdoc/command.go
@@ -11,7 +11,6 @@ import (
 	"html/template"
 	"io"
 	"io/ioutil"
-	"log"
 	"os"
 	"path/filepath"
 	"runtime/debug"
@@ -70,17 +69,19 @@ func buildCommand() *cobra.Command {
 	var opts commandOptions
 	var configFile string
 
-	cobra.OnInitialize(func() { buildConfig(configFile) })
+	// cobra.OnInitialize(func() { buildConfig(configFile) })
 
 	var command = &cobra.Command{
 		Use:   "gomarkdoc [package ...]",
 		Short: "generate markdown documentation for golang code",
-		Run: func(cmd *cobra.Command, args []string) {
+		RunE: func(cmd *cobra.Command, args []string) error {
 			if opts.version {
 				printVersion()
-				return
+				return nil
 			}
 
+			buildConfig(configFile)
+
 			// Load configuration from viper
 			opts.includeUnexported = viper.GetBool("includeUnexported")
 			opts.output = viper.GetString("output")
@@ -98,17 +99,15 @@ func buildCommand() *cobra.Command {
 			opts.repository.PathFromRoot = viper.GetString("repository.path")
 
 			if opts.check && opts.output == "" {
-				log.Fatal("check mode cannot be run without an output set")
+				return errors.New("gomarkdoc: check mode cannot be run without an output set")
 			}
 
 			if len(args) == 0 {
 				// Default to current directory
 				args = []string{"."}
 			}
 
-			if err := runCommand(args, opts); err != nil {
-				log.Fatal(err)
-			}
+			return runCommand(args, opts)
 		},
 	}