feat: add kxio printer to context

src/api_result.rs

@@ -1,5 +1,5 @@
 //
-use kxio::net::Response;
+use kxio::{net::Response, print::Printer};
 
 use crate::{e, s};
 
@@ -9,7 +9,7 @@ pub struct APIResult<T> {
 }
 
 impl<T: for<'a> serde::Deserialize<'a>> APIResult<T> {
-    pub async fn new(response: kxio::net::Result<Response>) -> Self {
+    pub async fn new(response: kxio::net::Result<Response>, prt: &Printer) -> Self {
         match response {
             Ok(response) => {
                 let text = response.text().await.unwrap_or_default();
@@ -17,7 +17,7 @@ impl<T: for<'a> serde::Deserialize<'a>> APIResult<T> {
                 let result = serde_json::from_str::<T>(&text)
                     .map_err(|e| e.to_string())
                     .map_err(|e| {
-                        e!("{e}: {text}");
+                        e!(prt, "{e}: {text}");
                         e
                     })
                     .map_err(kxio::net::Error::from);

src/init.rs

@@ -14,6 +14,7 @@ pub(crate) fn run(ctx: &Ctx) -> Result<()> {
     } else {
         file.write(include_str!("default-config.toml"))?;
         p!(
+            ctx.prt,
             "{}",
             template::expand(
                 include_str!("post-init-instructions.txt"),

src/lib.rs

@@ -4,7 +4,7 @@ use std::path::PathBuf;
 use clap::Parser;
 use color_eyre::eyre::eyre;
 pub use config::AppConfig;
-use kxio::{fs::FileSystem, net::Net};
+use kxio::{fs::FileSystem, net::Net, print::Printer};
 
 mod api_result;
 mod config;
@@ -19,6 +19,9 @@ mod tests;
 
 pub const NAME: &str = "trello-to-deck";
 
+pub use kxio::kxeprintln as e;
+pub use kxio::kxprintln as p;
+
 #[derive(Parser, Debug)]
 #[clap(version = clap::crate_version!(), author = clap::crate_authors!(), about = clap::crate_description!())]
 struct Commands {
@@ -36,12 +39,14 @@ enum Command {
 pub struct Ctx {
     pub fs: FileSystem,
     pub net: Net,
+    pub prt: Printer,
 }
 impl Default for Ctx {
     fn default() -> Self {
         Self {
             fs: kxio::fs::new(PathBuf::default()),
             net: kxio::net::new(),
+            prt: kxio::print::standard(),
         }
     }
 }
@@ -50,6 +55,7 @@ impl Default for Ctx {
 pub struct FullCtx {
     pub fs: FileSystem,
     pub net: Net,
+    pub prt: Printer,
     pub cfg: AppConfig,
 }
 
@@ -71,6 +77,7 @@ pub async fn run(ctx: Ctx) -> color_eyre::Result<()> {
             let _ctx = FullCtx {
                 fs: ctx.fs,
                 net: ctx.net,
+                prt: ctx.prt,
                 cfg,
             };
             match commands.command {

src/macros/print.rs

@@ -1,14 +1,14 @@
 //
-#[macro_export]
+// #[macro_export]
-macro_rules! p {
+// macro_rules! p {
-    ($($arg:tt)*) => {{
+//     ($printer:expr, $($arg:tt)*) => {{
-        println!($($arg)*);
+//         kxio::kxprintln!($printer, $($arg)*);
-    }};
+//     }};
-}
+// }
 
-#[macro_export]
+// #[macro_export]
-macro_rules! e {
+// macro_rules! e {
-    ($($arg:tt)*) => {{
+//     ($printer:expr, $($arg:tt)*) => {{
-        eprintln!($($arg)*);
+//         kxio::kxeprintln!($($arg)*);
-    }};
+//     }};
-}
+// }

src/main.rs

@@ -1,6 +1,4 @@
 //
-use std::path::PathBuf;
-
 use color_eyre::Result;
 
 use trello_to_deck::{run, Ctx};
@@ -8,9 +6,5 @@ use trello_to_deck::{run, Ctx};
 #[tokio::main]
 #[cfg_attr(test, mutants::skip)]
 async fn main() -> Result<()> {
-    run(Ctx {
+    run(Ctx::default()).await
-        fs: kxio::fs::new(PathBuf::default()),
-        net: kxio::net::new(),
-    })
-    .await
 }

src/nextcloud/mod.rs

@@ -1,5 +1,6 @@
 //
 use kxio::net::Net;
+use kxio::print::Printer;
 
 use crate::api_result::APIResult;
 use crate::{config::NextcloudConfig, f};
@@ -14,15 +15,17 @@ mod tests;
 
 pub struct DeckClient<'cfg> {
     net: Net,
+    prt: Printer,
     hostname: &'cfg NextcloudHostname,
     username: &'cfg NextcloudUsername,
     password: &'cfg NextcloudPassword,
 }
 
 impl<'cfg> DeckClient<'cfg> {
-    pub fn new(cfg: &'cfg NextcloudConfig, net: Net) -> Self {
+    pub fn new(cfg: &'cfg NextcloudConfig, net: Net, prt: Printer) -> Self {
         Self {
             net,
+            prt,
             hostname: &cfg.hostname,
             username: &cfg.username,
             password: &cfg.password,
@@ -45,6 +48,7 @@ impl<'cfg> DeckClient<'cfg> {
                 .header("accept", "application/json")
                 .send()
                 .await,
+            &self.prt,
         )
         .await
     }
@@ -57,6 +61,7 @@ impl<'cfg> DeckClient<'cfg> {
                 .header("accept", "application/json")
                 .send()
                 .await,
+            &self.prt,
         )
         .await
     }
@@ -76,6 +81,7 @@ impl<'cfg> DeckClient<'cfg> {
                 )
                 .send()
                 .await,
+            &self.prt,
         )
         .await
     }
@@ -88,6 +94,7 @@ impl<'cfg> DeckClient<'cfg> {
                 .header("accept", "application/json")
                 .send()
                 .await,
+            &self.prt,
         )
         .await
     }
@@ -120,6 +127,7 @@ impl<'cfg> DeckClient<'cfg> {
                 .body(json.to_string())
                 .send()
                 .await,
+            &self.prt,
         )
         .await
     }

src/nextcloud/tests.rs

@@ -148,7 +148,7 @@ mod client {
             .expect("mock request");
 
         let cfg = given::a_nextcloud_config();
-        let deck_client = DeckClient::new(&cfg, mock_net.into());
+        let deck_client = DeckClient::new(&cfg, mock_net.into(), given::a_printer());
 
         //when
         let result = deck_client.get_boards().await.result.expect("get boards");
@@ -190,7 +190,7 @@ mod client {
             .expect("mock request");
 
         let cfg = given::a_nextcloud_config();
-        let deck_client = DeckClient::new(&cfg, mock_net.into());
+        let deck_client = DeckClient::new(&cfg, mock_net.into(), given::a_printer());
 
         //when
         let result = deck_client
@@ -229,6 +229,8 @@ mod client {
 }
 
 mod given {
+    use kxio::print::Printer;
+
     use super::*;
 
     pub fn a_nextcloud_config() -> NextcloudConfig {
@@ -243,4 +245,8 @@ mod given {
             board_id,
         }
     }
+
+    pub fn a_printer() -> Printer {
+        kxio::print::test()
+    }
 }

src/tests/mod.rs

@@ -17,7 +17,7 @@ mod init {
     fn when_file_does_not_exist_should_create() {
         //given
         let fs = given::a_filesystem();
-        let ctx = given::a_context(fs.as_real(), given::a_network().into());
+        let ctx = given::a_context(fs.as_real(), given::a_network().into(), given::a_printer());
 
         //when
         let_assert!(Ok(_) = run(&ctx));
@@ -37,7 +37,7 @@ mod init {
         let file = fs.file(&path);
         file.write("").expect("create file");
 
-        let ctx = given::a_context(fs.as_real(), given::a_network().into());
+        let ctx = given::a_context(fs.as_real(), given::a_network().into(), given::a_printer());
         //when
         let_assert!(Err(err) = run(&ctx));
 
@@ -59,12 +59,13 @@ mod config {
             //given
             let fs = given::a_filesystem();
             let mock_net = given::a_network();
+            let prt = given::a_printer();
 
             let file = fs.file(&fs.base().join("trello-to-deck.toml"));
             file.write(include_str!("test-config.toml"))
                 .expect("write test config");
 
-            let ctx = given::a_context(fs.as_real(), mock_net.into());
+            let ctx = given::a_context(fs.as_real(), mock_net.into(), prt);
 
             //when
             let cfg = AppConfig::load(&ctx);
@@ -114,12 +115,13 @@ mod given {
     use kxio::{
         fs::{FileSystem, TempFileSystem},
         net::{MockNet, Net},
+        print::Printer,
     };
 
     use crate::Ctx;
 
-    pub fn a_context(fs: FileSystem, net: Net) -> Ctx {
+    pub fn a_context(fs: FileSystem, net: Net, prt: Printer) -> Ctx {
-        Ctx { fs, net }
+        Ctx { fs, net, prt }
     }
 
     pub fn a_filesystem() -> TempFileSystem {
@@ -129,4 +131,8 @@ mod given {
     pub fn a_network() -> MockNet {
         kxio::net::mock()
     }
+
+    pub fn a_printer() -> Printer {
+        kxio::print::test()
+    }
 }

src/trello/api/members.rs

@@ -1,5 +1,5 @@
 //
-use kxio::net::Net;
+use kxio::{net::Net, print::Printer};
 
 use crate::api_result::APIResult;
 use crate::{
@@ -42,6 +42,7 @@ use crate::{
 pub async fn get_boards_that_member_belongs_to(
     auth: &TrelloAuth,
     net: &Net,
+    prt: &Printer,
 ) -> APIResult<Vec<TrelloBoard>> {
     APIResult::new(
         net.get(url(f!("/members/{}/boards?lists=open", **auth.user())))
@@ -49,6 +50,7 @@ pub async fn get_boards_that_member_belongs_to(
             .header("Accept", "application/json")
             .send()
             .await,
+        prt,
     )
     .await
 }

src/trello/api/tests/given.rs

@@ -1,5 +1,5 @@
 //
-use kxio::net::MockNet;
+use kxio::{net::MockNet, print::Printer};
 
 use crate::trello::types::auth::{TrelloApiKey, TrelloApiSecret, TrelloAuth, TrelloUser};
 
@@ -7,6 +7,10 @@ pub(crate) fn a_network() -> MockNet {
     kxio::net::mock()
 }
 
+pub(crate) fn a_printer() -> Printer {
+    kxio::print::test()
+}
+
 pub(crate) fn an_auth() -> TrelloAuth {
     TrelloAuth::new(
         TrelloApiKey::new("foo"),

src/trello/api/tests/mod.rs

@@ -26,6 +26,7 @@ mod members {
      async fn get_member_boards() -> TestResult {
          //given
          let net = given::a_network();
+         let prt = given::a_printer();
          let auth = given::an_auth();
  
          net.on()
@@ -43,7 +44,7 @@ mod members {
              ])))?;
  
          //when
-        let result = get_boards_that_member_belongs_to(&auth, &net.into())
+        let result = get_boards_that_member_belongs_to(&auth, &net.into(), &prt)
             .await
             .result?;