isitup-cli 0.1.2__tar.gz → 0.1.4__tar.gz

{isitup_cli-0.1.2 → isitup_cli-0.1.4}/PKG-INFO

@@ -1,11 +1,12 @@
 Metadata-Version: 2.4
 Name: isitup-cli
-Version: 0.1.2
+Version: 0.1.4
 Summary: A small CLI that periodically checks whether servers respond to ping, HTTP, and TCP ports
 Author: stefan.insam
 Author-email: stefan.insam <stefan.insam@netgo.de>
 License-Expression: GPL-3.0-only
 License-File: LICENSE
+Classifier: Development Status :: 4 - Beta
 Classifier: Environment :: Console
 Classifier: Intended Audience :: System Administrators
 Classifier: Topic :: System :: Networking :: Monitoring
@@ -90,6 +91,14 @@ Either way, remove it later with `uv tool uninstall isitup`.
 
 ## Usage
 
+```bash
+isitup example.com https://example.org db.internal:5432
+```
+
+`--url`/`-u` work the same way and can be freely mixed with positional
+targets: `isitup example.com -u https://example.org` is the same as
+`isitup example.com https://example.org`:
+
 ```bash
 isitup --url example.com --url https://example.org --url db.internal:5432
 ```
@@ -102,16 +111,18 @@ cp config.example.yaml config.yaml
 isitup --config config.yaml
 ```
 
-Config files and `--url` flags can be combined; the tool watches the union of
-both. The config file is watched for changes and reloaded automatically:
-add, remove, or edit targets without restarting the tool (`--url` targets
-can't change at runtime, only what's in the file).
+Config files and CLI-supplied targets (positional or `--url`) can be
+combined; the tool watches the union of both. The config file is watched for
+changes and reloaded automatically: add, remove, or edit targets without
+restarting the tool (CLI-supplied targets can't change at runtime, only
+what's in the file).
 
 ### Options
 
 | Flag | Description |
 | --- | --- |
 | `-c`, `--config PATH` | YAML file listing targets; reloaded automatically on change |
+| `TARGET` (positional) | a target to monitor: same as `-u`/`--url`, just without the flag (repeatable) |
 | `-u`, `--url TARGET` | a target to monitor (repeatable): hostname, `hostname:port`, or a URL |
 | `-i`, `--interval SECONDS` | seconds between check rounds (default: 30) |
 | `--ping-timeout SECONDS` | ping reply timeout (default: 2) |
@@ -167,6 +178,10 @@ uv run mypy src tests  # type check
 Every push and pull request runs this same lint/type-check/test suite via
 [GitHub Actions](.github/workflows/ci.yml), across Linux and Windows.
 
+## Changelog
+
+See [CHANGELOG.md](CHANGELOG.md).
+
 ## License
 
 [GPL-3.0](LICENSE): see [LICENSE](LICENSE) for the full text.

{isitup_cli-0.1.2 → isitup_cli-0.1.4}/README.md

@@ -70,6 +70,14 @@ Either way, remove it later with `uv tool uninstall isitup`.
 
 ## Usage
 
+```bash
+isitup example.com https://example.org db.internal:5432
+```
+
+`--url`/`-u` work the same way and can be freely mixed with positional
+targets: `isitup example.com -u https://example.org` is the same as
+`isitup example.com https://example.org`:
+
 ```bash
 isitup --url example.com --url https://example.org --url db.internal:5432
 ```
@@ -82,16 +90,18 @@ cp config.example.yaml config.yaml
 isitup --config config.yaml
 ```
 
-Config files and `--url` flags can be combined; the tool watches the union of
-both. The config file is watched for changes and reloaded automatically:
-add, remove, or edit targets without restarting the tool (`--url` targets
-can't change at runtime, only what's in the file).
+Config files and CLI-supplied targets (positional or `--url`) can be
+combined; the tool watches the union of both. The config file is watched for
+changes and reloaded automatically: add, remove, or edit targets without
+restarting the tool (CLI-supplied targets can't change at runtime, only
+what's in the file).
 
 ### Options
 
 | Flag | Description |
 | --- | --- |
 | `-c`, `--config PATH` | YAML file listing targets; reloaded automatically on change |
+| `TARGET` (positional) | a target to monitor: same as `-u`/`--url`, just without the flag (repeatable) |
 | `-u`, `--url TARGET` | a target to monitor (repeatable): hostname, `hostname:port`, or a URL |
 | `-i`, `--interval SECONDS` | seconds between check rounds (default: 30) |
 | `--ping-timeout SECONDS` | ping reply timeout (default: 2) |
@@ -147,6 +157,10 @@ uv run mypy src tests  # type check
 Every push and pull request runs this same lint/type-check/test suite via
 [GitHub Actions](.github/workflows/ci.yml), across Linux and Windows.
 
+## Changelog
+
+See [CHANGELOG.md](CHANGELOG.md).
+
 ## License
 
 [GPL-3.0](LICENSE): see [LICENSE](LICENSE) for the full text.

{isitup_cli-0.1.2 → isitup_cli-0.1.4}/pyproject.toml

@@ -1,12 +1,13 @@
 [project]
 name = "isitup-cli"
-version = "0.1.2"
+version = "0.1.4"
 description = "A small CLI that periodically checks whether servers respond to ping, HTTP, and TCP ports"
 readme = "README.md"
 license = "GPL-3.0-only"
 license-files = ["LICENSE"]
 requires-python = ">=3.14"
 classifiers = [
+    "Development Status :: 4 - Beta",
     "Environment :: Console",
     "Intended Audience :: System Administrators",
     "Topic :: System :: Networking :: Monitoring",

{isitup_cli-0.1.2 → isitup_cli-0.1.4}/pyproject.toml.orig

@@ -1,6 +1,6 @@
 [project]
 name = "isitup-cli"
-version = "0.1.2"
+version = "0.1.4"
 description = "A small CLI that periodically checks whether servers respond to ping, HTTP, and TCP ports"
 readme = "README.md"
 license = "GPL-3.0-only"
@@ -10,6 +10,7 @@ authors = [
 ]
 requires-python = ">=3.14"
 classifiers = [
+    "Development Status :: 4 - Beta",
     "Environment :: Console",
     "Intended Audience :: System Administrators",
     "Topic :: System :: Networking :: Monitoring",

isitup_cli-0.1.4/src/isitup/__init__.py

@@ -0,0 +1,3 @@
+from .cli import __version__, main
+
+__all__ = ["main", "__version__"]

{isitup_cli-0.1.2 → isitup_cli-0.1.4}/src/isitup/cli.py

@@ -1,7 +1,9 @@
 from __future__ import annotations
 
 import argparse
+import sys
 import time
+from importlib.metadata import PackageNotFoundError, version
 from pathlib import Path
 
 from rich.console import Console, RenderableType
@@ -12,12 +14,23 @@ from .history import HistoryStore
 from .output import compute_exit_code, format_json_line, format_plain_line, run_checks
 from .render import build_table, countdown, framed, is_online, run_round, waiting_placeholder
 
+try:
+    __version__ = version("isitup-cli")
+except PackageNotFoundError:
+    __version__ = "0.0.0+unknown"
+
 
 def parse_args(argv: list[str] | None = None) -> argparse.Namespace:
     parser = argparse.ArgumentParser(
         prog="isitup",
         description="Periodically check whether servers respond to ping, HTTP, and TCP ports.",
     )
+    parser.add_argument(
+        "-v",
+        "--version",
+        action="version",
+        version=f"%(prog)s {__version__}",
+    )
     parser.add_argument(
         "-c",
         "--config",
@@ -26,6 +39,14 @@ def parse_args(argv: list[str] | None = None) -> argparse.Namespace:
         help="path to a YAML config file listing targets (see config.example.yaml); "
         "reloaded automatically whenever it changes",
     )
+    parser.add_argument(
+        "targets",
+        nargs="*",
+        default=[],
+        metavar="TARGET",
+        help="a target to monitor, same as --url (positional shorthand, e.g. "
+        "'isitup example.com https://example.org')",
+    )
     parser.add_argument(
         "-u",
         "--url",
@@ -82,6 +103,12 @@ def parse_args(argv: list[str] | None = None) -> argparse.Namespace:
     return parser.parse_args(argv)
 
 
+def combined_targets(args: argparse.Namespace) -> list[str]:
+    """Positional targets and --url flags are equivalent; combine them into
+    one list wherever CLI-supplied targets are needed."""
+    return args.targets + args.urls
+
+
 def run_headless(
     console: Console,
     args: argparse.Namespace,
@@ -93,23 +120,29 @@ def run_headless(
     config_path = args.config
     mtime = config_mtime(config_path)
 
-    while True:
-        results = run_checks(targets, ping_enabled, args.ping_timeout, args.http_timeout)
-        history.update(results, {r.target.raw: is_online(r) for r in results})
-        for result in results:
-            print(emit(result, history), flush=True)
-
-        if args.once:
-            return compute_exit_code(results)
-
-        reload = reload_if_changed(config_path, args.urls, mtime)
-        mtime = reload.mtime
-        if reload.error:
-            console.print(f"[yellow]warning:[/yellow] config reload failed: {reload.error}")
-        if reload.targets is not None:
-            targets = reload.targets
-
-        time.sleep(args.interval)
+    try:
+        while True:
+            results = run_checks(targets, ping_enabled, args.ping_timeout, args.http_timeout)
+            history.update(results, {r.target.raw: is_online(r) for r in results})
+            for result in results:
+                print(emit(result, history), flush=True)
+
+            if args.once:
+                return compute_exit_code(results)
+
+            reload = reload_if_changed(config_path, combined_targets(args), mtime)
+            mtime = reload.mtime
+            if reload.error:
+                console.print(f"[yellow]warning:[/yellow] config reload failed: {reload.error}")
+            if reload.targets is not None:
+                targets = reload.targets
+
+            time.sleep(args.interval)
+    except KeyboardInterrupt:
+        # Plain-text/JSON output is meant for logs/pipes, so keep stdout
+        # clean and only note the interruption on stderr.
+        print("stopped", file=sys.stderr)
+        return 0
 
 
 def run_interactive(
@@ -154,7 +187,7 @@ def run_interactive(
                 base = build_table(results, history)
                 live.update(framed(base))
 
-                reload = reload_if_changed(config_path, args.urls, mtime)
+                reload = reload_if_changed(config_path, combined_targets(args), mtime)
                 mtime = reload.mtime
                 if reload.error:
                     console.print(f"[yellow]warning:[/yellow] config reload failed: {reload.error}")
@@ -173,7 +206,7 @@ def main(argv: list[str] | None = None) -> int:
     console = Console()
 
     try:
-        targets = load_targets(args.config, args.urls)
+        targets = load_targets(args.config, combined_targets(args))
     except (FileNotFoundError, ValueError) as exc:
         console.print(f"[bold red]error:[/bold red] {exc}")
         return 1

isitup_cli-0.1.2/src/isitup/__init__.py

@@ -1,3 +0,0 @@
-from .cli import main
-
-__all__ = ["main"]