Use the shared bitwarden-cli in bws

crates/bitwarden-cli/src/color.rs

@@ -17,6 +17,9 @@ impl Color {
     }
 }
 
+/**
+ * Conditionally install color_eyre. If colors are disabled we also disable error colors.
+ */
 pub fn install_color_eyre(color: Color) -> color_eyre::Result<(), color_eyre::Report> {
     if color.is_enabled() {
         color_eyre::install()

crates/bws/Cargo.toml

@@ -19,6 +19,7 @@ bat = { version = "0.24.0", features = [
     "regex-onig",
 ], default-features = false }
 bitwarden = { workspace = true, features = ["secrets"] }
+bitwarden-cli = { workspace = true }
 chrono = { version = "0.4.35", features = [
     "clock",
     "std",

crates/bws/src/main.rs

@@ -14,6 +14,7 @@ use bitwarden::{
         },
     },
 };
+use bitwarden_cli::{install_color_eyre, Color};
 use clap::{ArgGroup, CommandFactory, Parser, Subcommand};
 use clap_complete::Shell;
 use color_eyre::eyre::{bail, Result};
@@ -24,7 +25,7 @@ mod render;
 mod state;
 
 use config::ProfileKey;
-use render::{serialize_response, Color, Output};
+use render::{serialize_response, Output};
 use uuid::Uuid;
 
 #[derive(Parser, Debug)]
@@ -236,16 +237,9 @@ const SERVER_URL_KEY_VAR_NAME: &str = "BWS_SERVER_URL";
 #[allow(clippy::comparison_chain)]
 async fn process_commands() -> Result<()> {
     let cli = Cli::parse();
+    let color = cli.color;
 
-    let color = cli.color.is_enabled();
-    if color {
-        color_eyre::install()?;
-    } else {
-        // Use an empty theme to disable error coloring
-        color_eyre::config::HookBuilder::new()
-            .theme(color_eyre::config::Theme::new())
-            .install()?;
-    }
+    install_color_eyre(color)?;
 
     let Some(command) = cli.command else {
         let mut cmd = Cli::command();

crates/bws/src/render.rs

@@ -1,4 +1,5 @@
 use bitwarden::secrets_manager::{projects::ProjectResponse, secrets::SecretResponse};
+use bitwarden_cli::Color;
 use chrono::{DateTime, Utc};
 use clap::ValueEnum;
 use comfy_table::Table;
@@ -15,29 +16,12 @@ pub(crate) enum Output {
     None,
 }
 
-#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, ValueEnum, Debug)]
-pub(crate) enum Color {
-    No,
-    Yes,
-    Auto,
-}
-
-impl Color {
-    pub(crate) fn is_enabled(self) -> bool {
-        match self {
-            Color::No => false,
-            Color::Yes => true,
-            Color::Auto => supports_color::on(supports_color::Stream::Stdout).is_some(),
-        }
-    }
-}
-
 const ASCII_HEADER_ONLY: &str = "     --            ";
 
 pub(crate) fn serialize_response<T: Serialize + TableSerialize<N>, const N: usize>(
     data: T,
     output: Output,
-    color: bool,
+    color: Color,
 ) {
     match output {
         Output::JSON => {
@@ -101,8 +85,8 @@ pub(crate) fn serialize_response<T: Serialize + TableSerialize<N>, const N: usiz
     }
 }
 
-fn pretty_print(language: &str, data: &str, color: bool) {
-    if color {
+fn pretty_print(language: &str, data: &str, color: Color) {
+    if color.is_enabled() {
         bat::PrettyPrinter::new()
             .input_from_bytes(data.as_bytes())
             .language(language)