From 042bd8942abbc8888cdb83909909e2cfd3b9a8f6 Mon Sep 17 00:00:00 2001
From: rsteube <rsteube@users.noreply.github.com>
Date: Sat, 18 Feb 2023 11:52:05 +0100
Subject: [PATCH] run: add flags to env

---
 example/runnable.yaml | 12 ++++++++++++
 example_test.go       |  3 ++-
 run.go                | 15 +++++++++++++++
 3 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/example/runnable.yaml b/example/runnable.yaml
index 613e226..a8e69c6 100644
--- a/example/runnable.yaml
+++ b/example/runnable.yaml
@@ -12,3 +12,15 @@ commands:
        positional:
          - - "$(git branch --format '%(refname:short)\t%(subject)\tblue')"
            - "$(git tag --format '%(refname:short)\t\tyellow')"
+
+  -  name: sub3
+     description: shell with flags
+     run: "$(git log --author \"${C_FLAG_AUTHOR}\" $1)"
+     flags:
+       -a, --author=: limit to author
+     completion:
+       flag:
+         author: ["$(git shortlog --summary --email HEAD | sed -e 's/^.*\t//' -e 's/ </\t</')"]
+       positional:
+         - - "$(git branch --format '%(refname:short)\t%(subject)\tblue')"
+           - "$(git tag --format '%(refname:short)\t\tyellow')"
diff --git a/example_test.go b/example_test.go
index cb3b0cc..6ae623c 100644
--- a/example_test.go
+++ b/example_test.go
@@ -21,7 +21,8 @@ func TestRunnable(t *testing.T) {
 		s.Run("runnable.yaml", "export", "runnable", "").
 			Expect(carapace.ActionValuesDescribed(
 				"sub1", "alias",
-				"sub2", "shell").
+				"sub2", "shell",
+				"sub3", "shell with flags").
 				Tag("commands"))
 	})
 }
diff --git a/run.go b/run.go
index 7587781..e0a28a0 100644
--- a/run.go
+++ b/run.go
@@ -8,7 +8,9 @@ import (
 	"runtime"
 	"strings"
 
+	"github.com/rsteube/carapace"
 	"github.com/spf13/cobra"
+	"github.com/spf13/pflag"
 	"gopkg.in/yaml.v3"
 )
 
@@ -57,10 +59,23 @@ func (r run) parse() func(cmd *cobra.Command, args []string) error {
 			return fmt.Errorf("malformed macro: %#v", r)
 		}
 
+		context := carapace.NewContext(args...)
+		cmd.Flags().Visit(func(f *pflag.Flag) {
+			context.Setenv(fmt.Sprintf("C_FLAG_%v", strings.ToUpper(f.Name)), f.Value.String())
+		})
+		var err error
+		for index, mArg := range mArgs {
+			mArgs[index], err = context.Envsubst(mArg)
+			if err != nil {
+				return err
+			}
+		}
+
 		execCmd := exec.Command(mCmd, append(mArgs, args...)...)
 		execCmd.Stdin = cmd.InOrStdin()
 		execCmd.Stdout = cmd.OutOrStdout()
 		execCmd.Stderr = cmd.ErrOrStderr()
+		execCmd.Env = context.Env
 		if err := execCmd.Run(); err != nil {
 			if exitErr, ok := err.(*exec.ExitError); ok {
 				os.Exit(exitErr.ProcessState.ExitCode())