Add gopassRaw template function

docs/REFERENCE.md

@@ -92,6 +92,7 @@ Manage your dotfiles securely across multiple machines.
   * [`bitwardenFields` [*arg*...]](#bitwardenfields-arg)
   * [`gitHubKeys` *user*](#githubkeys-user)
   * [`gopass` *gopass-name*](#gopass-gopass-name)
+  * [`gopassRaw` *gopass-name*](#gopassraw-gopass-name)
   * [`include` *filename*](#include-filename)
   * [`ioreg`](#ioreg)
   * [`joinPath` *element*...](#joinpath-element)
@@ -1568,17 +1569,26 @@ token](https://docs.github.com/en/github/authenticating-to-github/creating-a-per
 ### `gopass` *gopass-name*
 
 `gopass` returns passwords stored in [gopass](https://www.gopass.pw/) using the
-gopass CLI (`gopass`). *gopass-name* is passed to `gopass show <gopass-name>`
-and first line of the output of `gopass` is returned with the trailing newline
-stripped. The output from `gopass` is cached so calling `gopass` multiple times
-with the same *gopass-name* will only invoke `gopass` once.
+gopass CLI (`gopass`). *gopass-name* is passed to `gopass show --password
+<gopass-name>` and the first line of the output of `gopass` is returned with the
+trailing newline stripped. The output from `gopass` is cached so calling
+`gopass` multiple times with the same *gopass-name* will only invoke `gopass`
+once.
 
 #### `gopass` examples
 
 ```
 {{ gopass "<pass-name>" }}
 ```
 
+### `gopassRaw` *gopass-name*
+
+`gopass` returns passwords stored in [gopass](https://www.gopass.pw/) using the
+gopass CLI (`gopass`). *gopass-name* is passed to `gopass show <gopass-name>`
+and  output of `gopass` is returned. The output from `gopassRaw` is cached so
+calling `gopassRaw` multiple times with the same *gopass-name* will only invoke
+`gopass` once.
+
 ### `include` *filename*
 
 `include` returns the literal contents of the file named `*filename*`. Relative

internal/cmd/config.go

@@ -335,6 +335,7 @@ func newConfig(options ...configOption) (*Config, error) {
 		"bitwardenFields":          c.bitwardenFieldsTemplateFunc,
 		"gitHubKeys":               c.gitHubKeysTemplateFunc,
 		"gopass":                   c.gopassTemplateFunc,
+		"gopassRaw":                c.gopassRawTemplateFunc,
 		"include":                  c.includeTemplateFunc,
 		"ioreg":                    c.ioregTemplateFunc,
 		"joinPath":                 c.joinPathTemplateFunc,

internal/cmd/gopasstemplatefuncs.go

@@ -24,6 +24,7 @@ type gopassConfig struct {
 	Command   string
 	versionOK bool
 	cache     map[string]string
+	rawCache  map[string][]byte
 }
 
 func (c *Config) gopassOutput(args ...string) ([]byte, error) {
@@ -38,6 +39,34 @@ func (c *Config) gopassOutput(args ...string) ([]byte, error) {
 	return output, nil
 }
 
+func (c *Config) gopassRawTemplateFunc(id string) string {
+	if !c.Gopass.versionOK {
+		if err := c.gopassVersionCheck(); err != nil {
+			returnTemplateError(err)
+			return ""
+		}
+		c.Gopass.versionOK = true
+	}
+
+	if output, ok := c.Gopass.rawCache[id]; ok {
+		return string(output)
+	}
+
+	args := []string{"show", id}
+	output, err := c.gopassOutput(args...)
+	if err != nil {
+		returnTemplateError(fmt.Errorf("%s %s: %w", c.Gopass.Command, chezmoi.ShellQuoteArgs(args), err))
+		return ""
+	}
+
+	if c.Gopass.rawCache == nil {
+		c.Gopass.rawCache = make(map[string][]byte)
+	}
+	c.Gopass.rawCache[id] = output
+
+	return string(output)
+}
+
 func (c *Config) gopassTemplateFunc(id string) string {
 	if !c.Gopass.versionOK {
 		if err := c.gopassVersionCheck(); err != nil {
@@ -47,8 +76,8 @@ func (c *Config) gopassTemplateFunc(id string) string {
 		c.Gopass.versionOK = true
 	}
 
-	if s, ok := c.Gopass.cache[id]; ok {
-		return s
+	if password, ok := c.Gopass.cache[id]; ok {
+		return password
 	}
 
 	args := []string{"show", "--password", id}
@@ -69,6 +98,7 @@ func (c *Config) gopassTemplateFunc(id string) string {
 		c.Gopass.cache = make(map[string]string)
 	}
 	c.Gopass.cache[id] = password
+
 	return password
 }
 

internal/cmd/testdata/scripts/gopass.txt

@@ -5,13 +5,23 @@
 chezmoi execute-template '{{ gopass "misc/example.com" }}'
 stdout examplepassword
 
+# test gopass template function
+chezmoi execute-template '{{ gopassRaw "misc/example.com" }}'
+stdout 'Secret: misc/example\.com'
+
 -- bin/gopass --
 #!/bin/sh
 
 case "$*" in
 "--version")
     echo "gopass 1.10.1 go1.15 linux amd64"
     ;;
+"show misc/example.com")
+    echo "Secret: misc/example.com"
+    echo
+    echo "examplepassword"
+    echo "key: value"
+    ;;
 "show --password misc/example.com")
     echo "examplepassword"
     ;;
@@ -23,6 +33,11 @@ esac
 @echo off
 IF "%*" == "--version" (
     echo "gopass 1.10.1 go1.15 windows amd64"
+) ELSE IF "%*" == "show misc/example.com" (
+    echo "Secret: misc/example.com"
+    echo
+    echo "examplepassword"
+    echo "key: value"
 ) ELSE IF "%*" == "show --password misc/example.com" (
     echo | set /p=examplepassword
     exit /b 0