httpdbg 2.1.8__tar.gz → 2.2.0__tar.gz

{httpdbg-2.1.8 → httpdbg-2.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: httpdbg
-Version: 2.1.8
+Version: 2.2.0
 Summary: A very simple tool to debug HTTP(S) client and server requests.
 Author-email: cle-b <cle@tictac.pm>
 License-Expression: Apache-2.0

{httpdbg-2.1.8 → httpdbg-2.2.0}/httpdbg/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "2.1.8"
+__version__ = "2.2.0"
 
 __all__ = ["export_html", "httprecord", "HTTPRecords"]
 

{httpdbg-2.1.8 → httpdbg-2.2.0}/httpdbg/args.py

@@ -5,12 +5,25 @@ from httpdbg.log import LogLevel
 
 
 def read_args(args: list[str]) -> tuple[argparse.Namespace, list[str]]:
+    """
+    Parse the raw command-line arguments to separate the arguments intended
+    for httpdbg from those intended for the script or module being executed.
+
+    The httpdbg arguments are everything up to and including the selected
+    execution option (e.g. ``--script``, ``--module``, or ``-m``), while the
+    remaining arguments are passed to the target script or module.
+    """
     httpdbg_args = args
     client_args = []
-    for action in ["--console", "--module", "-m", "--script"]:
-        if action in args:
-            httpdbg_args = args[: args.index(action) + 2]
-            client_args = args[args.index(action) + 1 :]
+    for arg in args:
+        tostop = False
+        for action in ["--console", "--module", "-m", "--script"]:
+            if action == arg:
+                httpdbg_args = args[: args.index(action) + 2]
+                client_args = args[args.index(action) + 1 :]
+                tostop = True
+                break
+        if tostop:
             break
 
     parser = argparse.ArgumentParser(

{httpdbg-2.1.8 → httpdbg-2.2.0}/httpdbg.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: httpdbg
-Version: 2.1.8
+Version: 2.2.0
 Summary: A very simple tool to debug HTTP(S) client and server requests.
 Author-email: cle-b <cle@tictac.pm>
 License-Expression: Apache-2.0

httpdbg-2.2.0/tests/test_cli.py

@@ -0,0 +1,32 @@
+import pytest
+
+from httpdbg import __version__
+from httpdbg.__main__ import pyhttpdbg_entry_point
+from httpdbg.args import read_args
+
+
+@pytest.mark.cli
+def test_cli_version(monkeypatch, capsys):
+    monkeypatch.setattr("sys.argv", ["pyhttpdb", "--version"])
+
+    pyhttpdbg_entry_point(test_mode=True)
+
+    assert __version__ in capsys.readouterr().out.strip()
+
+
+@pytest.mark.cli
+def test_read_args_split_httpdbg_and_script_args():
+    """Split httpdbg arguments from the arguments passed to the script/module."""
+    httpdbg_args_parsed, client_args = read_args(
+        ["--port", "345", "--script", "demo.py", "--script", "xyz"]
+    )
+    assert httpdbg_args_parsed.port == 345
+    assert httpdbg_args_parsed.script == "demo.py"
+    assert client_args == ["demo.py", "--script", "xyz"]
+
+
+@pytest.mark.cli
+def test_read_args_split_httpdbg_and_script_args_same_args():
+    """Allow script/module arguments to reuse httpdbg command-line same options."""
+    read_args(["--script", "demo.py", "--script", "xyz"])
+    read_args(["--script", "demo.py", "-m", "xyz"])

httpdbg-2.1.8/tests/test_cli.py

@@ -1,13 +0,0 @@
-import pytest
-
-from httpdbg import __version__
-from httpdbg.__main__ import pyhttpdbg_entry_point
-
-
-@pytest.mark.cli
-def test_cli_version(monkeypatch, capsys):
-    monkeypatch.setattr("sys.argv", ["pyhttpdb", "--version"])
-
-    pyhttpdbg_entry_point(test_mode=True)
-
-    assert __version__ in capsys.readouterr().out.strip()