Commit `f280f4008d`

f280f4008d48c66d7309059b350a1cae54db51e4

Verified · cmc

cmc <hello@cleberg.net> · 2026-09-18 01:25 UTC

Reject --length with --words

Layout: unified · split

Sources/keycask/Commands/Add.swift +3

         if generate, words != nil {
             throw ValidationError("--generate and --words are mutually exclusive")
         }
+        if words != nil, length != nil {
+            throw ValidationError("--length and --words are mutually exclusive")
+        }
         if let length, length < 1 { throw ValidationError("--length must be at least 1") }
         if let words, words < 1 { throw ValidationError("--words must be at least 1") }
         if length != nil, !generate, words == nil {

Tests/KeycaskCLITests/AddShowTests.swift +13

	@@ -101,6 +101,19 @@ import Testing
101	#expect(r.stderr.contains("keycask init"))	101	#expect(r.stderr.contains("keycask init"))
102	}	102	}
103		103
		104	@Test func lengthWithWordsIsUsageError() throws {
		105	let cli = try CLI.initialized()
		106	let r = try cli.run(["add", "a", "--words", "4", "--length", "30"])
		107	#expect(r.status == 2)
		108	}
		109
		110	@Test func addWithoutPasswordSourceIsUsageError() throws {
		111	let cli = try CLI.initialized()
		112	let r = try cli.run(["add", "x"], stdin: "")
		113	#expect(r.status == 2)
		114	#expect(r.stderr.contains("no password"))
		115	}
		116
104	@Test func corruptVaultIsFailure() throws {	117	@Test func corruptVaultIsFailure() throws {
105	let cli = try CLI.initialized()	118	let cli = try CLI.initialized()
106	try Data("{}".utf8).write(to: cli.vault)	119	try Data("{}".utf8).write(to: cli.vault)

Commit f280f4008d