robotcode-runner 0.41.0__tar.gz → 0.43.1__tar.gz

{robotcode_runner-0.41.0 → robotcode_runner-0.43.1}/PKG-INFO

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

{robotcode_runner-0.41.0 → robotcode_runner-0.43.1}/pyproject.toml

@@ -28,9 +28,9 @@ classifiers = [
 dynamic = ["version"]
 dependencies = [
   "robotframework>=4.1.0",
-  "robotcode-robot==0.41.0",
-  "robotcode-modifiers==0.41.0",
-  "robotcode==0.41.0",
+  "robotcode-robot==0.43.1",
+  "robotcode-modifiers==0.43.1",
+  "robotcode==0.43.1",
 ]
 
 [project.entry-points.robotcode]

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

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

{robotcode_runner-0.41.0 → robotcode_runner-0.43.1}/src/robotcode/runner/cli/discover/discover.py

@@ -1,4 +1,5 @@
 import os
+import platform
 import re
 import sys
 from collections import defaultdict
@@ -44,8 +45,8 @@ def _patch() -> None:
         return
     __patched = True
 
-    if get_robot_version() <= (6, 1, 0, "a", 1, None):
-        if get_robot_version() > (5, 0) and get_robot_version() < (6, 0, 0) or get_robot_version() < (5, 0):
+    if get_robot_version() <= (6, 1):
+        if get_robot_version() > (5, 0) and get_robot_version() < (6, 0) or get_robot_version() < (5, 0):
             from robot.running.builder.testsettings import TestDefaults  # pyright: ignore[reportMissingImports]
         else:
             from robot.running.builder.settings import Defaults as TestDefaults  # pyright: ignore[reportMissingImports]
@@ -69,7 +70,7 @@ def _patch() -> None:
             except DataError as e:
                 LOGGER.error(str(e))
                 parent_defaults = self._stack[-1][-1] if self._stack else None
-                if get_robot_version() < (6, 1, 0, "a", 1, None):
+                if get_robot_version() < (6, 1):
                     from robot.running.builder.parsers import format_name
 
                     return ErroneousTestSuite(
@@ -82,7 +83,17 @@ def _patch() -> None:
 
         SuiteStructureParser._build_suite = build_suite
 
-    elif get_robot_version() >= (6, 1, 0, "a", 1, None):
+        old_validate_execution_mode = SuiteStructureParser._validate_execution_mode
+
+        def _validate_execution_mode(self: SuiteStructureParser, suite: TestSuite) -> None:
+            try:
+                old_validate_execution_mode(self, suite)
+            except DataError as e:
+                LOGGER.error(f"Parsing '{suite.source}' failed: {e.message}")
+
+        SuiteStructureParser._validate_execution_mode = _validate_execution_mode
+
+    elif get_robot_version() >= (6, 1):
         from robot.parsing.suitestructure import SuiteDirectory, SuiteFile
         from robot.running.builder.settings import TestDefaults  # pyright: ignore[reportMissingImports]
 
@@ -124,6 +135,16 @@ def _patch() -> None:
 
         SuiteStructureParser._build_suite_directory = build_suite_directory
 
+        old_validate_execution_mode = SuiteStructureParser._validate_execution_mode
+
+        def _validate_execution_mode(self: SuiteStructureParser, suite: TestSuite) -> None:
+            try:
+                old_validate_execution_mode(self, suite)
+            except DataError as e:
+                LOGGER.error(f"Parsing '{suite.source}' failed: {e.message}")
+
+        SuiteStructureParser._validate_execution_mode = _validate_execution_mode
+
     old_get_file = FileReader._get_file
 
     def get_file(self: FileReader, source: Union[str, Path, IOBase], accept_text: bool) -> Any:
@@ -145,6 +166,8 @@ class TestItem:
     name: str
     longname: str
     uri: Optional[DocumentUri] = None
+    rel_source: Optional[str] = None
+    needs_parse_include: bool = False
     children: Optional[List["TestItem"]] = None
     description: Optional[str] = None
     range: Optional[Range] = None
@@ -165,6 +188,15 @@ class Statistics:
     tests: int = 0
 
 
+def get_rel_source(source: Optional[str]) -> Optional[str]:
+    if source is None:
+        return None
+    try:
+        return str(Path(source).relative_to(Path.cwd()).as_posix())
+    except ValueError:
+        return str(source)
+
+
 class Collector(SuiteVisitor):
     def __init__(self) -> None:
         super().__init__()
@@ -174,6 +206,7 @@ class Collector(SuiteVisitor):
             name=Path.cwd().name,
             longname=Path.cwd().name,
             uri=str(Uri.from_path(Path.cwd())),
+            needs_parse_include=get_robot_version() >= (6, 1),
         )
         self._current = self.all
         self.suites: List[TestItem] = []
@@ -182,21 +215,25 @@ class Collector(SuiteVisitor):
         self.statistics = Statistics()
 
     def visit_suite(self, suite: TestSuite) -> None:
-        item = TestItem(
-            type="suite",
-            id=f"{Path(suite.source).resolve() if suite.source is not None else ''};{suite.longname}",
-            name=suite.name,
-            longname=suite.longname,
-            uri=str(Uri.from_path(suite.source)) if suite.source else None,
-            range=Range(
-                start=Position(line=0, character=0),
-                end=Position(line=0, character=0),
+        try:
+            item = TestItem(
+                type="suite",
+                id=f"{Path(suite.source).resolve() if suite.source is not None else ''};{suite.longname}",
+                name=suite.name,
+                longname=suite.longname,
+                uri=str(Uri.from_path(Path(suite.source).resolve())) if suite.source else None,
+                rel_source=get_rel_source(suite.source),
+                range=Range(
+                    start=Position(line=0, character=0),
+                    end=Position(line=0, character=0),
+                )
+                if suite.source and Path(suite.source).is_file()
+                else None,
+                children=[],
+                error=suite.error_message if isinstance(suite, ErroneousTestSuite) else None,
             )
-            if suite.source and Path(suite.source).is_file()
-            else None,
-            children=[],
-            error=suite.error_message if isinstance(suite, ErroneousTestSuite) else None,
-        )
+        except ValueError as e:
+            raise ValueError(f"Error while parsing suite {suite.source}: {e}") from e
 
         self.suites.append(item)
 
@@ -218,18 +255,23 @@ class Collector(SuiteVisitor):
     def visit_test(self, test: TestCase) -> None:
         if self._current.children is None:
             self._current.children = []
-        item = TestItem(
-            type="test",
-            id=f"{Path(test.source).resolve() if test.source is not None else ''};{test.longname};{test.lineno}",
-            name=test.name,
-            longname=test.longname,
-            uri=str(Uri.from_path(test.source)) if test.source else None,
-            range=Range(
-                start=Position(line=test.lineno - 1, character=0),
-                end=Position(line=test.lineno - 1, character=0),
-            ),
-            tags=list(test.tags) if test.tags else None,
-        )
+        try:
+            item = TestItem(
+                type="test",
+                id=f"{Path(test.source).resolve() if test.source is not None else ''};{test.longname};{test.lineno}",
+                name=test.name,
+                longname=test.longname,
+                uri=str(Uri.from_path(Path(test.source).resolve())) if test.source else None,
+                rel_source=get_rel_source(test.source),
+                range=Range(
+                    start=Position(line=test.lineno - 1, character=0),
+                    end=Position(line=test.lineno - 1, character=0),
+                ),
+                tags=list(test.tags) if test.tags else None,
+            )
+        except ValueError as e:
+            raise ValueError(f"Error while parsing suite {test.source}: {e}") from e
+
         for tag in test.tags:
             self.tags[str(tag)].append(item)
 
@@ -280,7 +322,7 @@ def build_diagnostics(messages: List[Message]) -> Dict[str, List[Diagnostic]]:
     def add_diagnostic(
         message: Message, source_uri: Optional[str] = None, line: Optional[int] = None, text: Optional[str] = None
     ) -> None:
-        source_uri = str(Uri.from_path(Path(source_uri).absolute() if source_uri else Path.cwd()))
+        source_uri = str(Uri.from_path(Path(source_uri).resolve() if source_uri else Path.cwd()))
 
         if source_uri not in result:
             result[source_uri] = []
@@ -344,16 +386,16 @@ def handle_options(
             if settings.pythonpath:
                 sys.path = settings.pythonpath + sys.path
 
-        if get_robot_version() > (6, 1, 0, "a", 1, None):
+        if get_robot_version() > (6, 1):
             builder = TestSuiteBuilder(
-                settings["SuiteNames"],
-                custom_parsers=settings.parsers,
                 included_extensions=settings.extension,
+                included_files=settings.parse_include,
+                custom_parsers=settings.parsers,
                 rpa=settings.rpa,
                 lang=settings.languages,
                 allow_empty_suite=settings.run_empty_suite,
             )
-        elif get_robot_version() >= (6, 0, 0):
+        elif get_robot_version() >= (6, 0):
             builder = TestSuiteBuilder(
                 settings["SuiteNames"],
                 included_extensions=settings.extension,
@@ -576,7 +618,7 @@ def tags(
     ```
     """
 
-    suite, diagnostics = handle_options(app, by_longname, exclude_by_longname, robot_options_and_args)
+    suite, _diagnostics = handle_options(app, by_longname, exclude_by_longname, robot_options_and_args)
 
     collector = Collector()
     suite.visit(collector)
@@ -587,16 +629,89 @@ def tags(
             def print(tags: Dict[str, List[TestItem]]) -> Iterable[str]:
                 for tag, items in tags.items():
                     yield f"{tag}{os.linesep}"
-                    # for item in items:
-                    #     yield f"  {item.longname}{os.linesep}"
-                    #     if item.uri:
-                    #         yield (
-                    #             f" ({Uri(item.uri).to_path()}{f':{item.range.start.line+1}' if item.range else ''})"
-                    #             f"{os.linesep}"
-                    #         )
 
             if collector.suites:
                 app.echo_via_pager(print(collector.tags))
 
         else:
             app.print_data(TagsResult(collector.tags), remove_defaults=True)
+
+
+@dataclass
+class RobotVersion:
+    major: int
+    minor: int
+    patch: Optional[int] = None
+    pre_id: Optional[str] = None
+    pre_number: Optional[int] = None
+    dev: Optional[int] = None
+
+
+@dataclass
+class PythonVersion:
+    major: int
+    minor: int
+    micro: int
+    releaselevel: str
+    serial: int
+
+
+@dataclass
+class Info:
+    robot_version: RobotVersion
+    robot_version_string: str
+    robot_env: Dict[str, str]
+    python_version: PythonVersion
+    python_version_string: str
+    machine: str
+    processor: str
+    platform: str
+    system: str
+    system_version: str
+
+
+@discover.command(
+    add_help_option=True,
+)
+@pass_application
+def info(
+    app: Application,
+) -> None:
+    """\
+    Shows some informations about the current *robot* environment.
+
+    \b
+    Examples:
+    ```
+    robotcode discover info
+    ```
+    """
+    from robot.version import get_version as get_version
+
+    robot_env: Dict[str, str] = {}
+    if "ROBOT_OPTIONS" in os.environ:
+        robot_env["ROBOT_OPTIONS"] = os.environ["ROBOT_OPTIONS"]
+    if "ROBOT_SYSLOG_FILE" in os.environ:
+        robot_env["ROBOT_SYSLOG_FILE"] = os.environ["ROBOT_SYSLOG_FILE"]
+    if "ROBOT_SYSLOG_LEVEL" in os.environ:
+        robot_env["ROBOT_SYSLOG_LEVEL"] = os.environ["ROBOT_SYSLOG_LEVEL"]
+    if "ROBOT_INTERNAL_TRACES" in os.environ:
+        robot_env["ROBOT_INTERNAL_TRACES"] = os.environ["ROBOT_INTERNAL_TRACES"]
+
+    info = Info(
+        RobotVersion(*get_robot_version()),
+        get_version(),
+        robot_env,
+        PythonVersion(*sys.version_info),
+        platform.python_version(),
+        platform.machine(),
+        platform.processor(),
+        sys.platform,
+        platform.system(),
+        platform.version(),
+    )
+
+    if app.config.output_format is None or app.config.output_format == OutputFormat.TEXT:
+        app.print_data(info, remove_defaults=True)
+    else:
+        app.print_data(info, remove_defaults=True)

{robotcode_runner-0.41.0 → robotcode_runner-0.43.1}/src/robotcode/runner/cli/libdoc.py

@@ -51,7 +51,7 @@ class LibDocEx(LibDoc):
 @click.version_option(
     version=__version__,
     package_name="robotcode.runner.libdoc",
-    prog_name="RobotCode LibDoc",
+    prog_name="RobotCode libdoc",
     message=f"%(prog)s %(version)s\n{USAGE.splitlines()[0].split(' -- ')[0].strip()} {get_full_version()}",
 )
 @click.argument("robot_options_and_args", nargs=-1, type=click.Path())

{robotcode_runner-0.41.0 → robotcode_runner-0.43.1}/src/robotcode/runner/cli/rebot.py

@@ -50,8 +50,8 @@ class RebotEx(Rebot):
 )
 @click.version_option(
     version=__version__,
-    package_name="robotcode.runner.libdoc",
-    prog_name="RobotCode LibDoc",
+    package_name="robotcode.runner.rebot",
+    prog_name="RobotCode rebot",
     message=f"%(prog)s %(version)s\n{USAGE.splitlines()[0].split(' -- ')[0].strip()} {get_full_version()}",
 )
 @click.argument("robot_options_and_args", nargs=-1, type=click.Path())

{robotcode_runner-0.41.0 → robotcode_runner-0.43.1}/src/robotcode/runner/cli/robot.py

@@ -151,6 +151,8 @@ def robot(
     The options and arguments are passed to `robot` as is.
 
     Examples:
+
+    \b
     ```
     robotcode run
     ```

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

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