slumber-python 5.2.0__tar.gz → 5.2.4__tar.gz

{slumber_python-5.2.0 → slumber_python-5.2.4}/Cargo.lock

@@ -809,7 +809,7 @@ dependencies = [
 
 [[package]]
 name = "doc_utils"
-version = "5.2.0"
+version = "5.2.4"
 dependencies = [
  "anyhow",
  "clap",
@@ -3280,21 +3280,19 @@ checksum = "7a2ae44ef20feb57a68b23d846850f861394c2e02dc425a50098ae8c90267589"
 
 [[package]]
 name = "slumber"
-version = "5.2.0"
+version = "5.2.4"
 dependencies = [
  "anyhow",
- "console-subscriber",
  "slumber_cli",
  "slumber_tui",
  "slumber_util",
  "tokio",
  "tracing",
- "tracing-subscriber",
 ]
 
 [[package]]
 name = "slumber_cli"
-version = "5.2.0"
+version = "5.2.4"
 dependencies = [
  "anyhow",
  "assert_cmd",
@@ -3329,7 +3327,7 @@ dependencies = [
 
 [[package]]
 name = "slumber_config"
-version = "5.2.0"
+version = "5.2.4"
 dependencies = [
  "derive_more",
  "dirs",
@@ -3354,7 +3352,7 @@ dependencies = [
 
 [[package]]
 name = "slumber_core"
-version = "5.2.0"
+version = "5.2.4"
 dependencies = [
  "async-trait",
  "base64 0.22.1",
@@ -3402,7 +3400,7 @@ dependencies = [
 
 [[package]]
 name = "slumber_import"
-version = "5.2.0"
+version = "5.2.4"
 dependencies = [
  "anyhow",
  "base64 0.22.1",
@@ -3434,7 +3432,7 @@ dependencies = [
 
 [[package]]
 name = "slumber_macros"
-version = "5.2.0"
+version = "5.2.4"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3443,7 +3441,7 @@ dependencies = [
 
 [[package]]
 name = "slumber_python"
-version = "5.2.0"
+version = "5.2.4"
 dependencies = [
  "async-trait",
  "dialoguer",
@@ -3457,7 +3455,7 @@ dependencies = [
 
 [[package]]
 name = "slumber_template"
-version = "5.2.0"
+version = "5.2.4"
 dependencies = [
  "bytes",
  "derive_more",
@@ -3484,7 +3482,7 @@ dependencies = [
 
 [[package]]
 name = "slumber_tui"
-version = "5.2.0"
+version = "5.2.4"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -3526,8 +3524,9 @@ dependencies = [
 
 [[package]]
 name = "slumber_util"
-version = "5.2.0"
+version = "5.2.4"
 dependencies = [
+ "console-subscriber",
  "derive_more",
  "dirs",
  "env-lock",

{slumber_python-5.2.0 → slumber_python-5.2.4}/Cargo.toml

@@ -9,7 +9,7 @@ homepage = "https://slumber.lucaspickering.me"
 keywords = ["rest", "http", "terminal", "tui"]
 license = "MIT"
 repository = "https://github.com/LucasPickering/slumber"
-version = "5.2.0"
+version = "5.2.4"
 # Keep in sync w/ rust-toolchain.toml
 rust-version = "1.90.0"
 
@@ -43,14 +43,14 @@ serde_json = {version = "1.0.120", default-features = false, features = ["preser
 serde_json_path = "0.7.1"
 serde_test = "1.0.176"
 serde_yaml = {version = "0.9.0", default-features = false}
-slumber_cli = {path = "./crates/cli", version = "5.2.0" }
-slumber_config = {path = "./crates/config", version = "5.2.0", default-features = false }
-slumber_core = {path = "./crates/core", version = "5.2.0" }
-slumber_import = {path = "./crates/import", version = "5.2.0" }
-slumber_macros = {path = "./crates/macros", version = "5.2.0" }
-slumber_template = {path = "./crates/template", version = "5.2.0" }
-slumber_tui = {path = "./crates/tui", version = "5.2.0" }
-slumber_util = {path = "./crates/util", version = "5.2.0" }
+slumber_cli = {path = "./crates/cli", version = "5.2.4" }
+slumber_config = {path = "./crates/config", version = "5.2.4", default-features = false }
+slumber_core = {path = "./crates/core", version = "5.2.4" }
+slumber_import = {path = "./crates/import", version = "5.2.4" }
+slumber_macros = {path = "./crates/macros", version = "5.2.4" }
+slumber_template = {path = "./crates/template", version = "5.2.4" }
+slumber_tui = {path = "./crates/tui", version = "5.2.4" }
+slumber_util = {path = "./crates/util", version = "5.2.4" }
 strum = {version = "0.27.0", default-features = false}
 syn = "2.0.101"
 terminput = "0.5.3"
@@ -58,7 +58,6 @@ thiserror = "2.0.12"
 tokio = {version = "1.39.2", default-features = false}
 tokio-util = "0.7.13"
 tracing = "0.1.40"
-tracing-subscriber = {version = "0.3.17", default-features = false, features = ["ansi", "fmt", "registry"]}
 url = "2.0.0"
 uuid = {version = "1.10.0", default-features = false}
 winnow = "0.7.0"
@@ -118,7 +117,16 @@ installers = ["shell", "powershell", "homebrew"]
 # A GitHub repo to push Homebrew formulas to
 tap = "LucasPickering/homebrew-tap"
 # Target platforms to build apps for (Rust target-triple syntax)
-targets = ["aarch64-apple-darwin", "x86_64-apple-darwin", "x86_64-unknown-linux-gnu", "x86_64-unknown-linux-musl", "x86_64-pc-windows-msvc"]
+targets = [
+    "aarch64-apple-darwin",
+    "aarch64-unknown-linux-gnu",
+    "aarch64-unknown-linux-musl",
+    "aarch64-pc-windows-msvc",
+    "x86_64-apple-darwin",
+    "x86_64-unknown-linux-gnu",
+    "x86_64-unknown-linux-musl",
+    "x86_64-pc-windows-msvc",
+]
 # Publish jobs to run in CI
 publish-jobs = ["homebrew"]
 # Which actions to run on pull requests

{slumber_python-5.2.0 → slumber_python-5.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: slumber-python
-Version: 5.2.0
+Version: 5.2.4
 Classifier: Programming Language :: Rust
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy

{slumber_python-5.2.0 → slumber_python-5.2.4}/crates/template/src/lib.rs

@@ -240,29 +240,25 @@ impl Template {
         Ctx: Context<V>,
         V: RenderValue,
     {
-        {
-            // Map over each parsed chunk, and render the expressions into
-            // values. because raw text uses Arc and expressions
-            // just contain metadata The raw text chunks will be
-            // mapped 1:1. This clone is pretty cheap
-            let futures = self.chunks.iter().map(|chunk| async move {
-                match chunk {
-                    TemplateChunk::Raw(text) => {
-                        RenderedChunk::Raw(Arc::clone(text))
-                    }
-                    TemplateChunk::Expression(expression) => {
-                        match expression.render(context).await {
-                            Ok(value) => RenderedChunk::Dynamic(value),
-                            Err(error) => RenderedChunk::Error(error),
-                        }
+        // Map over each parsed chunk, and render the expressions into values.
+        // The raw text chunks will be mapped 1:1
+        let futures = self.chunks.iter().map(|chunk| async move {
+            match chunk {
+                TemplateChunk::Raw(text) => {
+                    RenderedChunk::Raw(Arc::clone(text))
+                }
+                TemplateChunk::Expression(expression) => {
+                    match expression.render(context).await {
+                        Ok(value) => RenderedChunk::Dynamic(value),
+                        Err(error) => RenderedChunk::Error(error),
                     }
                 }
-            });
+            }
+        });
 
-            // Concurrency!
-            let chunks = future::join_all(futures).await;
-            RenderedChunks(chunks)
-        }
+        // Concurrency!
+        let chunks = future::join_all(futures).await;
+        RenderedChunks(chunks)
     }
 }
 

{slumber_python-5.2.0 → slumber_python-5.2.4}/crates/util/Cargo.toml

@@ -14,6 +14,7 @@ version = {workspace = true}
 tag = false
 
 [dependencies]
+console-subscriber = {version = "0.5.0", default-features = false, optional = true}
 derive_more = {workspace = true, features = ["deref", "display", "from"]}
 dirs = {workspace = true}
 indexmap = {workspace = true}
@@ -25,7 +26,7 @@ serde = {workspace = true}
 serde_yaml = {workspace = true}
 thiserror = {workspace = true}
 tracing = {workspace = true}
-tracing-subscriber = {workspace = true, optional = true}
+tracing-subscriber = {version = "0.3.17", default-features = false, features = ["ansi", "fmt", "registry"]}
 uuid = {workspace = true, features = ["v4"]}
 winnow = {workspace = true}
 
@@ -34,11 +35,12 @@ env-lock = {workspace = true}
 pretty_assertions = {workspace = true}
 rstest = {workspace = true}
 serde = {workspace = true, features = ["derive"]}
-tracing-subscriber = {workspace = true}
 uuid = {workspace = true, features = ["v4"]}
 
 [features]
-test = ["dep:rstest", "dep:tracing-subscriber"]
+test = ["dep:rstest"]
+# Enable tokio-console tracing
+tokio_tracing = ["dep:console-subscriber"]
 
 [lints]
 workspace = true

{slumber_python-5.2.0 → slumber_python-5.2.4}/crates/util/src/lib.rs

@@ -22,11 +22,16 @@ use serde::{
 use std::{
     error::Error,
     fmt::{self, Debug, Display},
+    fs::{File, OpenOptions},
+    io,
     ops::Deref,
     str::FromStr,
     time::Duration,
 };
-use tracing::error;
+use tracing::{error, level_filters::LevelFilter};
+use tracing_subscriber::{
+    Layer, fmt::format::FmtSpan, layer::SubscriberExt, util::SubscriberInitExt,
+};
 use winnow::{
     ModalResult, Parser,
     ascii::digit1,
@@ -294,6 +299,74 @@ impl Display for DurationUnit {
     }
 }
 
+/// Set up tracing to a log file, and optionally stderr as well. If there's
+/// an error creating the log file, we'll skip that part. This means in the TUI
+/// the error (and all other tracing) will never be visible, but that's a
+/// problem for another day.
+pub fn initialize_tracing(level_filter: LevelFilter, has_stderr: bool) {
+    /// Create a new log file in a temporary directory. Each file gets a unique
+    /// name so this won't clobber any old files.
+    fn initialize_log_file() -> io::Result<File> {
+        let path = paths::log_file();
+        paths::create_parent(&path)?;
+        let log_file = OpenOptions::new()
+            .create(true)
+            .truncate(true)
+            .write(true)
+            .open(path)?;
+        Ok(log_file)
+    }
+
+    // Failing to log shouldn't be a fatal crash, so just move on
+    let log_file = initialize_log_file().traced().ok();
+
+    let file_subscriber = log_file.map(|log_file| {
+        // Include PID
+        // https://github.com/tokio-rs/tracing/pull/2655
+        tracing_subscriber::fmt::layer()
+            .with_file(true)
+            .with_line_number(true)
+            .with_writer(log_file)
+            .with_target(false)
+            .with_ansi(false)
+            .with_span_events(FmtSpan::NONE)
+            // File output can't be lower than warn. There's no good reason to
+            // disable file output. If someone passes off/error, they probably
+            // just want to set the stderr level.
+            .with_filter(level_filter.max(LevelFilter::WARN))
+    });
+
+    // Enable console output for CLI. By default logging is off, but it can be
+    // turned up with the verbose flag
+    let stderr_subscriber = tracing_subscriber::fmt::layer()
+        .with_writer(io::stderr)
+        .with_target(false)
+        .with_span_events(FmtSpan::NONE)
+        .without_time()
+        // Disable stderr for TUI mode
+        .with_filter(if has_stderr {
+            level_filter
+        } else {
+            LevelFilter::OFF
+        });
+
+    #[cfg(feature = "tokio_tracing")]
+    {
+        tracing_subscriber::registry()
+            .with(file_subscriber)
+            .with(stderr_subscriber)
+            .with(console_subscriber::spawn())
+            .init();
+    }
+    #[cfg(not(feature = "tokio_tracing"))]
+    {
+        tracing_subscriber::registry()
+            .with(file_subscriber)
+            .with(stderr_subscriber)
+            .init();
+    }
+}
+
 /// Serialize a list of tuples as a mapping
 ///
 /// This is used in a few spots where data is stored internally as `Vec<(K, V)>`

{slumber_python-5.2.0 → slumber_python-5.2.4}/crates/util/src/test_util.rs

@@ -164,16 +164,16 @@ pub fn assert_result<TA, TE, E>(
 ///
 /// Call this in a test to enable logging.
 #[deprecated(note = "Debugging only; remove when done")]
-pub fn initialize_tracing() {
+pub fn initialize_test_tracing() {
     #[expect(deprecated)]
-    initialize_tracing_with(LevelFilter::TRACE);
+    initialize_test_tracing_with(LevelFilter::TRACE);
 }
 
 /// Enable tracing output with a specific level filter
 ///
 /// Call this in a test to enable logging.
 #[deprecated(note = "Debugging only; remove when done")]
-pub fn initialize_tracing_with(level: LevelFilter) {
+pub fn initialize_test_tracing_with(level: LevelFilter) {
     let subscriber = tracing_subscriber::fmt::layer()
         .with_writer(io::stderr)
         .with_target(true)