Add missing installations

qlty-check/src/tool.rs

@@ -676,7 +676,7 @@ pub trait RuntimeTool: Tool {
     fn package_tool(&self, name: &str, plugin: &PluginDef) -> Box<dyn Tool>;
 }
 
-fn finalize_installation_from_cmd_result(
+pub fn finalize_installation_from_cmd_result(
     tool: &dyn Tool,
     result: &std::io::Result<Output>,
     installation: &mut Installation,
@@ -696,9 +696,7 @@ fn finalize_installation_from_cmd_result(
     log_file.write_all(installation.stderr.clone().unwrap_or_default().as_bytes())?;
 
     installation.finished_at = Some(Utc::now().into());
-    if let Err(err) = write_to_file(installation) {
-        error!("Error writing debug data: {}", err);
-    }
+    write_to_file(installation);
 
     Ok(())
 }

qlty-check/src/tool/download.rs

@@ -20,7 +20,6 @@ use std::io::Cursor;
 use std::path::{Path, PathBuf};
 use tar::Archive;
 use tempfile::tempfile;
-use tracing::error;
 use tracing::{info, trace, warn};
 use zip::ZipArchive;
 
@@ -420,10 +419,7 @@ fn finalize_installation_from_download_result(
         installation.download_success = Some(false);
     }
     installation.finished_at = Some(Utc::now().into());
-
-    if let Err(err) = write_to_file(installation) {
-        error!("Error writing debug data: {}", err);
-    }
+    write_to_file(installation);
 
     Ok(())
 }

qlty-check/src/tool/github.rs

@@ -12,7 +12,7 @@ use qlty_config::config::{Cpu, DownloadDef, OperatingSystem, PluginDef, ReleaseD
 use qlty_config::version::QLTY_VERSION;
 use qlty_types::analysis::v1::Installation;
 use sha2::Digest;
-use tracing::{debug, error, info, trace};
+use tracing::{debug, info, trace};
 
 const GITHUB_API_VERSION: &str = "2022-11-28";
 const USER_AGENT_PREFIX: &str = "qlty-check";
@@ -425,9 +425,7 @@ fn finalize_installation_from_assets_fetch(
     }
     installation.finished_at = Some(Utc::now().into());
 
-    if let Err(err) = write_to_file(installation) {
-        error!("Error writing debug data: {}", err);
-    }
+    write_to_file(installation);
 }
 
 #[cfg(test)]

qlty-check/src/tool/installations.rs

@@ -23,7 +23,13 @@ pub fn initialize_installation(tool: &dyn Tool) -> Installation {
     }
 }
 
-pub fn write_to_file(installation: &Installation) -> Result<()> {
+pub fn write_to_file(installation: &Installation) {
+    if let Err(err) = write_to_file_impl(installation) {
+        error!("Error writing debug data: {}", err);
+    }
+}
+
+fn write_to_file_impl(installation: &Installation) -> Result<()> {
     let installation_id = generate_random_id(6);
     let installation_files_directory = PathBuf::from(&installation.directory);
     if let Err(err) = create_dir_all(&installation_files_directory) {

qlty-check/src/tool/php.rs

@@ -1,9 +1,10 @@
 pub mod composer;
 use super::command_builder::{default_command_builder, CommandBuilder};
+use super::installations::initialize_installation;
 use super::runnable_archive::RunnableArchive;
 use super::Tool;
 use super::ToolType;
-use crate::tool::RuntimeTool;
+use crate::tool::{finalize_installation_from_cmd_result, RuntimeTool};
 use crate::ui::{ProgressBar, ProgressTask};
 use anyhow::Context;
 use anyhow::Result;
@@ -44,7 +45,7 @@ impl Tool for Php {
 
     fn install(&self, task: &ProgressTask) -> Result<()> {
         task.set_message("Verifying Php installation");
-        Php::verify_installation(self.env())?;
+        self.verify_installation(self.env())?;
 
         task.set_message("Installing composer");
         let composer = Composer {
@@ -75,15 +76,20 @@ impl Tool for Php {
 }
 
 impl Php {
-    fn verify_installation(env: HashMap<String, String>) -> Result<()> {
+    fn verify_installation(&self, env: HashMap<String, String>) -> Result<()> {
         let cmd = cmd!("php", "--version")
             .full_env(env)
             .stderr_to_stdout()
             .stdout_capture();
 
-        debug!("{:?}", cmd);
-        cmd.run()
-            .with_context(|| "Ensure `php` is installed and in $PATH")?;
+        let script = format!("{:?}", cmd);
+        debug!(script);
+
+        let mut installation = initialize_installation(self);
+        let result = cmd.run();
+        finalize_installation_from_cmd_result(self, &result, &mut installation, script).ok();
+
+        result.with_context(|| "Ensure `php` is installed and in $PATH")?;
 
         Ok(())
     }

qlty-check/src/tool/php/composer.rs

@@ -1,8 +1,10 @@
 use crate::tool::command_builder::CommandBuilder;
+use crate::tool::finalize_installation_from_cmd_result;
+use crate::tool::installations::initialize_installation;
 use crate::tool::node::package_json::PackageJson;
 use crate::ui::ProgressBar;
 use crate::{tool::ToolType, ui::ProgressTask, Tool};
-use anyhow::{Context, Result};
+use anyhow::{bail, Context, Result};
 use itertools::Itertools;
 use qlty_analysis::utils::fs::path_to_native_string;
 use serde_json::Value;
@@ -100,10 +102,21 @@ impl Composer {
             )
             .dir(install_dir)
             .full_env(self.env())
-            .stderr_to_stdout()
-            .stdout_file(php_package.install_log_file()?);
+            .stderr_capture()
+            .stdout_capture()
+            .unchecked(); // Capture output for debugging
 
-        cmd.run()?;
+        let script = format!("{:?}", cmd);
+        debug!(script);
+
+        let mut installation = initialize_installation(php_package);
+        let result = cmd.run();
+        let _ =
+            finalize_installation_from_cmd_result(php_package, &result, &mut installation, script);
+
+        if result?.status.code() != Some(0) {
+            bail!("Failed to install composer package file");
+        }
 
         Ok(())
     }

qlty-check/src/tool/ruby/gemfile.rs

@@ -1,4 +1,6 @@
 use super::RubygemsPackage;
+use crate::tool::finalize_installation_from_cmd_result;
+use crate::tool::installations::initialize_installation;
 use crate::ui::ProgressBar;
 use crate::{tool::Tool, ui::ProgressTask};
 use anyhow::{bail, Context, Result};
@@ -27,9 +29,15 @@ impl RubyGemfile {
             .stdout_capture()
             .unchecked();
 
-        let list_output: std::process::Output = list_command
-            .run()
-            .with_context(|| "Failed to run: ruby -S bundle list")?;
+        let script = format!("{:?}", list_command);
+        debug!(script);
+
+        let mut installation = initialize_installation(self);
+        let result = list_command.run();
+        let _ = finalize_installation_from_cmd_result(self, &result, &mut installation, script);
+
+        let list_output: std::process::Output =
+            result.with_context(|| "Failed to run: ruby -S bundle list")?;
 
         let stdout = String::from_utf8_lossy(&list_output.stdout).to_string();
         let stderr = String::from_utf8_lossy(&list_output.stderr).to_string();

qlty-check/src/tool/ruby/sys/linux.rs

@@ -1,11 +1,16 @@
 use crate::{
-    tool::ruby::PlatformRuby,
+    tool::{
+        installations::{initialize_installation, write_to_file},
+        ruby::PlatformRuby,
+    },
     ui::{ProgressBar, ProgressTask},
     Tool,
 };
 use anyhow::{bail, Result};
 use ar::Entry;
+use chrono::Utc;
 use qlty_analysis::{join_path_string, utils::fs::path_to_string};
+use qlty_types::analysis::v1::Installation;
 use std::{
     collections::HashMap,
     io::{BufReader, Cursor, Read},
@@ -99,7 +104,15 @@ impl RubyLinux {
             "https://ftp.debian.org/debian/pool/main/{}_{}.deb",
             package, ARCH
         );
-        match ureq::get(url.as_str()).call() {
+        let mut installation = initialize_installation(tool);
+        installation.download_url = Some(url.to_string());
+        installation.download_file_type = Some(".deb".to_string());
+        installation.download_binary_name = Some(package.to_string());
+
+        let result = ureq::get(url.as_str()).call();
+        Self::finalize_installation(&mut installation, &result);
+
+        match result {
             Ok(response) => {
                 self.extract_dependency_deb_archive(
                     response.into_reader(),
@@ -116,6 +129,24 @@ impl RubyLinux {
         Ok(())
     }
 
+    fn finalize_installation(
+        installation: &mut Installation,
+        result: &std::result::Result<ureq::Response, ureq::Error>,
+    ) {
+        installation.finished_at = Some(Utc::now().into());
+        match result {
+            Ok(_) => {
+                installation.download_success = Some(true);
+            }
+            Err(err) => {
+                installation.download_success = Some(false);
+                installation.stderr = Some(format!("{:?}", err));
+            }
+        }
+
+        write_to_file(installation);
+    }
+
     fn extract_dependency_deb_archive(
         &self,
         reader: impl Read,

qlty-check/src/tool/ruby/sys/macos.rs

@@ -1,5 +1,8 @@
 use crate::{
-    tool::{command_builder::CommandBuilder, ruby::PlatformRuby},
+    tool::{
+        command_builder::CommandBuilder, finalize_installation_from_cmd_result,
+        installations::initialize_installation, ruby::PlatformRuby,
+    },
     ui::{ProgressBar, ProgressTask},
     Tool,
 };
@@ -56,7 +59,15 @@ impl PlatformRuby for RubyMacos {
             .full_env(tool.env());
 
         debug!("Running: {:?}", cmd);
-        cmd.run()?;
+
+        let script = format!("{:?}", cmd);
+        debug!(script);
+
+        let mut installation = initialize_installation(tool);
+        let result = cmd.run();
+        finalize_installation_from_cmd_result(tool, &result, &mut installation, script).ok();
+
+        result?;
 
         Ok(())
     }

qlty-check/src/tool/ruby/sys/windows.rs

@@ -1,5 +1,8 @@
 use crate::{
-    tool::{command_builder::Command, download::Download, ruby::PlatformRuby},
+    tool::{
+        command_builder::Command, download::Download, finalize_installation_from_cmd_result,
+        installations::initialize_installation, ruby::PlatformRuby,
+    },
     ui::{ProgressBar, ProgressTask},
     Tool,
 };
@@ -64,10 +67,14 @@ impl RubyWindows {
             .stderr_to_stdout()
             .stdout_capture();
 
-        debug!("Verify system Ruby: {:?}", cmd);
-        let output = cmd
-            .run()
-            .with_context(|| "Ensure `ruby` is installed and in $PATH")?;
+        let script = format!("{:?}", cmd);
+        debug!("Verify system Ruby: {:?}", script);
+
+        let mut installation = initialize_installation(tool);
+        let result = cmd.run();
+        let _ = finalize_installation_from_cmd_result(tool, &result, &mut installation, script);
+
+        let output = result.with_context(|| "Ensure `ruby` is installed and in $PATH")?;
         debug!("Verified system ruby: {:?}", output);
 
         Ok(())