shelltastic 0.8.2__tar.gz → 0.9.0__tar.gz

{shelltastic-0.8.2 → shelltastic-0.9.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: shelltastic
-Version: 0.8.2
+Version: 0.9.0
 Summary: A fantastic shell command runner for python
 Author: Bearmine
 License-Expression: MPL-2.0

shelltastic-0.9.0/pyproject.toml

@@ -0,0 +1,59 @@
+[project]
+name = "shelltastic"
+version = "0.9.0"
+description = "A fantastic shell command runner for python"
+readme = "README.md"
+license = "MPL-2.0"
+license-files = ["LICENSE"]
+requires-python = ">=3.12"
+dependencies = []
+
+[[project.authors]]
+name = "Bearmine"
+
+[project.urls]
+Repository = "https://forge.bearmine.com/bearmine/shelltastic"
+
+[dependency-groups]
+lint = ["ruff"]
+test = [
+    "pytest",
+    "pytest-cov>=7.1.0",
+]
+
+[[dependency-groups.dev]]
+include-group = "lint"
+
+[[dependency-groups.dev]]
+include-group = "test"
+
+[build-system]
+requires = ["uv_build>=0.11.18,<0.12.0"]
+build-backend = "uv_build"
+
+[tool.ruff.lint]
+extend-select = [
+    "F",
+    "W",
+    "E",
+    "I",
+    "UP",
+    "C4",
+    "FA",
+    "ISC",
+    "ICN",
+    "RET",
+    "SIM",
+    "TID",
+    "TC",
+    "PTH",
+    "TD",
+    "NPY",
+    "FURB",
+]
+
+[tool.ruff.lint.pycodestyle]
+max-line-length = 100
+
+[tool.pytest.ini_options]
+addopts = "--cov=shelltastic --cov-report html"

shelltastic-0.8.2/pyproject.toml → shelltastic-0.9.0/pyproject.toml.orig

@@ -1,6 +1,6 @@
 [project]
 name = "shelltastic"
-version = "0.8.2"
+version = "0.9.0"
 description = "A fantastic shell command runner for python"
 readme = "README.md"
 authors = [
@@ -13,6 +13,19 @@ license-files = [
 requires-python = ">=3.12"
 dependencies = []
 
+[dependency-groups]
+dev = [
+  {include-group = "lint"},
+  {include-group = "test"},
+]
+lint = [
+  "ruff"
+]
+test = [
+  "pytest",
+  "pytest-cov>=7.1.0"
+]
+
 [project.urls]
 Repository = "https://forge.bearmine.com/bearmine/shelltastic"
 
@@ -44,14 +57,5 @@ extend-select = [
 [tool.ruff.lint.pycodestyle]
 max-line-length = 100
 
-[dependency-groups]
-dev = [
-  {include-group = "lint"},
-  {include-group = "test"}
-]
-lint = [
-  "ruff"
-]
-test = [
-  "pytest"
-]
+[tool.pytest.ini_options]
+addopts = "--cov=shelltastic --cov-report html"

{shelltastic-0.8.2 → shelltastic-0.9.0}/src/shelltastic/backend/default/common.py

@@ -1,3 +1,4 @@
+import contextlib
 import logging
 import os
 import shlex
@@ -233,32 +234,35 @@ class CommonShellAsyncResult(ShellResultAsync[RawIOBase | None, RawIOBase | None
         return self._stderr
 
     def __exit__(self, exc_type, exc, tb):
-        self.close()
+        with contextlib.suppress(KeyboardInterrupt, subprocess.TimeoutExpired):
+            self.close()
 
-    def close(self) -> None:
+    def close(self, timeout: float | None = None) -> None:
         if self._closed:
             return
 
-        # Terminate popen
-        self._popen.terminate()
-
         # Wait for command to finish before closing everything
-        self.wait()
-
-        # Close stdout and stderr
-        if self.stdout is not None:
-            self.stdout.close()
-        if self.stderr is not None:
-            self.stderr.close()
-
-        self._closed = True
+        try:
+            self._popen.wait(timeout)
+        except (KeyboardInterrupt, subprocess.TimeoutExpired):
+            # Kill the process and then reraise
+            self._popen.kill()
+            LOGGER.error("pid %s killed", self._popen.pid)
+            raise
+        finally:
+            # Close stdout and stderr
+            if self.stdout is not None:
+                self.stdout.close()
+            if self.stderr is not None:
+                self.stderr.close()
+
+            self._closed = True
 
     def terminate(self) -> None:
         if self._closed:
             raise ShellClosedException(f"{self} is closed")
 
         self._popen.terminate()
-        self.close()
 
     def result(self) -> ShellResult[RawIOBase | None, RawIOBase | None]:
         if self._closed: