robotcode-runner 0.82.0__tar.gz → 0.82.2__tar.gz

{robotcode_runner-0.82.0 → robotcode_runner-0.82.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: robotcode-runner
-Version: 0.82.0
+Version: 0.82.2
 Summary: RobotCode runner plugin for Robot Framework
 Project-URL: Homepage, https://robotcode.io
 Project-URL: Donate, https://opencollective.com/robotcode
@@ -25,10 +25,10 @@ Classifier: Programming Language :: Python :: Implementation :: PyPy
 Classifier: Topic :: Utilities
 Classifier: Typing :: Typed
 Requires-Python: >=3.8
-Requires-Dist: robotcode-modifiers==0.82.0
-Requires-Dist: robotcode-plugin==0.82.0
-Requires-Dist: robotcode-robot==0.82.0
-Requires-Dist: robotcode==0.82.0
+Requires-Dist: robotcode-modifiers==0.82.2
+Requires-Dist: robotcode-plugin==0.82.2
+Requires-Dist: robotcode-robot==0.82.2
+Requires-Dist: robotcode==0.82.2
 Requires-Dist: robotframework>=4.1.0
 Description-Content-Type: text/markdown
 

{robotcode_runner-0.82.0 → robotcode_runner-0.82.2}/pyproject.toml

@@ -28,10 +28,10 @@ classifiers = [
 dynamic = ["version"]
 dependencies = [
   "robotframework>=4.1.0",
-  "robotcode-robot==0.82.0",
-  "robotcode-modifiers==0.82.0",
-  "robotcode-plugin==0.82.0",
-  "robotcode==0.82.0",
+  "robotcode-robot==0.82.2",
+  "robotcode-modifiers==0.82.2",
+  "robotcode-plugin==0.82.2",
+  "robotcode==0.82.2",
 ]
 
 [project.entry-points.robotcode]

robotcode_runner-0.82.2/src/robotcode/runner/__version__.py

@@ -0,0 +1 @@
+__version__ = "0.82.2"

{robotcode_runner-0.82.0 → robotcode_runner-0.82.2}/src/robotcode/runner/cli/discover/discover.py

@@ -462,9 +462,7 @@ def handle_options(
     exclude_by_longname: Tuple[str, ...],
     robot_options_and_args: Tuple[str, ...],
 ) -> Tuple[TestSuite, Collector, Optional[Dict[str, List[Diagnostic]]]]:
-    root_folder, profile, cmd_options = handle_robot_options(
-        app, by_longname, exclude_by_longname, robot_options_and_args
-    )
+    root_folder, profile, cmd_options = handle_robot_options(app, robot_options_and_args)
 
     diagnostics_logger = DiagnosticsLogger()
     try:
@@ -479,6 +477,8 @@ def handle_options(
             ),
             app.config.dry,
             root_folder,
+            by_longname,
+            exclude_by_longname,
         ).parse_arguments((*cmd_options, "--runemptysuite", *robot_options_and_args))
 
         settings = RobotSettings(options)

{robotcode_runner-0.82.0 → robotcode_runner-0.82.2}/src/robotcode/runner/cli/robot.py

@@ -8,6 +8,7 @@ from robot.errors import DataError, Information
 from robot.run import USAGE, RobotFramework
 from robot.version import get_full_version
 
+import robotcode.modifiers
 from robotcode.plugin import Application, pass_application
 from robotcode.plugin.click_helper.aliases import AliasedCommand
 from robotcode.plugin.click_helper.types import add_options
@@ -25,6 +26,8 @@ class RobotFrameworkEx(RobotFramework):
         paths: List[str],
         dry: bool,
         root_folder: Optional[Path],
+        by_longname: Tuple[str, ...] = (),
+        exclude_by_longname: Tuple[str, ...] = (),
     ) -> None:
         super().__init__()
         self.app = app
@@ -32,6 +35,8 @@ class RobotFrameworkEx(RobotFramework):
         self.dry = dry
         self.root_folder = root_folder
         self._orig_cwd = Path.cwd()
+        self.by_longname = by_longname
+        self.exclude_by_longname = exclude_by_longname
 
     def parse_arguments(self, cli_args: Any) -> Any:
         if self.root_folder is not None and Path.cwd() != self.root_folder:
@@ -61,6 +66,18 @@ class RobotFrameworkEx(RobotFramework):
                 f'{line_end.join((*(f"{k} = {v!r}" for k, v in options.items()), *arguments))}'
             )
 
+        modifiers = []
+        root_name = options.get("name", None)
+
+        if self.by_longname:
+            modifiers.append(robotcode.modifiers.ByLongName(*self.by_longname, root_name=root_name))
+
+        if self.exclude_by_longname:
+            modifiers.append(robotcode.modifiers.ExcludedByLongName(*self.exclude_by_longname, root_name=root_name))
+
+        if modifiers:
+            options["prerunmodifier"] = options.get("prerunmodifier", []) + modifiers
+
         return options, arguments
 
 
@@ -90,10 +107,7 @@ ROBOT_OPTIONS: Set[click.Command] = {
 
 
 def handle_robot_options(
-    app: Application,
-    by_longname: Tuple[str, ...],
-    exclude_by_longname: Tuple[str, ...],
-    robot_options_and_args: Tuple[str, ...],
+    app: Application, robot_options_and_args: Tuple[str, ...]
 ) -> Tuple[Optional[Path], RobotBaseProfile, List[str]]:
     robot_arguments: Optional[List[Union[str, Path]]] = None
     old_sys_path = sys.path.copy()
@@ -118,20 +132,6 @@ def handle_robot_options(
 
     cmd_options = profile.build_command_line()
 
-    if by_longname:
-        sep = ";" if any(True for l in by_longname if ":" in l) else ":"
-        cmd_options += (
-            "--prerunmodifier",
-            f"robotcode.modifiers.ByLongName{sep}{sep.join(by_longname)}",
-        )
-
-    if exclude_by_longname:
-        sep = ";" if any(True for l in exclude_by_longname if ":" in l) else ":"
-        cmd_options += (
-            "--prerunmodifier",
-            f"robotcode.modifiers.ExcludedByLongName{sep}{sep.join(exclude_by_longname)}",
-        )
-
     app.verbose(
         lambda: "Executing robot with following options:\n    "
         + " ".join(f'"{o}"' for o in (cmd_options + list(robot_options_and_args)))
@@ -170,9 +170,7 @@ def robot(
     ```
     """
 
-    root_folder, profile, cmd_options = handle_robot_options(
-        app, by_longname, exclude_by_longname, robot_options_and_args
-    )
+    root_folder, profile, cmd_options = handle_robot_options(app, robot_options_and_args)
 
     app.exit(
         cast(
@@ -186,6 +184,8 @@ def robot(
                 ),
                 app.config.dry,
                 root_folder,
+                by_longname,
+                exclude_by_longname,
             ).execute_cli((*cmd_options, *robot_options_and_args), exit=False),
         )
     )

robotcode_runner-0.82.0/src/robotcode/runner/__version__.py

@@ -1 +0,0 @@
-__version__ = "0.82.0"