grenade/cull-gmail
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🔧 fix: address clippy warnings and improve code formatting

Browse Source
This commit is contained in:
Jeremiah Russell
2025-10-21 12:24:47 +01:00
committed by Jeremiah Russell
parent 5f40af6c88
commit 8f79081b4f
3 changed files with 86 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/cli/init_cli.rs
View File

@@ -684,9 +684,8 @@ impl InitCli {
Operation::EnsureTokenDir { path, .. } => { Operation::EnsureTokenDir { path, .. } => {
log::info!("Ensuring token directory: {}", path.display()); log::info!("Ensuring token directory: {}", path.display());
fs::create_dir_all(path).map_err(|e| { fs::create_dir_all(path)
Error::FileIo(format!("Failed to create token directory: {e}")) .map_err(|e| Error::FileIo(format!("Failed to create token directory: {e}")))?;
})?;
#[cfg(unix)] #[cfg(unix)]
if let Some(mode) = operation.get_mode() { if let Some(mode) = operation.get_mode() {

49
src/cli/init_cli/tests.rs
View File

@@ -3,9 +3,9 @@
#[cfg(test)] #[cfg(test)]
mod unit_tests { mod unit_tests {
use super::super::*; use super::super::*;
use tempfile::TempDir;
use std::fs; use std::fs;
use std::path::Path; use std::path::Path;
use tempfile::TempDir;
/// Test helper to create a mock credential file /// Test helper to create a mock credential file
fn create_mock_credential_file(dir: &Path) -> std::io::Result<()> { fn create_mock_credential_file(dir: &Path) -> std::io::Result<()> {
@@ -59,7 +59,7 @@ mod unit_tests {
assert!(config_content.contains("credential_file = \"credential.json\"")); assert!(config_content.contains("credential_file = \"credential.json\""));
assert!(config_content.contains("config_root = \"h:.cull-gmail\"")); assert!(config_content.contains("config_root = \"h:.cull-gmail\""));
assert!(config_content.contains("execute = false")); assert!(config_content.contains("execute = false"));
// Test that rules content is a valid template // Test that rules content is a valid template
let rules_content = InitDefaults::RULES_FILE_CONTENT; let rules_content = InitDefaults::RULES_FILE_CONTENT;
assert!(rules_content.contains("# Example rules for cull-gmail")); assert!(rules_content.contains("# Example rules for cull-gmail"));
@@ -117,7 +117,12 @@ mod unit_tests {
let result = init_cli.validate_credential_file(&credential_path); let result = init_cli.validate_credential_file(&credential_path);
assert!(result.is_err()); assert!(result.is_err());
assert!(result.unwrap_err().to_string().contains("Invalid credential file format")); assert!(
result
.unwrap_err()
.to_string()
.contains("Invalid credential file format")
);
} }
#[test] #[test]
@@ -185,17 +190,23 @@ mod unit_tests {
interactive: false, interactive: false,
}; };
let operations = init_cli.plan_operations(&config_path, Some(&cred_path)).unwrap(); let operations = init_cli
.plan_operations(&config_path, Some(&cred_path))
.unwrap();
// Should have: CreateDir, CopyFile (credential), WriteFile (config), WriteFile (rules), EnsureTokenDir, RunOAuth2 // Should have: CreateDir, CopyFile (credential), WriteFile (config), WriteFile (rules), EnsureTokenDir, RunOAuth2
assert_eq!(operations.len(), 6); assert_eq!(operations.len(), 6);
// Check that CopyFile operation exists // Check that CopyFile operation exists
let copy_op = operations.iter().find(|op| matches!(op, Operation::CopyFile { .. })); let copy_op = operations
.iter()
.find(|op| matches!(op, Operation::CopyFile { .. }));
assert!(copy_op.is_some()); assert!(copy_op.is_some());
// Check that RunOAuth2 operation exists // Check that RunOAuth2 operation exists
let oauth_op = operations.iter().find(|op| matches!(op, Operation::RunOAuth2 { .. })); let oauth_op = operations
.iter()
.find(|op| matches!(op, Operation::RunOAuth2 { .. }));
assert!(oauth_op.is_some()); assert!(oauth_op.is_some());
} }
@@ -204,7 +215,7 @@ mod unit_tests {
let temp_dir = TempDir::new().unwrap(); let temp_dir = TempDir::new().unwrap();
let config_path = temp_dir.path().join("existing-config"); let config_path = temp_dir.path().join("existing-config");
fs::create_dir_all(&config_path).unwrap(); fs::create_dir_all(&config_path).unwrap();
// Create existing config file // Create existing config file
fs::write(config_path.join("cull-gmail.toml"), "existing config").unwrap(); fs::write(config_path.join("cull-gmail.toml"), "existing config").unwrap();
@@ -226,7 +237,7 @@ mod unit_tests {
let temp_dir = TempDir::new().unwrap(); let temp_dir = TempDir::new().unwrap();
let config_path = temp_dir.path().join("existing-config"); let config_path = temp_dir.path().join("existing-config");
fs::create_dir_all(&config_path).unwrap(); fs::create_dir_all(&config_path).unwrap();
// Create existing config file // Create existing config file
fs::write(config_path.join("cull-gmail.toml"), "existing config").unwrap(); fs::write(config_path.join("cull-gmail.toml"), "existing config").unwrap();
fs::write(config_path.join("rules.toml"), "existing rules").unwrap(); fs::write(config_path.join("rules.toml"), "existing rules").unwrap();
@@ -243,7 +254,12 @@ mod unit_tests {
// Should succeed and plan backup operations // Should succeed and plan backup operations
let config_op = operations.iter().find(|op| { let config_op = operations.iter().find(|op| {
if let Operation::WriteFile { path, backup_if_exists, .. } = op { if let Operation::WriteFile {
path,
backup_if_exists,
..
} = op
{
path.file_name().unwrap() == "cull-gmail.toml" && *backup_if_exists path.file_name().unwrap() == "cull-gmail.toml" && *backup_if_exists
} else { } else {
false false
@@ -284,7 +300,7 @@ mod unit_tests {
.collect(); .collect();
assert_eq!(backup_files.len(), 1); assert_eq!(backup_files.len(), 1);
// Verify backup content // Verify backup content
let backup_path = temp_dir.path().join(&backup_files[0]); let backup_path = temp_dir.path().join(&backup_files[0]);
let backup_content = fs::read_to_string(backup_path).unwrap(); let backup_content = fs::read_to_string(backup_path).unwrap();
@@ -295,7 +311,7 @@ mod unit_tests {
#[test] #[test]
fn test_set_permissions() { fn test_set_permissions() {
use std::os::unix::fs::PermissionsExt; use std::os::unix::fs::PermissionsExt;
let temp_dir = TempDir::new().unwrap(); let temp_dir = TempDir::new().unwrap();
let test_file = temp_dir.path().join("test.txt"); let test_file = temp_dir.path().join("test.txt");
fs::write(&test_file, "test content").unwrap(); fs::write(&test_file, "test content").unwrap();
@@ -319,7 +335,7 @@ mod unit_tests {
#[test] #[test]
fn test_operation_display() { fn test_operation_display() {
let temp_path = std::path::PathBuf::from("/tmp/test"); let temp_path = std::path::PathBuf::from("/tmp/test");
let create_dir_op = Operation::CreateDir { let create_dir_op = Operation::CreateDir {
path: temp_path.clone(), path: temp_path.clone(),
#[cfg(unix)] #[cfg(unix)]
@@ -334,7 +350,10 @@ mod unit_tests {
mode: Some(0o600), mode: Some(0o600),
backup_if_exists: false, backup_if_exists: false,
}; };
assert_eq!(format!("{copy_file_op}"), "Copy file: /tmp/test → /tmp/test/dest"); assert_eq!(
format!("{copy_file_op}"),
"Copy file: /tmp/test → /tmp/test/dest"
);
let write_file_op = Operation::WriteFile { let write_file_op = Operation::WriteFile {
path: temp_path.clone(), path: temp_path.clone(),
@@ -356,7 +375,7 @@ mod unit_tests {
#[test] #[test]
fn test_operation_get_mode() { fn test_operation_get_mode() {
let temp_path = std::path::PathBuf::from("/tmp/test"); let temp_path = std::path::PathBuf::from("/tmp/test");
let create_dir_op = Operation::CreateDir { let create_dir_op = Operation::CreateDir {
path: temp_path.clone(), path: temp_path.clone(),
mode: Some(0o755), mode: Some(0o755),
@@ -369,4 +388,4 @@ mod unit_tests {
}; };
assert_eq!(oauth_op.get_mode(), None); assert_eq!(oauth_op.get_mode(), None);
} }
} }

80
tests/init_integration_tests.rs
View File

@@ -12,7 +12,9 @@ fn test_init_help() {
cmd.assert() cmd.assert()
.success() .success()
.stdout(predicate::str::contains("Initialize cull-gmail configuration")) .stdout(predicate::str::contains(
"Initialize cull-gmail configuration",
))
.stdout(predicate::str::contains("--config-dir")) .stdout(predicate::str::contains("--config-dir"))
.stdout(predicate::str::contains("--credential-file")) .stdout(predicate::str::contains("--credential-file"))
.stdout(predicate::str::contains("--dry-run")) .stdout(predicate::str::contains("--dry-run"))
@@ -28,9 +30,9 @@ fn test_init_dry_run_new_setup() {
let mut cmd = Command::cargo_bin("cull-gmail").unwrap(); let mut cmd = Command::cargo_bin("cull-gmail").unwrap();
cmd.args([ cmd.args([
"init", "init",
"--config-dir", "--config-dir",
&format!("c:{}", config_dir.to_string_lossy()), &format!("c:{}", config_dir.to_string_lossy()),
"--dry-run" "--dry-run",
]); ]);
cmd.assert() cmd.assert()
@@ -44,7 +46,9 @@ fn test_init_dry_run_new_setup() {
.stdout(predicate::str::contains("Ensure token directory:")) .stdout(predicate::str::contains("Ensure token directory:"))
.stdout(predicate::str::contains("gmail1")) .stdout(predicate::str::contains("gmail1"))
.stdout(predicate::str::contains("OAuth2 authentication skipped")) .stdout(predicate::str::contains("OAuth2 authentication skipped"))
.stdout(predicate::str::contains("To apply these changes, run without --dry-run")); .stdout(predicate::str::contains(
"To apply these changes, run without --dry-run",
));
// Verify no files were actually created // Verify no files were actually created
assert!(!config_dir.exists()); assert!(!config_dir.exists());
@@ -57,9 +61,11 @@ fn test_init_dry_run_with_credential_file() {
let temp_dir = assert_fs::TempDir::new().unwrap(); let temp_dir = assert_fs::TempDir::new().unwrap();
let config_dir = temp_dir.path().join("test-config"); let config_dir = temp_dir.path().join("test-config");
let credential_file = temp_dir.child("credential.json"); let credential_file = temp_dir.child("credential.json");
// Create a mock credential file // Create a mock credential file
credential_file.write_str(r#"{ credential_file
.write_str(
r#"{
"installed": { "installed": {
"client_id": "test-client-id.googleusercontent.com", "client_id": "test-client-id.googleusercontent.com",
"client_secret": "test-client-secret", "client_secret": "test-client-secret",
@@ -67,16 +73,18 @@ fn test_init_dry_run_with_credential_file() {
"token_uri": "https://oauth2.googleapis.com/token", "token_uri": "https://oauth2.googleapis.com/token",
"redirect_uris": ["http://localhost"] "redirect_uris": ["http://localhost"]
} }
}"#).unwrap(); }"#,
)
.unwrap();
let mut cmd = Command::cargo_bin("cull-gmail").unwrap(); let mut cmd = Command::cargo_bin("cull-gmail").unwrap();
cmd.args([ cmd.args([
"init", "init",
"--config-dir", "--config-dir",
&format!("c:{}", config_dir.to_string_lossy()), &format!("c:{}", config_dir.to_string_lossy()),
"--credential-file", "--credential-file",
credential_file.path().to_str().unwrap(), credential_file.path().to_str().unwrap(),
"--dry-run" "--dry-run",
]); ]);
cmd.assert() cmd.assert()
@@ -101,13 +109,15 @@ fn test_init_actual_execution() {
let mut cmd = Command::cargo_bin("cull-gmail").unwrap(); let mut cmd = Command::cargo_bin("cull-gmail").unwrap();
cmd.args([ cmd.args([
"init", "init",
"--config-dir", "--config-dir",
&format!("c:{}", config_dir.to_string_lossy()), &format!("c:{}", config_dir.to_string_lossy()),
]); ]);
cmd.assert() cmd.assert()
.success() .success()
.stdout(predicate::str::contains("Initialization completed successfully!")) .stdout(predicate::str::contains(
"Initialization completed successfully!",
))
.stdout(predicate::str::contains("Configuration directory:")) .stdout(predicate::str::contains("Configuration directory:"))
.stdout(predicate::str::contains("Files created:")) .stdout(predicate::str::contains("Files created:"))
.stdout(predicate::str::contains("cull-gmail.toml")) .stdout(predicate::str::contains("cull-gmail.toml"))
@@ -135,7 +145,7 @@ fn test_init_actual_execution() {
fn test_init_force_overwrite() { fn test_init_force_overwrite() {
let temp_dir = assert_fs::TempDir::new().unwrap(); let temp_dir = assert_fs::TempDir::new().unwrap();
let config_dir = temp_dir.path().join("test-config"); let config_dir = temp_dir.path().join("test-config");
// Create config directory and file first // Create config directory and file first
std::fs::create_dir_all(&config_dir).unwrap(); std::fs::create_dir_all(&config_dir).unwrap();
std::fs::write(config_dir.join("cull-gmail.toml"), "old config").unwrap(); std::fs::write(config_dir.join("cull-gmail.toml"), "old config").unwrap();
@@ -143,10 +153,10 @@ fn test_init_force_overwrite() {
let mut cmd = Command::cargo_bin("cull-gmail").unwrap(); let mut cmd = Command::cargo_bin("cull-gmail").unwrap();
cmd.args([ cmd.args([
"init", "init",
"--config-dir", "--config-dir",
&format!("c:{}", config_dir.to_string_lossy()), &format!("c:{}", config_dir.to_string_lossy()),
"--force", "--force",
"--dry-run" "--dry-run",
]); ]);
cmd.assert() cmd.assert()
@@ -161,7 +171,7 @@ fn test_init_force_overwrite() {
fn test_init_existing_config_no_force_fails() { fn test_init_existing_config_no_force_fails() {
let temp_dir = assert_fs::TempDir::new().unwrap(); let temp_dir = assert_fs::TempDir::new().unwrap();
let config_dir = temp_dir.path().join("test-config"); let config_dir = temp_dir.path().join("test-config");
// Create config directory and file first // Create config directory and file first
std::fs::create_dir_all(&config_dir).unwrap(); std::fs::create_dir_all(&config_dir).unwrap();
std::fs::write(config_dir.join("cull-gmail.toml"), "existing config").unwrap(); std::fs::write(config_dir.join("cull-gmail.toml"), "existing config").unwrap();
@@ -169,7 +179,7 @@ fn test_init_existing_config_no_force_fails() {
let mut cmd = Command::cargo_bin("cull-gmail").unwrap(); let mut cmd = Command::cargo_bin("cull-gmail").unwrap();
cmd.args([ cmd.args([
"init", "init",
"--config-dir", "--config-dir",
&format!("c:{}", config_dir.to_string_lossy()), &format!("c:{}", config_dir.to_string_lossy()),
]); ]);
@@ -187,9 +197,11 @@ fn test_init_with_credential_file_copy() {
let temp_dir = assert_fs::TempDir::new().unwrap(); let temp_dir = assert_fs::TempDir::new().unwrap();
let config_dir = temp_dir.path().join("test-config"); let config_dir = temp_dir.path().join("test-config");
let credential_file = temp_dir.child("source_credential.json"); let credential_file = temp_dir.child("source_credential.json");
// Create a mock credential file // Create a mock credential file
credential_file.write_str(r#"{ credential_file
.write_str(
r#"{
"installed": { "installed": {
"client_id": "test-client-id.googleusercontent.com", "client_id": "test-client-id.googleusercontent.com",
"client_secret": "test-client-secret", "client_secret": "test-client-secret",
@@ -197,12 +209,14 @@ fn test_init_with_credential_file_copy() {
"token_uri": "https://oauth2.googleapis.com/token", "token_uri": "https://oauth2.googleapis.com/token",
"redirect_uris": ["http://localhost"] "redirect_uris": ["http://localhost"]
} }
}"#).unwrap(); }"#,
)
.unwrap();
let mut cmd = Command::cargo_bin("cull-gmail").unwrap(); let mut cmd = Command::cargo_bin("cull-gmail").unwrap();
cmd.args([ cmd.args([
"init", "init",
"--config-dir", "--config-dir",
&format!("c:{}", config_dir.to_string_lossy()), &format!("c:{}", config_dir.to_string_lossy()),
"--credential-file", "--credential-file",
credential_file.path().to_str().unwrap(), credential_file.path().to_str().unwrap(),
@@ -211,7 +225,7 @@ fn test_init_with_credential_file_copy() {
// This will fail at OAuth step, but we can check that files were created correctly // This will fail at OAuth step, but we can check that files were created correctly
let _output = cmd.output().unwrap(); let _output = cmd.output().unwrap();
// Verify files were created up to the OAuth step // Verify files were created up to the OAuth step
assert!(config_dir.exists()); assert!(config_dir.exists());
assert!(config_dir.join("cull-gmail.toml").exists()); assert!(config_dir.join("cull-gmail.toml").exists());
@@ -220,7 +234,8 @@ fn test_init_with_credential_file_copy() {
assert!(config_dir.join("gmail1").exists()); assert!(config_dir.join("gmail1").exists());
// Verify credential file was copied // Verify credential file was copied
let copied_credential_content = std::fs::read_to_string(config_dir.join("credential.json")).unwrap(); let copied_credential_content =
std::fs::read_to_string(config_dir.join("credential.json")).unwrap();
assert!(copied_credential_content.contains("test-client-id.googleusercontent.com")); assert!(copied_credential_content.contains("test-client-id.googleusercontent.com"));
#[cfg(unix)] #[cfg(unix)]
@@ -240,14 +255,14 @@ fn test_init_invalid_credential_file() {
let temp_dir = assert_fs::TempDir::new().unwrap(); let temp_dir = assert_fs::TempDir::new().unwrap();
let config_dir = temp_dir.path().join("test-config"); let config_dir = temp_dir.path().join("test-config");
let credential_file = temp_dir.child("invalid_credential.json"); let credential_file = temp_dir.child("invalid_credential.json");
// Create an invalid credential file // Create an invalid credential file
credential_file.write_str("invalid json content").unwrap(); credential_file.write_str("invalid json content").unwrap();
let mut cmd = Command::cargo_bin("cull-gmail").unwrap(); let mut cmd = Command::cargo_bin("cull-gmail").unwrap();
cmd.args([ cmd.args([
"init", "init",
"--config-dir", "--config-dir",
&format!("c:{}", config_dir.to_string_lossy()), &format!("c:{}", config_dir.to_string_lossy()),
"--credential-file", "--credential-file",
credential_file.path().to_str().unwrap(), credential_file.path().to_str().unwrap(),
@@ -269,7 +284,7 @@ fn test_init_nonexistent_credential_file() {
let mut cmd = Command::cargo_bin("cull-gmail").unwrap(); let mut cmd = Command::cargo_bin("cull-gmail").unwrap();
cmd.args([ cmd.args([
"init", "init",
"--config-dir", "--config-dir",
&format!("c:{}", config_dir.to_string_lossy()), &format!("c:{}", config_dir.to_string_lossy()),
"--credential-file", "--credential-file",
nonexistent_file.to_str().unwrap(), nonexistent_file.to_str().unwrap(),
@@ -296,7 +311,7 @@ fn test_init_oauth_integration() {
let mut cmd = Command::cargo_bin("cull-gmail").unwrap(); let mut cmd = Command::cargo_bin("cull-gmail").unwrap();
cmd.args([ cmd.args([
"init", "init",
"--config-dir", "--config-dir",
&format!("c:{}", config_dir.to_string_lossy()), &format!("c:{}", config_dir.to_string_lossy()),
"--credential-file", "--credential-file",
&credential_file, &credential_file,
@@ -304,16 +319,21 @@ fn test_init_oauth_integration() {
cmd.assert() cmd.assert()
.success() .success()
.stdout(predicate::str::contains("OAuth2 authentication successful!")) .stdout(predicate::str::contains(
"OAuth2 authentication successful!",
))
.stdout(predicate::str::contains("gmail1/ (OAuth2 token cache)")); .stdout(predicate::str::contains("gmail1/ (OAuth2 token cache)"));
// Verify token files were created // Verify token files were created
assert!(config_dir.join("gmail1").exists()); assert!(config_dir.join("gmail1").exists());
// Check if there are token-related files in the gmail1 directory // Check if there are token-related files in the gmail1 directory
let gmail_dir_contents = std::fs::read_dir(config_dir.join("gmail1")).unwrap(); let gmail_dir_contents = std::fs::read_dir(config_dir.join("gmail1")).unwrap();
let has_token_files = gmail_dir_contents.count() > 0; let has_token_files = gmail_dir_contents.count() > 0;
assert!(has_token_files, "Expected token files to be created in gmail1 directory"); assert!(
has_token_files,
"Expected token files to be created in gmail1 directory"
);
temp_dir.close().unwrap(); temp_dir.close().unwrap();
} }