diff --git a/Cargo.lock b/Cargo.lock index c96f93f..45aeb77 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2,6 +2,15 @@ # It is not intended for manual editing. version = 3 +[[package]] +name = "aho-corasick" +version = "0.7.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" +dependencies = [ + "memchr", +] + [[package]] name = "autocfg" version = "1.1.0" @@ -88,12 +97,30 @@ dependencies = [ "winapi", ] +[[package]] +name = "difflib" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8" + +[[package]] +name = "downcast" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1435fa1053d8b2fbbe9be7e97eca7f33d37b28409959813daefc1446a14247f1" + [[package]] name = "dyn-clone" version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68b0cf012f1230e43cd00ebb729c6bb58707ecfa8ad08b52ef3a4ccd2697fc30" +[[package]] +name = "either" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" + [[package]] name = "errno" version = "0.2.8" @@ -115,12 +142,28 @@ dependencies = [ "libc", ] +[[package]] +name = "float-cmp" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" +dependencies = [ + "num-traits", +] + +[[package]] +name = "fragile" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" + [[package]] name = "git-mob" version = "0.1.0" dependencies = [ "clap", "inquire", + "mockall", ] [[package]] @@ -173,6 +216,15 @@ dependencies = [ "windows-sys", ] +[[package]] +name = "itertools" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +dependencies = [ + "either", +] + [[package]] name = "lazy_static" version = "1.4.0" @@ -210,6 +262,12 @@ dependencies = [ "cfg-if", ] +[[package]] +name = "memchr" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" + [[package]] name = "mio" version = "0.8.6" @@ -222,6 +280,33 @@ dependencies = [ "windows-sys", ] +[[package]] +name = "mockall" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50e4a1c770583dac7ab5e2f6c139153b783a53a1bbee9729613f193e59828326" +dependencies = [ + "cfg-if", + "downcast", + "fragile", + "lazy_static", + "mockall_derive", + "predicates", + "predicates-tree", +] + +[[package]] +name = "mockall_derive" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "832663583d5fa284ca8810bf7015e46c9fff9622d3cf34bd1eea5003fec06dd0" +dependencies = [ + "cfg-if", + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "newline-converter" version = "0.2.2" @@ -231,6 +316,21 @@ dependencies = [ "unicode-segmentation", ] +[[package]] +name = "normalize-line-endings" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" + +[[package]] +name = "num-traits" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +dependencies = [ + "autocfg", +] + [[package]] name = "once_cell" version = "1.17.1" @@ -266,6 +366,36 @@ dependencies = [ "windows-sys", ] +[[package]] +name = "predicates" +version = "2.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59230a63c37f3e18569bdb90e4a89cbf5bf8b06fea0b84e65ea10cc4df47addd" +dependencies = [ + "difflib", + "float-cmp", + "itertools", + "normalize-line-endings", + "predicates-core", + "regex", +] + +[[package]] +name = "predicates-core" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72f883590242d3c6fc5bf50299011695fa6590c2c70eac95ee1bdb9a733ad1a2" + +[[package]] +name = "predicates-tree" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54ff541861505aabf6ea722d2131ee980b8276e10a1297b94e896dd8b621850d" +dependencies = [ + "predicates-core", + "termtree", +] + [[package]] name = "proc-macro-error" version = "1.0.4" @@ -317,6 +447,23 @@ dependencies = [ "bitflags", ] +[[package]] +name = "regex" +version = "1.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.6.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" + [[package]] name = "rustix" version = "0.36.8" @@ -399,6 +546,12 @@ dependencies = [ "winapi-util", ] +[[package]] +name = "termtree" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95059e91184749cb66be6dc994f67f182b6d897cb3df74a5bf66b5e709295fd8" + [[package]] name = "thiserror" version = "1.0.38" diff --git a/Cargo.toml b/Cargo.toml index a72b941..37c4a7f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,3 +10,6 @@ description = "A CLI app which can help users automatically add co-author(s) to [dependencies] clap = { version = "4.1.8", features = ["derive"] } inquire = "0.6.0" + +[dev-dependencies] +mockall = "0.11.3" diff --git a/src/coauthor_repo.rs b/src/coauthor_repo.rs index 0db77b7..faf09d9 100644 --- a/src/coauthor_repo.rs +++ b/src/coauthor_repo.rs @@ -1,5 +1,8 @@ use std::process::Command; +#[cfg(test)] +use mockall::{automock, predicate::*}; +#[cfg_attr(test, automock)] pub trait CoauthorRepo { fn list(&self) -> Vec; fn get(&self, key: &str) -> String; diff --git a/src/commands/mob.rs b/src/commands/mob.rs index 044daad..bcf195f 100644 --- a/src/commands/mob.rs +++ b/src/commands/mob.rs @@ -8,10 +8,21 @@ pub struct Mob { /// Sets active co-author(s) for pair/mob programming #[arg(short='w', long="with", num_args=0.., value_name="COAUTHOR_KEY")] with: Option>, + /// Clears mob/pair programming session. Going solo! + #[arg(short = 'c', long = "clear")] + clear: bool, } impl Mob { pub fn handle(&self, coauthor_repo: &dyn CoauthorRepo) { + if self.clear { + coauthor_repo.deactivate_all(); + } + + if self.with.is_none() { + return; + } + let coauthor_keys = self.with.as_ref().unwrap(); match coauthor_keys.len() { @@ -51,3 +62,25 @@ impl Mob { } } } + +#[cfg(test)] +mod tests { + use super::*; + use crate::coauthor_repo::MockCoauthorRepo; + + #[test] + fn test_clear_deactivates_all_coauthors() { + let mut mock_coauthor_repo = MockCoauthorRepo::new(); + mock_coauthor_repo + .expect_deactivate_all() + .once() + .return_const({}); + + let mob = Mob { + with: None, + clear: true, + }; + + mob.handle(&mock_coauthor_repo); + } +}