making-with-code-cli 5.0.2__tar.gz → 5.1.0__tar.gz

{making_with_code_cli-5.0.2 → making_with_code_cli-5.1.0}/PKG-INFO

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

{making_with_code_cli-5.0.2 → making_with_code_cli-5.1.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "making-with-code-cli"
-version = "5.0.2"
+version = "5.1.0"
 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.2 → making_with_code_cli-5.1.0}/src/making_with_code_cli/mwc_accounts_api.py

@@ -46,6 +46,10 @@ class MWCAccountsAPI:
         response = self.put("/sections", data=params, token=token)
         return self.handle_response(response)
 
+    def delete_section(self, token, params):
+        response = self.delete("/sections", data=params, token=token)
+        return self.handle_response(response)
+
     def get(self, url, data=None, token=None):
         return self.http_request("get", url, data=data, token=token)
 
@@ -55,6 +59,9 @@ class MWCAccountsAPI:
     def put(self, url, data=None, token=None):
         return self.http_request("put", url, data=data, token=token)
 
+    def delete(self, url, data=None, token=None):
+        return self.http_request("delete", url, data=data, token=token)
+
     def http_request(self, method, url, data=None, token=None):
         fn = getattr(requests, method)
         headers = {"Authorization": f"Token {token}"} if token else None

{making_with_code_cli-5.0.2 → making_with_code_cli-5.1.0}/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.2 → making_with_code_cli-5.1.0}/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,
@@ -104,6 +105,7 @@ def setup(ctx, config, debug, git_name, git_email, mwc_accounts_url):
         WriteMWCShellConfig,
         SourceMWCShellConfig,
         InstallXCode,
+        SuppressDirenvDiffs,
         InstallDirenv,
         InstallGit,
         InstallTree,

{making_with_code_cli-5.0.2 → making_with_code_cli-5.1.0}/src/making_with_code_cli/setup/tasks.py

@@ -5,6 +5,7 @@ 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 (
@@ -287,6 +288,41 @@ class SourceMWCShellConfig(SetupTask):
             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.2 → making_with_code_cli-5.1.0}/src/making_with_code_cli/teach/section/__init__.py

@@ -8,8 +8,9 @@ from making_with_code_cli.styles import (
 )
 from making_with_code_cli.teach.setup import check_required_teacher_settings
 from making_with_code_cli.teach.section.create import create_section
-from making_with_code_cli.teach.section.edit import edit_section
 from making_with_code_cli.teach.section.show import show_section
+from making_with_code_cli.teach.section.edit import edit_section
+from making_with_code_cli.teach.section.delete import delete_section
 
 @click.group(invoke_without_command=True)
 @click.pass_context
@@ -42,6 +43,7 @@ def summarize_sections(section_data):
     return section_data
 
 section.add_command(create_section)
-section.add_command(edit_section)
 section.add_command(show_section)
+section.add_command(edit_section)
+section.add_command(delete_section)
 

making_with_code_cli-5.1.0/src/making_with_code_cli/teach/section/delete.py

@@ -0,0 +1,24 @@
+import click
+from making_with_code_cli.settings import read_settings
+from making_with_code_cli.mwc_accounts_api import MWCAccountsAPI
+from making_with_code_cli.styles import (
+    address, 
+    error,
+    info,
+    question,
+)
+
+@click.command('delete')
+@click.argument("slug")
+@click.option("--config", help="Path to config file (default: ~/.mwc)")
+def delete_section(slug, config):
+    "Delete a section"
+    settings = read_settings(config)
+    api = MWCAccountsAPI(settings.get('mwc_accounts_url'))
+    params = {"slug": slug}
+    try:
+        response = api.delete_section(settings.get('mwc_accounts_token'), params)
+        click.echo(info(f"Deleted section {slug}."))
+    except api.RequestFailed as err:
+        click.echo(error(f"Error deleting section {slug}."))
+

{making_with_code_cli-5.0.2 → making_with_code_cli-5.1.0}/src/making_with_code_cli/teach/section/edit.py

@@ -19,7 +19,7 @@ from making_with_code_cli.styles import (
 @click.option("--course-name", help="MWC course name")
 @click.option("--code", help="Code students can use to join the section")
 @click.option("--roster", help="csv file containing student information")
-def edit_section(config, slug, name, curriculum_site_url, course_name, code, roster):
+def edit_section(slug, config, name, curriculum_site_url, course_name, code, roster):
     "Edit an existing section"
     settings = read_settings(config)
     api = MWCAccountsAPI(settings.get('mwc_accounts_url'))