Merge remote-tracking branch 'origin/main' into fetch-yarn3

# Conflicts:
#	tests/acceptance/merged_platform.rs

Author: mikrostew

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "volta"
-version = "1.0.5"
+version = "1.0.6"
 authors = ["David Herman <[email protected]>", "Charles Pierce <[email protected]>"]
 license = "BSD-2-Clause"
 repository = "https://github.com/volta-cli/volta"
@@ -33,7 +33,7 @@ cfg-if = "1.0"
 mockito = { version = "0.31.0", optional = true }
 test-support = { path = "crates/test-support" }
 textwrap = "0.14.2"
-which = "4.2.4"
+which = "4.2.5"
 dirs = "4.0.0"
 volta-migrate = { path = "crates/volta-migrate" }
 

Cargo.toml

@@ -1,3 +1,9 @@
+# Version 1.0.6
+
+- Fixed panic when `stdout` is closed (#1058)
+- Disabled global package interception when `--prefix` is provided (#1171)
+- Numerous dependency updates
+
 # Version 1.0.5
 
 - Added error when attempting to install Node using `nvm` syntax (#1020)

RELEASES.md

@@ -32,7 +32,7 @@ os_info = "3.2.0"
 detect-indent = { git = "https://github.com/stefanpenner/detect-indent-rs", branch = "master" }
 envoy = "0.1.3"
 mockito = { version = "0.31.0", optional = true }
-regex = "1.5.4"
+regex = "1.5.5"
 dirs = "4.0.0"
 sha-1 = "0.10.0"
 hex = "0.4.3"
@@ -50,7 +50,7 @@ ci_info = "0.14.4"
 hyperx = "1.4.0"
 attohttpc = { version = "0.18.0", features = ["json"] }
 chain-map = "0.1.0"
-indexmap = "1.8.0"
+indexmap = "1.8.1"
 retry = "1.3.1"
 fs2 = "0.4.3"
 

crates/volta-core/Cargo.toml

@@ -3,22 +3,22 @@
 use std::env;
 use std::time::{SystemTime, UNIX_EPOCH};
 
-use serde::Serialize;
+use serde::{Deserialize, Serialize};
 
 use crate::error::{ExitCode, VoltaError};
 use crate::hook::Publish;
-use crate::monitor::Monitor;
+use crate::monitor::send_events;
 use crate::session::ActivityKind;
 
 // the Event data that is serialized to JSON and sent the plugin
-#[derive(Serialize)]
+#[derive(Deserialize, Serialize)]
 pub struct Event {
     timestamp: u64,
-    name: String,
-    event: EventKind,
+    pub name: String,
+    pub event: EventKind,
 }
 
-#[derive(Serialize)]
+#[derive(Deserialize, Serialize, PartialEq, Debug)]
 pub struct ErrorEnv {
     argv: String,
     exec_path: String,
@@ -27,9 +27,9 @@ pub struct ErrorEnv {
     platform_version: String,
 }
 
-#[derive(Serialize)]
+#[derive(Deserialize, Serialize, PartialEq, Debug)]
 #[serde(rename_all = "lowercase")]
-enum EventKind {
+pub enum EventKind {
     Start,
     End {
         exit_code: i32,
@@ -42,6 +42,9 @@ enum EventKind {
     ToolEnd {
         exit_code: i32,
     },
+    Args {
+        argv: String,
+    },
 }
 
 impl EventKind {
@@ -122,6 +125,18 @@ impl EventLog {
             activity_kind,
         )
     }
+    pub fn add_event_args(&mut self) {
+        let argv = env::args_os()
+            .enumerate()
+            .fold(String::new(), |mut result, (i, arg)| {
+                if i > 0 {
+                    result.push(' ');
+                }
+                result.push_str(&arg.to_string_lossy());
+                result
+            });
+        self.add_event(EventKind::Args { argv }, ActivityKind::Args)
+    }
 
     fn add_event(&mut self, event_kind: EventKind, activity_kind: ActivityKind) {
         let event = event_kind.into_event(activity_kind);
@@ -133,8 +148,7 @@ impl EventLog {
             // Note: This call to unimplemented is left in, as it's not a Fallible operation that can use ErrorKind::Unimplemented
             Some(&Publish::Url(_)) => unimplemented!(),
             Some(&Publish::Bin(ref command)) => {
-                let mut monitor = Monitor::new(command);
-                monitor.send_events(&self.events);
+                send_events(command, &self.events);
             }
             None => {}
         }
@@ -144,9 +158,10 @@ impl EventLog {
 #[cfg(test)]
 pub mod tests {
 
-    use super::EventLog;
+    use super::{EventKind, EventLog};
     use crate::error::{ErrorKind, ExitCode};
     use crate::session::ActivityKind;
+    use regex::Regex;
 
     #[test]
     fn test_adding_events() {
@@ -156,18 +171,41 @@ pub mod tests {
         event_log.add_event_start(ActivityKind::Current);
         assert_eq!(event_log.events.len(), 1);
         assert_eq!(event_log.events[0].name, "current");
+        assert_eq!(event_log.events[0].event, EventKind::Start);
 
         event_log.add_event_end(ActivityKind::Pin, ExitCode::NetworkError);
         assert_eq!(event_log.events.len(), 2);
         assert_eq!(event_log.events[1].name, "pin");
+        assert_eq!(event_log.events[1].event, EventKind::End { exit_code: 5 });
 
         event_log.add_event_tool_end(ActivityKind::Version, 12);
         assert_eq!(event_log.events.len(), 3);
         assert_eq!(event_log.events[2].name, "version");
+        assert_eq!(
+            event_log.events[2].event,
+            EventKind::ToolEnd { exit_code: 12 }
+        );
 
         let error = ErrorKind::BinaryExecError.into();
         event_log.add_event_error(ActivityKind::Install, &error);
         assert_eq!(event_log.events.len(), 4);
         assert_eq!(event_log.events[3].name, "install");
+        // not checking the error because it has too much machine-specific info
+
+        event_log.add_event_args();
+        assert_eq!(event_log.events.len(), 5);
+        assert_eq!(event_log.events[4].name, "args");
+        match event_log.events[4].event {
+            EventKind::Args { ref argv } => {
+                let re = Regex::new("volta_core").unwrap();
+                assert!(re.is_match(argv));
+            }
+            _ => {
+                panic!(
+                    "Expected EventKind::Args {{ argv }}, Got: {:?}",
+                    event_log.events[4].event
+                );
+            }
+        }
     }
 }

crates/volta-core/src/event.rs

@@ -2,7 +2,7 @@
 
 mod command;
 pub mod error;
-mod event;
+pub mod event;
 pub mod fs;
 mod hook;
 pub mod inventory;