Merge pull request #166 from alexflint/env-in-error

Put name of environment variable in error message

2 files changed, 13 insertions, 1 deletions

diff --git a/parse.go b/parse.go
index 1ebb2a4..7588dfb 100644
--- a/parse.go
+++ b/parse.go
@@ -653,7 +653,11 @@ func (p *Parser) process(args []string) error {
 		}
 
 		if spec.required {
-			return fmt.Errorf("%s is required", name)
+			msg := fmt.Sprintf("%s is required", name)
+			if spec.env != "" {
+				msg += " (or environment variable " + spec.env + ")"
+			}
+			return errors.New(msg)
 		}
 		if spec.defaultVal != "" {
 			err := scalar.ParseValue(p.val(spec.dest), spec.defaultVal)
diff --git a/parse_test.go b/parse_test.go
index 284e386..2d0ef7a 100644
--- a/parse_test.go
+++ b/parse_test.go
@@ -203,6 +203,14 @@ func TestRequired(t *testing.T) {
 	require.Error(t, err, "--foo is required")
 }
 
+func TestRequiredWithEnv(t *testing.T) {
+	var args struct {
+		Foo string `arg:"required,env:FOO"`
+	}
+	err := parse("", &args)
+	require.Error(t, err, "--foo is required (or environment variable FOO)")
+}
+
 func TestShortFlag(t *testing.T) {
 	var args struct {
 		Foo string `arg:"-f"`