runem 0.1.2__py3-none-any.whl → 0.3.0__py3-none-any.whl

runem/VERSION

@@ -1 +1 @@
-0.1.2
+0.3.0

runem/job.py

@@ -11,6 +11,12 @@ class NoJobName(ValueError):
     pass
 
 
+class BadWhenConfigLocation(ValueError):
+    """The job-config does not contain a label and can't be coerced to crate one."""
+
+    pass
+
+
 class Job:
     """A class with utility functions for jobs.
 
@@ -27,6 +33,16 @@ class Job:
 
         TODO: make a non-static member function
         """
+        if "tags" in job:
+            raise BadWhenConfigLocation(
+                "'tags' should be listed inside the 'when' config for jobs"
+            )
+
+        if "phase" in job:
+            raise BadWhenConfigLocation(
+                "'phase' should be listed inside the 'when' config for jobs"
+            )
+
         if "when" not in job or "tags" not in job["when"]:
             # handle the special case where we have No tags
             return None

runem/job_runner_simple_command.py

@@ -1,18 +1,24 @@
 import shlex
 import typing
 
+from typing_extensions import Unpack
+
+from runem.config_metadata import ConfigMetadata
 from runem.run_command import run_command
+from runem.types.common import FilePathList
+from runem.types.options import OptionsWritable
 from runem.types.runem_config import JobConfig
+from runem.types.types_jobs import AllKwargs
 
 
 def validate_simple_command(command_string: str) -> typing.List[str]:
-    # use shlex to handle parsing of the command string, a non-trivial problem.
+    """Use shlex to handle parsing of the command string, a non-trivial problem."""
     split_command: typing.List[str] = shlex.split(command_string)
     return split_command
 
 
 def job_runner_simple_command(
-    **kwargs: typing.Any,
+    **kwargs: Unpack[AllKwargs],
 ) -> None:
     """Parses the command and tries to run it via the system.
 
@@ -22,11 +28,37 @@ def job_runner_simple_command(
     job_config: JobConfig = kwargs["job"]
     command_string: str = job_config["command"]
 
+    command_string_files: str = command_string
+    if "{file_list}" in command_string:
+        file_list: FilePathList = kwargs["file_list"]
+        file_list_with_quotes: typing.List[str] = [
+            f'"{str(file_path)}"' for file_path in file_list
+        ]
+        command_string_files = command_string.replace(
+            "{file_list}", " ".join(file_list_with_quotes)
+        )
+
+    config_metadata: ConfigMetadata = kwargs["config_metadata"]
+    options: OptionsWritable = config_metadata.options
+    command_string_options: str = command_string_files
+    for name, value in options.items():
+        # For now, just pass `--option-name`, `--check` or similar to the
+        # command line. At some point we will want this to be cleverer, but
+        # this will do for now.
+        option_search = f"{{{name}}}"
+        if option_search in command_string_files:
+            replacement = ""
+            if value:
+                replacement = f"--{name}"
+            command_string_options = command_string_options.replace(
+                option_search, replacement
+            )
+
     # use shlex to handle parsing of the command string, a non-trivial problem.
-    result = validate_simple_command(command_string)
+    cmd = validate_simple_command(command_string_options)
 
     # preserve quotes for consistent handling of strings and avoid the "word
     # splitting" problem for unix-like shells.
-    result_with_quotes = [f'"{token}"' if " " in token else token for token in result]
+    cmd_with_quotes = [f'"{token}"' if " " in token else token for token in cmd]
 
-    run_command(cmd=result_with_quotes, **kwargs)
+    run_command(cmd=cmd_with_quotes, **kwargs)

{runem-0.1.2.dist-info → runem-0.3.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: runem
-Version: 0.1.2
+Version: 0.3.0
 Summary: Awesome runem created by lursight
 Home-page: https://github.com/lursight/runem/
 Author: lursight
@@ -9,7 +9,7 @@ License-File: LICENSE
 Requires-Dist: packaging
 Requires-Dist: PyYAML
 Requires-Dist: rich
-Requires-Dist: typing-extensions
+Requires-Dist: typing_extensions
 Provides-Extra: tests
 Requires-Dist: black==24.10.0; extra == "tests"
 Requires-Dist: coverage==7.5; extra == "tests"

{runem-0.1.2.dist-info → runem-0.3.0.dist-info}/RECORD

@@ -1,4 +1,4 @@
-runem/VERSION,sha256=KXtQ8IOG01Ifj9ry94642dCs30UtLmFZaQX7o3IIx5I,6
+runem/VERSION,sha256=2RXMldbKj0euKXcT7UbU5cXZnd0p_Dxh4mO98wXytbA,6
 runem/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 runem/__main__.py,sha256=dsOiVZegpfK9JOs5n7UmbX5iwwbj7iFkEbLoVeEgAn4,136
 runem/base.py,sha256=EZfR7FIlwEdU9Vfe47Wk2DOO8GQqpKxxLNKp6YHueZ4,316
@@ -11,10 +11,10 @@ runem/config_parse.py,sha256=sXPMA8HSUcaJoq0dUfphK181waZqnIrq20mpYOQ_XCo,13498
 runem/files.py,sha256=59boeFvUANYOS-PllIjeKIht6lNINZ43WxahDg90oAc,4392
 runem/hook_manager.py,sha256=H0TL3HCqU2mgKm_-dgCD7TsK5T1bLT4g7x6kpytMPhU,4350
 runem/informative_dict.py,sha256=U7p9z78UwOT4TAfng1iDXCEyeYz6C-XZlx9Z1pWNVrI,1548
-runem/job.py,sha256=LmNXDHxDxAwyJxAAdPHIv_0bwZy2btyTPHPGO_N7euI,2986
+runem/job.py,sha256=NOdRQnGePPyYdmIR_6JKVFzp9nbgNGetpE13bHEHaf4,3442
 runem/job_execute.py,sha256=BPkeTpeTGJs3QWa0-07DZvF1f0uKO79e4yMsTxq1UHk,4656
 runem/job_filter.py,sha256=7vgG4YWJ9gyGBFjV7QbSojG5ofYoszAmxXx9HnMLkHo,5384
-runem/job_runner_simple_command.py,sha256=OIfj7CrPy0fPszhubUsTzORMlMC62OiNSvH5DysYL-4,1104
+runem/job_runner_simple_command.py,sha256=iP5an6yixW8o4C0ZBtu6csb-oVK3Q62ZZgtHBmxlXaU,2428
 runem/job_wrapper.py,sha256=q5GtopZ5vhSJ581rwU4-lF9KnbL3ZYgOC8fqaCnXD_g,983
 runem/job_wrapper_python.py,sha256=rx7J_N-JXs8GgMq7Sla7B9s_ZAfofKUhEnzgMcq_bts,4303
 runem/log.py,sha256=dIrocigvIJs1ZGkAzTogXkAK-0ZW3q5FkjpDgLdeW-E,630
@@ -34,9 +34,9 @@ runem/types/runem_config.py,sha256=qG_bghm5Nr-ZTbaZbf1v8Fx447V-hgEvvRy5NZ3t-Io,5
 runem/types/types_jobs.py,sha256=wqiiBmRIJDbGlKcfOqewHGKx350w0p4_7pysMm7xGmo,4906
 tests/test_types/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/test_types/test_public_api.py,sha256=QHiwt7CetQur65JSbFRnOzQxhCJkX5MVLymHHVd_6yc,160
-runem-0.1.2.dist-info/LICENSE,sha256=awOCsWJ58m_2kBQwBUGWejVqZm6wuRtCL2hi9rfa0X4,1211
-runem-0.1.2.dist-info/METADATA,sha256=UQCyI88PE3lJWibR7VmDFyIGi9xPpnykhp8QKmn9E-U,5842
-runem-0.1.2.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
-runem-0.1.2.dist-info/entry_points.txt,sha256=nu0g_vBeuPihYtimbtlNusxWovylMppvJ8UxdJlJfvM,46
-runem-0.1.2.dist-info/top_level.txt,sha256=Zu65aVeDPh8WbChU4Mi7-Md4S3XJDPuqdQjEE3DSQno,12
-runem-0.1.2.dist-info/RECORD,,
+runem-0.3.0.dist-info/LICENSE,sha256=awOCsWJ58m_2kBQwBUGWejVqZm6wuRtCL2hi9rfa0X4,1211
+runem-0.3.0.dist-info/METADATA,sha256=60xJCeO4__eyLluCyFosw1UTsIbs1dyQFruOJ6iNM7I,5842
+runem-0.3.0.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+runem-0.3.0.dist-info/entry_points.txt,sha256=nu0g_vBeuPihYtimbtlNusxWovylMppvJ8UxdJlJfvM,46
+runem-0.3.0.dist-info/top_level.txt,sha256=Zu65aVeDPh8WbChU4Mi7-Md4S3XJDPuqdQjEE3DSQno,12
+runem-0.3.0.dist-info/RECORD,,

{runem-0.1.2.dist-info → runem-0.3.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.5.0)
+Generator: setuptools (75.6.0)
 Root-Is-Purelib: true
 Tag: py3-none-any