lockbox

commit 91967f5ba70504dcbd6fc389acc128ba20c77218
parent c8ced00b9527520709ec43ff7e9322b27d2e264c
Author: Sean Enck <sean@ttypty.com>
Date:   Mon, 14 Apr 2025 16:54:41 -0400

WORDS_COMMAND -> WORD_COMMAND

Diffstat:
M
cmd/main_test.go
 | 
2
+-
M
cmd/tests/expected.log
 | 
2
+-
M
internal/app/pwgen_test.go
 | 
20
++++++++++----------
M
internal/config/vars.go
 | 
2
+-

4 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/cmd/main_test.go b/cmd/main_test.go
@@ -352,7 +352,7 @@ func test(profile string) error {
 	r.run("", "ls")
 
 	// pwgen
-	c["pwgen.words_command"] = "[\"/bin/sh\", \"-c\", \"echo abc abc | tr ' ' '\\n'\"]"
+	c["pwgen.word_command"] = "[\"/bin/sh\", \"-c\", \"echo abc abc | tr ' ' '\\n'\"]"
 	c["pwgen.word_count"] = "1"
 	r.writeConfig(c)
 	r.run("", "pwgen")
diff --git a/cmd/tests/expected.log b/cmd/tests/expected.log
@@ -177,6 +177,6 @@ LOCKBOX_JSON_MODE=hash
 LOCKBOX_PWGEN_CHARACTERS=b
 LOCKBOX_PWGEN_TEMPLATE={{range $idx, $val := .}}{{if lt $val.Position.End 5}}{{ $val.Text }}{{end}}{{end}}
 LOCKBOX_PWGEN_TITLE=false
+LOCKBOX_PWGEN_WORD_COMMAND=[/bin/sh -c echo abc abc | tr ' ' '
 LOCKBOX_PWGEN_WORD_COUNT=2
-LOCKBOX_PWGEN_WORDS_COMMAND=[/bin/sh -c echo abc abc | tr ' ' '
 LOCKBOX_STORE=testdata/datadir/pass.kdbx
diff --git a/internal/app/pwgen_test.go b/internal/app/pwgen_test.go
@@ -35,19 +35,19 @@ func TestGenerateError(t *testing.T) {
 	if err := app.GeneratePassword(m); err == nil || err.Error() != "word list command must set" {
 		t.Errorf("invalid error: %v", err)
 	}
-	store.SetArray("LOCKBOX_PWGEN_WORDS_COMMAND", []string{"1 x"})
+	store.SetArray("LOCKBOX_PWGEN_WORD_COMMAND", []string{"1 x"})
 	if err := app.GeneratePassword(m); err == nil || !strings.Contains(err.Error(), "exec: \"1 x\":") {
 		t.Errorf("invalid error: %v", err)
 	}
-	store.SetArray("LOCKBOX_PWGEN_WORDS_COMMAND", []string{pwgenPath})
+	store.SetArray("LOCKBOX_PWGEN_WORD_COMMAND", []string{pwgenPath})
 	if err := app.GeneratePassword(m); err == nil || err.Error() != "no sources given" {
 		t.Errorf("invalid error: %v", err)
 	}
-	store.SetArray("LOCKBOX_PWGEN_WORDS_COMMAND", []string{pwgenPath, "1"})
+	store.SetArray("LOCKBOX_PWGEN_WORD_COMMAND", []string{pwgenPath, "1"})
 	if err := app.GeneratePassword(m); err != nil {
 		t.Errorf("invalid error: %v", err)
 	}
-	store.SetArray("LOCKBOX_PWGEN_WORDS_COMMAND", []string{pwgenPath, "aloj", "1"})
+	store.SetArray("LOCKBOX_PWGEN_WORD_COMMAND", []string{pwgenPath, "aloj", "1"})
 	if err := app.GeneratePassword(m); err != nil {
 		t.Errorf("invalid error: %v", err)
 	}
@@ -71,20 +71,20 @@ func testPasswordGen(t *testing.T, expect string) {
 func TestGenerate(t *testing.T) {
 	pwgenPath := setupGenScript()
 	store.SetInt64("LOCKBOX_PWGEN_WORD_COUNT", 1)
-	store.SetArray("LOCKBOX_PWGEN_WORDS_COMMAND", []string{pwgenPath, "1"})
+	store.SetArray("LOCKBOX_PWGEN_WORD_COMMAND", []string{pwgenPath, "1"})
 	testPasswordGen(t, "1")
 	store.SetInt64("LOCKBOX_PWGEN_WORD_COUNT", 10)
-	store.SetArray("LOCKBOX_PWGEN_WORDS_COMMAND", []string{pwgenPath, "1 1 1 1 1 1 1 1 1 1 1 1"})
+	store.SetArray("LOCKBOX_PWGEN_WORD_COMMAND", []string{pwgenPath, "1 1 1 1 1 1 1 1 1 1 1 1"})
 	testPasswordGen(t, "1-1-1-1-1-1-1-1-1-1")
 	store.SetInt64("LOCKBOX_PWGEN_WORD_COUNT", 4)
 	store.SetBool("LOCKBOX_PWGEN_TITLE", true)
-	store.SetArray("LOCKBOX_PWGEN_WORDS_COMMAND", []string{pwgenPath, "a a a a a a a a a a a a a a a a a a a a a a"})
+	store.SetArray("LOCKBOX_PWGEN_WORD_COMMAND", []string{pwgenPath, "a a a a a a a a a a a a a a a a a a a a a a"})
 	testPasswordGen(t, "A-A-A-A")
 	store.SetString("LOCKBOX_PWGEN_CHARACTERS", "bc")
-	store.SetArray("LOCKBOX_PWGEN_WORDS_COMMAND", []string{pwgenPath, "abc abc abc abc abc abc aaa aa aaa a"})
+	store.SetArray("LOCKBOX_PWGEN_WORD_COMMAND", []string{pwgenPath, "abc abc abc abc abc abc aaa aa aaa a"})
 	testPasswordGen(t, "Bc-Bc-Bc-Bc")
 	store.SetString("LOCKBOX_PWGEN_CHARACTERS", "")
-	store.SetArray("LOCKBOX_PWGEN_WORDS_COMMAND", []string{pwgenPath, "a a a a a a a a a a a a a a a a a a a a a a"})
+	store.SetArray("LOCKBOX_PWGEN_WORD_COMMAND", []string{pwgenPath, "a a a a a a a a a a a a a a a a a a a a a a"})
 	store.SetBool("LOCKBOX_PWGEN_TITLE", false)
 	testPasswordGen(t, "a-a-a-a")
 	// NOTE: this allows templating below in golang
@@ -94,7 +94,7 @@ func TestGenerate(t *testing.T) {
 	testPasswordGen(t, "-a-a-a-a")
 	store.Clear()
 	store.SetBool("LOCKBOX_PWGEN_TITLE", true)
-	store.SetArray("LOCKBOX_PWGEN_WORDS_COMMAND", []string{pwgenPath, "abc axy axY aZZZ aoijafea aoiajfoea afeafa"})
+	store.SetArray("LOCKBOX_PWGEN_WORD_COMMAND", []string{pwgenPath, "abc axy axY aZZZ aoijafea aoiajfoea afeafa"})
 	m := newMockCommand(t)
 	if err := app.GeneratePassword(m); err != nil {
 		t.Errorf("invalid error: %v", err)
diff --git a/internal/config/vars.go b/internal/config/vars.go
@@ -284,7 +284,7 @@ Set to '%s' to ignore the set key value`, noKeyMode, IgnoreKeyMode),
 		environmentStrings: environmentStrings{
 			environmentDefault: newDefaultedEnvironment("",
 				environmentBase{
-					key:         genCategory + "WORDS_COMMAND",
+					key:         genCategory + "WORD_COMMAND",
 					description: "Command to retrieve the word list to use for password generation (must be split by newline).",
 				}),
 			flags: []stringsFlags{isCommandFlag},