ENH: Handle RMS 15+ build versions

Author: mferrera

src/runrms/config/_rms_config.py

@@ -63,19 +63,27 @@ def _resolve_version(
             f"RMS version '{version}' is not supported. "
             "To see the supported versions, run `rms -l` or `runrms -l`."
         )
+
     if rms_project:
-        if rms_project.master.version in site_config.versions:
-            master_version = version_parse(rms_project.master.version)
-            major = master_version.major
-            minor = master_version.minor
+        master_version = version_parse(rms_project.master.version)
+        major = master_version.major
+        minor = master_version.minor
 
+        if rms_project.master.version in site_config.versions:
             # Handle RMS 14.2 specially as it stores no patch version internally.
             if major == 14 and minor <= 2:
                 newest_patch = site_config.get_newest_patch_version(major, minor)
                 return f"{major}.{minor}.{newest_patch}"
 
             return rms_project.master.version
 
+        # RMS 15+ gives three coordinates in .master, but is released with four
+        # coordinates.
+        if major >= 15:
+            patch = master_version.micro
+            newest_build = site_config.get_newest_build_version(major, minor, patch)
+            return f"{major}.{minor}.{patch}.{newest_build}"
+
         raise RmsVersionError(
             f"RMS version '{rms_project.master.version}' "
             "configured in the RMS project is not supported. "

src/runrms/config/_site_config.py

@@ -44,8 +44,15 @@ def get_newest_patch_version(self, major: int, minor: int) -> int:
         latest = max(
             version_parse(v) for v in self.versions if v.startswith(f"{major}.{minor}")
         )
-        _, _, patch = latest.release
-        return patch
+        return latest.release[2]
+
+    def get_newest_build_version(self, major: int, minor: int, patch: int) -> int:
+        latest = max(
+            version_parse(v)
+            for v in self.versions
+            if v.startswith(f"{major}.{minor}.{patch}")
+        )
+        return latest.release[3]
 
     @model_validator(mode="after")
     def default_version_exists_validator(self) -> Self:

src/runrms/config/runrms.yml

@@ -50,3 +50,15 @@ versions:
       RMS_PLUGINS_LIBRARY: /opt/rms/14.5.0.1/site/plugins
       TCL_LIBRARY: /opt/rms/14.5.0.1/lib/tcl8.6
       TK_LIBRARY: /opt/rms/14.5.0.1/lib/tcl8.6
+  15.0.1.0:
+    env:
+      PYTHONPATH: /opt/rms/15.0.1.0/site/lib/python3.11/site-packages
+      RMS_PLUGINS_LIBRARY: /opt/rms/15.0.1.0/site/plugins
+      TCL_LIBRARY: /opt/rms/15.0.1.0/lib/tcl8.6
+      TK_LIBRARY: /opt/rms/15.0.1.0/lib/tcl8.6
+  15.0.1.1:
+    env:
+      PYTHONPATH: /opt/rms/15.0.1.1/site/lib/python3.11/site-packages
+      RMS_PLUGINS_LIBRARY: /opt/rms/15.0.1.1/site/plugins
+      TCL_LIBRARY: /opt/rms/15.0.1.1/lib/tcl8.6
+      TK_LIBRARY: /opt/rms/15.0.1.1/lib/tcl8.6

tests/test_rms_config.py

@@ -32,6 +32,7 @@ def test_resolve_version(default_config_file: dict[str, Any]) -> None:
     assert _resolve_version("14.2.1", site_config, None) == "14.2.1"
     assert _resolve_version("14.5", site_config, None) == "14.5"
     assert _resolve_version("14.5.0.1", site_config, None) == "14.5.0.1"
+    assert _resolve_version("15.0.1.0", site_config, None) == "15.0.1.0"
     assert _resolve_version(None, site_config, None) == "14.2.2"
 
     with pytest.raises(
@@ -44,17 +45,23 @@ def test_resolve_version(default_config_file: dict[str, Any]) -> None:
 
 
 def test_resolve_version_from_project_master(
-    default_config_file: dict[str, Any], executor_env: Path
+    default_config_file: dict[str, Any],
+    executor_env: Path,
 ) -> None:
     site_config = SiteConfig.model_validate(default_config_file)
     rms_project = RmsProject.from_filepath("project")
+
     version = _resolve_version(None, site_config, rms_project)
     assert version == "14.2.2"
 
     rms_project.master.version = "14.2.2"
     version = _resolve_version(None, site_config, rms_project)
     assert version == "14.2.2"
 
+    rms_project.master.version = "15.0.1"
+    version = _resolve_version(None, site_config, rms_project)
+    assert version == "15.0.1.1"
+
     rms_project.master.version = "10.0.0"
     with pytest.raises(
         RmsVersionError,

tests/test_site_config.py

@@ -0,0 +1,42 @@
+"""Tests the SiteConfig class, containing the user defined configuration."""
+
+import pytest
+
+from runrms.config._site_config import Env, GlobalEnv, SiteConfig, Version
+
+
+@pytest.fixture
+def site_config() -> SiteConfig:
+    """Loads and return the site config object."""
+    version = Version(
+        env=Env(PYTHONPATH="", RMS_PLUGINS_LIBRARY="", TCL_LIBRARY="", TK_LIBRARY="")
+    )
+    return SiteConfig(
+        wrapper="",
+        default="2.2.0.0",
+        exe="",
+        env=GlobalEnv(PATH_PREFIX=""),
+        versions={
+            "1.1.0": version,
+            "1.2.0": version,
+            "1.2.1": version,
+            "1.2.2": version,
+            "1.2.3": version,
+            "2.2.0.0": version,
+            "2.2.0.1": version,
+            "2.2.0.2": version,
+            "2.2.1.0": version,
+        },
+    )
+
+
+def test_get_newest_patch_version(site_config: SiteConfig) -> None:
+    """Tests that getting the newest patch version works as expected."""
+    assert site_config.get_newest_patch_version(1, 1) == 0
+    assert site_config.get_newest_patch_version(1, 2) == 3
+
+
+def test_get_newest_build_version(site_config: SiteConfig) -> None:
+    """Tests that getting the newest build version works as expected."""
+    assert site_config.get_newest_build_version(2, 2, 0) == 2
+    assert site_config.get_newest_build_version(2, 2, 1) == 0