refactor`: "--verbose" -> "--affected-versions"

Author: peb-peb

cve_bin_tool/cli.py

@@ -162,11 +162,10 @@ def main(argv=None):
         help="add a unique tag to differentiate between multiple intermediate reports",
     )
     output_group.add_argument(
-        "-v",
-        "--verbose",
+        "--affected-versions",
         action="count",
         default=0,
-        help="outputs affected versions in report",
+        help="Lists versions of product affected by a given CVE (to facilitate upgrades)",
     )
     parser.add_argument("-V", "--version", action="version", version=VERSION)
     parser.add_argument(
@@ -240,7 +239,7 @@ def main(argv=None):
         "tag": "",
         "merge": None,
         "nvd": "json",
-        "verbose": 0,
+        "affected_versions": 0,
     }
 
     with ErrorHandler(mode=ErrorMode.NoTrace):
@@ -458,7 +457,7 @@ def main(argv=None):
                 is_report=args["report"],
                 append=args["append"],
                 merge_report=merged_reports,
-                verbosity_level=args["verbose"],
+                affected_versions=args["affected_versions"],
             )
 
             if not args["quiet"]:

cve_bin_tool/output_engine/__init__.py

@@ -271,7 +271,7 @@ def __init__(
         is_report: bool = False,
         append: Union[str, bool] = False,
         merge_report: Union[None, List[str]] = None,
-        verbosity_level: int = 0,
+        affected_versions: int = 0,
         all_cve_version_info=None,
     ):
         self.logger = logger or LOGGER.getChild(self.__class__.__name__)
@@ -287,7 +287,7 @@ def __init__(
         self.append = append
         self.tag = tag
         self.merge_report = merge_report
-        self.verbosity_level = verbosity_level
+        self.affected_versions = affected_versions
         self.all_cve_data = all_cve_data
 
     def output_cves(self, outfile, output_type="console"):
@@ -325,7 +325,7 @@ def output_cves(self, outfile, output_type="console"):
                 self.all_cve_data,
                 self.all_cve_version_info,
                 self.time_of_last_update,
-                self.verbosity_level,
+                self.affected_versions,
             )
 
         if isinstance(self.append, str):

cve_bin_tool/output_engine/console.py

@@ -40,14 +40,8 @@ def parse_version_info(list_of_version):
             affected_version["excluding"][1] = list_of_version[3]
 
         if affected_version["including"] is not RANGE_EMPTY:
-            print(
-                f"[{affected_version['including'][0]} - {affected_version['including'][1]}]"
-            )
             return f"[{affected_version['including'][0]} - {affected_version['including'][1]}]"
         elif affected_version["excluding"] is not RANGE_EMPTY:
-            print(
-                f"({affected_version['excluding'][0]} - {affected_version['excluding'][1]})"
-            )
             return f"({affected_version['excluding'][0]} - {affected_version['excluding'][1]})"
     else:
         return "-"
@@ -57,7 +51,7 @@ def output_console(
     all_cve_data: Dict[ProductInfo, CVEData],
     all_cve_version_info,
     time_of_last_update,
-    verbosity_level: int,
+    affected_versions: int,
     console=Console(theme=cve_theme),
 ):
     """Output list of CVEs in a tabular format with color support"""
@@ -88,7 +82,7 @@ def output_console(
 
     cve_by_remarks: DefaultDict[Remarks, List[Dict[str, str]]] = defaultdict(list)
     # group cve_data by its remarks
-    if verbosity_level != 0:
+    if affected_versions != 0:
         for product_info, cve_data in all_cve_data.items():
             for cve in cve_data["cves"]:
                 cve_by_remarks[cve.remarks].append(
@@ -105,6 +99,7 @@ def output_console(
                         ),
                     }
                 )
+                print(cve)
         print(all_cve_version_info)
     else:
         for product_info, cve_data in all_cve_data.items():
@@ -134,7 +129,7 @@ def output_console(
         table.add_column("CVE Number")
         table.add_column("Severity")
         table.add_column("Score (CVSS Version)")
-        if verbosity_level != 0:
+        if affected_versions != 0:
             table.add_column("Affected Versions")
         # table.add_column("CVSS Version")