git-ember 1.4.1__tar.gz → 1.4.2__tar.gz

{git_ember-1.4.1/src/git_ember.egg-info → git_ember-1.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: git-ember
-Version: 1.4.1
+Version: 1.4.2
 Summary: A GitHub-style heatmap of commits and local repo statistics for your terminal
 Author-email: Luka van Rooyen <lukavrooyen@proton.me>
 License-Expression: MIT
@@ -65,6 +65,14 @@ pip install git-ember
    git-ember --version
    ```
 
+### Using uv
+
+If you use [uv](https://github.com/astral-sh/uv) as your package manager:
+
+```bash
+uv pip install git-ember
+```
+
 ### Running without installation
 
 If you prefer not to install the package, run directly:
@@ -203,6 +211,18 @@ git-ember --plain
 git-ember --plain > heatmap.txt
 ```
 
+Reset configuration to defaults:
+
+```bash
+git-ember --reset-default
+```
+
+Show debug information:
+
+```bash
+git-ember --verbose
+```
+
 ### Command-line options
 
 | Flag             | Alias   | Description                                    | Default     |
@@ -225,7 +245,9 @@ git-ember --plain > heatmap.txt
 | `--merges-only`  | -       | Show only merge commits                     | `false`     |
 | `--grep`        | -       | Filter commits by message content              | -           |
 | `--hourly`       | -       | Show hour-of-day x day-of-week heatmap       | `false`     |
+| `--reset-default` | -      | Reset config to defaults                    | -           |
 | `--version`      | `-V`    | Show version                             | -           |
+| `--verbose`      | `-v`    | Show debug information                  | -           |
 | `--help`        | `-h`    | Show help                               | -           |
 
 ## Project Structure
@@ -269,6 +291,12 @@ Run tests:
 pytest
 ```
 
+Run tests with coverage:
+
+```bash
+pytest --cov=gitember --cov-report=term-missing
+```
+
 ## License
 
 MIT License — see [LICENSE](LICENSE) file.

{git_ember-1.4.1 → git_ember-1.4.2}/README.md

@@ -43,6 +43,14 @@ pip install git-ember
    git-ember --version
    ```
 
+### Using uv
+
+If you use [uv](https://github.com/astral-sh/uv) as your package manager:
+
+```bash
+uv pip install git-ember
+```
+
 ### Running without installation
 
 If you prefer not to install the package, run directly:
@@ -181,6 +189,18 @@ git-ember --plain
 git-ember --plain > heatmap.txt
 ```
 
+Reset configuration to defaults:
+
+```bash
+git-ember --reset-default
+```
+
+Show debug information:
+
+```bash
+git-ember --verbose
+```
+
 ### Command-line options
 
 | Flag             | Alias   | Description                                    | Default     |
@@ -203,7 +223,9 @@ git-ember --plain > heatmap.txt
 | `--merges-only`  | -       | Show only merge commits                     | `false`     |
 | `--grep`        | -       | Filter commits by message content              | -           |
 | `--hourly`       | -       | Show hour-of-day x day-of-week heatmap       | `false`     |
+| `--reset-default` | -      | Reset config to defaults                    | -           |
 | `--version`      | `-V`    | Show version                             | -           |
+| `--verbose`      | `-v`    | Show debug information                  | -           |
 | `--help`        | `-h`    | Show help                               | -           |
 
 ## Project Structure
@@ -247,6 +269,12 @@ Run tests:
 pytest
 ```
 
+Run tests with coverage:
+
+```bash
+pytest --cov=gitember --cov-report=term-missing
+```
+
 ## License
 
 MIT License — see [LICENSE](LICENSE) file.

{git_ember-1.4.1 → git_ember-1.4.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "git-ember"
-version = "1.4.1"
+version = "1.4.2"
 description = "A GitHub-style heatmap of commits and local repo statistics for your terminal"
 readme = "README.md"
 authors = [{name = "Luka van Rooyen", email = "lukavrooyen@proton.me"}]

{git_ember-1.4.1 → git_ember-1.4.2/src/git_ember.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: git-ember
-Version: 1.4.1
+Version: 1.4.2
 Summary: A GitHub-style heatmap of commits and local repo statistics for your terminal
 Author-email: Luka van Rooyen <lukavrooyen@proton.me>
 License-Expression: MIT
@@ -65,6 +65,14 @@ pip install git-ember
    git-ember --version
    ```
 
+### Using uv
+
+If you use [uv](https://github.com/astral-sh/uv) as your package manager:
+
+```bash
+uv pip install git-ember
+```
+
 ### Running without installation
 
 If you prefer not to install the package, run directly:
@@ -203,6 +211,18 @@ git-ember --plain
 git-ember --plain > heatmap.txt
 ```
 
+Reset configuration to defaults:
+
+```bash
+git-ember --reset-default
+```
+
+Show debug information:
+
+```bash
+git-ember --verbose
+```
+
 ### Command-line options
 
 | Flag             | Alias   | Description                                    | Default     |
@@ -225,7 +245,9 @@ git-ember --plain > heatmap.txt
 | `--merges-only`  | -       | Show only merge commits                     | `false`     |
 | `--grep`        | -       | Filter commits by message content              | -           |
 | `--hourly`       | -       | Show hour-of-day x day-of-week heatmap       | `false`     |
+| `--reset-default` | -      | Reset config to defaults                    | -           |
 | `--version`      | `-V`    | Show version                             | -           |
+| `--verbose`      | `-v`    | Show debug information                  | -           |
 | `--help`        | `-h`    | Show help                               | -           |
 
 ## Project Structure
@@ -269,6 +291,12 @@ Run tests:
 pytest
 ```
 
+Run tests with coverage:
+
+```bash
+pytest --cov=gitember --cov-report=term-missing
+```
+
 ## License
 
 MIT License — see [LICENSE](LICENSE) file.

{git_ember-1.4.1 → git_ember-1.4.2}/src/git_ember.egg-info/SOURCES.txt

@@ -12,6 +12,7 @@ src/gitember/colors.py
 src/gitember/config.py
 src/gitember/git.py
 src/gitember/render.py
+tests/test_cli.py
 tests/test_config.py
 tests/test_git.py
 tests/test_render.py

{git_ember-1.4.1 → git_ember-1.4.2}/src/gitember/cli.py

@@ -6,8 +6,9 @@ import time
 from pathlib import Path
 
 from gitember import __version__
-from gitember.colors import LIGHT_GRAY, PLAIN, RESET, get_color_scheme
+from gitember.colors import BOLD, LIGHT_GRAY, PLAIN, RESET, get_color_scheme
 from gitember.config import (
+    DEFAULT_CONFIG,
     get_bool,
     load_config,
     save_config,
@@ -34,6 +35,23 @@ from gitember.render import (
 __all__ = ["main"]
 
 
+def highlight_grep(text: str, pattern: str, bold_code: str, reset_code: str) -> str:
+    """Highlight pattern matches in text using bold."""
+    if not pattern:
+        return text
+    import re
+
+    try:
+        return re.sub(
+            f"({re.escape(pattern)})",
+            f"{bold_code}\\1{reset_code}",
+            text,
+            flags=re.IGNORECASE,
+        )
+    except re.error:
+        return text
+
+
 def parse_args() -> argparse.Namespace:
     """Parse command line arguments.
 
@@ -175,6 +193,17 @@ def parse_args() -> argparse.Namespace:
         action="version",
         version=f"git-ember {__version__}",
     )
+    parser.add_argument(
+        "--reset-default",
+        action="store_true",
+        help="Reset all config values to their defaults",
+    )
+    parser.add_argument(
+        "-v",
+        "--verbose",
+        action="store_true",
+        help="Show debug information including git commands",
+    )
     return parser.parse_args()
 
 
@@ -202,21 +231,28 @@ def main() -> None:
     """Main entry point."""
     args = parse_args()
     repo_path = get_repo_path(args.path)
+    verbose = getattr(args, "verbose", False)
+    start_time = time.perf_counter()
 
     config = load_config()
 
+    if args.reset_default:
+        config = DEFAULT_CONFIG.copy()
+        save_config(config)
+        print("Config reset to defaults.")
+        sys.exit(0)
+
     color_name = args.color or config.get("color", "green")
     try:
         config_years = max(1, int(config.get("years", "1")))
     except ValueError:
         config_years = 1
     years = args.years if args.years is not None else config_years
+    years = max(1, years)
     border_char = (args.border[0] if args.border else None) or config.get(
         "border", "="
     )[0]
-    ascii_mode = (
-        args.ascii if args.ascii is not None else get_bool(config, "ascii")
-    )
+    ascii_mode = args.ascii if args.ascii is not None else get_bool(config, "ascii")
     branch = args.branch
     week_start = args.week_start or config.get("week_start", "sunday")
     author = args.author
@@ -230,7 +266,7 @@ def main() -> None:
 
     grep = args.grep
 
-    default_branch = get_default_branch(repo_path)
+    default_branch = get_default_branch(repo_path, verbose=verbose)
 
     MAX_YEARS = 10
     if years > MAX_YEARS:
@@ -240,7 +276,7 @@ def main() -> None:
         years = MAX_YEARS
 
     if branch:
-        valid_branches = get_branches(repo_path)
+        valid_branches = get_branches(repo_path, verbose=verbose)
         if branch not in valid_branches:
             print(f"Error: Branch '{branch}' not found")
             sys.exit(1)
@@ -283,15 +319,9 @@ def main() -> None:
     today = dt.date.today()
     output_parts = []
     extended = (
-        args.extended
-        if args.extended is not None
-        else get_bool(config, "extended")
-    )
-    compact = (
-        args.compact
-        if args.compact is not None
-        else get_bool(config, "compact")
+        args.extended if args.extended is not None else get_bool(config, "extended")
     )
+    compact = args.compact if args.compact is not None else get_bool(config, "compact")
 
     custom_range = args.after or args.before
 
@@ -311,6 +341,12 @@ def main() -> None:
             print("Error: Invalid --before date. Use YYYY-MM-DD format.")
             sys.exit(1)
 
+    if custom_range and start_date > end_date:
+        after_str = args.after or "--after not set"
+        before_str = args.before or "--before not set"
+        print(f"Error: {after_str} must be before {before_str}")
+        sys.exit(1)
+
     if custom_range:
         num_iterations = 1
     else:
@@ -343,6 +379,7 @@ def main() -> None:
                 default_branch=default_branch,
                 merge_filter=merge_filter,
                 grep=grep,
+                verbose=verbose,
             )
         except ValueError as e:
             print(f"Error: {e}")
@@ -364,18 +401,16 @@ def main() -> None:
         legend = render_legend(thresholds, color_scheme, ascii_mode)
 
         if custom_range:
-            output_parts.append(f"{heatmap}\n    {legend}")
+            output_parts.append(f"{heatmap}\n{legend}\n")
         elif num_iterations > 1:
-            output_parts.append(f"[{year}]\n{heatmap}\n    {legend}")
+            output_parts.append(f"[{year}]\n{heatmap}\n{legend}\n")
         else:
-            output_parts.append(f"{heatmap}\n    {legend}")
+            output_parts.append(f"{heatmap}\n{legend}\n")
 
     output_parts.reverse()
     print("\n" + "\n".join(output_parts))
 
-    show_tree = (
-        args.tree if args.tree is not None else get_bool(config, "tree")
-    )
+    show_tree = args.tree if args.tree is not None else get_bool(config, "tree")
     if show_tree:
         tree_commits = get_branch_tree(
             repo_path,
@@ -385,6 +420,8 @@ def main() -> None:
             merge_filter=merge_filter,
             grep=grep,
         )
+        tree_reset = RESET if not args.plain else ""
+        tree_bold = BOLD if not args.plain else ""
         tree_output = render_branch_tree(
             tree_commits,
             default_branch=default_branch,
@@ -392,6 +429,9 @@ def main() -> None:
             color_scheme=color_scheme,
             ascii_mode=ascii_mode,
             compact=compact,
+            grep=grep,
+            bold_code=tree_bold,
+            reset_code=tree_reset,
         )
         if tree_output:
             print(tree_output)
@@ -471,23 +511,30 @@ def main() -> None:
             commit_color = color_scheme.get(3)
             author_color = color_scheme.get(2)
 
-            commit_time = (
-                time.strftime("%H:%M", time.localtime(int(commit["timestamp"])))
-                if commit["timestamp"]
-                else ""
-            )
+            commit_time = ""
+            if commit.get("timestamp"):
+                try:
+                    commit_time = time.strftime("%H:%M", time.localtime(int(commit["timestamp"])))
+                except (ValueError, OSError):
+                    pass
             date_parts = commit["date"].split("-")
-            formatted_date = (
-                f"{date_parts[2]}-{date_parts[1]}-{date_parts[0]}"
-                if len(date_parts) == 3
-                else commit["date"]
-            )
+            try:
+                if len(date_parts) == 3:
+                    formatted_date = f"{date_parts[2]}-{date_parts[1]}-{date_parts[0]}"
+                else:
+                    formatted_date = commit["date"]
+            except (ValueError, IndexError):
+                formatted_date = commit["date"]
             print(
                 f"  {commit_color}{commit['hash']}{reset_code}"
                 f" | {author_color}{commit['author']}{reset_code}"
                 f" | {gray_code}{formatted_date} {commit_time}{reset_code}"
             )
-            print(f"      {commit['message']}")
+            bold_code = BOLD if not args.plain else ""
+            highlighted_msg = highlight_grep(
+                commit["message"], grep, bold_code + commit_color, reset_code
+            )
+            print(f"      {highlighted_msg}")
 
         print("\n--- Top Contributors ---")
         contrib_color = color_scheme.get(2)
@@ -528,6 +575,10 @@ def main() -> None:
         print(hourly_grid)
         print(f"    {legend}")
 
+    if verbose:
+        elapsed = time.perf_counter() - start_time
+        print(f"\n[DEBUG] Completed in {elapsed:.3f}s", file=sys.stderr)
+
 
 if __name__ == "__main__":
     main()

{git_ember-1.4.1 → git_ember-1.4.2}/src/gitember/colors.py

@@ -1,8 +1,10 @@
 RESET = "\x1b[0m"
 LIGHT_GRAY = "\x1b[38;5;250m"
+BOLD = "\x1b[1m"
 
 
 __all__ = [
+    "BOLD",
     "COLOR_SCHEMES",
     "LIGHT_GRAY",
     "PLAIN",

{git_ember-1.4.1 → git_ember-1.4.2}/src/gitember/config.py

@@ -1,5 +1,6 @@
 import os
 import sys
+import tomllib
 from pathlib import Path
 
 __all__ = [
@@ -27,7 +28,9 @@ def get_bool(config: dict, key: str, default: bool = False) -> bool:
     raw = config[key]
     if isinstance(raw, bool):
         return raw
-    return raw.strip().lower() == "true"
+    if isinstance(raw, int):
+        return bool(raw)
+    return str(raw).strip().lower() == "true"
 
 
 def config_file_path() -> Path:
@@ -95,23 +98,32 @@ def load_config() -> dict:
     except OSError:
         return config
 
-    # Simple TOML-like parsing: key=value, ignore comments
-    for line in text.splitlines():
-        stripped = line.strip()
-        # Skip empty lines and comments
-        if not stripped or stripped.startswith("#"):
-            continue
-        if "=" in stripped:
-            key, _, value = stripped.partition("=")
-            key = key.strip()
-            # Strip quotes from value - handles both "value" and 'value'
-            value = value.strip().strip('"').strip("'")
-            # Only allow predefined keys (whitelist for security)
-            if key in ALLOWED_CONFIG_KEYS:
+    try:
+        parsed = tomllib.loads(text)
+    except ValueError:
+        return config
+
+    for key in ALLOWED_CONFIG_KEYS:
+        if key in parsed:
+            value = parsed[key]
+            if isinstance(value, bool):
+                config[key] = "true" if value else "false"
+            elif isinstance(value, int):
+                config[key] = str(value)
+            elif isinstance(value, str):
                 config[key] = value
     return config
 
 
+def _serialize_value(value: str) -> str:
+    """Serialize a config value to TOML string."""
+    if value.lower() in ("true", "false"):
+        return value.lower()
+    if value.isdigit():
+        return value
+    return f'"{value}"'
+
+
 def save_config(config: dict) -> None:
     """Save config to file.
 
@@ -122,10 +134,9 @@ def save_config(config: dict) -> None:
     try:
         path.parent.mkdir(parents=True, exist_ok=True)
         lines = []
-        for k, v in config.items():
-            if k in ALLOWED_CONFIG_KEYS:
-                escaped = v.replace('"', '\\"')
-                lines.append(f'{k} = "{escaped}"')
+        for k in ALLOWED_CONFIG_KEYS:
+            if k in config:
+                lines.append(f"{k} = {_serialize_value(config[k])}")
         path.write_text("\n".join(lines), encoding="utf-8")
     except OSError:
         pass

{git_ember-1.4.1 → git_ember-1.4.2}/src/gitember/git.py

@@ -1,10 +1,12 @@
 import datetime as dt
 import re
 import subprocess
+import sys
 from collections import Counter
 from typing import Any
 
 COMMIT_PREFIX = "COMMIT:"
+GIT_TIMEOUT = 30  # seconds
 
 
 __all__ = [
@@ -68,6 +70,7 @@ def run_git_log(
     default_branch: str | None = None,
     merge_filter: str | None = None,
     grep: str | None = None,
+    verbose: bool = False,
 ) -> dict[dt.date, int]:
     """Get commit counts per day within a date range.
 
@@ -102,6 +105,7 @@ def run_git_log(
         subprocess.run(
             ["git", "-C", repo_path, "rev-parse", "--is-inside-work-tree"],
             check=True,
+            timeout=GIT_TIMEOUT,
             stdout=subprocess.DEVNULL,
             stderr=subprocess.DEVNULL,
         )
@@ -142,7 +146,10 @@ def run_git_log(
         ]
     )
 
-    result = subprocess.run(cmd, capture_output=True, text=True)
+    if verbose:
+        print(f"[DEBUG] git {' '.join(cmd)}", file=sys.stderr)
+
+    result = subprocess.run(cmd, capture_output=True, text=True, timeout=GIT_TIMEOUT)
 
     if result.returncode != 0:
         err = result.stderr.strip() or result.stdout.strip()
@@ -161,7 +168,7 @@ def run_git_log(
     return dict(counter)
 
 
-def get_branches(repo_path: str) -> list[str]:
+def get_branches(repo_path: str, verbose: bool = False) -> list[str]:
     """Get list of local branch names.
 
     Args:
@@ -184,7 +191,7 @@ def get_branches(repo_path: str) -> list[str]:
     return [line.strip() for line in result.stdout.splitlines() if line.strip()]
 
 
-def get_default_branch(repo_path: str) -> str:
+def get_default_branch(repo_path: str, verbose: bool = False) -> str:
     """Get the default branch name (e.g., main, master).
 
     Args:
@@ -278,7 +285,7 @@ def get_recent_commits(
     elif merge_filter == "merges-only":
         cmd.append("--merges")
 
-    result = subprocess.run(cmd, capture_output=True, text=True)
+    result = subprocess.run(cmd, capture_output=True, text=True, timeout=GIT_TIMEOUT)
 
     if result.returncode != 0:
         return []
@@ -361,7 +368,7 @@ def get_top_contributors(
     elif merge_filter == "merges-only":
         cmd.append("--merges")
 
-    result = subprocess.run(cmd, capture_output=True, text=True)
+    result = subprocess.run(cmd, capture_output=True, text=True, timeout=GIT_TIMEOUT)
 
     if result.returncode != 0:
         return []
@@ -439,7 +446,7 @@ def get_repo_stats(
     elif merge_filter == "merges-only":
         cmd.append("--merges")
 
-    result = subprocess.run(cmd, capture_output=True, text=True)
+    result = subprocess.run(cmd, capture_output=True, text=True, timeout=GIT_TIMEOUT)
 
     if result.returncode != 0:
         err = result.stderr.strip() or result.stdout.strip()
@@ -515,7 +522,11 @@ def get_streaks(counts: dict[dt.date, int]) -> dict[str, Any]:
 
         prev_date = date
 
-    today = dt.date.today()
+    if sorted_dates:
+        today = sorted_dates[-1]
+    else:
+        today = dt.date.today()
+
     current = 0
     check_date = today
     while True:
@@ -626,7 +637,7 @@ def get_branch_tree(
     elif merge_filter == "merges-only":
         cmd.append("--merges")
 
-    result = subprocess.run(cmd, capture_output=True, text=True)
+    result = subprocess.run(cmd, capture_output=True, text=True, timeout=GIT_TIMEOUT)
     if result.returncode != 0:
         return []
 
@@ -740,7 +751,7 @@ def get_hourly_counts(
         ]
     )
 
-    result = subprocess.run(cmd, capture_output=True, text=True)
+    result = subprocess.run(cmd, capture_output=True, text=True, timeout=GIT_TIMEOUT)
     if result.returncode != 0:
         return {}
 

{git_ember-1.4.1 → git_ember-1.4.2}/src/gitember/render.py

@@ -69,7 +69,7 @@ def render_legend(
     return " ".join(parts)
 
 
-def calculate_thresholds(counts: dict[dt.date, int], mode: str = "auto") -> tuple:
+def calculate_thresholds(counts: dict, mode: str = "auto") -> tuple:
     """Calculate intensity thresholds based on scaling mode.
 
     Args:
@@ -261,6 +261,9 @@ def render_branch_tree(
     color_scheme: ColorScheme | PlainScheme | None = None,
     ascii_mode: bool = False,
     compact: bool = False,
+    grep: str | None = None,
+    bold_code: str = "",
+    reset_code: str = "",
 ) -> str:
     """Render horizontal branch tree visualization.
 
@@ -322,11 +325,27 @@ def render_branch_tree(
 
         hash7 = commit["hash"]
         full_message = commit["message"]
-        max_msg_len = 20 if compact else 35
-        if len(full_message) > max_msg_len:
-            message = full_message[: max_msg_len - 3] + "..."
+
+        if grep and bold_code and reset_code:
+            import re
+
+            try:
+                highlighted = re.sub(
+                    f"({re.escape(grep)})",
+                    f"{bold_code}\\1{reset_code}",
+                    full_message,
+                    flags=re.IGNORECASE,
+                )
+            except re.error:
+                highlighted = full_message
+        else:
+            highlighted = full_message
+
+        max_msg_len = 35 if compact else 50
+        if len(highlighted) > max_msg_len:
+            message = highlighted[: max_msg_len - 3] + "..."
         else:
-            message = full_message + " " * (max_msg_len - len(full_message))
+            message = highlighted + " " * (max_msg_len - len(highlighted))
         branches = commit.get("branches", [])
 
         is_connector = not hash7 and "|" in graph_line