Merge pull request #30 from gopherguides/home-directory

replace tildas with users home directory when executing commands

cmd.go

@@ -104,7 +104,17 @@ func (c *Cmd) Execute(ctx context.Context, doc *Document) error {
 		cmd.Dir = dir
 	}
 
-	res, err := cmd.Run(ctx, c.Args...)
+	// Check the args for the ~ character and replace it with the home directory
+	// Make a copy of those args as we only want to change them when we pass it to the clam.Cmd
+	args := make([]string, len(c.Args))
+	copy(args, c.Args)
+	for i, arg := range args {
+		if strings.HasPrefix(arg, "~") {
+			args[i] = filepath.Join(homeDirectory(), arg[1:])
+		}
+	}
+
+	res, err := cmd.Run(ctx, args...)
 	if err != nil {
 		switch c.ExpectedExit {
 		case -1:

cmd_test.go

@@ -3,6 +3,8 @@ package hype
 import (
 	"context"
 	"errors"
+	"os"
+	"path/filepath"
 	"strings"
 	"testing"
 	"time"
@@ -186,3 +188,54 @@ func Test_Cmd_MarshalJSON(t *testing.T) {
 	testJSON(t, "cmd", c)
 
 }
+func Test_Cmd_HomeDirectory(t *testing.T) {
+	t.Parallel()
+	r := require.New(t)
+
+	homeDir, err := os.UserHomeDir()
+	r.NoError(err)
+
+	// Create a directory in the user's home directory with a random temporary name
+	dir := filepath.Join(homeDir, "tmp_test_dir")
+	t.Log("created dir:", dir)
+	err = os.MkdirAll(dir, 0755)
+	r.NoError(err)
+	t.Cleanup(func() {
+		os.RemoveAll(dir)
+	})
+
+	// Add three files to the directory: a.txt, b.txt, and c.txt
+	files := []string{"a.txt", "b.txt", "c.txt"}
+	for _, file := range files {
+		filePath := filepath.Join(dir, file)
+		_, err := os.Create(filePath)
+		r.NoError(err)
+	}
+
+	c := &Cmd{
+		Element: NewEl("cmd", nil),
+		Args:    []string{"ls", "~/tmp_test_dir"},
+	}
+	r.NoError(c.Set("exec", "ls ~/tmp_test_dir"))
+	r.NoError(c.Set("hide-cmd", ""))
+
+	ctx := context.Background()
+	doc := &Document{
+		Parser: NewParser(nil),
+	}
+
+	doc.Nodes = append(doc.Nodes, c)
+	err = doc.Execute(ctx)
+	r.NoError(err)
+
+	r.NotNil(c.Result())
+
+	act := c.String()
+	act = strings.TrimSpace(act)
+
+	exp := `<cmd exec="ls ~/tmp_test_dir" hide-cmd=""><pre><code class="language-shell" language="shell">a.txt
+b.txt
+c.txt</code></pre></cmd>`
+
+	r.Equal(exp, act)
+}

home.go

@@ -0,0 +1,23 @@
+package hype
+
+import (
+	"log"
+	"os"
+)
+
+// homeDirectory retursn the home directory of the current user
+// it only runs once
+var homeDir string
+
+func homeDirectory() string {
+	if homeDir != "" {
+		return homeDir
+	}
+
+	hd, err := os.UserHomeDir()
+	if err != nil {
+		log.Fatal(err)
+	}
+	homeDir = hd
+	return homeDir
+}