bakefile 0.0.10__tar.gz → 0.0.12__tar.gz

{bakefile-0.0.10 → bakefile-0.0.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: bakefile
-Version: 0.0.10
+Version: 0.0.12
 Summary: Add your description here
 Author: Wisaroot Lertthaweedech
 Author-email: Wisaroot Lertthaweedech <l.wisaroot@gmail.com>
@@ -18,7 +18,9 @@ Requires-Dist: tomli>=2.0.0 ; python_full_version < '3.11'
 Requires-Dist: ty>=0.0.8
 Requires-Dist: typer>=0.21.0
 Requires-Dist: uv>=0.9.20
+Requires-Dist: keyring>=25.7.0 ; extra == 'lib'
 Requires-Dist: pathspec>=1.0.3 ; extra == 'lib'
+Requires-Dist: tenacity>=9.1.2 ; extra == 'lib'
 Requires-Python: >=3.10
 Provides-Extra: lib
 Description-Content-Type: text/markdown

{bakefile-0.0.10 → bakefile-0.0.12}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "bakefile"
-version = "0.0.10" # use git tag
+version = "0.0.12" # use git tag
 description = "Add your description here"
 readme = "README.md"
 authors = [
@@ -26,7 +26,9 @@ dependencies = [
 
 [project.optional-dependencies]
 lib = [
-  "pathspec>=1.0.3"
+  "keyring>=25.7.0",
+  "pathspec>=1.0.3",
+  "tenacity>=9.1.2"
 ]
 
 [project.scripts]
@@ -79,5 +81,11 @@ select = [
 module-name = ["bake", "bakelib"]
 module-root = "src"
 
+[[tool.uv.index]]
+name = "testpypi"
+url = "https://test.pypi.org/simple/"
+publish-url = "https://test.pypi.org/legacy/"
+explicit = true
+
 [tool.uv.sources]
 python-package = {path = "examples/python-package", editable = true}

bakefile-0.0.12/src/bake/cli/bake/main.py

@@ -0,0 +1,116 @@
+import sys
+from collections.abc import Callable
+from contextlib import contextmanager
+from pathlib import Path
+
+import typer
+
+from bake.cli.bake.reinvocation import _reinvoke_with_detected_python
+from bake.cli.common.app import (
+    add_completion,
+    call_app_with_chdir,
+    rich_markup_mode,
+    show_help_if_no_command,
+)
+from bake.cli.common.context import Context
+from bake.cli.common.obj import BakefileObject, get_bakefile_object, is_bakebook_optional
+from bake.cli.common.params import (
+    bakebook_name_option,
+    chdir_option,
+    dry_run_option,
+    file_name_option,
+    is_chain_commands_option,
+    verbosity_option,
+    version_option,
+)
+from bake.ui import console
+from bake.utils.constants import (
+    DEFAULT_BAKEBOOK_NAME,
+    DEFAULT_CHDIR,
+    DEFAULT_FILE_NAME,
+    DEFAULT_IS_CHAIN_COMMAND,
+)
+from bake.utils.settings import bake_settings
+
+
+def bake_app_callback_with_obj(obj: BakefileObject) -> Callable[..., None]:
+    def bake_app_callback(
+        ctx: Context,
+        _chdir: chdir_option = DEFAULT_CHDIR,
+        _file_name: file_name_option = DEFAULT_FILE_NAME,
+        _bakebook_name: bakebook_name_option = DEFAULT_BAKEBOOK_NAME,
+        _version: version_option = False,
+        _is_chain_commands: is_chain_commands_option = DEFAULT_IS_CHAIN_COMMAND,
+        _verbosity: verbosity_option = 0,
+        _dry_run: dry_run_option = False,
+    ):
+        ctx.obj = obj
+        show_help_if_no_command(ctx)
+
+    return bake_app_callback
+
+
+@contextmanager
+def set_argv(argv: list[str]):
+    original = sys.argv.copy()
+    sys.argv = argv
+    try:
+        yield
+    finally:
+        sys.argv = original
+
+
+def _run_chain_commands(
+    remaining_args: list[str], prog_name: str, bake_app: typer.Typer, bakefile_path: Path | None
+) -> int:
+    exit_code = 0
+    for cmd in remaining_args:
+        try:
+            with set_argv([prog_name, cmd]):
+                console.cmd(" ".join(sys.argv))
+                call_app_with_chdir(app=bake_app, bakefile_path=bakefile_path, prog_name=prog_name)
+        except SystemExit as e:
+            if e.code is not None and e.code != 0:
+                exit_code = e.code if isinstance(e.code, int) else 1
+                break
+    return exit_code
+
+
+def main():
+    bakefile_obj = get_bakefile_object(rich_markup_mode=rich_markup_mode)
+    bakefile_obj.setup_logging()
+    bakefile_obj.resolve_bakefile_path()
+
+    # Check re-invocation with resolved bakefile path
+    # If re-invocation happens, process is replaced and we don't return
+    _reinvoke_with_detected_python(bakefile_obj.bakefile_path)
+    # If returned above, we're in the correct Python
+
+    bakefile_obj.get_bakebook(
+        allow_missing=is_bakebook_optional(remaining_args=bakefile_obj.remaining_args)
+    )
+
+    bakefile_obj.warn_if_no_bakebook(color_echo=bake_settings.should_use_colors())
+
+    bake_app = typer.Typer(
+        add_completion=add_completion,
+        rich_markup_mode=rich_markup_mode,
+    )
+
+    callback = bake_app_callback_with_obj(obj=bakefile_obj)
+    bake_app.callback(invoke_without_command=True)(callback)
+
+    prog_name = "bake"
+
+    if bakefile_obj.bakebook is not None:
+        bake_app.add_typer(bakefile_obj.bakebook._app)
+
+    if bakefile_obj.is_chain_commands and bakefile_obj.remaining_args:
+        exit_code = _run_chain_commands(
+            remaining_args=bakefile_obj.remaining_args,
+            prog_name=prog_name,
+            bake_app=bake_app,
+            bakefile_path=bakefile_obj.bakefile_path,
+        )
+        raise SystemExit(exit_code)
+    call_app_with_chdir(app=bake_app, bakefile_path=bakefile_obj.bakefile_path, prog_name=prog_name)

{bakefile-0.0.10 → bakefile-0.0.12}/src/bake/cli/bake/reinvocation.py

@@ -4,7 +4,7 @@ import subprocess
 import sys
 from pathlib import Path
 
-from bake.utils.env import _BAKE_REINVOKED
+from bake.utils.settings import ENV__BAKE_REINVOKED, bake_settings
 
 logger = logging.getLogger(__name__)
 
@@ -21,8 +21,11 @@ def _reinvoke_with_detected_python(bakefile_path: Path | None) -> None:
     Returns:
         None. Either calls os.execve() (replaces process) or returns normally.
     """
+    # Access via module path so tests can reassign
+    # from bake.utils import settings
+
     # 1. Check marker to prevent infinite loops
-    if os.environ.get(_BAKE_REINVOKED):
+    if bake_settings.bake_reinvoked:
         logger.debug(
             "Re-invocation marker set, skipping Python check",
             extra={"sys.executable": sys.executable},
@@ -52,7 +55,7 @@ def _reinvoke_with_detected_python(bakefile_path: Path | None) -> None:
         extra={"target_python": str(target_python)},
     )
     env = os.environ.copy()
-    env[_BAKE_REINVOKED] = "1"
+    env[ENV__BAKE_REINVOKED] = "1"
 
     sys.stdout.flush()
     sys.stderr.flush()

bakefile-0.0.12/src/bake/cli/bakefile/main.py

@@ -0,0 +1,77 @@
+from collections.abc import Callable
+
+from bake.cli.common.app import (
+    BakefileApp,
+    add_completion,
+    call_app_with_chdir,
+    rich_markup_mode,
+    show_help_if_no_command,
+)
+from bake.cli.common.context import Context
+from bake.cli.common.obj import BakefileObject, get_bakefile_object
+from bake.cli.common.params import (
+    bakebook_name_option,
+    chdir_option,
+    dry_run_option,
+    file_name_option,
+    verbosity_option,
+    version_option,
+)
+from bake.utils.constants import (
+    DEFAULT_BAKEBOOK_NAME,
+    DEFAULT_CHDIR,
+    DEFAULT_FILE_NAME,
+)
+
+from . import uv
+from .add_inline import add_inline
+from .export import export
+from .find_python import find_python
+from .init import init
+from .lint import lint
+
+
+def bakefile_app_callback_with_obj(obj: BakefileObject) -> Callable[..., None]:
+    def bakefile_app_callback(
+        ctx: Context,
+        _chdir: chdir_option = DEFAULT_CHDIR,
+        _file_name: file_name_option = DEFAULT_FILE_NAME,
+        _bakebook_name: bakebook_name_option = DEFAULT_BAKEBOOK_NAME,
+        _version: version_option = False,
+        _verbosity: verbosity_option = 0,
+        _dry_run: dry_run_option = False,
+    ):
+        ctx.obj = obj
+        show_help_if_no_command(ctx)
+
+    return bakefile_app_callback
+
+
+def main():
+    bakefile_obj = get_bakefile_object(rich_markup_mode=rich_markup_mode)
+    bakefile_obj.setup_logging()
+    bakefile_obj.resolve_bakefile_path()
+
+    bakefile_app = BakefileApp(
+        add_completion=add_completion,
+        rich_markup_mode=rich_markup_mode,
+    )
+
+    uv_commands_context_settings = {
+        "allow_extra_args": True,
+        "ignore_unknown_options": True,
+    }
+
+    callback = bakefile_app_callback_with_obj(obj=bakefile_obj)
+    bakefile_app.callback(invoke_without_command=True)(callback)
+    bakefile_app.command()(init)
+    bakefile_app.command()(add_inline)
+    bakefile_app.command()(find_python)
+    bakefile_app.command()(lint)
+    bakefile_app.command()(export)
+    bakefile_app.command(context_settings=uv_commands_context_settings)(uv.sync)
+    bakefile_app.command(context_settings=uv_commands_context_settings)(uv.lock)
+    bakefile_app.command(context_settings=uv_commands_context_settings)(uv.add)
+    bakefile_app.command(context_settings=uv_commands_context_settings)(uv.pip)
+    bakefile_app.bakefile_object = bakefile_obj
+    call_app_with_chdir(app=bakefile_app, bakefile_path=bakefile_obj.bakefile_path)

bakefile-0.0.12/src/bake/cli/common/app.py

@@ -0,0 +1,56 @@
+import os
+import sys
+from collections.abc import Generator
+from contextlib import contextmanager
+from pathlib import Path
+from typing import Any
+
+import typer
+from typer.core import MarkupMode
+
+from bake.cli.common.context import Context
+from bake.ui import console
+
+from .obj import BakefileObject
+
+rich_markup_mode: MarkupMode = "rich" if not console.out.no_color else None
+add_completion = True
+
+
+class BakefileApp(typer.Typer):
+    bakefile_object: BakefileObject
+
+
+if sys.version_info >= (3, 11):
+    from contextlib import chdir
+else:
+
+    @contextmanager
+    def chdir(path: Path) -> Generator[None, None, None]:
+        """Change directory context manager for Python < 3.11 compatibility."""
+        original = Path.cwd()
+        try:
+            os.chdir(path)
+            yield
+        finally:
+            os.chdir(original)
+
+
+def call_app_with_chdir(
+    app: typer.Typer,
+    bakefile_path: Path | None,
+    *args: Any,
+    **kwargs: Any,
+) -> None:
+    if bakefile_path is not None:
+        dir_path = bakefile_path.parent
+        with chdir(dir_path):
+            app(*args, **kwargs)
+    else:
+        app(*args, **kwargs)
+
+
+def show_help_if_no_command(ctx: Context) -> None:
+    if ctx.invoked_subcommand is None:
+        console.echo(ctx.get_help())
+        raise typer.Exit(1)

{bakefile-0.0.10 → bakefile-0.0.12}/src/bake/cli/common/context.py

@@ -57,6 +57,7 @@ class Context(typer.Context):
         stream: bool = True,
         shell: bool | None = None,
         echo: bool = True,
+        echo_cmd: str | None = None,
         dry_run: bool | None = None,
         keep_temp_file: bool = False,
         env: dict[str, str] | None = None,
@@ -74,6 +75,7 @@ class Context(typer.Context):
         stream: bool = True,
         shell: bool | None = None,
         echo: bool = True,
+        echo_cmd: str | None = None,
         dry_run: bool | None = None,
         keep_temp_file: bool = False,
         env: dict[str, str] | None = None,
@@ -90,6 +92,7 @@ class Context(typer.Context):
         stream: bool = True,
         shell: bool | None = None,
         echo: bool = True,
+        echo_cmd: str | None = None,
         dry_run: bool | None = None,
         keep_temp_file: bool = False,
         env: dict[str, str] | None = None,
@@ -104,6 +107,7 @@ class Context(typer.Context):
             stream=stream,
             shell=shell,
             echo=echo,
+            echo_cmd=echo_cmd,
             dry_run=self.obj.dry_run if dry_run is None else dry_run,
             keep_temp_file=keep_temp_file,
             env=env,

{bakefile-0.0.10 → bakefile-0.0.12}/src/bake/cli/common/obj.py

@@ -27,7 +27,6 @@ from bake.utils.constants import (
 )
 from bake.utils.exceptions import BakebookError, BakefileNotFoundError
 
-from .callback import validate_file_name
 from .exception_handler import typer_exception_handler
 from .params import (
     bakebook_name_option,
@@ -36,6 +35,7 @@ from .params import (
     file_name_option,
     is_chain_commands_option,
     remaining_args_argument,
+    validate_file_name,
     verbosity_option,
 )
 
@@ -112,8 +112,9 @@ class BakefileObject:
             console.echo(f"Searched in: {self.chdir.resolve()}\n")
 
     def setup_logging(self):
-        level_map = {0: logging.WARNING, 1: logging.INFO, 2: logging.DEBUG}
-        log_level = level_map.get(self.verbosity, logging.WARNING)
+        # Verbosity: 0=silent, 1=INFO, 2=DEBUG (CRITICAL+1 silences all logs)
+        level_map: dict[int, int] = {0: logging.CRITICAL + 1, 1: logging.INFO, 2: logging.DEBUG}
+        log_level = level_map.get(self.verbosity, logging.CRITICAL + 1)
         setup_logging(level_per_module={"": log_level}, is_pretty_log=True)
 
 

{bakefile-0.0.10 → bakefile-0.0.12}/src/bake/cli/common/params.py

@@ -3,10 +3,18 @@ from typing import Annotated
 
 import typer
 
-from bake.cli.common.callback import validate_file_name_callback
 from bake.cli.utils.version import version_callback
 
 
+def validate_file_name(value: str) -> str:
+    """Validate file name for --file-name option."""
+    if "/" in value or "\\" in value:
+        raise typer.BadParameter(f"File name must not contain path separators: {value}")
+    if not value.endswith(".py"):
+        raise typer.BadParameter(f"File name must end with .py: {value}")
+    return value
+
+
 def verbosity_callback(_ctx: typer.Context, _param: typer.CallbackParam, value: int) -> int:
     """Validate verbosity level (max 2)."""
     if value > 2:
@@ -31,7 +39,7 @@ file_name_option = Annotated[
         "--file-name",
         "-f",
         help="Path to bakefile.py",
-        callback=validate_file_name_callback,
+        callback=validate_file_name,
     ),
 ]
 bakebook_name_option = Annotated[

{bakefile-0.0.10 → bakefile-0.0.12}/src/bake/manage/lint.py

@@ -5,7 +5,6 @@ from pathlib import Path
 from ruff.__main__ import find_ruff_bin
 from ty.__main__ import find_ty_bin
 
-from bake.ui import console
 from bake.ui.run import run
 
 logger = logging.getLogger(__name__)
@@ -19,19 +18,19 @@ def run_ruff(
     only_bakefile: bool = False,
     check: bool = True,
     dry_run: bool = False,
+    echo: bool = True,
 ) -> subprocess.CompletedProcess[str]:
     ruff_bin = find_ruff_bin()
     target = bakefile_path.name if only_bakefile else "."
     cmd = [subcommand, *args, target]
-    display_cmd = "ruff " + " ".join(cmd)
-    console.cmd(display_cmd)
     return run(
         [str(ruff_bin), *cmd],
         cwd=bakefile_path.parent,
         capture_output=True,
         stream=True,
         check=check,
-        echo=False,
+        echo=echo,
+        echo_cmd="ruff " + " ".join(cmd) if echo else None,
         dry_run=dry_run,
     )
 
@@ -42,6 +41,7 @@ def run_ruff_format(
     only_bakefile: bool = False,
     check: bool = True,
     dry_run: bool = False,
+    echo: bool = True,
 ) -> subprocess.CompletedProcess[str]:
     return run_ruff(
         bakefile_path=bakefile_path,
@@ -50,6 +50,7 @@ def run_ruff_format(
         only_bakefile=only_bakefile,
         check=check,
         dry_run=dry_run,
+        echo=echo,
     )
 
 
@@ -59,6 +60,7 @@ def run_ruff_check(
     only_bakefile: bool = False,
     check: bool = True,
     dry_run: bool = False,
+    echo: bool = True,
 ) -> subprocess.CompletedProcess[str]:
     return run_ruff(
         bakefile_path=bakefile_path,
@@ -72,6 +74,7 @@ def run_ruff_check(
         only_bakefile=only_bakefile,
         check=check,
         dry_run=dry_run,
+        echo=echo,
     )
 
 
@@ -82,20 +85,20 @@ def run_ty_check(
     only_bakefile: bool = False,
     check: bool = True,
     dry_run: bool = False,
+    echo: bool = True,
 ) -> subprocess.CompletedProcess[str]:
     ty_bin = find_ty_bin()
     cmd = ["check", "--error-on-warning", "--python", str(python_path)]
     if only_bakefile:
         cmd.append(bakefile_path.name)
 
-    display_cmd = "ty " + " ".join(cmd)
-    console.cmd(display_cmd)
     return run(
         [str(ty_bin), *cmd],
         cwd=bakefile_path.parent,
         capture_output=True,
         stream=True,
         check=check,
-        echo=False,
+        echo=echo,
+        echo_cmd="ty " + " ".join(cmd) if echo else None,
         dry_run=dry_run,
     )

bakefile-0.0.12/src/bake/ui/console.py

@@ -0,0 +1,122 @@
+import sys
+import textwrap
+from typing import Any
+
+from beautysh import BashFormatter
+from rich.console import Console
+
+from bake.utils.settings import bake_settings
+
+out = Console(stderr=False)
+err = Console(stderr=True)
+
+BOLD_GREEN = "bold green"
+UNICODE_ENCODINGS = {"utf-8", "utf-16", "utf-32", "utf-16-le", "utf-16-be"}
+
+
+def _supports_unicode() -> bool:
+    return sys.stdout.encoding.lower() in UNICODE_ENCODINGS
+
+
+def _format_prefix(
+    console_obj: Console,
+    emoji: str | None,
+    label: str,
+    style: str,
+    message: str,
+) -> str:
+    formatted_label = f"[{label}]" if console_obj.no_color or out.color_system is None else label
+
+    # Strip emoji/unicode in non-UTF contexts (e.g., Windows CI) to avoid encoding issues
+    emoji_str = ""
+    if emoji and _supports_unicode():
+        emoji_str = emoji + " "
+
+    return f"[{style}]{emoji_str}{formatted_label}[/{style}] {message}"
+
+
+def prefix_out(
+    message: str,
+    emoji: str | None = None,
+    label: str = "INFO",
+    style: str = "bold blue",
+    **kwargs,
+) -> None:
+    out.print(_format_prefix(out, emoji=emoji, label=label, style=style, message=message), **kwargs)
+
+
+def prefix_err(
+    message: str,
+    emoji: str | None = None,
+    label: str = "INFO",
+    style: str = "bold blue",
+    **kwargs,
+) -> None:
+    err.print(_format_prefix(err, emoji=emoji, label=label, style=style, message=message), **kwargs)
+
+
+def success(message: str, **kwargs) -> None:
+    prefix_out(
+        emoji=":white_check_mark:",
+        label="SUCCESS",
+        style=BOLD_GREEN,
+        message=message,
+        **kwargs,
+    )
+
+
+def start(message: str, **kwargs) -> None:
+    prefix_out(emoji=None, label="START", style="cyan", message=f"{message}...", **kwargs)
+
+
+def echo(message: Any, **kwargs) -> None:
+    out.print(message, **kwargs)
+
+
+def cmd(cmd_str: str, **kwargs) -> None:
+    arrow = "❯" if _supports_unicode() else ">"  # noqa: RUF001
+    err.print(f"[{BOLD_GREEN}]{arrow}[/{BOLD_GREEN}] [default]{cmd_str}[/default]", **kwargs)
+
+
+def script_block(title: str, script: str, **kwargs) -> None:
+    formatter = BashFormatter()
+    formatted, error = formatter.beautify_string(script)
+
+    if error:
+        formatted = textwrap.dedent(script)
+
+    terminal_width: int = err.size.width
+    width = min(70, terminal_width)
+    bold_line = "━" * width
+    thin_line = "─" * width
+
+    err.print(bold_line, style=BOLD_GREEN)
+    err.print(title, style="bold")
+    err.print(thin_line, style=BOLD_GREEN)
+    err.print(formatted, highlight=False, **kwargs)
+    err.print(bold_line, style=BOLD_GREEN)
+
+
+def warning(message: str, **kwargs) -> None:
+    if bake_settings.github_actions:
+        err.print(f"::warning::{message}", **kwargs)
+    else:
+        prefix_err(
+            emoji=":warning-emoji: ",
+            label="WARNING",
+            style="bold yellow",
+            message=message,
+            **kwargs,
+        )
+
+
+def error(message: str, **kwargs) -> None:
+    if bake_settings.github_actions:
+        err.print(f"::error::{message}", **kwargs)
+    else:
+        prefix_err(emoji=":x:", label="ERROR", style="bold red", message=message, **kwargs)
+
+
+def github_action_add_mask(value: str, **kwargs) -> None:
+    if bake_settings.github_actions:
+        out.print(f"::add-mask::{value}", **kwargs)