Ignore comments when parsing recipient files

internal/recipients/recipients.go

@@ -15,20 +15,26 @@ func Marshal(r []string) []byte {
 
 	out := bytes.Buffer{}
 	for _, k := range set.Sorted(r) {
-		_, _ = out.WriteString(k)
+		_, _ = out.WriteString(strings.TrimSpace(k))
 		_, _ = out.WriteString("\n")
 	}
 
 	return out.Bytes()
 }
 
 // Unmarshal Recipients line by line from a io.Reader. Handles Unix, Windows and Mac line endings.
+// Note: Does not preserve comments!
 func Unmarshal(buf []byte) []string {
 	in := strings.ReplaceAll(string(buf), "\r", "\n")
 
 	return set.Apply(set.SortedFiltered(strings.Split(in, "\n"), func(k string) bool {
-		return k != ""
+		return k != "" && !strings.HasPrefix(k, "#")
 	}), func(k string) string {
-		return strings.TrimSpace(k)
+		out := strings.TrimSpace(k)
+		if strings.Contains(out, " #") {
+			out = out[:strings.Index(k, " #")]
+		}
+
+		return out
 	})
 }

internal/recipients/recipients_test.go

@@ -10,7 +10,32 @@ import (
 func TestMarshal(t *testing.T) {
 	t.Parallel()
 
-	t.Skip("implement this")
+	for _, tc := range []struct {
+		in   []string
+		want string
+	}{
+		{
+			want: "foo@bar.com\n",
+			in:   []string{"foo@bar.com\n\r"},
+		},
+		{
+			want: "baz@bar.com\nfoo@bar.com\n",
+			in:   []string{"baz@bar.com", "foo@bar.com"},
+		},
+		{
+			want: "baz@bar.com\nzab@zab.com\n",
+			in:   []string{"baz@bar.com", "zab@zab.com"},
+		},
+	} {
+		tc := tc
+		t.Run(tc.want, func(t *testing.T) {
+			t.Parallel()
+
+			sort.Strings(tc.in)
+			got := string(Marshal(tc.in))
+			assert.Equal(t, tc.want, got, tc.want)
+		})
+	}
 }
 
 func TestUnmarshal(t *testing.T) {
@@ -36,6 +61,14 @@ func TestUnmarshal(t *testing.T) {
 			in:   "foo@bar.com\rbaz@bar.com\r",
 			want: []string{"baz@bar.com", "foo@bar.com"},
 		},
+		{
+			in:   "# foo@bar.com\nbaz@bar.com\nzab@zab.com # comment",
+			want: []string{"baz@bar.com", "zab@zab.com"},
+		},
+		{
+			in:   "# foo@bar.com\nbaz@bar.com\n# comment\nzab@zab.com\n",
+			want: []string{"baz@bar.com", "zab@zab.com"},
+		},
 	} {
 		tc := tc
 		t.Run(tc.in, func(t *testing.T) {