Uses snakesay in all the places it was used inside core package and removed in the new version.

filiplajszczak · filiplajszczak · commit 4491290eacc2 · 2025-11-14T18:24:39.000Z
diff --git a/cli/django.py b/cli/django.py
@@ -47,6 +47,7 @@ def autoconfigure(
     """
     domain = ensure_domain(domain_name)
     project = DjangoProject(domain, python_version)
+    typer.echo(snakesay("Running sanity checks"))
     project.sanity_checks(nuke=nuke)
     project.download_repo(repo_url, nuke=nuke),
     project.ensure_branch(branch),
@@ -94,6 +95,7 @@ def start(
     """
     domain = ensure_domain(domain_name)
     project = DjangoProject(domain, python_version)
+    typer.echo(snakesay("Running sanity checks"))
     project.sanity_checks(nuke=nuke)
     project.create_virtualenv(django_version, nuke=nuke)
     project.run_startproject(nuke=nuke)
diff --git a/cli/webapp.py b/cli/webapp.py
@@ -4,12 +4,13 @@
 from pathlib import Path
 
 import typer
+from pythonanywhere_core.exceptions import MissingCNAMEException
 from pythonanywhere_core.webapp import Webapp
 from snakesay import snakesay
 from tabulate import tabulate
 
 from pythonanywhere.project import Project
-from pythonanywhere.utils import ensure_domain
+from pythonanywhere.utils import ensure_domain, format_log_deletion_message
 
 app = typer.Typer(no_args_is_help=True)
 
@@ -73,6 +74,7 @@ def create(
     """Create a new webapp with virtualenv and project setup"""
     domain = ensure_domain(domain_name)
     project = Project(domain, python_version)
+    typer.echo(snakesay("Running sanity checks"))
     project.sanity_checks(nuke=nuke)
     project.virtualenv.create(nuke=nuke)
     project.create_webapp(nuke=nuke)
@@ -102,7 +104,10 @@ def reload(
     domain_name = ensure_domain(domain_name)
     webapp = Webapp(domain_name)
     typer.echo(snakesay(f"Reloading {domain_name} via API"))
-    webapp.reload()
+    try:
+        webapp.reload()
+    except MissingCNAMEException as e:
+        typer.echo(snakesay(str(e)))
     typer.echo(snakesay(f"{domain_name} has been reloaded"))
 
 
@@ -146,7 +151,10 @@ def install_ssl(
     webapp = Webapp(domain_name)
     webapp.set_ssl(certificate, private_key)
     if not suppress_reload:
-        webapp.reload()
+        try:
+            webapp.reload()
+        except MissingCNAMEException as e:
+            typer.echo(snakesay(str(e)))
 
     ssl_details = webapp.get_ssl_info()
     typer.echo(
@@ -197,20 +205,25 @@ def delete_logs(
     ),
 ):
     """Delete webapp log files (access, error, server logs)"""
-    webapp = Webapp(ensure_domain(domain_name))
+    domain = ensure_domain(domain_name)
+    webapp = Webapp(domain)
     log_types = ["access", "error", "server"]
     logs = webapp.get_log_info()
     if log_type == "all" and log_index == "all":
         for key in log_types:
             for log in logs[key]:
+                typer.echo(snakesay(format_log_deletion_message(domain, key, log)))
                 webapp.delete_log(key, log)
     elif log_type == "all":
         for key in log_types:
+            typer.echo(snakesay(format_log_deletion_message(domain, key, int(log_index))))
             webapp.delete_log(key, int(log_index))
     elif log_index == "all":
         for i in logs[log_type]:
+            typer.echo(snakesay(format_log_deletion_message(domain, log_type.value, i)))
             webapp.delete_log(log_type, int(i))
     else:
+        typer.echo(snakesay(format_log_deletion_message(domain, log_type.value, int(log_index))))
         webapp.delete_log(log_type, int(log_index))
     typer.echo(snakesay("All done!"))
 
diff --git a/pythonanywhere/project.py b/pythonanywhere/project.py
@@ -1,6 +1,7 @@
 from pathlib import Path
 import uuid
 
+from pythonanywhere_core.exceptions import MissingCNAMEException
 from pythonanywhere_core.webapp import Webapp
 from snakesay import snakesay
 
@@ -45,7 +46,10 @@ def create_webapp(self, nuke):
 
     def reload_webapp(self):
         print(snakesay(f"Reloading web app on {self.domain}"))
-        self.webapp.reload()
+        try:
+            self.webapp.reload()
+        except MissingCNAMEException as e:
+            print(snakesay(str(e)))
 
     def add_static_file_mappings(self):
         print(snakesay("Adding static files mappings for /static/ and /media/"))
diff --git a/pythonanywhere/utils.py b/pythonanywhere/utils.py
@@ -9,3 +9,19 @@ def ensure_domain(domain):
         return f"{username}.{pa_domain}"
     else:
         return domain
+
+
+def format_log_deletion_message(domain, log_type, log_index):
+    """Generate message describing log deletion.
+
+    Args:
+        domain: Domain name (e.g., 'www.example.com')
+        log_type: Log type string ('access', 'error', or 'server')
+        log_index: 0 for current log, >0 for archived log
+
+    Returns:
+        Formatted message string
+    """
+    if log_index:
+        return f"Deleting old (archive number {log_index}) {log_type} log file for {domain} via API"
+    return f"Deleting current {log_type} log file for {domain} via API"
diff --git a/pythonanywhere/utils.pyi b/pythonanywhere/utils.pyi
@@ -1 +1,3 @@
 def ensure_domain(domain: str) -> str: ...
+
+def format_log_deletion_message(domain: str, log_type: str, log_index: int) -> str: ...
diff --git a/requirements.txt b/requirements.txt
@@ -8,7 +8,7 @@ pytest==8.4.2
 pytest-cov==7.0.0
 pytest-mock==3.15.1
 pytest-mypy==1.0.1
-pythonanywhere_core==0.2.8
+pythonanywhere_core==0.2.9
 requests==2.32.5
 responses==0.25.8
 schema==0.7.2
diff --git a/scripts/pa_autoconfigure_django.py b/scripts/pa_autoconfigure_django.py
@@ -27,6 +27,7 @@
 def main(repo_url, branch, domain, python_version, nuke):
     domain = ensure_domain(domain)
     project = DjangoProject(domain, python_version)
+    print(snakesay("Running sanity checks"))
     project.sanity_checks(nuke=nuke)
     project.download_repo(repo_url, nuke=nuke),
     project.ensure_branch(branch),
diff --git a/scripts/pa_create_webapp_with_virtualenv.py b/scripts/pa_create_webapp_with_virtualenv.py
@@ -28,6 +28,7 @@
 def main(domain, python_version, nuke):
     domain = ensure_domain(domain)
     project = Project(domain, python_version)
+    print(snakesay("Running sanity checks"))
     project.sanity_checks(nuke=nuke)
     project.virtualenv.create(nuke=nuke)
     project.create_webapp(nuke=nuke)
diff --git a/scripts/pa_delete_webapp_logs.py b/scripts/pa_delete_webapp_logs.py
@@ -17,24 +17,29 @@
 from pythonanywhere_core.webapp import Webapp
 from snakesay import snakesay
 
-from pythonanywhere.utils import ensure_domain
+from pythonanywhere.utils import ensure_domain, format_log_deletion_message
 
 
 def main(domain, log_type, log_index):
-    webapp = Webapp(ensure_domain(domain))
+    domain = ensure_domain(domain)
+    webapp = Webapp(domain)
     log_types = ["access", "error", "server"]
     logs = webapp.get_log_info()
     if log_type == "all" and log_index == "all":
         for key in log_types:
             for log in logs[key]:
+                print(snakesay(format_log_deletion_message(domain, key, log)))
                 webapp.delete_log(key, log)
     elif log_type == "all":
         for key in log_types:
+            print(snakesay(format_log_deletion_message(domain, key, int(log_index))))
             webapp.delete_log(key, int(log_index))
     elif log_index == "all":
         for i in logs[log_type]:
+            print(snakesay(format_log_deletion_message(domain, log_type, i)))
             webapp.delete_log(log_type, int(i))
     else:
+        print(snakesay(format_log_deletion_message(domain, log_type, int(log_index))))
         webapp.delete_log(log_type, int(log_index))
     print(snakesay('All Done!'))
 
diff --git a/scripts/pa_install_webapp_letsencrypt_ssl.py b/scripts/pa_install_webapp_letsencrypt_ssl.py
@@ -17,6 +17,7 @@
 import os
 import sys
 
+from pythonanywhere_core.exceptions import MissingCNAMEException
 from pythonanywhere_core.webapp import Webapp
 from snakesay import snakesay
 
@@ -40,7 +41,10 @@ def main(domain_name, suppress_reload):
             webapp = Webapp(domain_name)
             webapp.set_ssl(certificate, private_key)
             if not suppress_reload:
-                webapp.reload()
+                try:
+                    webapp.reload()
+                except MissingCNAMEException as e:
+                    print(snakesay(str(e)))
 
             ssl_details = webapp.get_ssl_info()
             print(
diff --git a/scripts/pa_install_webapp_ssl.py b/scripts/pa_install_webapp_ssl.py
@@ -19,6 +19,7 @@
 import sys
 
 from docopt import docopt
+from pythonanywhere_core.exceptions import MissingCNAMEException
 from pythonanywhere_core.webapp import Webapp
 from snakesay import snakesay
 
@@ -39,7 +40,10 @@ def main(domain_name, certificate_file, private_key_file, suppress_reload):
     webapp = Webapp(domain_name)
     webapp.set_ssl(certificate, private_key)
     if not suppress_reload:
-        webapp.reload()
+        try:
+            webapp.reload()
+        except MissingCNAMEException as e:
+            print(snakesay(str(e)))
 
     ssl_details = webapp.get_ssl_info()
     print(snakesay(
diff --git a/scripts/pa_reload_webapp.py b/scripts/pa_reload_webapp.py
@@ -10,13 +10,17 @@
 
 from docopt import docopt
 
+from pythonanywhere_core.exceptions import MissingCNAMEException
 from pythonanywhere_core.webapp import Webapp
 from snakesay import snakesay
 
 
 def main(domain_name):
     webapp = Webapp(domain_name)
-    webapp.reload()
+    try:
+        webapp.reload()
+    except MissingCNAMEException as e:
+        print(snakesay(str(e)))
     print(snakesay(
         f"{domain_name} has been reloaded"
     ))
diff --git a/scripts/pa_start_django_webapp_with_virtualenv.py b/scripts/pa_start_django_webapp_with_virtualenv.py
@@ -22,6 +22,7 @@
 def main(domain, django_version, python_version, nuke):
     domain = ensure_domain(domain)
     project = DjangoProject(domain, python_version)
+    print(snakesay("Running sanity checks"))
     project.sanity_checks(nuke=nuke)
     project.create_virtualenv(django_version, nuke=nuke)
     project.run_startproject(nuke=nuke)
diff --git a/setup.py b/setup.py
@@ -36,7 +36,7 @@
         "docopt",
         "packaging",
         "python-dateutil",
-        "pythonanywhere_core==0.2.8",
+        "pythonanywhere_core==0.2.9",
         "requests",
         "schema",
         "snakesay==0.10.4",
diff --git a/tests/test_cli_django.py b/tests/test_cli_django.py
@@ -71,6 +71,7 @@ def test_autoconfigure_calls_all_stuff_in_right_order(mock_django_project):
         call.reload_webapp(),
         call.start_bash(),
     ]
+    assert "Running sanity checks" in result.stdout
     assert (
         f"All done!  Your site is now live at https://www.domain.com" in result.stdout
     )
@@ -171,6 +172,7 @@ def test_start_calls_all_stuff_in_right_order(mock_django_project):
         call.update_wsgi_file(),
         call.reload_webapp(),
     ]
+    assert "Running sanity checks" in result.stdout
     assert (
         f"All done!  Your site is now live at https://www.domain.com" in result.stdout
     )
diff --git a/tests/test_cli_webapp.py b/tests/test_cli_webapp.py
@@ -108,6 +108,7 @@ def test_create_calls_all_stuff_in_right_order(mocker):
         call.add_static_file_mappings(),
         call.reload_webapp(),
     ]
+    assert "Running sanity checks" in result.stdout
     assert "All done! Your site is now live at https://www.domain.com" in result.stdout
     assert (
         f"https://www.pythonanywhere.com/user/{getpass.getuser().lower()}/webapps/www_domain_com"
@@ -123,6 +124,16 @@ def test_reload(mock_webapp, domain_name):
     assert mock_webapp.return_value.method_calls == [call.reload()]
 
 
+def test_reload_handles_missing_cname_exception(mocker, mock_webapp, domain_name):
+    from pythonanywhere_core.exceptions import MissingCNAMEException
+    mock_webapp.return_value.reload.side_effect = MissingCNAMEException()
+
+    result = runner.invoke(app, ["reload", "-d", domain_name])
+
+    assert "Could not find a CNAME for your website" in result.stdout
+    assert f"{domain_name} has been reloaded" in result.stdout
+
+
 def test_install_ssl_with_default_reload(mock_webapp, domain_name, file_with_content):
     mock_webapp.return_value.get_ssl_info.return_value = {
         "not_after": datetime(2018, 8, 24, 17, 16, 23, tzinfo=tzutc())
@@ -236,6 +247,34 @@ def test_delete_all_current_logs(mock_webapp, domain_name):
     assert "All done!" in result.stdout
 
 
+def test_delete_all_logs_shows_per_file_messages(mock_webapp, domain_name):
+    result = runner.invoke(
+        app,
+        [
+            "delete-logs",
+            "-d",
+            domain_name,
+        ],
+    )
+
+    assert "Deleting current access log file" in result.stdout
+    assert "Deleting old (archive number 1) access log file" in result.stdout
+    assert "Deleting old (archive number 2) error log file" in result.stdout
+    assert "foo.bar.baz" in result.stdout
+    assert "All done!" in result.stdout
+
+
+def test_delete_one_log_shows_message(mock_webapp, domain_name):
+    result = runner.invoke(
+        app, ["delete-logs", "-d", domain_name, "-t", "server", "-i", "2"]
+    )
+
+    assert "Deleting old (archive number 2) server log file" in result.stdout
+    assert "foo.bar.baz" in result.stdout
+    assert "All done!" in result.stdout
+
+
+
 def test_validates_log_number(mock_webapp):
     result = runner.invoke(
         app, ["delete-logs", "-d", "foo.bar.baz", "-t", "server", "-i", "10"]
diff --git a/tests/test_pa_autoconfigure_django.py b/tests/test_pa_autoconfigure_django.py
@@ -77,6 +77,15 @@ def test_actually_works_against_example_repo(
         response = requests.get('http://localhost:8000/', headers={'HOST': 'mydomain.com'})
         assert 'Hello from an example django project' in response.text
 
+    def test_shows_sanity_checks_message(self, mocker):
+        mock_print = mocker.patch('builtins.print')
+        mocker.patch('scripts.pa_autoconfigure_django.DjangoProject')
+
+        main('repo.url', 'foo', 'www.domain.com', 'python.version', nuke=False)
+
+        print_calls = [str(call) for call in mock_print.call_args_list]
+        assert any("Running sanity checks" in str(call) for call in print_calls)
+
 
 
 
diff --git a/tests/test_pa_start_django_webapp_with_virtualenv.py b/tests/test_pa_start_django_webapp_with_virtualenv.py
@@ -76,3 +76,13 @@ def test_nuke_option_lets_you_run_twice(
         .strip()
     )
     assert django_version == new_django_version
+
+
+def test_shows_sanity_checks_message(mocker):
+    mock_print = mocker.patch('builtins.print')
+    mocker.patch("scripts.pa_start_django_webapp_with_virtualenv.DjangoProject")
+
+    main(sentinel.domain, sentinel.django_version, sentinel.python_version, nuke=sentinel.nuke)
+
+    print_calls = [str(call) for call in mock_print.call_args_list]
+    assert any("Running sanity checks" in str(call) for call in print_calls)
diff --git a/tests/test_utils.py b/tests/test_utils.py

Original file line number	Diff line number	Diff line change
`@@ -1 +1,3 @@`
`1`	`1`	`def ensure_domain(domain: str) -> str: ...`
	`2`	`+`
	`3`	`+def format_log_deletion_message(domain: str, log_type: str, log_index: int) -> str: ...`