Merge pull request #91 from smkent/sendmail-arguments

Add `--sendmail` argument for custom sendmail path, arguments

safeway_coupons/app.py

@@ -1,4 +1,5 @@
 import argparse
+import shlex
 import sys
 import traceback
 from http.client import HTTPConnection
@@ -53,6 +54,17 @@ def _parse_args() -> argparse.Namespace:
         metavar="number",
         help="Maximum number of coupons to clip (default: all)",
     )
+    arg_parser.add_argument(
+        "--sendmail",
+        metavar="path/to/sendmail",
+        dest="sendmail",
+        type=shlex.split,
+        default="/usr/sbin/sendmail",
+        help=(
+            "Path to sendmail and any additional arguments to use when "
+            "sending email (default: %(default)s)"
+        ),
+    )
     arg_parser.add_argument(
         "-n",
         "--no-email",
@@ -99,6 +111,7 @@ def main() -> None:
         HTTPConnection.debuglevel = 1
     sc = SafewayCoupons(
         send_email=args.send_email,
+        sendmail=args.sendmail,
         debug_level=args.debug_level,
         debug_dir=Path(args.debug_dir) if args.debug_dir else None,
         sleep_level=args.sleep_level,

safeway_coupons/email.py

@@ -12,6 +12,7 @@
 
 
 def _send_email(
+    sendmail: List[str],
     account: Account,
     subject: str,
     mail_message: List[str],
@@ -46,13 +47,13 @@ def _send_email(
             subtype=sub,
         )
     p = subprocess.Popen(
-        ["/usr/sbin/sendmail", "-f", account.mail_to, "-t"],
-        stdin=subprocess.PIPE,
+        sendmail + ["-f", account.mail_to, "-t"], stdin=subprocess.PIPE
     )
     p.communicate(bytes(msg.as_string(), "UTF-8"))
 
 
 def email_clip_results(
+    sendmail: List[str],
     account: Account,
     offers: List[Offer],
     error: Optional[Error],
@@ -72,10 +73,13 @@ def email_clip_results(
         mail_message.append(
             f"    {offer_type.name}: {len(offers_this_type)} coupons"
         )
-    _send_email(account, mail_subject, mail_message, debug_level, send_email)
+    _send_email(
+        sendmail, account, mail_subject, mail_message, debug_level, send_email
+    )
 
 
 def email_error(
+    sendmail: List[str],
     account: Account,
     error: Error,
     debug_level: int,
@@ -91,6 +95,7 @@ def email_error(
         for offer in error.clipped_offers:
             mail_message += str(offer)
     _send_email(
+        sendmail,
         account,
         mail_subject,
         mail_message,

safeway_coupons/safeway.py

@@ -15,6 +15,7 @@ class SafewayCoupons:
     def __init__(
         self,
         send_email: bool = True,
+        sendmail: Optional[List[str]] = None,
         debug_level: int = 0,
         debug_dir: Optional[Path] = None,
         sleep_level: int = 0,
@@ -23,6 +24,7 @@ def __init__(
         max_clip_errors: int = CLIP_ERROR_MAX,
     ) -> None:
         self.send_email = send_email
+        self.sendmail = sendmail or ["/usr/sbin/sendmail"]
         self.debug_level = debug_level
         self.debug_dir = debug_dir
         self.sleep_level = sleep_level
@@ -82,6 +84,7 @@ def clip_for_account(self, account: Account) -> None:
 
             print(f"Clipped {len(clipped_offers)} coupons")
             email_clip_results(
+                self.sendmail,
                 account,
                 clipped_offers,
                 error=None,
@@ -91,6 +94,7 @@ def clip_for_account(self, account: Account) -> None:
             )
         except Error as e:
             email_error(
+                self.sendmail,
                 account,
                 error=e,
                 debug_level=self.debug_level,

tests/test_app.py

@@ -57,6 +57,7 @@ def test_app_error(
             [],
             dict(
                 send_email=True,
+                sendmail=["/usr/sbin/sendmail"],
                 debug_level=0,
                 debug_dir=Path("."),
                 sleep_level=0,
@@ -68,17 +69,53 @@ def test_app_error(
             ["-d", "-d", "-SS"],
             dict(
                 send_email=True,
+                sendmail=["/usr/sbin/sendmail"],
                 debug_level=2,
                 debug_dir=Path("."),
                 sleep_level=2,
                 dry_run=False,
                 max_clip_count=0,
             ),
         ),
+        (
+            ["--sendmail", "/my/special/sendmail"],
+            dict(
+                send_email=True,
+                sendmail=["/my/special/sendmail"],
+                debug_level=0,
+                debug_dir=Path("."),
+                sleep_level=0,
+                dry_run=False,
+                max_clip_count=0,
+            ),
+        ),
+        (
+            [
+                "--sendmail",
+                (
+                    "/my/special/sendmail "
+                    '--do-the-thing "with an argument value with spaces"'
+                ),
+            ],
+            dict(
+                send_email=True,
+                sendmail=[
+                    "/my/special/sendmail",
+                    "--do-the-thing",
+                    "with an argument value with spaces",
+                ],
+                debug_level=0,
+                debug_dir=Path("."),
+                sleep_level=0,
+                dry_run=False,
+                max_clip_count=0,
+            ),
+        ),
         (
             ["-n"],
             dict(
                 send_email=False,
+                sendmail=["/usr/sbin/sendmail"],
                 debug_level=0,
                 debug_dir=Path("."),
                 sleep_level=0,
@@ -90,6 +127,7 @@ def test_app_error(
             ["-p", "--max-clip", "42"],
             dict(
                 send_email=True,
+                sendmail=["/usr/sbin/sendmail"],
                 debug_level=0,
                 debug_dir=Path("."),
                 sleep_level=0,
@@ -101,6 +139,8 @@ def test_app_error(
     ids=[
         "Default values",
         "Debug and sleep levels 2",
+        "Custom sendmail",
+        "Custom sendmail with arguments",
         "No email",
         "Dry run and max clip count",
     ],