feat: make factory lib

Cargo.toml

@@ -1,12 +1,14 @@
 [workspace]
 resolver = "2"
-members = ["aes", "cipher-core", "cli", "des"]
+members = ["aes", "cipher-core", "cipher-factory", "cli", "des"]
 
 [workspace.dependencies]
 aes = { path = "aes" }
 color-eyre = "0.6"
 cipher-core = { path = "cipher-core" }
+cipher-factory = { path = "cipher-factory" }
 claims = "0.8"
+clap = { version = "4.5", features = ["derive"] }
 des = { path = "des" }
 rand = "0.9"
 rstest = "0.26"

cipher-factory/Cargo.toml

@@ -0,0 +1,17 @@
+[package]
+name = "cipher-factory"
+version = "0.1.0"
+edition = "2024"
+
+[dependencies]
+aes.workspace = true
+cipher-core.workspace = true
+clap = { workspace = true, optional = true }
+des.workspace = true
+
+[features]
+default = []
+clap = ["dep:clap"]
+
+[lints]
+workspace = true

cipher-factory/src/algorithm.rs

@@ -0,0 +1,30 @@
+use cipher_core::{BlockCipher, InputBlock};
+use des::Des;
+use std::fmt::Display;
+
+#[cfg_attr(feature = "clap", derive(clap::ValueEnum))]
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum Algorithm {
+    Des,
+    Aes,
+}
+
+impl Algorithm {
+    #[must_use]
+    pub fn get_cipher(&self, key: &impl InputBlock) -> impl BlockCipher {
+        match self {
+            Self::Des => Des::from_key(key.as_bytes()),
+            Self::Aes => todo!("Must implement AES first"),
+        }
+    }
+}
+
+impl Display for Algorithm {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        let s = match self {
+            Self::Des => "Des",
+            Self::Aes => "Aes",
+        };
+        f.write_str(s)
+    }
+}

cipher-factory/src/lib.rs

@@ -0,0 +1,5 @@
+mod algorithm;
+mod operation;
+mod output;
+
+pub use {algorithm::Algorithm, operation::OperationChoice, output::OutputFormat};

cipher-factory/src/operation.rs

@@ -0,0 +1,6 @@
+#[cfg_attr(feature = "clap", derive(clap::ValueEnum))]
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum OperationChoice {
+    Encrypt,
+    Decrypt,
+}

cipher-factory/src/output.rs

@@ -0,0 +1,27 @@
+use cipher_core::Output;
+
+#[cfg_attr(feature = "clap", derive(clap::ValueEnum))]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Default)]
+pub enum OutputFormat {
+    /// Binary output
+    Binary,
+    /// Octal output
+    Octal,
+    /// Decimal output
+    #[default]
+    Hex,
+    /// Text output (ASCII)
+    Text,
+}
+
+impl OutputFormat {
+    #[must_use]
+    pub fn to_string(&self, value: &Output) -> String {
+        match self {
+            Self::Binary => format!("{value:064b}"),
+            Self::Octal => format!("{value:022o}"),
+            Self::Hex => format!("{value:016X}"),
+            Self::Text => format!("{value}"),
+        }
+    }
+}

cli/Cargo.toml

@@ -7,7 +7,8 @@ edition = "2024"
 [dependencies]
 aes.workspace = true
 cipher-core.workspace = true
-clap = { version = "4.5", features = ["derive"] }
+cipher-factory = { workspace = true, features = ["clap"] }
+clap.workspace = true
 color-eyre.workspace = true
 des.workspace = true
 thiserror.workspace = true

cli/src/args.rs

@@ -1,5 +1,5 @@
-use crate::output::OutputFormat;
+use cipher_factory::{Algorithm, OperationChoice, OutputFormat};
-use clap::{Parser, ValueEnum};
+use clap::Parser;
 use des::Block64;
 use std::str::FromStr;
 
@@ -12,7 +12,7 @@ pub struct Args {
 
     /// Encryption algorithm
     #[arg(short, long)]
-    pub algorithm: AlgorithmChoice,
+    pub algorithm: Algorithm,
 
     /// Key used for encryption/decryption. Can be a string or a path to a file
     #[arg(short, long, value_parser = Block64::from_str, required = true)]
@@ -26,15 +26,3 @@ pub struct Args {
     #[arg(short = 'f', long)]
     pub output_format: Option<OutputFormat>,
 }
-
-#[derive(Debug, Clone, Copy, ValueEnum)]
-pub enum AlgorithmChoice {
-    Des,
-    Aes,
-}
-
-#[derive(Debug, Clone, Copy, ValueEnum)]
-pub enum OperationChoice {
-    Encrypt,
-    Decrypt,
-}

cli/src/cipher.rs

@@ -1,13 +0,0 @@
-use crate::args::AlgorithmChoice;
-use cipher_core::{BlockCipher, InputBlock};
-use des::Des;
-
-impl AlgorithmChoice {
-    #[must_use]
-    pub fn get_cipher(&self, key: &impl InputBlock) -> impl BlockCipher {
-        match self {
-            Self::Des => Des::from_key(key.as_bytes()),
-            Self::Aes => todo!("Must implement AES first"),
-        }
-    }
-}

cli/src/main.rs

@@ -1,12 +1,8 @@
 mod args;
-mod cipher;
-mod output;
 
-use crate::{
+use crate::args::Args;
-    args::{Args, OperationChoice},
-    output::OutputFormat,
-};
 use cipher_core::BlockCipher;
+use cipher_factory::OperationChoice;
 use clap::Parser;
 
 fn main() -> color_eyre::Result<()> {
@@ -28,12 +24,8 @@ fn main() -> color_eyre::Result<()> {
         OperationChoice::Decrypt => {
             let cipher = algorithm.get_cipher(&key);
             let plaintext = cipher.decrypt(&text.to_be_bytes())?;
-            match output_format.unwrap_or_default() {
+            let output = output_format.unwrap_or_default().to_string(&plaintext);
-                OutputFormat::Binary => println!("{plaintext:064b}"),
+            println!("{output}");
-                OutputFormat::Octal => println!("{plaintext:022o}"),
-                OutputFormat::Hex => println!("{plaintext:016X}"),
-                OutputFormat::Text => println!("{plaintext}"),
-            }
         }
     }
     Ok(())

cli/src/output.rs

@@ -1,14 +0,0 @@
-use clap::ValueEnum;
-
-#[derive(Debug, Clone, Default, ValueEnum)]
-pub enum OutputFormat {
-    /// Binary output
-    Binary,
-    /// Octal output
-    Octal,
-    /// Decimal output
-    #[default]
-    Hex,
-    /// Text output (ASCII)
-    Text,
-}