fix: update names throughout nox session and file along with fix update-demo not creating branches and some env var issues

Author: 56kyle

noxfile.py

@@ -35,23 +35,22 @@
 if DEFAULT_ENV_FILE.exists():
     load_dotenv(DEFAULT_ENV_FILE)
 
-APP_AUTHOR: str = os.getenv("COOKIECUTTER_ROBUST_PYTHON_APP_AUTHOR", "robust-python")
-COOKIECUTTER_ROBUST_PYTHON_CACHE_FOLDER: Path = Path(
+APP_AUTHOR: str = os.getenv("COOKIECUTTER_ROBUST_PYTHON__APP_AUTHOR", "robust-python")
+COOKIECUTTER_ROBUST_PYTHON__CACHE_FOLDER: Path = Path(
     platformdirs.user_cache_path(
         appname="cookiecutter-robust-python",
         appauthor=APP_AUTHOR,
         ensure_exists=True,
     )
 ).resolve()
 
-DEFAULT_DEMOS_CACHE_FOLDER = COOKIECUTTER_ROBUST_PYTHON_CACHE_FOLDER / "project_demos"
+DEFAULT_DEMOS_CACHE_FOLDER = COOKIECUTTER_ROBUST_PYTHON__CACHE_FOLDER / "project_demos"
 DEMOS_CACHE_FOLDER: Path = Path(
     os.getenv(
         "COOKIECUTTER_ROBUST_PYTHON__DEMOS_CACHE_FOLDER", default=DEFAULT_DEMOS_CACHE_FOLDER
     )
 ).resolve()
 DEFAULT_DEMO_NAME: str = "robust-python-demo"
-DEMO_ROOT_FOLDER: Path = DEMOS_CACHE_FOLDER / DEFAULT_DEMO_NAME
 
 GENERATE_DEMO_SCRIPT: Path = SCRIPTS_FOLDER / "generate-demo.py"
 GENERATE_DEMO_OPTIONS: tuple[str, ...] = (

scripts/update-demo.py

@@ -51,14 +51,14 @@ def update_demo(
 
     if branch_override is not None:
         typer.secho(f"Overriding current branch name for demo reference. Using '{branch_override}' instead.")
-        current_branch: str = branch_override
+        desired_branch_name: str = branch_override
     else:
-        current_branch: str = get_current_branch()
+        desired_branch_name: str = get_current_branch()
     template_commit: str = get_current_commit()
 
-    _validate_template_main_not_checked_out(branch=current_branch)
+    _validate_template_main_not_checked_out(branch=desired_branch_name)
     require_clean_and_up_to_date_demo_repo(demo_path=demo_path)
-    _checkout_demo_develop_or_existing_branch(demo_path=demo_path, branch=current_branch)
+    _checkout_demo_develop_or_existing_branch(demo_path=demo_path, branch=desired_branch_name)
     last_update_commit: str = get_last_cruft_update_commit(demo_path=demo_path)
 
     if not is_ancestor(last_update_commit, template_commit):
@@ -69,6 +69,9 @@ def update_demo(
 
     typer.secho(f"Updating demo project at {demo_path=}.", fg="yellow")
     with work_in(demo_path):
+        if get_current_branch() != desired_branch_name:
+            git("checkout", "-b", desired_branch_name, DEMO.develop_branch)
+
         uv("python", "pin", min_python_version)
         uv("python", "install", min_python_version)
         cruft.update(
@@ -84,9 +87,9 @@ def update_demo(
         uv("lock")
         git("add", ".")
         git("commit", "-m", f"chore: {last_update_commit} -> {template_commit}", "--no-verify")
-        git("push", "-u", "origin", current_branch)
-        if current_branch != "develop":
-            _create_demo_pr(demo_path=demo_path, branch=current_branch, commit_start=last_update_commit)
+        git("push", "-u", "origin", desired_branch_name)
+        if desired_branch_name != "develop":
+            _create_demo_pr(demo_path=demo_path, branch=desired_branch_name, commit_start=last_update_commit)
 
 
 def _checkout_demo_develop_or_existing_branch(demo_path: Path, branch: str) -> None: