baldwin 0.0.7__tar.gz → 0.0.9__tar.gz

baldwin-0.0.9/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 → baldwin-0.0.9}/PKG-INFO

@@ -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.7 → baldwin-0.0.9}/README.md

@@ -1,5 +1,6 @@
 # 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)
@@ -7,7 +8,9 @@
 ![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/baldwin/__init__.py

@@ -0,0 +1,4 @@
+"""baldwin module."""
+from __future__ import annotations
+
+__version__ = '0.0.9'

baldwin-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-0.0.7 → baldwin-0.0.9}/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-0.0.7 → baldwin-0.0.9}/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-0.0.9/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/man/baldwin.1

@@ -0,0 +1,151 @@
+.\" Man page generated from reStructuredText.
+.
+.
+.nr rst2man-indent-level 0
+.
+.de1 rstReportMargin
+\\$1 \\n[an-margin]
+level \\n[rst2man-indent-level]
+level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
+-
+\\n[rst2man-indent0]
+\\n[rst2man-indent1]
+\\n[rst2man-indent2]
+..
+.de1 INDENT
+.\" .rstReportMargin pre:
+. RS \\$1
+. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin]
+. nr rst2man-indent-level +1
+.\" .rstReportMargin post:
+..
+.de UNINDENT
+. RE
+.\" indent \\n[an-margin]
+.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.nr rst2man-indent-level -1
+.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
+..
+.TH "BALDWIN" "1" "Apr 12, 2025" "0.0.7" "baldwin"
+.SH NAME
+baldwin \- baldwin v0.0.7
+.sp
+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.
+.SH COMMANDS
+.SS bw
+.sp
+Manage a home directory with Git.
+.INDENT 0.0
+.INDENT 3.5
+.sp
+.EX
+bw [OPTIONS] COMMAND [ARGS]...
+.EE
+.UNINDENT
+.UNINDENT
+.sp
+Options
+.INDENT 0.0
+.TP
+.B \-d, \-\-debug
+Enable debug logging.
+.UNINDENT
+.SS auto\-commit
+.sp
+Automated commit of changed and untracked files.
+.INDENT 0.0
+.INDENT 3.5
+.sp
+.EX
+bw auto\-commit [OPTIONS]
+.EE
+.UNINDENT
+.UNINDENT
+.SS format
+.sp
+Format changed and untracked files.
+.INDENT 0.0
+.INDENT 3.5
+.sp
+.EX
+bw format [OPTIONS]
+.EE
+.UNINDENT
+.UNINDENT
+.SS git
+.sp
+Wrap git with git\-dir and work\-tree passed.
+.INDENT 0.0
+.INDENT 3.5
+.sp
+.EX
+bw git [OPTIONS] [ARGS]...
+.EE
+.UNINDENT
+.UNINDENT
+.sp
+Arguments
+.INDENT 0.0
+.TP
+.B ARGS
+Optional argument(s)
+.UNINDENT
+.SS info
+.sp
+Get basic information about the repository.
+.INDENT 0.0
+.INDENT 3.5
+.sp
+.EX
+bw info [OPTIONS]
+.EE
+.UNINDENT
+.UNINDENT
+.SS init
+.sp
+Start tracking a home directory.
+.INDENT 0.0
+.INDENT 3.5
+.sp
+.EX
+bw init [OPTIONS]
+.EE
+.UNINDENT
+.UNINDENT
+.SS install\-units
+.sp
+Install systemd units for automatic committing.
+.INDENT 0.0
+.INDENT 3.5
+.sp
+.EX
+bw install\-units [OPTIONS]
+.EE
+.UNINDENT
+.UNINDENT
+.SS hgit
+.sp
+Wrap git with git\-dir and work\-tree passed.
+.INDENT 0.0
+.INDENT 3.5
+.sp
+.EX
+hgit [OPTIONS] [ARGS]...
+.EE
+.UNINDENT
+.UNINDENT
+.sp
+Arguments
+.INDENT 0.0
+.TP
+.B ARGS
+Optional argument(s)
+.UNINDENT
+.SH AUTHOR
+Andrew Udvare <audvare@gmail.com>
+.SH COPYRIGHT
+2025
+.\" Generated by docutils manpage writer.
+.

{baldwin-0.0.7 → baldwin-0.0.9}/pyproject.toml

@@ -8,6 +8,8 @@ classifiers = [
   "Intended Audience :: Developers",
   "License :: OSI Approved :: MIT License",
   "Programming Language :: Python",
+  "Programming Language :: Python :: 3.10",
+  "Programming Language :: Python :: 3.11",
   "Programming Language :: Python :: 3.12",
   "Programming Language :: Python :: 3.13",
   "Typing :: Typed",
@@ -18,39 +20,51 @@ keywords = ["command line", "file management", "git", "version control"]
 license = "MIT"
 name = "baldwin"
 readme = "README.md"
-version = "0.0.7"
+version = "0.0.9"
 
 [[project.authors]]
 email = "audvare@gmail.com"
 name = "Andrew Udvare"
 
+[project.scripts]
+bw = "baldwin.main:baldwin"
+hgit = "baldwin.main:git"
+
 [project.urls]
+Issues = "https://github.com/Tatsh/baldwin/issues"
 documentation = "https://baldwin.readthedocs.org"
-issues = "https://github.com/Tatsh/baldwin/issues"
+homepage = "https://tatsh.github.io/baldwin/"
 repository = "https://github.com/Tatsh/baldwin"
 
-[tool]
-
 [tool.commitizen]
 tag_format = "v$version"
 version_files = [
-  ".project.jsonnet",
+  ".wiswa.jsonnet",
   "CITATION.cff",
   "README.md",
   "baldwin/__init__.py",
+  "docs/index.rst",
+  "man/baldwin.1",
   "package.json",
 ]
 version_provider = "pep621"
 
-[tool.coverage]
-
 [tool.coverage.report]
-omit = ["tests/conftest.py", "tests/test_*.py"]
+exclude_also = ["if TYPE_CHECKING:"]
+omit = ["conftest.py", "tests.py", "tests/test_*.py", "__main__.py"]
 show_missing = true
 
 [tool.coverage.run]
 branch = true
-omit = ["tests/conftest.py", "tests/test_*.py"]
+omit = ["conftest.py", "tests.py", "tests/test_*.py", "__main__.py"]
+
+[tool.djlint]
+max_line_length = 100
+no_line_after_yaml = true
+preserve_blank_lines = true
+preserve_leading_space = true
+profile = "jinja"
+use_gitignore = true
 
 [tool.doc8]
 max-line-length = 100
@@ -59,68 +73,85 @@ max-line-length = 100
 cache_dir = "~/.cache/mypy"
 explicit_package_bases = true
 platform = "linux"
-python_version = "3.12"
+python_version = "3.10"
 show_column_numbers = true
 strict = true
 strict_optional = true
 warn_unreachable = true
 
 [tool.poetry]
+include = ["man", { format = "sdist", path = "tests" }]
 
 [tool.poetry.dependencies]
 binaryornot = "^0.4.4"
 click = "^8.1.8"
+colorlog = "^6.9.0"
 gitpython = "^3.1.44"
 platformdirs = "^4.3.6"
-python = ">=3.12,<4"
-
-[tool.poetry.group]
+python = ">=3.10,<3.14"
+tomlkit = "^0.13.2"
+typing-extensions = "^4.13.2"
 
 [tool.poetry.group.dev]
 optional = true
 
 [tool.poetry.group.dev.dependencies]
 binaryornot-stubs = "^0"
-commitizen = "^4.0.0"
-mypy = "^1.13.0"
-ruff = "^0.8.0"
+commitizen = "^4.7.0"
+djlint = "^1.36.4"
+mypy = ">=1.12,<1.16"
+ruff = "^0.11.9"
 yapf = "^0.43.0"
 
 [tool.poetry.group.docs]
 optional = true
 
 [tool.poetry.group.docs.dependencies]
+autodoc-pydantic = "^2.2.0"
 doc8 = "^1.1.2"
 docutils = "^0.21.2"
 esbonio = "^0.16.5"
+numpydoc = "^1.8.0"
 restructuredtext-lint = "^1.4.0"
-sphinx = "^8.1.3"
 sphinx-click = "^6.0.0"
-tomlkit = "^0.13.2"
+sphinx-datatables = "^0.2.1"
+sphinx-hoverxref = "^1.4.2"
+sphinx-immaterial = "^0.13.5"
+
+[tool.poetry.group.docs.dependencies.enum-tools]
+extras = ["sphinx"]
+version = "^0.12.0"
+
+[[tool.poetry.group.docs.dependencies.sphinx]]
+python = ">=3.11"
+version = "^8.2.0"
+
+[[tool.poetry.group.docs.dependencies.sphinx]]
+python = "<3.11"
+version = "^7.2.5"
 
 [tool.poetry.group.tests]
 optional = true
 
 [tool.poetry.group.tests.dependencies]
-coveralls = "^3.3.1"
-mock = "^5.1.0"
-pytest = "^8.3.3"
-pytest-cov = "^5.0.0"
+mock = "^5.2.0"
+pytest = "^8.3.5"
+pytest-cov = "^6.1.1"
 pytest-mock = "^3.14.0"
 
+[tool.poetry.group.tests.dependencies.coveralls]
+python = "<3.13"
+version = "^4.0.1"
+
 [[tool.poetry.packages]]
 include = "baldwin"
 
-[tool.poetry.scripts]
-bw = "baldwin.main:baldwin_main"
-hgit = "baldwin.main:git_main"
-
 [tool.pyright]
 deprecateTypingAliases = true
 enableExperimentalFeatures = true
 include = ["./baldwin", "./tests"]
 pythonPlatform = "Linux"
-pythonVersion = "3.12"
+pythonVersion = "3.10"
 reportCallInDefaultInitializer = "warning"
 reportImplicitOverride = "warning"
 reportImportCycles = "error"
@@ -131,21 +162,18 @@ reportUnnecessaryTypeIgnoreComment = "none"
 typeCheckingMode = "off"
 useLibraryCodeForTypes = false
 
-[tool.pytest]
-
 [tool.pytest.ini_options]
 mock_use_standalone_module = true
 norecursedirs = ["node_modules"]
-python_files = ["test_*.py", "*_tests.py"]
+python_files = ["tests.py", "test_*.py", "*_tests.py"]
 testpaths = ["tests"]
 
 [tool.ruff]
 cache-dir = "~/.cache/ruff"
-extend-exclude = []
 force-exclude = true
 line-length = 100
 namespace-packages = ["docs", "tests"]
-target-version = "py312"
+target-version = "py310"
 unsafe-fixes = true
 
 [tool.ruff.lint]
@@ -163,6 +191,7 @@ extend-select = [
   "CPY",
   "D",
   "DJ",
+  "DOC",
   "DTZ",
   "E",
   "EM",
@@ -170,6 +199,7 @@ extend-select = [
   "EXE",
   "F",
   "FA",
+  "FAST",
   "FBT",
   "FIX",
   "FLY",
@@ -201,11 +231,12 @@ extend-select = [
   "SLOT",
   "T10",
   "T20",
-  "TCH",
+  "TC",
   "TD",
   "TID",
   "TRY",
   "UP",
+  "W",
   "YTT",
 ]
 ignore = [
@@ -217,17 +248,11 @@ ignore = [
   "C901",
   "COM812",
   "CPY001",
-  "D100",
-  "D101",
-  "D102",
-  "D103",
-  "D104",
-  "D105",
-  "D106",
-  "D107",
+  "D201",
   "D203",
   "D204",
   "D212",
+  "DOC201",
   "EM101",
   "N818",
   "PLR0912",
@@ -243,6 +268,8 @@ ignore = [
   "TD002",
   "TD003",
   "TD004",
+  "UP046",
+  "UP047",
 ]
 preview = true
 
@@ -254,6 +281,8 @@ multiline-quotes = "double"
 case-sensitive = true
 combine-as-imports = true
 from-first = true
+required-imports = ["from __future__ import annotations"]
+section-order = ["future", "standard-library", "third-party", "local-folder"]
 
 [tool.ruff.lint.pep8-naming]
 extend-ignore-names = ["test_*"]

baldwin-0.0.9/tests/conftest.py

@@ -0,0 +1,24 @@
+"""Configuration for Pytest."""
+from __future__ import annotations
+
+from typing import NoReturn
+import os
+
+from click.testing import CliRunner
+import pytest
+
+if os.getenv('_PYTEST_RAISE', '0') != '0':  # pragma no cover
+
+    @pytest.hookimpl(tryfirst=True)
+    def pytest_exception_interact(call: pytest.CallInfo[None]) -> NoReturn:
+        assert call.excinfo is not None
+        raise call.excinfo.value
+
+    @pytest.hookimpl(tryfirst=True)
+    def pytest_internalerror(excinfo: pytest.ExceptionInfo[BaseException]) -> NoReturn:
+        raise excinfo.value
+
+
+@pytest.fixture
+def runner() -> CliRunner:
+    return CliRunner()

baldwin-0.0.9/tests/pyproject.toml

@@ -0,0 +1,10 @@
+[tool]
+
+[tool.ruff]
+extend = "../pyproject.toml"
+
+[tool.ruff.lint]
+extend-ignore = ["ARG001", "ARG002", "D100", "D103", "INP001", "PLC0415", "PLR2004", "S105", "S106"]
+
+[tool.ruff.lint.pep8-naming]
+extend-ignore-names = ["test_*"]

baldwin-0.0.9/tests/test_commit.py

@@ -0,0 +1,101 @@
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+from baldwin.main import baldwin
+
+if TYPE_CHECKING:
+    from click.testing import CliRunner
+    from pytest_mock import MockerFixture
+
+
+def test_commit(runner: CliRunner, mocker: MockerFixture) -> None:
+    path = mocker.patch('baldwin.lib.Path')
+    mocker.patch('baldwin.lib.platformdirs.user_data_path')
+    mocker.patch('baldwin.lib.resources')
+    which = mocker.patch('baldwin.lib.which')
+    which.return_value = None  # Disable format
+    repo = mocker.patch('baldwin.lib.Repo')
+    repo.return_value.untracked_files = ['untracked1']
+    changed_file = mocker.MagicMock()
+    changed_file.a_path = 'changed1'
+    deleted_file = mocker.MagicMock()
+    deleted_file.a_path = 'deleted1'
+    repo.return_value.index.diff.return_value = [changed_file, deleted_file]
+    path.home.return_value.__truediv__.return_value.exists.side_effect = [True, False, True, False]
+    runner.invoke(baldwin, ('auto-commit',))
+    assert repo.return_value.index.add.called
+    assert repo.return_value.index.remove.called
+    assert repo.return_value.index.commit.called
+
+
+def test_commit_no_files(runner: CliRunner, mocker: MockerFixture) -> None:
+    mocker.patch('baldwin.lib.Path')
+    mocker.patch('baldwin.lib.platformdirs.user_data_path')
+    mocker.patch('baldwin.lib.resources')
+    which = mocker.patch('baldwin.lib.which')
+    which.return_value = None  # Disable format
+    repo = mocker.patch('baldwin.lib.Repo')
+    repo.return_value.untracked_files = []
+    repo.return_value.index.diff.return_value = []
+    runner.invoke(baldwin, ('auto-commit',))
+    assert not repo.return_value.index.add.called
+    assert not repo.return_value.index.remove.called
+    assert not repo.return_value.index.commit.called
+
+
+def test_commit_no_add(runner: CliRunner, mocker: MockerFixture) -> None:
+    path = mocker.patch('baldwin.lib.Path')
+    mocker.patch('baldwin.lib.platformdirs.user_data_path')
+    mocker.patch('baldwin.lib.resources')
+    which = mocker.patch('baldwin.lib.which')
+    which.return_value = None  # Disable format
+    repo = mocker.patch('baldwin.lib.Repo')
+    repo.return_value.untracked_files = []
+    deleted_file = mocker.MagicMock()
+    deleted_file.a_path = 'deleted1'
+    repo.return_value.index.diff.return_value = [deleted_file]
+    path.home.return_value.__truediv__.return_value.exists.return_value = False
+    runner.invoke(baldwin, ('auto-commit',))
+    assert not repo.return_value.index.add.called
+    assert repo.return_value.index.remove.called
+    assert repo.return_value.index.commit.called
+
+
+def test_commit_no_delete(runner: CliRunner, mocker: MockerFixture) -> None:
+    mocker.patch('baldwin.lib.Path')
+    mocker.patch('baldwin.lib.platformdirs.user_data_path')
+    mocker.patch('baldwin.lib.resources')
+    which = mocker.patch('baldwin.lib.which')
+    which.return_value = None  # Disable format
+    repo = mocker.patch('baldwin.lib.Repo')
+    repo.return_value.untracked_files = ['untracked1']
+    changed_file = mocker.MagicMock()
+    changed_file.a_path = 'changed1'
+    repo.return_value.index.diff.return_value = [changed_file]
+    runner.invoke(baldwin, ('auto-commit',))
+    assert repo.return_value.index.add.called
+    assert not repo.return_value.index.remove.called
+    assert repo.return_value.index.commit.called
+
+
+def test_commit_ignore_unreadable_files(runner: CliRunner, mocker: MockerFixture) -> None:
+    path = mocker.patch('baldwin.lib.Path')
+    mocker.patch('baldwin.lib.platformdirs.user_data_path')
+    mocker.patch('baldwin.lib.resources')
+    which = mocker.patch('baldwin.lib.which')
+    which.return_value = None  # Disable format
+    repo = mocker.patch('baldwin.lib.Repo')
+    repo.return_value.untracked_files = ['untracked1']
+    changed_file = mocker.MagicMock()
+    changed_file.a_path = 'changed1'
+    deleted_file = mocker.MagicMock()
+    deleted_file.a_path = 'deleted1'
+    repo.return_value.index.diff.return_value = [changed_file, deleted_file]
+    path.home.return_value.__truediv__.return_value.exists.side_effect = [True, False, True, False]
+    path.home.return_value.__truediv__.return_value.is_file.side_effect = [True, False, True]
+    path.home.return_value.__truediv__.return_value.open.side_effect = PermissionError
+    runner.invoke(baldwin, ('auto-commit',))
+    assert len(repo.return_value.index.add.call_args[0][0]) == 1
+    assert repo.return_value.index.remove.called
+    assert repo.return_value.index.commit.called

baldwin-0.0.9/tests/test_format.py

@@ -0,0 +1,85 @@
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+from baldwin.main import baldwin
+
+if TYPE_CHECKING:
+    from click.testing import CliRunner
+    from pytest_mock import MockerFixture
+
+
+def test_format_no_prettier(runner: CliRunner, mocker: MockerFixture) -> None:
+    path = mocker.patch('baldwin.lib.Path')
+    mocker.patch('baldwin.lib.platformdirs.user_data_path')
+    mocker.patch('baldwin.lib.resources')
+    run = mocker.patch('baldwin.lib.sp.run')
+    which = mocker.patch('baldwin.lib.which')
+    which.return_value = None
+    repo = mocker.patch('baldwin.lib.Repo')
+    repo.untracked_files = ['untracked1']
+    changed_file = mocker.MagicMock()
+    changed_file.a_path = 'changed1'
+    deleted_file = mocker.MagicMock()
+    deleted_file.a_path = 'deleted1'
+    repo.return_value.index.diff.return_value = [changed_file, deleted_file]
+    path.home.return_value.__truediv__.return_value.exists.side_effect = [True, False, True, False]
+    runner.invoke(baldwin, ('format',))
+    assert not run.called
+
+
+def test_format_no_files(runner: CliRunner, mocker: MockerFixture) -> None:
+    mocker.patch('baldwin.lib.Path')
+    mocker.patch('baldwin.lib.platformdirs.user_data_path')
+    mocker.patch('baldwin.lib.resources')
+    run = mocker.patch('baldwin.lib.sp.run')
+    which = mocker.patch('baldwin.lib.which')
+    repo = mocker.patch('baldwin.lib.Repo')
+    repo.untracked_files = []
+    repo.return_value.index.diff.return_value = []
+    runner.invoke(baldwin, ('format',))
+    assert not run.called
+    assert not which.called
+
+
+def test_format(runner: CliRunner, mocker: MockerFixture) -> None:
+    path = mocker.patch('baldwin.lib.Path')
+    mocker.patch('baldwin.lib.platformdirs.user_data_path')
+    mocker.patch('baldwin.lib.platformdirs.user_config_path'
+                 ).return_value.__truediv__.return_value.exists.return_value = False
+    mocker.patch('baldwin.lib.resources')
+    run = mocker.patch('baldwin.lib.sp.run')
+    which = mocker.patch('baldwin.lib.which')
+    which.return_value = '/bin/prettier'
+    repo = mocker.patch('baldwin.lib.Repo')
+    repo.untracked_files = ['untracked1']
+    changed_file = mocker.MagicMock()
+    changed_file.a_path = 'changed1'
+    deleted_file = mocker.MagicMock()
+    deleted_file.a_path = 'deleted1'
+    repo.return_value.index.diff.return_value = [changed_file, deleted_file]
+    path.home.return_value.__truediv__.return_value.exists.side_effect = [True, False, True, False]
+    runner.invoke(baldwin, ('format',))
+    assert run.called
+
+
+def test_format_config_file_exists(runner: CliRunner, mocker: MockerFixture) -> None:
+    path = mocker.patch('baldwin.lib.Path')
+    mocker.patch('baldwin.lib.platformdirs.user_data_path')
+    mocker.patch('baldwin.lib.platformdirs.user_config_path'
+                 ).return_value.__truediv__.return_value.exists.return_value = True
+    mocker.patch('baldwin.lib.resources')
+    mocker.patch('baldwin.lib.tomlkit.loads').return_value = {}
+    run = mocker.patch('baldwin.lib.sp.run')
+    which = mocker.patch('baldwin.lib.which')
+    which.return_value = '/bin/prettier'
+    repo = mocker.patch('baldwin.lib.Repo')
+    repo.untracked_files = ['untracked1']
+    changed_file = mocker.MagicMock()
+    changed_file.a_path = 'changed1'
+    deleted_file = mocker.MagicMock()
+    deleted_file.a_path = 'deleted1'
+    repo.return_value.index.diff.return_value = [changed_file, deleted_file]
+    path.home.return_value.__truediv__.return_value.exists.side_effect = [True, False, True, False]
+    runner.invoke(baldwin, ('format',))
+    assert run.called

baldwin-0.0.9/tests/test_git_wrapper.py

@@ -0,0 +1,25 @@
+from __future__ import annotations
+
+from pathlib import Path
+from typing import TYPE_CHECKING
+
+from baldwin.lib import get_git_path
+from baldwin.main import baldwin, git
+
+if TYPE_CHECKING:
+    from click.testing import CliRunner
+    from pytest_mock import MockerFixture
+
+
+def test_hgit_wrapper(runner: CliRunner, mocker: MockerFixture) -> None:
+    run = mocker.patch('baldwin.lib.sp.run')
+    runner.invoke(git, ('status',))
+    run.assert_called_once_with(
+        ('git', f'--git-dir={get_git_path()}', f'--work-tree={Path.home()}', 'status'), check=False)
+
+
+def test_bw_git_wrapper(runner: CliRunner, mocker: MockerFixture) -> None:
+    run = mocker.patch('baldwin.lib.sp.run')
+    runner.invoke(baldwin, ('git', 'status'))
+    run.assert_called_once_with(
+        ('git', f'--git-dir={get_git_path()}', f'--work-tree={Path.home()}', 'status'), check=False)

baldwin-0.0.9/tests/test_info.py

@@ -0,0 +1,19 @@
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+import re
+
+from baldwin.main import baldwin
+
+if TYPE_CHECKING:
+    from click.testing import CliRunner
+    from pytest_mock import MockerFixture
+
+
+def test_init_returns_if_exists(runner: CliRunner, mocker: MockerFixture) -> None:
+    mocker.patch('baldwin.lib.platformdirs.user_data_path').return_value.exists.return_value = True
+    mocker.patch('baldwin.lib.Path')
+    run = runner.invoke(baldwin, ('info',))
+    lines = run.stdout.splitlines()
+    assert re.match(r'^git-dir path: <MagicMock.*>$', lines[0])
+    assert re.match(r'^work-tree path: <MagicMock.*>$', lines[1])

baldwin-0.0.9/tests/test_init.py

@@ -0,0 +1,81 @@
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+from baldwin.main import baldwin
+
+if TYPE_CHECKING:
+    from click.testing import CliRunner
+    from pytest_mock import MockerFixture
+
+
+def test_init_returns_if_exists(runner: CliRunner, mocker: MockerFixture) -> None:
+    mocker.patch('baldwin.lib.platformdirs.user_data_path').return_value.exists.return_value = True
+    repo = mocker.patch('baldwin.lib.Repo')
+    runner.invoke(baldwin, ('init',))
+    assert not repo.called
+
+
+def test_init(runner: CliRunner, mocker: MockerFixture) -> None:
+    path = mocker.patch('baldwin.lib.Path')
+    mocker.patch('baldwin.lib.platformdirs.user_data_path').return_value.exists.return_value = False
+    repo = mocker.patch('baldwin.lib.Repo')
+    mocker.patch('baldwin.lib.resources')
+    which = mocker.patch('baldwin.lib.which')
+    which.side_effect = ['jq', 'prettier']
+    runner.invoke(baldwin, ('init',))
+    assert repo.init.called
+    assert repo.init.return_value.index.add.called
+    path.home.return_value.__truediv__.assert_any_call('.gitattributes')
+    path.home.return_value.__truediv__.assert_any_call('.gitignore')
+    assert path.home.return_value.__truediv__.return_value.write_text.call_count == 2
+    which.assert_any_call('jq')
+    which.assert_any_call('prettier')
+    repo.init.return_value.git.execute.assert_any_call(('git', 'config', 'commit.gpgsign', 'false'))
+    repo.init.return_value.git.execute.assert_any_call(
+        ('git', 'config', 'diff.json.textconv', '"jq" -MS .'))
+    repo.init.return_value.git.execute.assert_any_call(
+        ('git', 'config', 'diff.xml.textconv',
+         '"prettier" --no-editorconfig --parser xml --xml-whitespace-sensitivity ignore'))
+    repo.init.return_value.git.execute.assert_any_call(
+        ('git', 'config', 'diff.yaml.textconv', '"prettier" --no-editorconfig --parser yaml'))
+
+
+def test_init_no_tools(runner: CliRunner, mocker: MockerFixture) -> None:
+    path = mocker.patch('baldwin.lib.Path')
+    mocker.patch('baldwin.lib.platformdirs.user_data_path').return_value.exists.return_value = False
+    repo = mocker.patch('baldwin.lib.Repo')
+    mocker.patch('baldwin.lib.resources')
+    which = mocker.patch('baldwin.lib.which')
+    which.return_value = False
+    runner.invoke(baldwin, ('init',))
+    assert repo.init.called
+    path.home.return_value.__truediv__.assert_any_call('.gitattributes')
+    path.home.return_value.__truediv__.assert_any_call('.gitignore')
+    assert path.home.return_value.__truediv__.return_value.write_text.call_count == 2
+    which.assert_any_call('jq')
+    which.assert_any_call('prettier')
+    repo.init.return_value.git.execute.assert_any_call(('git', 'config', 'commit.gpgsign', 'false'))
+
+
+def test_init_no_xml_plugin(runner: CliRunner, mocker: MockerFixture) -> None:
+    path = mocker.patch('baldwin.lib.Path')
+    mocker.patch('baldwin.lib.platformdirs.user_data_path').return_value.exists.return_value = False
+    repo = mocker.patch('baldwin.lib.Repo')
+    mocker.patch('baldwin.lib.resources')
+    which = mocker.patch('baldwin.lib.which')
+    which.side_effect = ['jq', 'prettier']
+    path.return_value.resolve.return_value.parent.__truediv__.return_value.__truediv__.return_value.resolve.return_value.__truediv__.return_value.exists.return_value = False  # noqa: E501
+    runner.invoke(baldwin, ('init',))
+    assert repo.init.called
+    assert repo.init.return_value.index.add.called
+    path.home.return_value.__truediv__.assert_any_call('.gitattributes')
+    path.home.return_value.__truediv__.assert_any_call('.gitignore')
+    assert path.home.return_value.__truediv__.return_value.write_text.call_count == 2
+    which.assert_any_call('jq')
+    which.assert_any_call('prettier')
+    repo.init.return_value.git.execute.assert_any_call(('git', 'config', 'commit.gpgsign', 'false'))
+    repo.init.return_value.git.execute.assert_any_call(
+        ('git', 'config', 'diff.json.textconv', '"jq" -MS .'))
+    repo.init.return_value.git.execute.assert_any_call(
+        ('git', 'config', 'diff.yaml.textconv', '"prettier" --no-editorconfig --parser yaml'))

baldwin-0.0.9/tests/test_install_units.py

@@ -0,0 +1,27 @@
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+from baldwin.main import baldwin
+
+if TYPE_CHECKING:
+    from click.testing import CliRunner
+    from pytest_mock import MockerFixture
+
+
+def test_install_units_no_bw(runner: CliRunner, mocker: MockerFixture) -> None:
+    mocker.patch('baldwin.lib.which').return_value = None
+    run = runner.invoke(baldwin, ('install-units',))
+    assert run.exit_code != 0
+
+
+def test_install_units(runner: CliRunner, mocker: MockerFixture) -> None:
+    path = mocker.patch('baldwin.lib.Path')
+    mocker.patch('baldwin.lib.sp.run')
+    runner.invoke(baldwin, ('install-units',))
+    service_content = path.return_value.expanduser.return_value.write_text.mock_calls[0].args[0]
+    assert 'Type=oneshot' in service_content
+    assert 'ExecStart=' in service_content
+    timer_content = path.return_value.expanduser.return_value.write_text.mock_calls[1].args[0]
+    assert 'OnCalendar=' in timer_content
+    assert 'WantedBy=timers.target' in timer_content

baldwin-0.0.7/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/baldwin/__init__.py

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