tlaplus-cli 0.4.1__tar.gz → 0.4.2__tar.gz

{tlaplus_cli-0.4.1/src/tlaplus_cli.egg-info → tlaplus_cli-0.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tlaplus-cli
-Version: 0.4.1
+Version: 0.4.2
 Summary: TLA+ tools: download TLC, compile custom modules, run model checker
 Author-email: Denis Nikolskiy <codeomatics@gmail.com>
 License-Expression: MIT

{tlaplus_cli-0.4.1 → tlaplus_cli-0.4.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "tlaplus-cli"
-version = "0.4.1"
+version = "0.4.2"
 description = "TLA+ tools: download TLC, compile custom modules, run model checker"
 readme = "README.md"
 requires-python = ">=3.11"

{tlaplus_cli-0.4.1 → tlaplus_cli-0.4.2}/src/tlaplus_cli/tlc/compiler.py

@@ -14,7 +14,7 @@ def get_tlc_jar_path() -> Path:
     return pinned_jar if (pinned_jar and pinned_jar.exists()) else legacy
 
 
-def compile_modules(base_dir: Path | None = None, verbose: bool = False) -> Path:
+def compile_modules(base_dir: Path | None = None, verbose: bool = False) -> Path:  # noqa: PLR0912, PLR0915
     """Compile custom Java modules. Returns the classes directory path."""
     config = load_config()
     base_dir = base_dir or workspace_root()
@@ -24,19 +24,49 @@ def compile_modules(base_dir: Path | None = None, verbose: bool = False) -> Path
         msg = "tla2tools.jar not found. Run 'tla tools install' first."
         raise FileNotFoundError(msg)
 
-    modules_dir = Path(config.module_path) if config.module_path else base_dir / config.workspace.modules_dir
+    local_modules_dir = base_dir / config.workspace.modules_dir
     classes_dir = base_dir / config.workspace.classes_dir
 
-    lib_dir = Path(config.module_lib_path) if config.module_lib_path else modules_dir / "lib"
+    custom_modules_dir = None
+    if config.module_path:
+        custom_modules_dir = Path(config.module_path)
+        if not custom_modules_dir.exists():
+            msg = f"modules directory not found: {custom_modules_dir}"
+            raise FileNotFoundError(msg)
+
+    if not config.module_path and not local_modules_dir.exists():
+        msg = f"modules directory not found: {local_modules_dir}"
+        raise FileNotFoundError(msg)
+
+    lib_jars = []
+    if config.module_lib_path:
+        lib_dir = Path(config.module_lib_path)
+        if lib_dir.is_dir():
+            lib_jars.extend(sorted(lib_dir.glob("*.jar")))
+    else:
+        if custom_modules_dir:
+            custom_lib = custom_modules_dir / "lib"
+            if custom_lib.is_dir():
+                lib_jars.extend(sorted(custom_lib.glob("*.jar")))
+        local_lib = local_modules_dir / "lib"
+        if local_lib.is_dir():
+            lib_jars.extend(sorted(local_lib.glob("*.jar")))
+
+    # Remove duplicates preserving order
+    unique_jars = []
+    for jar in lib_jars:
+        if jar not in unique_jars:
+            unique_jars.append(jar)
+    lib_jars = unique_jars
 
-    lib_jars = sorted(lib_dir.glob("*.jar")) if lib_dir.is_dir() else []
     classpath = os.pathsep.join([str(jar_path)] + [str(j) for j in lib_jars])
 
-    if not modules_dir.exists():
-        msg = f"modules directory not found: {modules_dir}"
-        raise FileNotFoundError(msg)
+    java_files = []
+    if custom_modules_dir:
+        java_files.extend(list(custom_modules_dir.rglob("*.java")))
+    if local_modules_dir.exists():
+        java_files.extend(list(local_modules_dir.rglob("*.java")))
 
-    java_files = list(modules_dir.rglob("*.java"))
     if not java_files:
         return classes_dir
 

{tlaplus_cli-0.4.1 → tlaplus_cli-0.4.2/src/tlaplus_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tlaplus-cli
-Version: 0.4.1
+Version: 0.4.2
 Summary: TLA+ tools: download TLC, compile custom modules, run model checker
 Author-email: Denis Nikolskiy <codeomatics@gmail.com>
 License-Expression: MIT

{tlaplus_cli-0.4.1 → tlaplus_cli-0.4.2}/src/tlaplus_cli.egg-info/SOURCES.txt

@@ -55,6 +55,7 @@ src/tlaplus_cli/versioning/metadata.py
 src/tlaplus_cli/versioning/paths.py
 src/tlaplus_cli/versioning/resolver.py
 src/tlaplus_cli/versioning/schema.py
+tests/test_build_both.py
 tests/test_build_modules_path.py
 tests/test_cli.py
 tests/test_config.py

tlaplus_cli-0.4.2/tests/test_build_both.py

@@ -0,0 +1,32 @@
+from tlaplus_cli.cli import app
+
+
+def test_build_uses_both_local_and_custom_module_path(mocker, tmp_path, base_settings, runner):
+    custom_modules = tmp_path / "custom_modules"
+    custom_modules.mkdir()
+    (custom_modules / "Custom.java").write_text("class Custom {}")
+
+    local_modules = tmp_path / "modules"
+    local_modules.mkdir()
+    (local_modules / "Local.java").write_text("class Local {}")
+
+    settings = base_settings.model_copy(deep=True)
+    settings.module_path = str(custom_modules)
+    mocker.patch("tlaplus_cli.tlc.compiler.load_config", return_value=settings)
+    mocker.patch("tlaplus_cli.tlc.compiler.workspace_root", return_value=tmp_path)
+
+    pinned_dir = tmp_path / "tools" / "v1.8.0"
+    pinned_dir.mkdir(parents=True)
+    (pinned_dir / "tla2tools.jar").write_bytes(b"fake")
+    mocker.patch("tlaplus_cli.tlc.compiler.get_pinned_version_dir", return_value=pinned_dir)
+
+    mock_run = mocker.patch("tlaplus_cli.tlc.compiler.subprocess.run")
+    mock_run.return_value.returncode = 0
+
+    result = runner.invoke(app, ["modules", "build"])
+
+    assert result.exit_code == 0
+    args, _ = mock_run.call_args
+    cmd = args[0]
+    assert str(custom_modules / "Custom.java") in cmd
+    assert str(local_modules / "Local.java") in cmd