gOdoo-cli 1.0.1__tar.gz → 1.0.2__tar.gz

{godoo_cli-1.0.1 → godoo_cli-1.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: gOdoo-cli
-Version: 1.0.1
+Version: 1.0.2
 Summary: Odoo lifecycle, Python dependency preflight, and shared Git workspaces.
 Project-URL: repository, https://github.com/OpenJKSoftware/gOdoo
 Author-email: Joshua Kreuder <Joshua_Kreuder@outlook.com>

{godoo_cli-1.0.1 → godoo_cli-1.0.2}/docs/lifecycle.md

@@ -112,9 +112,9 @@ filestore, SQL and archive overlays are staged once and reused. Disabling the fu
 checks. CRC checks detect accidental corruption; they do not establish the archive's origin.
 
 On Linux, gOdoo probes one nonempty file before recursive reflink copying, then falls back to rsync or Python copying.
-Desktop bind mounts can make many small attachment copies expensive; see
-[dataset storage](downstream.md#restore-dataset-storage). Reset baselines can share reflink extents, so logical sizes
-may count shared data more than once.
+Rsync shows progress only when stdout is a terminal; diagnostics remain visible in captured output. Desktop bind mounts
+can make many small attachment copies expensive; see [dataset storage](downstream.md#restore-dataset-storage). Reset
+baselines can share reflink extents, so logical sizes may count shared data more than once.
 
 The official upgrade client reports phase start and completion or failure without a heartbeat. Child processes retain
 their native streams. gOdoo forwards SIGINT/SIGTERM, waits for shutdown, and preserves child exit status.

{godoo_cli-1.0.1 → godoo_cli-1.0.2}/src/godoo_cli/__about__.py

@@ -1,3 +1,3 @@
 """Version information."""
 
-__version__ = "1.0.1"
+__version__ = "1.0.2"

{godoo_cli-1.0.1 → godoo_cli-1.0.2}/src/godoo_cli/runtime/filestore.py

@@ -85,7 +85,10 @@ def _copy_with_rsync(source: Path, destination: Path) -> tuple[bool, str | None]
     if not shutil.which("rsync"):
         return False, "rsync is not available"
 
-    command = ["rsync", "-rLpt", "--human-readable", "--info=progress2", f"{source}/", str(destination)]
+    command = ["rsync", "-rLpt", "--human-readable"]
+    if sys.stdout.isatty():
+        command.append("--info=progress2")
+    command.extend([f"{source}/", str(destination)])
     try:
         process = subprocess.Popen(command, stdout=None, stderr=subprocess.STDOUT)
     except OSError as error:

{godoo_cli-1.0.1 → godoo_cli-1.0.2}/tests/runtime/test_filestore.py

@@ -235,14 +235,17 @@ def _fake_rsync(tmp_path: Path, monkeypatch: pytest.MonkeyPatch, *, status: int)
     rsync.write_text(
         "#!/bin/sh\n"
         'printf \'%s\\n\' "$@" > "$GODOO_RSYNC_ARGS"\n'
-        "printf '12%%\\rdiagnostic one\\n34%%\\rdiagnostic two\\n56%%\\r78%%\\n'\n"
+        'if [ "$3" = "--info=progress2" ]; then\n'
+        "    printf '12%%\\rdiagnostic one\\n34%%\\rdiagnostic two\\n56%%\\r78%%\\n'\n"
+        "    shift\n"
+        "fi\n"
         "printf 'rsync diagnostic\\n' >&2\n"
         f"if [ {status} -ne 0 ]; then\n"
-        '    mkdir -p "$5"\n'
-        '    printf stale > "$5/stale"\n'
+        '    mkdir -p "$4"\n'
+        '    printf stale > "$4/stale"\n'
         f"    exit {status}\n"
         "fi\n"
-        'cp -RL "$4/." "$5"\n'
+        'cp -RL "$3/." "$4"\n'
         f"exit {status}\n",
         encoding="utf-8",
     )
@@ -252,12 +255,16 @@ def _fake_rsync(tmp_path: Path, monkeypatch: pytest.MonkeyPatch, *, status: int)
     return rsync
 
 
+@pytest.mark.parametrize("interactive", [False, True])
 def test_rsync_copy_passes_output_directly_to_stdout_and_materializes_symlinks(
     tmp_path: Path,
     monkeypatch: pytest.MonkeyPatch,
     caplog: pytest.LogCaptureFixture,
     capfdbinary: pytest.CaptureFixture[bytes],
+    interactive: bool,
 ) -> None:
+    monkeypatch.setattr("godoo_cli.runtime.filestore.sys.stdout.isatty", lambda: interactive)
+    monkeypatch.setattr("godoo_cli.runtime.filestore.sys.stderr.isatty", lambda: not interactive)
     source = tmp_path / "source"
     source.mkdir()
     (source / "kept").write_text("original")
@@ -277,13 +284,14 @@ def test_rsync_copy_passes_output_directly_to_stdout_and_materializes_symlinks(
     assert (tmp_path / "rsync-args").read_text().splitlines() == [
         "-rLpt",
         "--human-readable",
-        "--info=progress2",
+        *(["--info=progress2"] if interactive else []),
         f"{source}/",
         str(destination),
     ]
     assert "-a" not in (tmp_path / "rsync-args").read_text().splitlines()
     captured = capfdbinary.readouterr()
-    assert captured.out == b"12%\rdiagnostic one\n34%\rdiagnostic two\n56%\r78%\nrsync diagnostic\n"
+    progress = b"12%\rdiagnostic one\n34%\rdiagnostic two\n56%\r78%\n" if interactive else b""
+    assert captured.out == progress + b"rsync diagnostic\n"
     assert captured.err == b""
     assert not caplog.records