robotcode-runner 0.86.2__tar.gz → 0.87.0__tar.gz

{robotcode_runner-0.86.2 → robotcode_runner-0.87.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: robotcode-runner
-Version: 0.86.2
+Version: 0.87.0
 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.86.2
-Requires-Dist: robotcode-plugin==0.86.2
-Requires-Dist: robotcode-robot==0.86.2
-Requires-Dist: robotcode==0.86.2
+Requires-Dist: robotcode-modifiers==0.87.0
+Requires-Dist: robotcode-plugin==0.87.0
+Requires-Dist: robotcode-robot==0.87.0
+Requires-Dist: robotcode==0.87.0
 Requires-Dist: robotframework>=4.1.0
 Description-Content-Type: text/markdown
 

{robotcode_runner-0.86.2 → robotcode_runner-0.87.0}/pyproject.toml

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

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

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

{robotcode_runner-0.86.2 → robotcode_runner-0.87.0}/src/robotcode/runner/cli/discover/discover.py

@@ -29,6 +29,7 @@ from robot.running.builder.builders import SuiteStructureParser
 from robot.utils import NormalizedDict, normalize
 from robot.utils.filereader import FileReader
 
+from robotcode.core.ignore_spec import GIT_IGNORE_FILE, ROBOT_IGNORE_FILE, iter_files
 from robotcode.core.lsp.types import (
     Diagnostic,
     DiagnosticSeverity,
@@ -546,10 +547,26 @@ def handle_options(
     add_help_option=True,
     epilog='Use "-- --help" to see `robot` help.',
 )
+@click.option(
+    "--tags / --no-tags",
+    "show_tags",
+    default=False,
+    show_default=True,
+    help="Show the tags that are present.",
+)
 @add_options(*ROBOT_OPTIONS)
+@click.option(
+    "--full-paths / --no-full-paths",
+    "full_paths",
+    default=False,
+    show_default=True,
+    help="Show full paths instead of releative.",
+)
 @pass_application
 def all(
     app: Application,
+    full_paths: bool,
+    show_tags: bool,
     by_longname: Tuple[str, ...],
     exclude_by_longname: Tuple[str, ...],
     robot_options_and_args: Tuple[str, ...],
@@ -582,27 +599,32 @@ def all(
                 )
 
                 if item.type == "test":
-                    yield f"    {type}: {item.longname}{os.linesep}"
+                    yield "    "
+                    yield type
+                    yield click.style(f": {item.longname}", bold=True)
+                    yield click.style(
+                        f" ({item.source if full_paths else item.rel_source}"
+                        f":{item.range.start.line + 1 if item.range is not None else 1}){os.linesep}"
+                    )
+                    if show_tags and item.tags:
+                        yield click.style("        Tags:", bold=True, fg="green")
+                        yield f" {', '. join(normalize(str(tag), ignore='_') for tag in sorted(item.tags))}{os.linesep}"
                 else:
-                    yield f"{type}: {item.longname}{os.linesep}"
-
+                    yield type
+                    yield f": {item.longname}"
+                    yield click.style(f" ({item.source if full_paths else item.rel_source}){os.linesep}")
                 for child in item.children or []:
                     yield from print(child, indent + 2)
 
-                # type = click.style(
-                #     item.type.capitalize() if item.type == "suite" else tests_or_tasks.capitalize(), fg="green"
-                # )
-                # yield (f"{'  ' * indent}{type}: {item.name}{os.linesep}")
-                # if item.children:
-                #     for child in item.children:
-                #         yield from print(child, indent + 2)
-
                 if indent == 0:
                     yield os.linesep
-                    yield f"Summary:{os.linesep}"
-                    yield f"  Suites: {collector.statistics.suites}{os.linesep}"
-                    yield f"  Suites with {tests_or_tasks}: {collector.statistics.suites_with_tests}{os.linesep}"
-                    yield f"  {tests_or_tasks}: {collector.statistics.tests}{os.linesep}"
+
+                    yield click.style("Suites: ", underline=True, bold=True, fg="blue")
+                    yield f"{collector.statistics.suites}{os.linesep}"
+                    yield click.style(f"Suites with {tests_or_tasks}: ", underline=True, bold=True, fg="blue")
+                    yield f"{collector.statistics.suites_with_tests}{os.linesep}"
+                    yield click.style(f"{tests_or_tasks}: ", underline=True, bold=True, fg="blue")
+                    yield f"{collector.statistics.tests}{os.linesep}"
 
             app.echo_via_pager(print(collector.all.children[0]))
 
@@ -654,24 +676,27 @@ def tests(
     ```
     """
 
-    _suite, collector, diagnostics = handle_options(app, by_longname, exclude_by_longname, robot_options_and_args)
+    suite, collector, diagnostics = handle_options(app, by_longname, exclude_by_longname, robot_options_and_args)
 
     if collector.all.children:
         if app.config.output_format is None or app.config.output_format == OutputFormat.TEXT:
 
+            tests_or_tasks = "Task" if suite.rpa else "Test"
+
             def print(items: List[TestItem]) -> Iterable[str]:
                 for item in items:
-                    yield click.style(
-                        f"{item.longname}",
-                        bold=True,
-                        fg="green" if show_tags else None,
+                    type = click.style(
+                        item.type.capitalize() if item.type == "suite" else tests_or_tasks.capitalize(),
+                        fg="blue",
                     )
+                    yield type
+                    yield click.style(f": {item.longname}", bold=True)
                     yield click.style(
                         f" ({item.source if full_paths else item.rel_source}"
                         f":{item.range.start.line + 1 if item.range is not None else 1}){os.linesep}"
                     )
                     if show_tags and item.tags:
-                        yield click.style("    Tags:", bold=True)
+                        yield click.style("    Tags:", bold=True, fg="green")
                         yield f" {', '. join(normalize(str(tag), ignore='_') for tag in sorted(item.tags))}{os.linesep}"
 
             if collector.tests:
@@ -687,9 +712,17 @@ def tests(
     epilog='Use "-- --help" to see `robot` help.',
 )
 @add_options(*ROBOT_OPTIONS)
+@click.option(
+    "--full-paths / --no-full-paths",
+    "full_paths",
+    default=False,
+    show_default=True,
+    help="Show full paths instead of releative.",
+)
 @pass_application
 def suites(
     app: Application,
+    full_paths: bool,
     by_longname: Tuple[str, ...],
     exclude_by_longname: Tuple[str, ...],
     robot_options_and_args: Tuple[str, ...],
@@ -716,7 +749,12 @@ def suites(
 
             def print(items: List[TestItem]) -> Iterable[str]:
                 for item in items:
-                    yield f"{item.longname}{os.linesep}"
+                    # yield f"{item.longname}{os.linesep}"
+                    yield click.style(
+                        f"{item.longname}",
+                        bold=True,
+                    )
+                    yield click.style(f" ({item.source if full_paths else item.rel_source}){os.linesep}")
 
             if collector.suites:
                 app.echo_via_pager(print(collector.suites))
@@ -878,3 +916,78 @@ def info(app: Application) -> None:
         # app.print_data(info, remove_defaults=True)
     else:
         app.print_data(info, remove_defaults=True)
+
+
+@discover.command(add_help_option=True)
+@click.option(
+    "--full-paths / --no-full-paths",
+    "full_paths",
+    default=False,
+    show_default=True,
+    help="Show full paths instead of releative.",
+)
+@click.argument(
+    "paths",
+    nargs=-1,
+    type=click.Path(exists=True, file_okay=True, dir_okay=True),
+)
+@pass_application
+def files(app: Application, full_paths: bool, paths: Iterable[Path]) -> None:
+    """\
+    Shows all files that are used to discover the tests.
+
+    Note: At the moment only `.robot` and `.resource` files are shown.
+    \b
+    Examples:
+    ```
+    robotcode discover files .
+    ```
+    """
+
+    root_folder, profile, cmd_options = handle_robot_options(app, ())
+
+    search_paths = set(
+        (
+            (
+                [*(app.config.default_paths if app.config.default_paths else ())]
+                if profile.paths is None
+                else profile.paths if isinstance(profile.paths, list) else [profile.paths]
+            )
+            if not paths
+            else [str(p) for p in paths]
+        )
+    )
+    if not search_paths:
+        raise click.UsageError("Expected at least 1 argument.")
+
+    def filter_extensions(p: Path) -> bool:
+        return p.suffix in [".robot", ".resource"]
+
+    result: List[str] = list(
+        map(
+            lambda p: os.path.abspath(p) if full_paths else (get_rel_source(str(p)) or str(p)),
+            filter(
+                filter_extensions,
+                iter_files(
+                    (Path(s) for s in search_paths),
+                    root=root_folder,
+                    ignore_files=[ROBOT_IGNORE_FILE, GIT_IGNORE_FILE],
+                    include_hidden=False,
+                    verbose_callback=app.verbose,
+                ),
+            ),
+        )
+    )
+    if app.config.output_format is None or app.config.output_format == OutputFormat.TEXT:
+
+        def print() -> Iterable[str]:
+            for p in result:
+                yield f"{p}{os.linesep}"
+
+            yield os.linesep
+            yield click.style("Total: ", underline=True, bold=True, fg="blue")
+            yield click.style(f"{len(result)} file(s){os.linesep}")
+
+        app.echo_via_pager(print())
+    else:
+        app.print_data(result, remove_defaults=True)

{robotcode_runner-0.86.2 → robotcode_runner-0.87.0}/src/robotcode/runner/cli/robot.py

@@ -98,7 +98,6 @@ def _is_ignored(builder: SuiteStructureBuilder, path: Path) -> bool:
                 if not path_is_relative_to(dir, cache_data.base_path):
                     break
         else:
-            # TODO: we are in a different folder
             if curr_dir.parent in cache_data.data:
                 parent_data = cache_data.data[curr_dir.parent]
                 parent_spec_dir = curr_dir.parent
@@ -121,7 +120,10 @@ def _is_ignored(builder: SuiteStructureBuilder, path: Path) -> bool:
             if ignore_file is not None:
                 parent_data.ignore_files = [ignore_file.name]
 
-                parent_data.spec = parent_data.spec + IgnoreSpec.from_gitignore(parent_spec_dir / ignore_file)
+                if _app is not None:
+                    _app.verbose(f"using ignore file: '{ignore_file}'")
+
+                parent_data.spec = parent_data.spec + IgnoreSpec.from_gitignore(ignore_file)
             cache_data.data[parent_spec_dir] = parent_data
 
         if parent_data is not None and parent_data.spec is not None and parent_spec_dir != curr_dir:
@@ -130,7 +132,10 @@ def _is_ignored(builder: SuiteStructureBuilder, path: Path) -> bool:
             if ignore_file is not None:
                 curr_data = BuilderCacheData()
 
-                curr_data.spec = parent_data.spec + IgnoreSpec.from_gitignore(curr_dir / ignore_file)
+                if _app is not None:
+                    _app.verbose(f"using ignore file: '{ignore_file}'")
+
+                curr_data.spec = parent_data.spec + IgnoreSpec.from_gitignore(ignore_file)
                 curr_data.ignore_files = [ignore_file.name]
 
                 cache_data.data[curr_dir] = curr_data

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

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