Fix flags (#12)

* Improve tests * Update changelog * Update version * Fix flags * Fix test * Fix test
quambene · May 2, 2024 · 1f7aa4c · 1f7aa4c
1 parent 2af8ba8
commit 1f7aa4c
Show file tree

Hide file tree

Showing 18 changed files with 169 additions and 130 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,11 @@
 - changed
 - removed
 
+### v0.4.2 (2024-05-03)
+
+- changed
+  - Fix flags
+
 ### v0.4.1 (2024-04-06)
 
 - added

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pigeon-rs"
-version = "0.4.1"
+version = "0.4.2"
 authors = ["quambene <[email protected]>"]
 description = "Command line tool for cheap and efficient email automation"
 edition = "2021"

diff --git a/src/cmd/connect.rs b/src/cmd/connect.rs
@@ -8,7 +8,7 @@ use anyhow::{anyhow, Result};
 use clap::ArgMatches;
 
 pub fn connect(matches: &ArgMatches) -> Result<(), anyhow::Error> {
-    if matches.contains_id(arg::VERBOSE) {
+    if matches.get_flag(arg::VERBOSE) {
         println!("matches: {:#?}", matches);
     }
 

diff --git a/src/cmd/init.rs b/src/cmd/init.rs
@@ -4,7 +4,7 @@ use clap::ArgMatches;
 use std::{env, io};
 
 pub fn init(matches: &ArgMatches) -> Result<(), anyhow::Error> {
-    if matches.contains_id(arg::VERBOSE) {
+    if matches.get_flag(arg::VERBOSE) {
         println!("matches: {:#?}", matches);
     }
 

diff --git a/src/cmd/query.rs b/src/cmd/query.rs
@@ -8,7 +8,7 @@ use clap::ArgMatches;
 use std::path::Path;
 
 pub fn query(matches: &ArgMatches) -> Result<(), anyhow::Error> {
-    if matches.contains_id(arg::VERBOSE) {
+    if matches.get_flag(arg::VERBOSE) {
         println!("matches: {:#?}", matches);
     }
 
@@ -23,11 +23,11 @@ pub fn query(matches: &ArgMatches) -> Result<(), anyhow::Error> {
                 let connection = DbConnection::new(&conn_vars, ssh_tunnel)?;
                 let mut df_query = sources::query_postgres(&connection, query)?;
 
-                if matches.contains_id(arg::DISPLAY) {
+                if matches.get_flag(arg::DISPLAY) {
                     println!("Display query result: {}", df_query);
                 }
 
-                if matches.contains_id(arg::SAVE) {
+                if matches.get_flag(arg::SAVE) {
                     let save_dir = Path::new(arg::value(arg::SAVE_DIR, matches)?);
 
                     // If argument 'FILE_TYPE' is not present the default value 'csv' will be used

diff --git a/src/cmd/read.rs b/src/cmd/read.rs
@@ -4,7 +4,7 @@ use clap::ArgMatches;
 use std::path::PathBuf;
 
 pub fn read(matches: &ArgMatches) -> Result<(), anyhow::Error> {
-    if matches.contains_id(arg::VERBOSE) {
+    if matches.get_flag(arg::VERBOSE) {
         println!("matches: {:#?}", matches);
     }
 
@@ -14,7 +14,7 @@ pub fn read(matches: &ArgMatches) -> Result<(), anyhow::Error> {
                 let path = PathBuf::from(csv_file);
                 let csv = sources::read_csv(&path)?;
 
-                if matches.contains_id(arg::DISPLAY) {
+                if matches.get_flag(arg::DISPLAY) {
                     println!("Display csv file: {}", csv);
                 }
 

diff --git a/src/cmd/send.rs b/src/cmd/send.rs
@@ -11,13 +11,13 @@ use clap::ArgMatches;
 use std::{io, path::Path, time::SystemTime};
 
 pub fn send(matches: &ArgMatches) -> Result<(), anyhow::Error> {
-    if matches.contains_id(arg::VERBOSE) {
+    if matches.get_flag(arg::VERBOSE) {
         println!("matches: {:#?}", matches);
     }
 
     let now = SystemTime::now();
-    let dry_run = matches.contains_id(arg::DRY_RUN);
-    let is_archived = matches.contains_id(arg::ARCHIVE);
+    let dry_run = matches.get_flag(arg::DRY_RUN);
+    let is_archived = matches.get_flag(arg::ARCHIVE);
     let archive_dir = Path::new(arg::value(arg::ARCHIVE_DIR, matches)?);
     let sender = Sender(arg::value(arg::SENDER, matches)?);
     let receiver = Receiver(arg::value(arg::RECEIVER, matches)?);
@@ -26,7 +26,7 @@ pub fn send(matches: &ArgMatches) -> Result<(), anyhow::Error> {
     let mime_format = MimeFormat::new(sender, receiver, &message, attachment, now)?;
     let email = Email::new(sender, receiver, &message, &mime_format)?;
 
-    if matches.contains_id(arg::DISPLAY) {
+    if matches.get_flag(arg::DISPLAY) {
         println!("Display email: {:#?}", email);
     }
 
@@ -40,7 +40,7 @@ pub fn send(matches: &ArgMatches) -> Result<(), anyhow::Error> {
 
     println!("Sending email to 1 receiver ...");
 
-    if matches.contains_id(arg::ASSUME_YES) {
+    if matches.get_flag(arg::ASSUME_YES) {
         let sent_email = client.send(&email)?;
         sent_email.display_status();
 
@@ -62,7 +62,7 @@ pub fn send(matches: &ArgMatches) -> Result<(), anyhow::Error> {
         }
     }
 
-    if matches.contains_id(arg::DRY_RUN) {
+    if matches.get_flag(arg::DRY_RUN) {
         println!("Email sent (dry run)");
     } else {
         println!("Email sent");

diff --git a/src/cmd/send_bulk.rs b/src/cmd/send_bulk.rs
@@ -11,12 +11,12 @@ use clap::ArgMatches;
 use std::{io, path::Path};
 
 pub fn send_bulk(matches: &ArgMatches) -> Result<(), anyhow::Error> {
-    if matches.contains_id(arg::VERBOSE) {
+    if matches.get_flag(arg::VERBOSE) {
         println!("matches: {:#?}", matches);
     }
 
-    let dry_run = matches.contains_id(arg::DRY_RUN);
-    let is_archived = matches.contains_id(arg::ARCHIVE);
+    let dry_run = matches.get_flag(arg::DRY_RUN);
+    let is_archived = matches.get_flag(arg::ARCHIVE);
     let archive_dir = Path::new(arg::value(arg::ARCHIVE_DIR, matches)?);
     let sender = Sender(arg::value(arg::SENDER, matches)?);
     let receivers = BulkReceiver::from_args(matches)?;
@@ -44,15 +44,15 @@ pub fn send_bulk(matches: &ArgMatches) -> Result<(), anyhow::Error> {
     let client = Client::from_args(matches)?;
     let eml_formatter = EmlFormatter::new(archive_dir)?;
 
-    if matches.contains_id(arg::DISPLAY) {
+    if matches.get_flag(arg::DISPLAY) {
         println!("Display emails: {:#?}", bulk_email);
     }
 
     if dry_run {
         println!("Dry run: {}", format_green("activated"));
     }
 
-    if matches.contains_id(arg::ASSUME_YES) {
+    if matches.get_flag(arg::ASSUME_YES) {
         process_emails(
             &client,
             &eml_formatter,

diff --git a/src/cmd/simple_query.rs b/src/cmd/simple_query.rs
@@ -4,7 +4,7 @@ use clap::ArgMatches;
 use postgres::{Client, NoTls, SimpleQueryMessage};
 
 pub fn simple_query(matches: &ArgMatches) -> Result<(), anyhow::Error> {
-    if matches.contains_id(arg::VERBOSE) {
+    if matches.get_flag(arg::VERBOSE) {
         println!("matches: {:#?}", matches);
     }
 

diff --git a/src/email_builder/message.rs b/src/email_builder/message.rs
@@ -63,7 +63,7 @@ impl Message {
             let message_path = Path::new(message_file);
             let message = Message::read_yaml(message_path)?;
 
-            if matches.contains_id(arg::DISPLAY) {
+            if matches.get_flag(arg::DISPLAY) {
                 println!("Display message file: {:#?}", message);
             }
 

diff --git a/src/email_builder/receiver.rs b/src/email_builder/receiver.rs
@@ -46,7 +46,7 @@ impl BulkReceiver {
                 let connection = DbConnection::new(&conn_vars, ssh_tunnel)?;
                 let df_receiver = sources::query_postgres(&connection, query)?;
 
-                if matches.contains_id(arg::DISPLAY) {
+                if matches.get_flag(arg::DISPLAY) {
                     println!("Display query result: {}", df_receiver);
                 }
 
@@ -58,7 +58,7 @@ impl BulkReceiver {
             (None, Some(path)) => {
                 let df_receiver = sources::read_csv(path)?;
 
-                if matches.contains_id(arg::DISPLAY) {
+                if matches.get_flag(arg::DISPLAY) {
                     println!("Display csv file: {}", df_receiver);
                 }
 

diff --git a/src/email_provider/aws.rs b/src/email_provider/aws.rs
@@ -29,7 +29,7 @@ impl AwsSesClient {
         let region_name = region.name().to_string();
 
         // Check if AWS access keys are set in environment
-        if matches.contains_id(arg::DRY_RUN) {
+        if matches.get_flag(arg::DRY_RUN) {
             AwsSesClient::get_credentials(&provider).context(
                 "Missing environment variable 'AWS_ACCESS_KEY_ID' and/or 'AWS_SECRET_ACCESS_KEY'",
             )?;

diff --git a/src/email_transmission/client.rs b/src/email_transmission/client.rs
@@ -42,7 +42,7 @@ impl<'a> Client<'a> {
     }
 
     pub fn from_args(matches: &ArgMatches) -> Result<Self, anyhow::Error> {
-        if matches.contains_id(arg::DRY_RUN) {
+        if matches.get_flag(arg::DRY_RUN) {
             let client = MockClient;
             return Ok(Client::new(TransmissionType::Dry, Box::new(client)));
         }