Merge pull request #4 from krupa-dev/ft/manplan-2

Ft/manplan 2

Author: GJKrupa

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "manplan"
-version = "0.1.3"
+version = "0.1.4"
 authors = ["Gerard Krupa"]
 edition = "2021"
 description = "Tool for keeping sdkman candidates up-to-date"
@@ -17,6 +17,7 @@ serde = { version = "1.0", features = ["derive"] }
 serde_yaml = "0.9"
 maplit = "1.0.2"
 clap = { version = "4.4.6", features = ["derive"] }
+expect-exit = "0.5.2"
 
 [profile.release]
 lto = "fat"

Cargo.toml

@@ -3,6 +3,9 @@
 This tool reads a YAML manifest defining a list of SDKman candidate
 versions and installs the latest versions that match this manifest.
 
+If the -f option is not provided, the default manifest
+(~/.sdk-rules.yaml) is used.
+
 Each candidate can support multiple versions and each version is
 specified as a regular expression match and zero or more regular
 expression exclusions (in order to, for example, filter out release
@@ -44,7 +47,7 @@ chmod +x /usr/local/bin/manplan
 
 ## Usage
 
-`manplan -f|--file <manifest file> [-d|--dry-run] [-n|--no-uninstall]`
+`manplan [-f|--file <manifest file>] [-d|--dry-run] [-n|--no-uninstall]`
 
 ## Manifest format
 

README.md

@@ -1,7 +1,9 @@
 use std::collections::HashSet;
-use std::fs;
+use std::path::Path;
+use std::{env, fs};
 
 use clap::Parser;
+use expect_exit::Expected;
 
 use crate::rules::{parse_rules, VersionMatch};
 use crate::sdkman::{SdkMan, ToolManager};
@@ -14,7 +16,7 @@ pub mod sdkman;
 struct Args {
     /// Filename of the YAML config file
     #[arg(short, long)]
-    file: String,
+    file: Option<String>,
 
     /// Just print out the commands that would be executed
     #[arg(short, long, default_value_t = false)]
@@ -25,15 +27,32 @@ struct Args {
     no_uninstall: bool,
 }
 
+#[allow(clippy::needless_return)]
+fn get_rules_file(args: &Args) -> Option<String> {
+    if let Some(file) = args.file.as_ref() {
+        return Some(file.clone());
+    } else if let Ok(home) = env::var("HOME") {
+        let dotfile = Path::new(home.as_str()).join(".sdk-rules.yaml");
+        if dotfile.is_file() {
+            return Some(dotfile.to_str().unwrap().to_string());
+        }
+    }
+    return None;
+}
+
 fn main() {
     let args = Args::parse();
 
     let sdkman = SdkMan {
         dry_run: args.dry_run,
         no_uninstall: args.no_uninstall,
     };
-    let rules = parse_rules(fs::read_to_string(args.file).expect("Failed to read input file"));
-    for (name, candidate) in rules.expect("Rules file could not be parsed").candidates {
+
+    let rules_file =
+        get_rules_file(&args).or_exit_("Must specify -f or have a ~/.sdk-rules.yaml file");
+    let rules = parse_rules(fs::read_to_string(rules_file).or_exit_("Failed to read rules file"));
+
+    for (name, candidate) in rules.or_exit_("Rules file could not be parsed").candidates {
         let installed: HashSet<_> = sdkman
             .installed_versions(name.clone())
             .into_iter()

src/main.rs

@@ -1,3 +1,4 @@
+use expect_exit::Expected;
 use regex::Regex;
 use std::collections::HashMap;
 
@@ -32,7 +33,7 @@ pub trait VersionMatch {
 impl VersionMatch for Version {
     fn get_matching(&self, name: String, available: Vec<String>) -> Option<String> {
         let pattern = Regex::new(self.pattern.as_str())
-            .unwrap_or_else(|_| panic!("Invalid regex for {}: {}", name, self.pattern));
+            .or_exit_(format!("Invalid regex for {}: {}", name, self.pattern).as_str());
         let mut matches: Vec<String> = available
             .iter()
             .filter(|it| pattern.is_match(it))
@@ -41,7 +42,7 @@ impl VersionMatch for Version {
 
         if let Some(exclude) = self.exclude.as_ref() {
             let exclude_pattern = Regex::new(exclude.join("|").as_str())
-                .unwrap_or_else(|_| panic!("Invalid regex for {}: {}", name, exclude.join("|")));
+                .or_exit_(format!("Invalid regex for {}: {}", name, exclude.join("|")).as_str());
             matches.retain(|it| !exclude_pattern.is_match(it));
         }
 

src/rules/mod.rs

@@ -1,6 +1,8 @@
 use crate::sdkman::candidate::{Candidate, SdkManCandidate};
+use expect_exit::Expected;
 use std::fs::read_dir;
 use std::io::Write;
+use std::path::Path;
 use std::{env, io};
 
 mod candidate;
@@ -23,10 +25,10 @@ impl ToolManager for SdkMan {
     fn installed_versions(&self, candidate: String) -> Vec<String> {
         return match env::var("SDKMAN_DIR") {
             Ok(dir) => {
-                let base = format!("{}/candidates/{}", dir, candidate);
-                if std::path::Path::new(&base).is_dir() {
+                let base = Path::new(dir.as_str()).join("candidates").join(candidate);
+                if base.is_dir() {
                     read_dir(base)
-                        .expect("Failed to read $SDKMAN_DIR")
+                        .or_exit_("Failed to read $SDKMAN_DIR")
                         .filter(|entry| entry.as_ref().unwrap().file_type().unwrap().is_dir())
                         .map(|entry| entry.unwrap().file_name().into_string().unwrap())
                         .collect()
@@ -48,7 +50,7 @@ impl ToolManager for SdkMan {
             .arg("-c")
             .arg(format!("sdk list {}", candidate))
             .output()
-            .expect("Failed to run the sdk list command. Is SDKMAN installed?");
+            .or_exit_("Failed to run the sdk list command. Is SDKMAN installed?");
         if output.status.success() {
             SdkManCandidate {
                 name: candidate,
@@ -76,7 +78,7 @@ impl ToolManager for SdkMan {
                 .arg("-c")
                 .arg(cmd)
                 .output()
-                .expect("Error running sdk install command");
+                .or_exit_("Error running sdk install command");
             if output.status.success() {
                 println!("OK");
             } else {
@@ -105,7 +107,7 @@ impl ToolManager for SdkMan {
                 .arg("-c")
                 .arg(cmd)
                 .output()
-                .expect("Error running sdk install command");
+                .or_exit_("Error running sdk install command");
             if output.status.success() {
                 println!("OK");
             } else {
@@ -132,7 +134,7 @@ impl ToolManager for SdkMan {
                 .arg("-c")
                 .arg(cmd)
                 .output()
-                .expect("Error running sdk install command");
+                .or_exit_("Error running sdk install command");
             if output.status.success() {
                 println!("OK");
             } else {