From 1a79f9e051ccee77bdbcc7985d447e5d9d696727 Mon Sep 17 00:00:00 2001 From: Bauke Date: Fri, 4 Nov 2022 18:09:15 +0100 Subject: [PATCH] Refactor subcommands into their own functions. --- hooked-cli/source/cli/install.rs | 45 +++++++++++++++++++++++ hooked-cli/source/cli/mod.rs | 4 +++ hooked-cli/source/cli/uninstall.rs | 40 +++++++++++++++++++++ hooked-cli/source/main.rs | 58 ++---------------------------- 4 files changed, 92 insertions(+), 55 deletions(-) create mode 100644 hooked-cli/source/cli/install.rs create mode 100644 hooked-cli/source/cli/uninstall.rs diff --git a/hooked-cli/source/cli/install.rs b/hooked-cli/source/cli/install.rs new file mode 100644 index 0000000..0b9ac89 --- /dev/null +++ b/hooked-cli/source/cli/install.rs @@ -0,0 +1,45 @@ +//! The `install` subcommand. +use std::{ + fs::{set_permissions, write, Permissions}, + os::unix::fs::PermissionsExt, + path::PathBuf, +}; + +use { + color_eyre::{eyre::eyre, Result}, + hooked_config::Config, + tera::{Context, Tera}, +}; + +use crate::{cli::InstallArgs, DEFAULT_TEMPLATE, HOOK_TYPES}; + +/// The `install` subcommand. +pub fn hooked_install(config: Config, args: InstallArgs) -> Result<()> { + let git_hooks_dir = PathBuf::from(".git/hooks/"); + if !git_hooks_dir.exists() { + return Err(eyre!("The \".git/hooks/\" directory does not exist")); + } + + for hook_type in HOOK_TYPES { + let mut context = Context::new(); + context.insert("config_path", &config.general.config); + context.insert("hook_type", hook_type); + + let hook_path = git_hooks_dir.join(hook_type); + if hook_path.exists() && !args.overwrite { + println!( + "{:?} exists, use --overwrite to replace the existing file", + hook_path + ); + continue; + } + + write( + &hook_path, + Tera::one_off(DEFAULT_TEMPLATE, &context, false)?, + )?; + set_permissions(hook_path, Permissions::from_mode(0o775))?; + } + + Ok(()) +} diff --git a/hooked-cli/source/cli/mod.rs b/hooked-cli/source/cli/mod.rs index 9dae1c4..6061b78 100644 --- a/hooked-cli/source/cli/mod.rs +++ b/hooked-cli/source/cli/mod.rs @@ -4,9 +4,13 @@ use std::path::PathBuf; use clap::{Args as Arguments, Parser, Subcommand}; +mod install; mod run; +mod uninstall; +pub use install::hooked_install; pub use run::hooked_run; +pub use uninstall::hooked_uninstall; /// CLI arguments struct using [`clap::Parser`]. #[derive(Debug, Parser)] diff --git a/hooked-cli/source/cli/uninstall.rs b/hooked-cli/source/cli/uninstall.rs new file mode 100644 index 0000000..87ae5d2 --- /dev/null +++ b/hooked-cli/source/cli/uninstall.rs @@ -0,0 +1,40 @@ +//! The `uninstall` subcommand. + +use std::{ + fs::{read_to_string, remove_file}, + path::PathBuf, +}; + +use { + color_eyre::{eyre::eyre, Result}, + hooked_config::Config, +}; + +use crate::{cli::UninstallArgs, HOOK_TYPES}; + +/// The `uninstall` subcommand. +pub fn hooked_uninstall(_config: Config, args: UninstallArgs) -> Result<()> { + let git_hooks_dir = PathBuf::from(".git/hooks/"); + if !git_hooks_dir.exists() { + return Err(eyre!("The \".git/hooks/\" directory does not exist")); + } + + for hook_type in HOOK_TYPES { + let hook_path = git_hooks_dir.join(hook_type); + if !hook_path.exists() { + continue; + } + + let hook_contents = read_to_string(&hook_path)?; + if args.all || hook_contents.contains("# Installed by Hooked.") { + remove_file(hook_path)?; + } else { + println!( + "{:?} wasn't installed by Hooked, use --all to remove it", + hook_path + ); + } + } + + Ok(()) +} diff --git a/hooked-cli/source/main.rs b/hooked-cli/source/main.rs index 7b4d4e0..d0a767c 100644 --- a/hooked-cli/source/main.rs +++ b/hooked-cli/source/main.rs @@ -5,17 +5,10 @@ #![forbid(unsafe_code)] #![warn(missing_docs, clippy::missing_docs_in_private_items)] -use std::{ - fs::{read_to_string, remove_file, set_permissions, write, Permissions}, - os::unix::fs::PermissionsExt, - path::PathBuf, -}; - use { clap::Parser, - color_eyre::{eyre::eyre, install, Result}, + color_eyre::{install, Result}, hooked_config::Config, - tera::{Context, Tera}, }; use crate::cli::{Args, MainSubcommands}; @@ -35,58 +28,13 @@ fn main() -> Result<()> { let args = Args::parse(); let config = Config::from_toml_file(args.config)?; - let git_hooks_dir = PathBuf::from(".git/hooks/"); - match args.command { MainSubcommands::Install(sub_args) => { - let overwrite = sub_args.overwrite; - if !git_hooks_dir.exists() { - return Err(eyre!("The \".git/hooks/\" directory does not exist")); - } - - for hook_type in HOOK_TYPES { - let mut context = Context::new(); - context.insert("config_path", &config.general.config); - context.insert("hook_type", hook_type); - - let hook_path = git_hooks_dir.join(hook_type); - if hook_path.exists() && !overwrite { - println!( - "{:?} exists, use --overwrite to replace the existing file", - hook_path - ); - continue; - } - - write( - &hook_path, - Tera::one_off(DEFAULT_TEMPLATE, &context, false)?, - )?; - set_permissions(hook_path, Permissions::from_mode(0o775))?; - } + cli::hooked_install(config, sub_args)?; } MainSubcommands::Uninstall(sub_args) => { - if !git_hooks_dir.exists() { - return Err(eyre!("The \".git/hooks/\" directory does not exist")); - } - - for hook_type in HOOK_TYPES { - let hook_path = git_hooks_dir.join(hook_type); - if !hook_path.exists() { - continue; - } - - let hook_contents = read_to_string(&hook_path)?; - if sub_args.all || hook_contents.contains("# Installed by Hooked.") { - remove_file(hook_path)?; - } else { - println!( - "{:?} wasn't installed by Hooked, use --all to remove it", - hook_path - ); - } - } + cli::hooked_uninstall(config, sub_args)?; } MainSubcommands::Run(sub_args) => {