use DocGenerationFlag.GetDefaultText

Author: joshuaswickirl

docs.go

@@ -6,7 +6,6 @@ import (
 	"fmt"
 	"io"
 	"os"
-	"reflect"
 	"regexp"
 	"runtime"
 	"sort"
@@ -564,23 +563,5 @@ func getFlagDefaultValue(f cli.DocGenerationFlag) string {
 	if !f.TakesValue() {
 		return ""
 	}
-
-	var ref = reflect.ValueOf(f)
-	if ref.Kind() == reflect.Ptr {
-		ref = ref.Elem()
-	}
-
-	if ref.Kind() != reflect.Struct {
-		return ""
-	}
-
-	if defaultTextVal := ref.FieldByName("DefaultText"); defaultTextVal.IsValid() && defaultTextVal.Kind() == reflect.String && defaultTextVal.String() != "" {
-		return defaultTextVal.String()
-	}
-
-	if val := ref.FieldByName("Value"); val.IsValid() && val.Type().Kind() != reflect.Bool {
-		return fmt.Sprintf("%v", val.Interface())
-	}
-
-	return ""
+	return f.GetDefaultText()
 }

docs_test.go

@@ -24,8 +24,8 @@ func expectFileContent(t *testing.T, file, got string) {
 	r := require.New(t)
 	r.NoError(err)
 	r.Equal(
-		string(normalizeNewlines([]byte(got))),
 		string(normalizeNewlines(data)),
+		string(normalizeNewlines([]byte(got))),
 	)
 }
 
@@ -45,11 +45,12 @@ func buildExtendedTestCommand() *cli.Command {
 		Name:   "greet",
 		Flags: []cli.Flag{
 			&cli.StringFlag{
-				Name:      "socket",
-				Aliases:   []string{"s"},
-				Usage:     "some 'usage' text",
-				Value:     "value",
-				TakesFile: true,
+				Name:        "socket",
+				Aliases:     []string{"s"},
+				Usage:       "some 'usage' text",
+				Value:       "value",
+				DefaultText: "value",
+				TakesFile:   true,
 			},
 			&cli.StringFlag{Name: "flag", Aliases: []string{"fl", "f"}},
 			&cli.BoolFlag{
@@ -65,7 +66,7 @@ func buildExtendedTestCommand() *cli.Command {
 			&cli.StringFlag{
 				Name:        "dir",
 				Value:       pwd(),
-				DefaultText: "\".\"",
+				DefaultText: ".",
 			},
 		},
 		Commands: []*cli.Command{{

testdata/expected-doc-full.man

@@ -45,7 +45,7 @@ app [first_arg] [second_arg]
 \fB--another-flag, -b\fP: another usage text
 
 .PP
-\fB--dir\fP="":  (default: ".")
+\fB--dir\fP="":  (default: .)
 
 .PP
 \fB--flag, --fl, -f\fP="":

testdata/expected-doc-full.md

@@ -27,7 +27,7 @@ app [first_arg] [second_arg]
 
 **--another-flag, -b**: another usage text
 
-**--dir**="":  (default: ".")
+**--dir**="":  (default: .)
 
 **--flag, --fl, -f**="": 
 

testdata/expected-doc-no-authors.md

@@ -27,7 +27,7 @@ app [first_arg] [second_arg]
 
 **--another-flag, -b**: another usage text
 
-**--dir**="":  (default: ".")
+**--dir**="":  (default: .)
 
 **--flag, --fl, -f**="": 
 

testdata/expected-doc-no-commands.md

@@ -27,7 +27,7 @@ app [first_arg] [second_arg]
 
 **--another-flag, -b**: another usage text
 
-**--dir**="":  (default: ".")
+**--dir**="":  (default: .)
 
 **--flag, --fl, -f**="": 
 

testdata/expected-doc-no-usagetext.md

@@ -27,7 +27,7 @@ greet [GLOBAL OPTIONS] [command [COMMAND OPTIONS]] [ARGUMENTS...]
 
 **--another-flag, -b**: another usage text
 
-**--dir**="":  (default: ".")
+**--dir**="":  (default: .)
 
 **--flag, --fl, -f**="": 
 

testdata/expected-tabular-markdown-custom-app-path.md

@@ -19,7 +19,7 @@ Global flags:
 | `--socket="…"` (`-s`)       | some 'usage' text  |    `value`    |         *none*          |
 | `--flag="…"` (`--fl`, `-f`) |                    |               |         *none*          |
 | `--another-flag` (`-b`)     | another usage text |    `false`    | `EXAMPLE_VARIABLE_NAME` |
-| `--dir="…"`                 |                    |     `"."`     |         *none*          |
+| `--dir="…"`                 |                    |      `.`      |         *none*          |
 
 ### `config` command (aliases: `c`)
 

testdata/expected-tabular-markdown-full.md

@@ -19,7 +19,7 @@ Global flags:
 | `--socket="…"` (`-s`)       | some 'usage' text  |    `value`    |         *none*          |
 | `--flag="…"` (`--fl`, `-f`) |                    |               |         *none*          |
 | `--another-flag` (`-b`)     | another usage text |    `false`    | `EXAMPLE_VARIABLE_NAME` |
-| `--dir="…"`                 |                    |     `"."`     |         *none*          |
+| `--dir="…"`                 |                    |      `.`      |         *none*          |
 
 ### `config` command (aliases: `c`)