command_watcher 0.4.1__tar.gz → 0.6.0__tar.gz

{command_watcher-0.4.1 → command_watcher-0.6.0}/PKG-INFO

@@ -1,25 +1,25 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: command_watcher
-Version: 0.4.1
+Version: 0.6.0
 Summary: Module to watch the execution of shell scripts. Both streams (`stdout` and `stderr`) are captured.
-Home-page: https://github.com/Josef-Friedrich/command-watcher
-License: MIT
 Author: Josef Friedrich
-Author-email: josef@friedrich.rocks
-Requires-Python: >=3.10,<4.0
+Author-email: Josef Friedrich <josef@friedrich.rocks>
+License-Expression: MIT
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: License :: OSI Approved :: MIT License
+Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
-Classifier: Programming Language :: Python :: 3 :: Only
-Requires-Dist: conf2levels (>=0,<1)
-Requires-Dist: icinga2apic (>=0,<1)
-Requires-Dist: icinga2apic-stubs (>=0,<1)
-Requires-Dist: termcolor (>=1,<2)
-Requires-Dist: types-requests (>=2,<3)
-Requires-Dist: types-termcolor (>=1,<2)
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
+Requires-Dist: pretiac>=0.6.0
+Requires-Dist: pydantic>=2.12.5
+Requires-Dist: pyyaml>=6.0.3
+Requires-Dist: termcolor>=3.3.0
+Requires-Dist: types-pyyaml>=6.0.12.20250915
+Requires-Dist: types-requests>=2.32.4.20260107
+Requires-Dist: types-termcolor>=1.1.6.2
+Requires-Python: >=3.12, <4
 Project-URL: Repository, https://github.com/Josef-Friedrich/command-watcher
 Description-Content-Type: text/x-rst
 
@@ -49,20 +49,22 @@ and `stderr`) are captured.
 
 .. code-block:: python
 
+    #! /opt/venvs/command_watcher/bin/python
+
     from command_watcher import Watch
     watch = Watch(
-        config_file='/etc/command-watcher.ini',
+        config_file='/etc/command-watcher.yml',
         service_name='texlive_update'
     )
 
     tlmgr = '/usr/local/texlive/bin/x86_64-linux/tlmgr'
 
-    watch.run('{} update --self'.format(tlmgr))
-    watch.run('{} update --all'.format(tlmgr))
+    watch.run(f'{tlmgr} update --self')
+    watch.run(f'{tlmgr} update --all')
     installed_packages = watch.run(
-        '{} info --only-installed'.format(tlmgr), log=False
+        f'{tlmgr} info --only-installed', log=False
     )
-    all_packages = watch.run('{} info'.format(tlmgr), log=False)
+    all_packages = watch.run(f'{tlmgr} info', log=False)
 
     watch.final_report(
         status=0,
@@ -72,28 +74,29 @@ and `stderr`) are captured.
         },
     )
 
-.. code-block:: ini
-
-    [email]
-    subject_prefix = [cwatcher]
-    from_addr =
-    to_addr = logs@example.com
-    to_addr_critical = critical@example.com
-    smtp_login = mailer
-    smtp_password = 1234
-    smtp_server = mail.example.com:587
-
-    [nsca]
-    remote_host = 1.2.3.4
-    password = asdf1234
-    encryption_method = 8
-    ; port = 5667
-
-    [icinga]
-    url = https://icinga.example.com:5665
-    user = user
-    password = 1234
-
-    [beep]
-    activated = True
-
+.. code-block:: yaml
+
+        ---
+        email:
+            from_addr: logs@example.com
+            to_addr: logs@example.com
+            to_addr_critical: critical@example.com
+            smtp_login: mailer@mail.example.com
+            smtp_password: abcd
+            smtp_server: mail.example.com:587
+
+        icinga:
+            api_endpoint_host: localhost
+            api_endpoint_port: 5665
+            client_private_key: /etc/pretiac/api-client.key.pem
+            client_certificate: /etc/pretiac/api-client.cert.pem
+            ca_certificate: /etc/pretiac/ca.crt
+            new_host_defaults:
+                templates: [passive-host]
+            new_service_defaults:
+                templates: [passive-service]
+                attrs:
+                check_interval: monthly
+
+        beep:
+            activated: true

{command_watcher-0.4.1 → command_watcher-0.6.0}/README.rst

@@ -24,20 +24,22 @@ and `stderr`) are captured.
 
 .. code-block:: python
 
+    #! /opt/venvs/command_watcher/bin/python
+
     from command_watcher import Watch
     watch = Watch(
-        config_file='/etc/command-watcher.ini',
+        config_file='/etc/command-watcher.yml',
         service_name='texlive_update'
     )
 
     tlmgr = '/usr/local/texlive/bin/x86_64-linux/tlmgr'
 
-    watch.run('{} update --self'.format(tlmgr))
-    watch.run('{} update --all'.format(tlmgr))
+    watch.run(f'{tlmgr} update --self')
+    watch.run(f'{tlmgr} update --all')
     installed_packages = watch.run(
-        '{} info --only-installed'.format(tlmgr), log=False
+        f'{tlmgr} info --only-installed', log=False
     )
-    all_packages = watch.run('{} info'.format(tlmgr), log=False)
+    all_packages = watch.run(f'{tlmgr} info', log=False)
 
     watch.final_report(
         status=0,
@@ -47,27 +49,29 @@ and `stderr`) are captured.
         },
     )
 
-.. code-block:: ini
-
-    [email]
-    subject_prefix = [cwatcher]
-    from_addr =
-    to_addr = logs@example.com
-    to_addr_critical = critical@example.com
-    smtp_login = mailer
-    smtp_password = 1234
-    smtp_server = mail.example.com:587
+.. code-block:: yaml
 
-    [nsca]
-    remote_host = 1.2.3.4
-    password = asdf1234
-    encryption_method = 8
-    ; port = 5667
+        ---
+        email:
+            from_addr: logs@example.com
+            to_addr: logs@example.com
+            to_addr_critical: critical@example.com
+            smtp_login: mailer@mail.example.com
+            smtp_password: abcd
+            smtp_server: mail.example.com:587
 
-    [icinga]
-    url = https://icinga.example.com:5665
-    user = user
-    password = 1234
+        icinga:
+            api_endpoint_host: localhost
+            api_endpoint_port: 5665
+            client_private_key: /etc/pretiac/api-client.key.pem
+            client_certificate: /etc/pretiac/api-client.cert.pem
+            ca_certificate: /etc/pretiac/ca.crt
+            new_host_defaults:
+                templates: [passive-host]
+            new_service_defaults:
+                templates: [passive-service]
+                attrs:
+                check_interval: monthly
 
-    [beep]
-    activated = True
+        beep:
+            activated: true

command_watcher-0.6.0/pyproject.toml

@@ -0,0 +1,49 @@
+[project]
+name = "command_watcher"
+version = "0.6.0"
+description = "Module to watch the execution of shell scripts. Both streams (`stdout` and `stderr`) are captured."
+authors = [{ name = "Josef Friedrich", email = "josef@friedrich.rocks" }]
+requires-python = ">=3.12,<4"
+readme = "README.rst"
+license = "MIT"
+classifiers = [
+    "Development Status :: 5 - Production/Stable",
+    "License :: OSI Approved :: MIT License",
+    "Programming Language :: Python :: 3 :: Only",
+    "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
+]
+dependencies = [
+    "pretiac>=0.6.0",
+    "pydantic>=2.12.5",
+    "pyyaml>=6.0.3",
+    "termcolor>=3.3.0",
+    "types-pyyaml>=6.0.12.20250915",
+    "types-requests>=2.32.4.20260107",
+    "types-termcolor>=1.1.6.2",
+]
+
+[project.urls]
+Repository = "https://github.com/Josef-Friedrich/command-watcher"
+
+[dependency-groups]
+dev = [
+    "pytest>=9.0.2",
+    "stdout-stderr-capturing>=0.2.1",
+]
+
+[tool.uv]
+
+[tool.uv.sources]
+pretiac = { git = "https://github.com/Josef-Friedrich/PREtty-Typed-Icinga2-Api-Client_py.git" }
+
+[build-system]
+requires = ["uv_build>=0.11.1,<0.12.0"]
+build-backend = "uv_build"
+
+[tool.pytest.ini_options]
+verbosity_assertions = 2
+truncation_limit_lines = 999999
+truncation_limit_chars = 999999