Add tests and address review comments

Signed-off-by: Tushar Goel <[email protected]>

Author: TG1999

src/python_inspector/resolution.py

@@ -641,9 +641,9 @@ def pdt_dfs(mapping, graph, src):
         return dict(
             key=src, package_name=src, installed_version=str(mapping[src].version), dependencies=[]
         )
-        # recurse
-        dependencies = [pdt_dfs(mapping, graph, c) for c in children]
-        dependencies.sort(key=lambda d: d["key"])
+    # recurse
+    dependencies = [pdt_dfs(mapping, graph, c) for c in children]
+    dependencies.sort(key=lambda d: d["key"])
     return dict(
         key=src,
         package_name=src,
@@ -671,7 +671,7 @@ def get_resolved_dependencies(
     repos: Sequence[PypiSimpleRepository] = tuple(),
     as_tree: bool = False,
     max_rounds: int = 200000,
-    debug: bool = False,
+    verbose: bool = False,
     pdt_output: bool = False,
 ):
     """
@@ -694,7 +694,7 @@ def get_resolved_dependencies(
             resolver_results, as_tree=as_tree, environment=environment, repos=repos
         )
     except Exception as e:
-        if debug:
+        if verbose:
             import click
 
             click.secho(f"{e!r}", err=True)

src/python_inspector/resolve_cli.py

@@ -10,7 +10,6 @@
 #
 
 import json
-import sys
 from typing import List
 
 import click
@@ -34,6 +33,7 @@
 
 
 @click.command()
+@click.pass_context
 @click.option(
     "-r",
     "--requirement",
@@ -133,13 +133,14 @@
     "--index-url are ignored when this option is active.",
 )
 @click.option(
-    "--debug",
+    "--verbose",
     is_flag=True,
     hidden=True,
     help="Enable debug output.",
 )
 @click.help_option("-h", "--help")
 def resolve_dependencies(
+    ctx,
     requirement_files,
     netrc_file,
     specifiers,
@@ -151,7 +152,7 @@ def resolve_dependencies(
     max_rounds,
     use_cached_index=False,
     use_pypi_json_api=False,
-    debug=TRACE,
+    verbose=TRACE,
 ):
     """
     Resolve the dependencies of the packages listed in REQUIREMENT-FILE(s) file
@@ -172,11 +173,14 @@ def resolve_dependencies(
         dad --spec "flask==2.1.2" --json -
     """
     if not (json_output or pdt_output):
-        if debug:
-            click.secho("No output file specified. Use --json or --json-pdt.", err=True)
-        return
+        click.secho("No output file specified. Use --json or --json-pdt.", err=True)
+        ctx.exit(1)
 
-    if debug:
+    if json_output and pdt_output:
+        click.secho("Only one of --json or --json-pdt can be used.", err=True)
+        ctx.exit(1)
+
+    if verbose:
         click.secho(f"Resolving dependencies...")
 
     netrc = None
@@ -199,11 +203,10 @@ def resolve_dependencies(
         direct_dependencies.append(dep)
 
     if not direct_dependencies:
-        if debug:
-            click.secho("Error: no requirements requested.")
-        sys.exit(1)
+        click.secho("Error: no requirements requested.")
+        ctx.exit(1)
 
-    if debug:
+    if verbose:
         click.secho("direct_dependencies:")
         for dep in direct_dependencies:
             click.secho(f" {dep}")
@@ -213,7 +216,7 @@ def resolve_dependencies(
         python_version=python_version, operating_system=operating_system
     )
 
-    if debug:
+    if verbose:
         click.secho(f"environment: {environment}")
 
     repos = []
@@ -239,7 +242,7 @@ def resolve_dependencies(
                 )
                 repos.append(repo)
 
-    if debug:
+    if verbose:
         click.secho("repos:")
         for repo in repos:
             click.secho(f" {repo}")
@@ -251,7 +254,7 @@ def resolve_dependencies(
         repos=repos,
         as_tree=False,
         max_rounds=max_rounds,
-        debug=debug,
+        verbose=verbose,
         pdt_output=pdt_output,
     )
 
@@ -286,7 +289,7 @@ def resolve_dependencies(
             json_output=json_output,
         )
 
-    if pdt_output:
+    else:
         write_output(
             headers=headers,
             requirements=requirements,
@@ -295,7 +298,7 @@ def resolve_dependencies(
             pdt_output=True,
         )
 
-    if debug:
+    if verbose:
         click.secho("done!")
 
 
@@ -305,7 +308,7 @@ def resolve(
     repos=tuple(),
     as_tree=False,
     max_rounds=200000,
-    debug=False,
+    verbose=False,
     pdt_output=False,
 ):
     """
@@ -324,11 +327,10 @@ def resolve(
         repos=repos,
         as_tree=as_tree,
         max_rounds=max_rounds,
-        debug=debug,
+        verbose=verbose,
         pdt_output=pdt_output,
     )
 
-
     initial_requirements = [d.to_dict() for d in direct_dependencies]
 
     return initial_requirements, resolved_dependencies

tests/test_cli.py

@@ -206,6 +206,17 @@ def check_specs_resolution(
     )
 
 
+def test_passing_of_json_pdt_and_json_flags():
+    result_file = test_env.get_temp_file("json")
+    options = ["--specifier", "foo", "--json", result_file, "--json-pdt", result_file]
+    run_cli(options=options, expected_rc=1)
+
+
+def test_passing_of_no_json_output_flag():
+    options = ["--specifier", "foo"]
+    run_cli(options=options, expected_rc=1)
+
+
 def check_requirements_resolution(
     requirements_file,
     expected_file,