Merge pull request #79 from bugout-dev/fix-usage-full-path

Fixed bug with names displayed in "usage" entries in locust output

Author: zomglings

locust/cli.py

@@ -2,10 +2,7 @@
 The Locust CLI
 """
 import argparse
-import json
-import os
 import sys
-from typing import Any, Dict, Optional
 
 from . import git
 from . import parse
@@ -18,6 +15,13 @@ def generate_argument_parser() -> argparse.ArgumentParser:
         description="Locust: Analyze Python code across git references",
         epilog=f"Version {version.LOCUST_VERSION}",
     )
+    parser.add_argument(
+        "-v",
+        "--version",
+        action="version",
+        version=f"locust {version.LOCUST_VERSION}",
+        help="Print the locust version",
+    )
     git.populate_argument_parser(parser)
     parse.populate_argument_parser(parser)
     render.populate_argument_parser(parser)

locust/parse.py

@@ -205,11 +205,12 @@ def visit_Attribute(self, node: ast.Attribute) -> None:
         ]
         symbols = self._current_symbols()
         parent = self._current_scope_parent()
+        final_component = cumulative_components[-1]
         for cumulative_component in cumulative_components:
             qualifications = symbols.get(cumulative_component)
             if qualifications:
                 for qualification in qualifications:
-                    definition = RawDefinition(
+                    origin_definition = RawDefinition(
                         name=qualification,
                         change_type=self.context_type.value,
                         line=node.lineno,
@@ -218,7 +219,21 @@ def visit_Attribute(self, node: ast.Attribute) -> None:
                         end_offset=node.end_col_offset,
                         parent=parent,
                     )
-                    self.definitions.append(definition)
+                    # Replace prefix with qualification in final_component
+                    name = final_component.replace(
+                        cumulative_component, qualification, 1
+                    )
+                    definition = RawDefinition(
+                        name=name,
+                        change_type=self.context_type.value,
+                        line=node.lineno,
+                        offset=node.col_offset,
+                        end_line=node.end_lineno,
+                        end_offset=node.end_col_offset,
+                        parent=parent,
+                    )
+
+                    self.definitions.extend([origin_definition, definition])
 
     def reset(self):
         self.scope = []

locust/version.py

@@ -1,4 +1,4 @@
-LOCUST_VERSION = "0.3.1"
+LOCUST_VERSION = "0.3.2"
 
 
 def main():

test.sh

@@ -15,4 +15,6 @@ then
 	exit 1
 fi
 
-python -m unittest discover -v
+TEST_COMMAND=${@:-"discover -v"}
+
+python -m unittest $TEST_COMMAND

tests/fixtures/test_parse.json

@@ -135,6 +135,16 @@
       "changed_lines": 1,
       "total_lines": 1,
       "parent": {}
+    },
+    {
+      "name": "argparse.ArgumentParser",
+      "change_type": "usage",
+      "filepath": "sample.py",
+      "revision": "0838585",
+      "line": 7,
+      "changed_lines": 1,
+      "total_lines": 1,
+      "parent": {}
     }
   ]
 }

tests/fixtures/test_parse_dependencies.json

@@ -321,6 +321,16 @@
       "total_lines": 1,
       "parent": {}
     },
+    {
+      "name": "json.dumps",
+      "change_type": "usage",
+      "filepath": "mod/submod/print.py",
+      "revision": "04cec01",
+      "line": 5,
+      "changed_lines": 1,
+      "total_lines": 1,
+      "parent": {}
+    },
     {
       "name": "..value.VALUE",
       "change_type": "usage",

tests/fixtures/test_render.json

@@ -26,6 +26,14 @@
           "changed_lines": 1,
           "total_lines": 1,
           "children": []
+        },
+        {
+          "name": "argparse.ArgumentParser",
+          "type": "usage",
+          "line": 7,
+          "changed_lines": 1,
+          "total_lines": 1,
+          "children": []
         }
       ]
     }