tlaplus-cli 0.2.1__tar.gz → 0.3.1__tar.gz

{tlaplus_cli-0.2.1/src/tlaplus_cli.egg-info → tlaplus_cli-0.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tlaplus-cli
-Version: 0.2.1
+Version: 0.3.1
 Summary: TLA+ tools: download TLC, compile custom modules, run model checker
 Author-email: Denis Nikolskiy <codeomatics@gmail.com>
 License-Expression: MIT
@@ -24,6 +24,7 @@ Requires-Dist: requests<3.0.0,>=2.31.0
 Requires-Dist: pyyaml<7.0,>=6.0
 Requires-Dist: platformdirs<5.0,>=4.0
 Requires-Dist: pydantic<3.0.0,>=2.12.5
+Requires-Dist: truststore<1.0.0,>=0.9.0
 Dynamic: license-file
 
 # TLA+ CLI
@@ -50,87 +51,99 @@ uv tool uninstall tlaplus-cli
 
 ## Usage
 
-### Managing TLC Versions
+### Managing TLA+ Tools
 
-The `tla tlc` command group allows you to download and manage multiple versions of the TLC model checker directly from GitHub releases. 
+The `tla tools` command group allows you to download and manage multiple versions of the TLA+ toolset (TLC, SANY, TLATeX) directly from GitHub releases. 
 
-List available and installed TLC versions:
+List available and installed toolset versions:
 ```bash
-tla tlc list
+tla tools list
 ```
 
-Install the latest TLC version:
+Install the latest toolset version:
 ```bash
-tla tlc install
+tla tools install
 ```
 
-Install a specific TLC version:
+> [!TIP]
+> The first version you install is automatically "pinned" as the default. Subsequent installs won't change your pin unless you manually use `tla tools pin`.
+
+Install a specific toolset version:
 ```bash
-tla tlc install v1.8.0
+tla tools install v1.8.0
 ```
 
 Pin a specific version to be used by default:
 ```bash
-tla tlc pin v1.8.0
+tla tools pin v1.8.0
 ```
 
 Upgrade the pinned version (or a specific version) to a newer commit:
 ```bash
-tla tlc upgrade
+tla tools upgrade
 ```
 
+> [!NOTE]
+> If the target version to upgrade is not yet installed locally, the CLI will automatically download it.
+
 Show the TLC2 version string and absolute path to the pinned version's `tla2tools.jar`:
 ```bash
-tla tlc path
+tla tools path
 ```
 
 Or for a specific version:
 ```bash
-tla tlc path v1.8.0
+tla tools path v1.8.0
 ```
 
 Example output:
 ```text
 TLC2 Version 2.19 of 08 August 2024 (rev: 5a47802)
-/home/bob/.cache/tla/tlc/v1.8.0-5a47802/tla2tools.jar
+/home/bob/.cache/tla/tools/v1.8.0-5a47802/tla2tools.jar
 ```
 
-Show the TLC versions directory and all installed version directories:
+Show the toolset versions directory and all installed version directories:
 ```bash
-tla tlc dir
+tla tools dir
 ```
 
 Example output:
 ```text
-/home/bob/.cache/tla/tlc
+/home/bob/.cache/tla/tools
   v1.7.0-abc1234
   v1.8.0-5a47802
 ```
 
 Uninstall a specific version (or use 'default' to remove legacy jars):
 ```bash
-tla tlc uninstall v1.8.0
+tla tools uninstall v1.8.0
 ```
 
+> [!TIP]
+> Use `--all` to remove all installed tags for a specific version name without interactive prompts.
+
+> [!NOTE]
+> If you uninstall the currently pinned version, the CLI will automatically "fall back" to the next best installed version (ranked by semver, then release date).
+
 ### Run TLC
 
-Run the TLC model checker on a specification. This uses the currently pinned TLC version.
+Run the TLC model checker on a specification. This uses the currently pinned toolset version.
 
 ```bash
-tla run <spec_name>
+tla tlc <spec_name>
 ```
 
 For example (runs `queue.tla`):
 
 ```bash
-tla run queue
+tla tlc queue
 ```
 
-> **Note:** Starting from version `0.2.0`, the command structure has changed. To run a model, use `tla run <spec>`. For older versions (<0.2.0), the command was `tla tlc <spec>`.
+> **Note:** Starting from version `0.3.0`, the command structure has changed. To run a model, use `tla tlc <spec>`. For version `0.2.x`, the command was `tla run <spec>`. Since `0.3.0`, management commands are under `tla tools`.
 
 ### Compile Custom Java Modules
 
-Note that modules are compiled using the pinned version of TLC.
+Note that modules are compiled using the pinned version of the toolset.
 
 Compile modules:
 ```bash
@@ -196,7 +209,7 @@ java:
 | Directory | Purpose | Location |
 |---|---|---|
 | Config | `config.yaml` | `~/.config/tla/` |
-| TLC Versions | Version dirs & `tlc-pinned-version.txt` file | `~/.cache/tla/tlc/` |
+| Toolset Versions | Version dirs & `tools-pinned-version.txt` file | `~/.cache/tla/tools/` |
 | API Cache | `github_cache.json` | `~/.cache/tla/` |
 | Workspace | specs + modules + classes | Set via `workspace.root` in config |
 

{tlaplus_cli-0.2.1 → tlaplus_cli-0.3.1}/README.md

@@ -22,87 +22,99 @@ uv tool uninstall tlaplus-cli
 
 ## Usage
 
-### Managing TLC Versions
+### Managing TLA+ Tools
 
-The `tla tlc` command group allows you to download and manage multiple versions of the TLC model checker directly from GitHub releases. 
+The `tla tools` command group allows you to download and manage multiple versions of the TLA+ toolset (TLC, SANY, TLATeX) directly from GitHub releases. 
 
-List available and installed TLC versions:
+List available and installed toolset versions:
 ```bash
-tla tlc list
+tla tools list
 ```
 
-Install the latest TLC version:
+Install the latest toolset version:
 ```bash
-tla tlc install
+tla tools install
 ```
 
-Install a specific TLC version:
+> [!TIP]
+> The first version you install is automatically "pinned" as the default. Subsequent installs won't change your pin unless you manually use `tla tools pin`.
+
+Install a specific toolset version:
 ```bash
-tla tlc install v1.8.0
+tla tools install v1.8.0
 ```
 
 Pin a specific version to be used by default:
 ```bash
-tla tlc pin v1.8.0
+tla tools pin v1.8.0
 ```
 
 Upgrade the pinned version (or a specific version) to a newer commit:
 ```bash
-tla tlc upgrade
+tla tools upgrade
 ```
 
+> [!NOTE]
+> If the target version to upgrade is not yet installed locally, the CLI will automatically download it.
+
 Show the TLC2 version string and absolute path to the pinned version's `tla2tools.jar`:
 ```bash
-tla tlc path
+tla tools path
 ```
 
 Or for a specific version:
 ```bash
-tla tlc path v1.8.0
+tla tools path v1.8.0
 ```
 
 Example output:
 ```text
 TLC2 Version 2.19 of 08 August 2024 (rev: 5a47802)
-/home/bob/.cache/tla/tlc/v1.8.0-5a47802/tla2tools.jar
+/home/bob/.cache/tla/tools/v1.8.0-5a47802/tla2tools.jar
 ```
 
-Show the TLC versions directory and all installed version directories:
+Show the toolset versions directory and all installed version directories:
 ```bash
-tla tlc dir
+tla tools dir
 ```
 
 Example output:
 ```text
-/home/bob/.cache/tla/tlc
+/home/bob/.cache/tla/tools
   v1.7.0-abc1234
   v1.8.0-5a47802
 ```
 
 Uninstall a specific version (or use 'default' to remove legacy jars):
 ```bash
-tla tlc uninstall v1.8.0
+tla tools uninstall v1.8.0
 ```
 
+> [!TIP]
+> Use `--all` to remove all installed tags for a specific version name without interactive prompts.
+
+> [!NOTE]
+> If you uninstall the currently pinned version, the CLI will automatically "fall back" to the next best installed version (ranked by semver, then release date).
+
 ### Run TLC
 
-Run the TLC model checker on a specification. This uses the currently pinned TLC version.
+Run the TLC model checker on a specification. This uses the currently pinned toolset version.
 
 ```bash
-tla run <spec_name>
+tla tlc <spec_name>
 ```
 
 For example (runs `queue.tla`):
 
 ```bash
-tla run queue
+tla tlc queue
 ```
 
-> **Note:** Starting from version `0.2.0`, the command structure has changed. To run a model, use `tla run <spec>`. For older versions (<0.2.0), the command was `tla tlc <spec>`.
+> **Note:** Starting from version `0.3.0`, the command structure has changed. To run a model, use `tla tlc <spec>`. For version `0.2.x`, the command was `tla run <spec>`. Since `0.3.0`, management commands are under `tla tools`.
 
 ### Compile Custom Java Modules
 
-Note that modules are compiled using the pinned version of TLC.
+Note that modules are compiled using the pinned version of the toolset.
 
 Compile modules:
 ```bash
@@ -168,7 +180,7 @@ java:
 | Directory | Purpose | Location |
 |---|---|---|
 | Config | `config.yaml` | `~/.config/tla/` |
-| TLC Versions | Version dirs & `tlc-pinned-version.txt` file | `~/.cache/tla/tlc/` |
+| Toolset Versions | Version dirs & `tools-pinned-version.txt` file | `~/.cache/tla/tools/` |
 | API Cache | `github_cache.json` | `~/.cache/tla/` |
 | Workspace | specs + modules + classes | Set via `workspace.root` in config |
 

{tlaplus_cli-0.2.1 → tlaplus_cli-0.3.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "tlaplus-cli"
-version = "0.2.1"
+version = "0.3.1"
 description = "TLA+ tools: download TLC, compile custom modules, run model checker"
 readme = "README.md"
 requires-python = ">=3.11"
@@ -14,6 +14,7 @@ dependencies = [
     "pyyaml>=6.0,<7.0",
     "platformdirs>=4.0,<5.0",
     "pydantic>=2.12.5,<3.0.0",
+    "truststore>=0.9.0,<1.0.0",
 ]
 authors = [
     {name = "Denis Nikolskiy", email = "codeomatics@gmail.com"}

tlaplus_cli-0.3.1/src/tlaplus_cli/__init__.py

@@ -0,0 +1,6 @@
+import truststore
+
+# Inject truststore as early as possible so that all standard library
+# and third-party tools relying on `ssl` (such as `requests` and `urllib3`)
+# utilize the native OS trust store.
+truststore.inject_into_ssl()

{tlaplus_cli-0.2.1 → tlaplus_cli-0.3.1}/src/tlaplus_cli/cli.py

@@ -8,11 +8,11 @@ from tlaplus_cli.build_tlc_module import build as build_tlc_cmd
 from tlaplus_cli.check_java import check_java_version, get_java_version
 from tlaplus_cli.config import load_config
 from tlaplus_cli.run_tlc import tlc as run_tlc_cmd
-from tlaplus_cli.tlc_manager import fetch_cache_app, tlc_app
+from tlaplus_cli.tools_manager import fetch_cache_app, tools_app
 
 app = typer.Typer(
     name="tla",
-    help="TLA+ tools: download TLC, compile custom modules, run model checker.",
+    help="TLA+ tools: download TLA+ toolset distribution, compile custom modules, run model checker.",
     no_args_is_help=True,
     add_completion=False,
 )
@@ -47,11 +47,11 @@ def root(
 
 # --- Subcommands ---
 
-# Attach typer subgroups for TLC and fetch-cache
-app.add_typer(tlc_app, name="tlc")
+# Attach typer subgroups for tools and fetch-cache
+app.add_typer(tools_app, name="tools")
 app.add_typer(fetch_cache_app, name="fetch-cache")
 
-app.command(name="run")(run_tlc_cmd)
+app.command(name="tlc")(run_tlc_cmd)
 app.command(name="build")(build_tlc_cmd)
 
 

{tlaplus_cli-0.2.1 → tlaplus_cli-0.3.1}/src/tlaplus_cli/run_tlc.py

@@ -21,7 +21,7 @@ def version_callback(value: bool) -> None:
 
         if not jar_path.exists():
             typer.echo(f"Error: tla2tools.jar not found at {jar_path}", err=True)
-            typer.echo("Run 'tla tlc install' first.", err=True)
+            typer.echo("Run 'tla tools install' first.", err=True)
             raise typer.Exit(1)
 
         cmd = ["java", "-cp", str(jar_path), config.tlc.java_class]
@@ -63,7 +63,7 @@ def tlc(
 
     if not jar_path.exists():
         typer.echo("Error: tla2tools.jar not found.", err=True)
-        typer.echo("Run 'tla tlc install' first.", err=True)
+        typer.echo("Run 'tla tools install' first.", err=True)
         raise typer.Exit(1)
 
     ws_root = workspace_root()