baldwin 0.0.7__py3-none-any.whl → 0.0.8__py3-none-any.whl

baldwin/__init__.py

@@ -1,2 +1,2 @@
-"""Manage a home directory with Git."""
-__version__ = '0.0.7'
+"""baldwin module."""
+__version__ = '0.0.8'

baldwin/__main__.py

@@ -0,0 +1,4 @@
+"""Main entry point for the Baldwin CLI."""
+from .main import baldwin as main
+
+main()

baldwin/lib.py

@@ -1,13 +1,13 @@
 """Baldwin library."""
 from collections.abc import Iterable
 from dataclasses import dataclass
-from datetime import UTC, datetime
+from datetime import datetime, timezone
 from importlib import resources
 from itertools import chain
 from pathlib import Path
 from shlex import quote
 from shutil import which
-from typing import Literal
+from typing import Any, Literal
 import logging
 import os
 import subprocess as sp
@@ -15,6 +15,7 @@ import subprocess as sp
 from binaryornot.check import is_binary
 from git import Actor, Repo
 import platformdirs
+import tomlkit
 
 log = logging.getLogger(__name__)
 
@@ -76,7 +77,7 @@ def auto_commit() -> None:
     if items_to_remove:
         repo.index.remove(items_to_remove)
     if items_to_add or items_to_remove or len(repo.index.diff('HEAD')) > 0:
-        repo.index.commit(f'Automatic commit @ {datetime.now(tz=UTC).isoformat()}',
+        repo.index.commit(f'Automatic commit @ {datetime.now(tz=timezone.utc).isoformat()}',
                           committer=Actor('Auto-commiter', 'hgit@tat.sh'))
 
 
@@ -136,6 +137,14 @@ def get_git_path() -> Path:
     return platformdirs.user_data_path('home-git', roaming=True)
 
 
+def get_config() -> tomlkit.TOMLDocument | dict[str, Any]:
+    """Get the configuration (TOML file)."""
+    config_file = platformdirs.user_config_path('baldwin', roaming=True) / 'config.toml'
+    if not config_file.exists():
+        return {}
+    return tomlkit.loads(config_file.read_text())
+
+
 def get_repo() -> Repo:
     """
     Get a :py:class:`git.Repo` object.
@@ -167,14 +176,15 @@ def format_(filenames: Iterable[Path | str] | None = None,
                        for d in repo.index.diff(None) if d.a_path is not None),
                      *(x for x in (Path.home() / y for y in repo.untracked_files)
                        if x.is_file() and not is_binary(str(x))))
-    if not (filenames := list(filenames)):
+    if not (filenames := list(filenames)) or not (prettier := which('prettier')):
         return
-    with resources.path('baldwin.resources', 'prettier.config.json') as config_file:
-        if not (prettier := which('prettier')):
-            return
+    with resources.path('baldwin.resources', 'prettier.config.json') as default_config_file:
+        config_file = get_config().get('baldwin', {
+            'prettier_config': str(default_config_file)
+        }).get('prettier_config')
         # Detect plugins
-        node_modules_path = (Path(prettier).resolve(strict=True).parent / '..' /
-                             '..').resolve(strict=True)
+        node_modules_path = (Path(prettier).resolve(strict=True).parent /
+                             '../..').resolve(strict=True)
         cmd_prefix = (prettier, '--config', str(config_file), '--write',
                       '--no-error-on-unmatched-pattern', '--ignore-unknown', '--log-level',
                       log_level, *chain(*(('--plugin', str(fp))

baldwin/main.py

@@ -3,23 +3,23 @@ import logging
 import click
 
 from .lib import (
-    auto_commit,
+    auto_commit as auto_commit_,
     format_,
-    git,
-    init,
-    install_units,
+    git as git_,
+    init as init_,
+    install_units as install_units_,
     repo_info,
     set_git_env_vars,
 )
 
 log = logging.getLogger(__name__)
 
-__all__ = ('baldwin_main', 'git_main')
+__all__ = ('baldwin', 'git')
 
 
 @click.group(context_settings={'help_option_names': ('-h', '--help')})
 @click.option('-d', '--debug', help='Enable debug logging.', is_flag=True)
-def baldwin_main(*, debug: bool = False) -> None:
+def baldwin(*, debug: bool = False) -> None:
     """Manage a home directory with Git."""
     set_git_env_vars()
     logging.basicConfig(level=logging.DEBUG if debug else logging.ERROR)
@@ -30,31 +30,31 @@ def baldwin_main(*, debug: bool = False) -> None:
     'ignore_unknown_options': True
 })
 @click.argument('args', nargs=-1, type=click.UNPROCESSED)
-def git_main(args: tuple[str, ...]) -> None:
+def git(args: tuple[str, ...]) -> None:
     """Wrap git with git-dir and work-tree passed."""
-    git(args)
+    git_(args)
 
 
 @click.command(context_settings={'help_option_names': ('-h', '--help')})
-def init_main() -> None:
+def init() -> None:
     """Start tracking a home directory."""
-    init()
+    init_()
 
 
 @click.command(context_settings={'help_option_names': ('-h', '--help')})
-def auto_commit_main() -> None:
+def auto_commit() -> None:
     """Automated commit of changed and untracked files."""
-    auto_commit()
+    auto_commit_()
 
 
 @click.command(context_settings={'help_option_names': ('-h', '--help')})
-def format_main() -> None:
+def format() -> None:  # noqa: A001
     """Format changed and untracked files."""
     format_()
 
 
 @click.command(context_settings={'help_option_names': ('-h', '--help')})
-def info_main() -> None:
+def info() -> None:
     """Get basic information about the repository."""
     data = repo_info()
     click.echo(f'git-dir path: {data.git_dir_path}')
@@ -62,14 +62,14 @@ def info_main() -> None:
 
 
 @click.command(context_settings={'help_option_names': ('-h', '--help')})
-def install_units_main() -> None:
+def install_units() -> None:
     """Install systemd units for automatic committing."""
-    install_units()
+    install_units_()
 
 
-baldwin_main.add_command(auto_commit_main, 'auto-commit')
-baldwin_main.add_command(format_main, 'format')
-baldwin_main.add_command(git_main, 'git')
-baldwin_main.add_command(info_main, 'info')
-baldwin_main.add_command(init_main, 'init')
-baldwin_main.add_command(install_units_main, 'install-units')
+baldwin.add_command(auto_commit)
+baldwin.add_command(format)
+baldwin.add_command(git)
+baldwin.add_command(info)
+baldwin.add_command(init)
+baldwin.add_command(install_units)

baldwin-0.0.8.dist-info/LICENSE.txt

@@ -0,0 +1,18 @@
+The MIT License (MIT)
+
+Copyright (c) 2025 baldwin authors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
+associated documentation files (the "Software"), to deal in the Software without restriction,
+including without limitation the rights to use, copy, modify, merge, publish, distribute,
+sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or
+substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT
+NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT
+OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

{baldwin-0.0.7.dist-info → baldwin-0.0.8.dist-info}/METADATA

@@ -1,26 +1,33 @@
 Metadata-Version: 2.3
 Name: baldwin
-Version: 0.0.7
+Version: 0.0.8
 Summary: Simple tracking of your home directory with easy-to-read diffs.
 License: MIT
 Keywords: command line,file management,git,version control
 Author: Andrew Udvare
 Author-email: audvare@gmail.com
-Requires-Python: >=3.12,<4
+Requires-Python: >=3.10,<3.14
 Classifier: Development Status :: 2 - Pre-Alpha
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Typing :: Typed
+Provides-Extra: erdantic
 Requires-Dist: binaryornot (>=0.4.4,<0.5.0)
 Requires-Dist: click (>=8.1.8,<9.0.0)
+Requires-Dist: erdantic (<2.0) ; extra == "erdantic"
 Requires-Dist: gitpython (>=3.1.44,<4.0.0)
 Requires-Dist: platformdirs (>=4.3.6,<5.0.0)
+Requires-Dist: tomlkit (>=0.13.2,<0.14.0)
+Requires-Dist: typing-extensions (>=4.13.1,<5.0.0)
 Project-URL: Documentation, https://baldwin.readthedocs.org
+Project-URL: Homepage, https://tatsh.github.io/baldwin/
+Project-URL: Issues, https://github.com/Tatsh/baldwin/issues
 Project-URL: Repository, https://github.com/Tatsh/baldwin
-Project-URL: issues, https://github.com/Tatsh/baldwin/issues
 Description-Content-Type: text/markdown
 
 # Simple home directory versioning
@@ -32,7 +39,7 @@ Description-Content-Type: text/markdown
 ![PyPI - Version](https://img.shields.io/pypi/v/baldwin)
 ![GitHub tag (with filter)](https://img.shields.io/github/v/tag/Tatsh/baldwin)
 ![GitHub](https://img.shields.io/github/license/Tatsh/baldwin)
-![GitHub commits since latest release (by SemVer including pre-releases)](https://img.shields.io/github/commits-since/Tatsh/baldwin/v0.0.7/master)
+![GitHub commits since latest release (by SemVer including pre-releases)](https://img.shields.io/github/commits-since/Tatsh/baldwin/v0.0.8/master)
 
 This is a conversion of my simple scripts to version my home directory with very specific excludes
 and formatting every file upon commit so that readable diffs can be generated.

baldwin-0.0.8.dist-info/RECORD

@@ -0,0 +1,13 @@
+baldwin/__init__.py,sha256=F--2vlUtecqV6dfCulqfPca9vSmeZCWcSlq3MltMgfQ,44
+baldwin/__main__.py,sha256=7xKOM7FqRjhwJgK30RfKKpTNZCw0DJp5EiKo2KhtqSY,86
+baldwin/lib.py,sha256=U3NLmy9VGk_pC_veb3r4pHqvDJSwuRIikewWnAZxUvQ,7942
+baldwin/main.py,sha256=PrSKsF5zdG9VzWvZUpBkmfhpkweTbVnb8kNroiMSlNA,2030
+baldwin/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+baldwin/resources/default_gitattributes.txt,sha256=uGoWTSVgPmdGB2EUIROkTz3FikGpNGhdS95SuuvoCRo,984
+baldwin/resources/default_gitignore.txt,sha256=oyxukNyK6F778C2jc7oIwosP7ou1WTdbuWwkpgGZtJA,3022
+baldwin/resources/prettier.config.json,sha256=-Hher3B02YflULYn0IYOG_a-rDxpaaaQ0QXD30-5IgQ,387
+baldwin-0.0.8.dist-info/LICENSE.txt,sha256=Y6e04wkVzxa82z5bhkF3-38WGKbISh0E28Eo0IxiOBU,1082
+baldwin-0.0.8.dist-info/METADATA,sha256=2KKR3CwsxeSDUqAQEuU2uQ9ChdL_3pOwkfR4HBMrBSM,4819
+baldwin-0.0.8.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
+baldwin-0.0.8.dist-info/entry_points.txt,sha256=16CO-Z2MW3o6hkxwJplFgnyJuHuTngwrPqCNdSQAOcc,65
+baldwin-0.0.8.dist-info/RECORD,,

{baldwin-0.0.7.dist-info → baldwin-0.0.8.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 2.0.1
+Generator: poetry-core 2.1.2
 Root-Is-Purelib: true
 Tag: py3-none-any

baldwin-0.0.8.dist-info/entry_points.txt

@@ -0,0 +1,4 @@
+[console_scripts]
+bw=baldwin.main:baldwin
+hgit=baldwin.main:git
+

baldwin-0.0.7.dist-info/LICENSE.txt

@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2023 baldwin authors
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.

baldwin-0.0.7.dist-info/RECORD

@@ -1,11 +0,0 @@
-baldwin/__init__.py,sha256=XBpZev4nqfkkKQd5YUoqlcJK0kO9lxPH48gypaHnU7c,62
-baldwin/lib.py,sha256=_-lFY5lXRDRMYpUgWvAuC-3ljYwMDSLaUvWjOX1QIWE,7494
-baldwin/main.py,sha256=08a70OZLyRBamntbCdhhBNKSk9mywu_2M085I_mDa-s,2131
-baldwin/resources/default_gitattributes.txt,sha256=uGoWTSVgPmdGB2EUIROkTz3FikGpNGhdS95SuuvoCRo,984
-baldwin/resources/default_gitignore.txt,sha256=oyxukNyK6F778C2jc7oIwosP7ou1WTdbuWwkpgGZtJA,3022
-baldwin/resources/prettier.config.json,sha256=-Hher3B02YflULYn0IYOG_a-rDxpaaaQ0QXD30-5IgQ,387
-baldwin-0.0.7.dist-info/LICENSE.txt,sha256=TDfksi5bdmmL5cu6tAiN1iL7k38hWR2KbUg0JkASPO4,1082
-baldwin-0.0.7.dist-info/METADATA,sha256=thCF46_lMihnW2-ONI3bOjyJgY2qCgcw0Qmw3c1EGbU,4487
-baldwin-0.0.7.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
-baldwin-0.0.7.dist-info/entry_points.txt,sha256=1PNIgkO4Pmvb8BFPHPNzNHJtfRMqkbzaUWpBWPPmEhs,75
-baldwin-0.0.7.dist-info/RECORD,,

baldwin-0.0.7.dist-info/entry_points.txt

@@ -1,4 +0,0 @@
-[console_scripts]
-bw=baldwin.main:baldwin_main
-hgit=baldwin.main:git_main
-