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

baldwin/__init__.py

@@ -1,2 +1,4 @@
-"""Manage a home directory with Git."""
-__version__ = '0.0.7'
+"""baldwin module."""
+from __future__ import annotations
+
+__version__ = '0.0.9'

baldwin/__main__.py

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

baldwin/lib.py

@@ -1,13 +1,14 @@
 """Baldwin library."""
-from collections.abc import Iterable
+from __future__ import annotations
+
 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 TYPE_CHECKING, Any, Literal
 import logging
 import os
 import subprocess as sp
@@ -15,6 +16,10 @@ import subprocess as sp
 from binaryornot.check import is_binary
 from git import Actor, Repo
 import platformdirs
+import tomlkit
+
+if TYPE_CHECKING:
+    from collections.abc import Iterable
 
 log = logging.getLogger(__name__)
 
@@ -60,23 +65,31 @@ def init() -> None:
 
 def auto_commit() -> None:
     """Automated commit of changed and untracked files."""
+    def can_open(file: Path) -> bool:
+        """Check if a file can be opened."""
+        try:
+            with file.open('rb'):
+                pass
+        except OSError:
+            return False
+        return True
+
     repo = get_repo()
-    diff_items = [Path.home() / e.a_path for e in repo.index.diff(None)
-                  if e.a_path is not None]  # pragma: no cover
+    diff_items = [Path.home() / e.a_path for e in repo.index.diff(None) if e.a_path is not None]
     items_to_add = [
         *[p for p in diff_items if p.exists()], *[
-            x for x in (Path.home() / y
-                        for y in repo.untracked_files) if x.is_file() and not is_binary(str(x))
+            x for x in (Path.home() / y for y in repo.untracked_files)
+            if can_open(x) and x.is_file() and not is_binary(str(x))
         ]
     ]
-    items_to_remove = [p for p in diff_items if not p.exists()]  # pragma: no cover
+    items_to_remove = [p for p in diff_items if not p.exists()]
     if items_to_add:
         format_(items_to_add)
         repo.index.add(items_to_add)
     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'))
 
 
@@ -95,7 +108,13 @@ def repo_info() -> RepoInfo:
 
 
 def install_units() -> None:
-    """Install systemd units for automatic committing."""
+    """
+    Install systemd units for automatic committing.
+
+    Raises
+    ------
+    FileNotFoundError
+    """
     bw = which('bw')
     if not bw:
         raise FileNotFoundError
@@ -104,8 +123,9 @@ def install_units() -> None:
 Description=Home directory VCS commit
 
 [Service]
-Type=oneshot
+Environment=NO_COLOR=1
 ExecStart={bw} auto-commit
+Type=oneshot
 """)
     log.debug('Wrote to `%s`.', service_file)
     timer_file = Path('~/.config/systemd/user/home-vcs.timer').expanduser()
@@ -136,6 +156,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.
@@ -168,13 +196,18 @@ def format_(filenames: Iterable[Path | str] | None = 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)):
+        log.debug('No files to format.')
         return
-    with resources.path('baldwin.resources', 'prettier.config.json') as config_file:
-        if not (prettier := which('prettier')):
-            return
+    if not (prettier := which('prettier')):
+        log.debug('Prettier not found in PATH.')
+        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

@@ -1,28 +1,32 @@
+"""Commands."""
+from __future__ import annotations
+
 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,
 )
+from .utils import setup_logging
 
 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)
+    setup_logging(debug=debug)
 
 
 @click.command(context_settings={
@@ -30,31 +34,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 +66,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/utils.py

@@ -0,0 +1,46 @@
+"""Utilities."""
+from __future__ import annotations
+
+import logging
+import logging.config
+
+log = logging.getLogger(__name__)
+
+
+def setup_logging(*,
+                  debug: bool = False,
+                  force_color: bool = False,
+                  no_color: bool = False) -> None:  # pragma: no cover
+    """Set up logging configuration."""
+    logging.config.dictConfig({
+        'disable_existing_loggers': True,
+        'root': {
+            'level': 'DEBUG' if debug else 'INFO',
+            'handlers': ['console'],
+        },
+        'formatters': {
+            'default': {
+                '()': 'colorlog.ColoredFormatter',
+                'force_color': force_color,
+                'format': (
+                    '%(light_cyan)s%(asctime)s%(reset)s | %(log_color)s%(levelname)-8s%(reset)s | '
+                    '%(light_green)s%(name)s%(reset)s:%(light_red)s%(funcName)s%(reset)s:'
+                    '%(blue)s%(lineno)d%(reset)s - %(message)s'),
+                'no_color': no_color,
+            }
+        },
+        'handlers': {
+            'console': {
+                'class': 'colorlog.StreamHandler',
+                'formatter': 'default',
+            }
+        },
+        'loggers': {
+            'baldwin': {
+                'level': 'DEBUG' if debug else 'INFO',
+                'handlers': ['console'],
+                'propagate': False,
+            }
+        },
+        'version': 1
+    })

baldwin-0.0.9.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.9.dist-info}/METADATA

@@ -1,30 +1,37 @@
 Metadata-Version: 2.3
 Name: baldwin
-Version: 0.0.7
+Version: 0.0.9
 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
 Requires-Dist: binaryornot (>=0.4.4,<0.5.0)
 Requires-Dist: click (>=8.1.8,<9.0.0)
+Requires-Dist: colorlog (>=6.9.0,<7.0.0)
 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.2,<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
 
+[![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit)](https://github.com/pre-commit/pre-commit)
 [![QA](https://github.com/Tatsh/baldwin/actions/workflows/qa.yml/badge.svg)](https://github.com/Tatsh/baldwin/actions/workflows/qa.yml)
 [![Tests](https://github.com/Tatsh/baldwin/actions/workflows/tests.yml/badge.svg)](https://github.com/Tatsh/baldwin/actions/workflows/tests.yml)
 [![Coverage Status](https://coveralls.io/repos/github/Tatsh/baldwin/badge.svg?branch=master)](https://coveralls.io/github/Tatsh/baldwin?branch=master)
@@ -32,7 +39,9 @@ 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.9/master)
+
+[![@Tatsh](https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fpublic.api.bsky.app%2Fxrpc%2Fapp.bsky.actor.getProfile%2F%3Factor%3Ddid%3Aplc%3Auq42idtvuccnmtl57nsucz72%26query%3D%24.followersCount%26style%3Dsocial%26logo%3Dbluesky%26label%3DFollow%2520%40Tatsh&query=%24.followersCount&style=social&logo=bluesky&label=Follow%20%40Tatsh)](https://bsky.app/profile/tatsh.bsky.social)
 
 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.9.dist-info/RECORD

@@ -0,0 +1,14 @@
+baldwin/__init__.py,sha256=pPCFLb4adFkSqhONgCTDYBp-kFFmxVzic80FQZzio4o,80
+baldwin/__main__.py,sha256=vLM990SXfS71YjwD7vs3TN8UMe03UrgzA2tvKwjV9bk,122
+baldwin/lib.py,sha256=nGWjtmbk8CkCevQ0qDv4UxM_vjYqGE1hCClp9cAfZQ0,8371
+baldwin/main.py,sha256=JGbHj6ZRas-acoNHFH1Lmbp4-d96d9X5SWpN8fqz1qA,2073
+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/utils.py,sha256=4lcYY7DErJS5GWh3utf1d697ZIMw6Q1GEEf6NCeSdak,1420
+baldwin-0.0.9.dist-info/LICENSE.txt,sha256=Y6e04wkVzxa82z5bhkF3-38WGKbISh0E28Eo0IxiOBU,1082
+baldwin-0.0.9.dist-info/METADATA,sha256=c0AB0Cnq_8sQC4tjxsehdgJJ-pQAJTyOp7P5bC4nCU8,5309
+baldwin-0.0.9.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+baldwin-0.0.9.dist-info/entry_points.txt,sha256=16CO-Z2MW3o6hkxwJplFgnyJuHuTngwrPqCNdSQAOcc,65
+baldwin-0.0.9.dist-info/RECORD,,

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

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

baldwin-0.0.9.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
-