feat(cli): tag each downloaded cli with its proper version

Author: stackmystack

src/tree_sitter.rs

@@ -44,7 +44,10 @@ async fn cli(
         }
     };
     let cli = format!("tree-sitter-{platform}");
-    let res = PathBuf::new().join(build_dir).join(&cli).canon()?;
+    let res = PathBuf::new()
+        .join(build_dir)
+        .join(format!("{cli}-{tag}"))
+        .canon()?;
 
     if !res.exists() {
         handle.msg(format!("Downloading {tag}",));
@@ -74,7 +77,7 @@ async fn download(gz: &Path, url: &str) -> TsdlResult<()> {
 
 async fn download_and_extract(gz: &Path, url: &str, res: &Path) -> TsdlResult<()> {
     download(gz, url).await?;
-    gunzip(gz).await?;
+    gunzip(gz, res).await?;
     chmod_x(res).await?;
     fs::remove_file(gz)
         .await
@@ -97,16 +100,16 @@ fn find_tag(refs: &HashMap<String, String>, version: &str) -> Tag {
         )
 }
 
-async fn gunzip(gz: &Path) -> TsdlResult<()> {
+async fn gunzip(gz: &Path, to: &Path) -> TsdlResult<()> {
     let file = fs::File::open(gz)
         .await
         .map_err(|e| TsdlError::context(format!("opening {}", gz.display()), e))?;
     let mut decompressor = GzipDecoder::new(tokio::io::BufReader::new(file));
-    let path = gz.with_extension("");
+    // let path = gz.with_extension("");
 
-    let mut file = tokio::fs::File::create(&path)
+    let mut file = tokio::fs::File::create(to)
         .await
-        .map_err(|e| TsdlError::context(format!("creating {}", path.display()), e))?;
+        .map_err(|e| TsdlError::context(format!("creating {}", to.display()), e))?;
 
     io::copy(&mut decompressor, &mut file)
         .await

tests/cmd/build.rs

@@ -28,10 +28,9 @@ fn no_args_should_download_tree_sitter_cli() {
             "tree-sitter-cli v{TREE_SITTER_VERSION}"
         )));
     assert!(!sandbox.is_empty());
-    let tree_sitter_cli = sandbox
-        .tmp
-        .child(TSDL_BUILD_DIR)
-        .child(format!("tree-sitter-{TREE_SITTER_PLATFORM}"));
+    let tree_sitter_cli = sandbox.tmp.child(TSDL_BUILD_DIR).child(format!(
+        "tree-sitter-{TREE_SITTER_PLATFORM}-v{TREE_SITTER_VERSION}"
+    ));
 
     tree_sitter_cli
         .assert(p::path::exists())
@@ -66,7 +65,7 @@ fn no_args_should_build_tree_sitter_with_specific_version(
         sandbox
             .tmp
             .child(TSDL_BUILD_DIR)
-            .child(format!("tree-sitter-{TREE_SITTER_PLATFORM}"))
+            .child(format!("tree-sitter-{TREE_SITTER_PLATFORM}-v{cli_version}"))
             .to_path_buf(),
     );
     tree_sitter_cli.arg("--version");