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

{making_with_code_cli-5.0.2 → 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.2
+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.2 → making_with_code_cli-5.0.3}/pyproject.toml

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