making-with-code-cli 5.0.1__tar.gz → 5.0.3__tar.gz

{making_with_code_cli-5.0.1 → making_with_code_cli-5.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: making-with-code-cli
-Version: 5.0.1
+Version: 5.0.3
 Summary: Courseware for Making With Code
 Author: Chris Proctor
 Author-email: Chris Proctor <chris@chrisproctor.net>

{making_with_code_cli-5.0.1 → making_with_code_cli-5.0.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "making-with-code-cli"
-version = "5.0.1"
+version = "5.0.3"
 description = "Courseware for Making With Code"
 authors = [{ name = "Chris Proctor", email = "chris@chrisproctor.net" }]
 requires-python = ">=3.11,<4.0"

{making_with_code_cli-5.0.1 → making_with_code_cli-5.0.3}/src/making_with_code_cli/git_backend/mwc_backend.py

@@ -1,5 +1,6 @@
 from .base_backend import GitBackend
-from subprocess import run
+from subprocess import run, CalledProcessError
+import traceback
 from pathlib import Path
 from urllib.parse import urlparse
 import click
@@ -8,7 +9,11 @@ import os
 import requests
 from making_with_code_cli.helpers import cd
 from making_with_code_cli.styles import (
+    address,
     confirm,
+    debug,
+    error,
+    info,
 )
 from making_with_code_cli.errors import (
     MissingSetting,
@@ -40,26 +45,25 @@ class MWCBackend(GitBackend):
         if (modpath / self.COMMIT_TEMPLATE).exists():
             run(f"git config commit.template {self.COMMIT_TEMPLATE}", shell=True, 
                     check=True, cwd=modpath)
-        run("uv venv", shell=True, check=True, cwd=modpath)
+        run("uv venv", shell=True, check=True, cwd=modpath, capture_output=True)
         self.init_direnv(modpath)
 
     def update(self, module, modpath, install=True):
         if (modpath / ".git").is_dir():
             with cd(modpath):
                 relpath = self.relative_path(modpath)
-                try:
-                    click.echo(address(f"Checking {relpath} for updates.", preformatted=True))
-                    gitresult = run("git pull", shell=True, check=True, capture_output=True,
-                            text=True)
-                    click.echo(info(gitresult.stdout))
-                    if install and Path("pyproject.toml").exists():
-                        result = run("uv sync", shell=True, check=True, 
-                                capture_output=True, text=True)
+                click.echo(address(f"Checking {relpath} for updates.", preformatted=True))
+                gitresult = run("git pull", shell=True, check=True, capture_output=True,
+                        text=True)
+                click.echo(info(gitresult.stdout))
+                if install and Path("pyproject.toml").exists():
+                    result = run("uv sync", shell=True, capture_output=True, text=True, cwd=modpath)
+                    if result.returncode != 0:
+                        click.echo(debug("Error running uv sync:"))
+                        click.echo(debug(result.stderr, preformatted=True))
+                        click.echo(error(f"There was a problem updating {relpath}. Ask a teacher."))
+                    else:
                         self.init_direnv(modpath)
-                        click.echo(info(result.stdout, preformatted=True))
-                except CalledProcessError as e:
-                    click.echo(error(f"There was a problem updating {relpath}. Ask a teacher."))
-                    raise e
 
     def init_direnv(self, modpath):
         if not (modpath / ".envrc").exists():

{making_with_code_cli-5.0.1 → making_with_code_cli-5.0.3}/src/making_with_code_cli/settings.py

@@ -15,7 +15,7 @@ def get_settings_path(settings_path=None):
         return Path(os.environ["MWC_CONFIG"])
     else:
         xdg_config_home = Path(os.environ.get("XDG_CONFIG_HOME", Path.home() / ".config"))
-        return xdg_config_home / "settings.toml"
+        return xdg_config_home / "mwc" / "settings.toml"
 
 def read_settings(settings_path=None):
     """Reads the settings file and returns a dict. 

{making_with_code_cli-5.0.1 → making_with_code_cli-5.0.3}/src/making_with_code_cli/setup/__init__.py

@@ -31,6 +31,7 @@ from making_with_code_cli.setup.tasks import (
     choose_editor,
     WriteMWCShellConfig,
     SourceMWCShellConfig,
+    SuppressDirenvDiffs,
     InstallXCode,
     InstallDirenv,
     InstallGit,
@@ -95,15 +96,16 @@ def setup(ctx, config, debug, git_name, git_email, mwc_accounts_url):
         if settings.get('mwc_accounts_url'):
             click.echo(debug_fmt(f"Using custom MWC accounts server: {settings['mwc_accounts_url']}"))
         click.echo(debug_fmt("MWC Accounts Server status:"))
-        click.echo(debug_fmt(str(status)))
-        click.echo(info("MWC settings:"))
-        click.echo(info(settings, preformatted=True))
+        click.echo(debug_fmt(str(status), preformatted=True))
+        click.echo(debug_fmt("MWC settings:"))
+        click.echo(debug_fmt(settings, preformatted=True))
     write_settings(settings, config)
 
     task_classes = [
         WriteMWCShellConfig,
         SourceMWCShellConfig,
         InstallXCode,
+        SuppressDirenvDiffs,
         InstallDirenv,
         InstallGit,
         InstallTree,

{making_with_code_cli-5.0.1 → making_with_code_cli-5.0.3}/src/making_with_code_cli/setup/tasks.py

@@ -5,12 +5,13 @@ import sys
 import os
 import re
 import platform
+import tomlkit
 from importlib.util import find_spec
 from making_with_code_cli.mwc_accounts_api import MWCAccountsAPI
 from making_with_code_cli.styles import (
     address,
     question,
-    debug,
+    debug as debug_fmt,
     confirm,
     info,
     success,
@@ -177,7 +178,7 @@ def get_mwc_rc_path():
     xdg_config_home = Path(os.environ.get("XDG_CONFIG_HOME", Path.home() / ".config"))
     return xdg_config_home / "mwc" / "shell_config.sh"
 
-def platform_rc_file():
+def platform_rc_file(debug=False):
     shell = get_shell_name()
     if shell == "zsh":
         dothome = Path(os.environ.get("ZDOTDIR", Path.home()))
@@ -195,7 +196,7 @@ def platform_rc_file():
     ]
     for sh, rc in candidates:
         if shell == sh and rc.exists():
-            click.echo(debug(f"Shell identified as {sh}. Using {rc} as rc file."))
+            click.echo(debug_fmt(f"Shell identified as {sh}. Using {rc} as rc file."))
             return rc
     raise IOError("Can't find an rc file.")
 
@@ -230,13 +231,14 @@ class SetupTask:
 
     def debug_log(self, message):
         if self.debug:
-            click.echo(debug(message))
+            click.echo(debug_fmt(message))
 
     def executable_on_path(self, name):
         return bool(run(f"which {name}", shell=True, capture_output=True).stdout)
 
 class WriteMWCShellConfig(SetupTask):
     description = "Write the MWC shell config file to ~/.config/mwc/shell_config.sh or XDG_CONFIG_HOME"
+    docs_url = "https://docs.makingwithcode.org/making-with-code-cli/students.html#configuration"
 
     def is_complete(self):
         p = get_mwc_rc_path()
@@ -253,7 +255,8 @@ class WriteMWCShellConfig(SetupTask):
         "Generates the shell configuration file contents"
         f = ""
         shell = get_shell_name()
-        f += "# Making With Code RC File\n\n" 
+        f += "# Making With Code RC File\n" 
+        f += f"# See {self.docs_url}\n\n"
         f += "## Hook direnv into shell\n"
         f += f'eval "$(direnv hook {shell})"\n\n'
 
@@ -278,16 +281,48 @@ class SourceMWCShellConfig(SetupTask):
         return f"source {get_mwc_rc_path()}" in platform_rc_file().read_text()
 
     def run_task(self):
-        rc_file = platform_rc_file()
+        rc_file = platform_rc_file(self.debug)
         self.debug_log(f"Adding `mwc` path to {rc_file}")
         with rc_file.open('a') as fh:
-            result = run("which mwc", shell=True, check=True, text=True, capture_output=True)
-            mwcpath = Path(result.stdout).parent
             fh.write(f"\n# MAKING WITH CODE\n")
-            fh.write(f'export PATH="$PATH:{mwcpath}"\n')
             fh.write(f"source {get_mwc_rc_path()}\n")
         click.echo(info(f"Updated your shell login file ({rc_file}). You may need to close and reopen Terminal."))
 
+class SuppressDirenvDiffs(SetupTask):
+    "Tell direnv not to pring out diffs when changing dirs"
+    description = "Write direnv config file"
+
+    def is_complete(self):
+        if self.settings.get("skip_direnv_config") == True:
+            return True
+        f = self.get_direnv_config_file()
+        if not f.exists():
+            return False
+        with open(f, 'rb') as fh:
+            direnv_conf = tomlkit.load(fh)
+            g = direnv_conf.get("global", {})
+            return g.get("hide_env_diff") == True and g.get("log_filter") == "^$"
+
+    def run_task(self):
+        f = self.get_direnv_config_file()
+        if f.exists():
+            with open(f, 'rb') as fh:
+                direnv_conf = tomlkit.load(fh)
+        else:
+            f.parent.mkdir(parents=True)
+            direnv_conf = {}
+        if 'global' not in direnv_conf:
+            direnv_conf['global'] = {}
+        direnv_conf["global"]["hide_env_diff"] = True
+        direnv_conf["global"]["log_filter"] = "^$"
+        with open(f, 'w') as fh:
+            tomlkit.dump(direnv_conf, fh)
+
+    def get_direnv_config_file(self):
+        config_home = os.environ.get("XDG_CONFIG_HOME", Path.home() / ".config")
+        return Path(config_home) / "direnv" / "direnv.toml"
+
+
 class InstallXCode(SetupTask):
     description = "Install XCode"
     platform = Platform.MAC

{making_with_code_cli-5.0.1 → making_with_code_cli-5.0.3}/src/making_with_code_cli/update/__init__.py

@@ -2,7 +2,7 @@ import click
 import traceback
 from pathlib import Path
 from subprocess import run
-from making_with_code_cli.settings import read_settings
+from making_with_code_cli.settings import read_settings, get_settings_path
 from making_with_code_cli.curriculum import get_curriculum
 from making_with_code_cli.git_backend import get_backend
 from making_with_code_cli.mwc_accounts_api import MWCAccountsAPI
@@ -18,13 +18,19 @@ from making_with_code_cli.styles import (
 
 @click.command()
 @click.option("--config", help="Path to config file (default: ~/.mwc)")
-def update(config):
+@click.option("--debug", is_flag=True, help="Show debug-level output")
+def update(config, debug):
     """Update the MWC work directory"""
     settings = read_settings(config)
+    sp = get_settings_path(config)
+    if debug:
+        click.echo(debug_fmt(f"Reading settings from {sp}"))
     if not settings:
         click.echo(error(f"Please run mwc setup first."))
         return
     mwc_home = Path(settings["work_dir"])
+    if debug:
+        click.echo(debug_fmt(f"mwc home is {mwc_home}."))
     if not mwc_home.exists():
         mwc_home.mkdir(mode=WORK_DIR_PERMISSIONS, parents=True)
     api = MWCAccountsAPI(settings.get('mwc_accounts_url'))
@@ -33,6 +39,15 @@ def update(config):
     except api.RequestFailed as bad_token:
         click.echo(error(f"Error logging into MWC accounts server. Please run mwc setup."))
         return
+    if debug:
+        if settings.get('mwc_accounts_url'):
+            click.echo(debug_fmt(f"Using custom MWC accounts server: {settings['mwc_accounts_url']}"))
+        click.echo(debug_fmt("MWC Accounts Server status:"))
+        click.echo(debug_fmt(str(status), preformatted=True))
+        click.echo(debug_fmt("MWC settings:"))
+        click.echo(debug_fmt(settings, preformatted=True))
+    if len(status['student_section_memberships']) == 0:
+        click.echo(info("There are no updates to run because you are not a student in any courses."))
     for course in status['student_section_memberships']:
         curr = get_curriculum(course['curriculum_site_url'], course['course_name'])
         git_backend = get_backend(curr['git_backend'])(settings)