feat: add packages sub-commands

crates/cli/Cargo.toml

@@ -21,5 +21,6 @@ envhub-providers = {path = "../providers", version = "0.1.0"}
 envhub-stow = {path = "../stow", version = "0.1.0"}
 envhub-types = {path = "../types", version = "0.1.0"}
 hcl-rs = "0.14.2"
+owo-colors = "3.5.0"
 tokio = {version = "1.28.2", features = ["full"]}
 toml = "0.7.4"

crates/cli/src/cmd/package.rs

@@ -1,15 +1,59 @@
 use anyhow::Error;
+use owo_colors::OwoColorize;
 
-pub fn add(_package: &str) -> Result<(), Error> {
-    // switch_env(None, config)?;
+use crate::{
+    cmd::r#use::use_environment,
+    helpers::{read_envhub_file, write_envhub_file},
+};
+
+pub fn add(package: &str, apply: bool) -> Result<(), Error> {
+    let mut config = read_envhub_file(".")?;
+    let mut packages = config.packages.unwrap_or_default();
+    if packages.contains(&package.to_string()) {
+        println!("Package {} already in envhub file", package.cyan());
+        return Ok(());
+    }
+    packages.push(package.to_string());
+    config.packages = Some(packages);
+    write_envhub_file(".", &config)?;
+    println!("Package {} added to envhub file", package.cyan());
+    if apply {
+        use_environment(".")?;
+    }
     Ok(())
 }
 
 pub fn list() -> Result<(), Error> {
+    let config = read_envhub_file(".")?;
+    println!("Packages found in envhub file:\n");
+    for package in config.packages.unwrap_or_default() {
+        println!("* {}", package.cyan());
+    }
+    println!("");
     Ok(())
 }
 
-pub fn remove(_package: &str) -> Result<(), Error> {
-    // switch_env(None, config)?;
+pub fn remove(package: &str, apply: bool) -> Result<(), Error> {
+    let mut config = read_envhub_file(".")?;
+    let mut packages = config.packages.unwrap_or_default();
+    if !packages.contains(&package.to_string()) {
+        println!(
+            "{} Package {} not in envhub file",
+            "[✗]".red(),
+            package.cyan()
+        );
+        return Ok(());
+    }
+    packages.retain(|x| x != package);
+    config.packages = Some(packages);
+    write_envhub_file(".", &config)?;
+    println!(
+        "{} Package {} removed from envhub file",
+        "[✓]".bright_green(),
+        package.cyan()
+    );
+    if apply {
+        use_environment(".")?;
+    }
     Ok(())
 }

crates/cli/src/cmd/use.rs

@@ -36,6 +36,8 @@ pub fn use_environment(name: &str) -> Result<(), Error> {
 
     switch_env(Some(&home_manager_dir), &config)?;
 
+    let state = toml::to_string(&config)?;
+
     if config.symlink_manager == Some("stow".into()) {
         let target = std::env::var("HOME")?;
         let package = "dotfiles";
@@ -51,5 +53,13 @@ pub fn use_environment(name: &str) -> Result<(), Error> {
         ),
     )?;
 
+    fs::write(
+        format!("{}/.envhub/envhub.toml", std::env::var("HOME")?),
+        format!(
+            "# This file is automatically @generated by envhub.\n# It is not intended for manual editing.\n\n{}",
+            state
+        ),
+    )?;
+
     Ok(())
 }

crates/cli/src/helpers.rs

@@ -133,7 +133,59 @@ pub fn read_envhub_file(dir: &str) -> Result<Configuration, Error> {
     }
 }
 
+pub fn write_envhub_file(dir: &str, config: &Configuration) -> Result<(), Error> {
+    let mut path = format!("{}/envhub.hcl", dir);
+
+    if !fs::metadata(&path).is_ok() {
+        path = format!("{}/envhub.toml", dir);
+    }
+
+    if !fs::metadata(&path).is_ok() {
+        panic!("No `envhub.toml` or `envhub.hcl` file found in {}", dir)
+    }
+
+    let ext = path.split(".").last().unwrap();
+    match ext {
+        "toml" => {
+            let content = toml::to_string_pretty(&config)?;
+            fs::write(&path, content)?;
+            Ok(())
+        }
+        "hcl" => {
+            let content = hcl::to_string(&config)?;
+            fs::write(&path, content)?;
+            Ok(())
+        }
+        _ => panic!("Unknown file extension: {}", ext),
+    }
+}
+
+fn sync_packages(config: &Configuration) -> Result<(), Error> {
+    let current_state = fs::read_to_string(format!("{}/.envhub/envhub.toml", env::var("HOME")?))?;
+    let current_config: Configuration = toml::from_str(&current_state)?;
+    let current_packages = current_config.packages.clone().unwrap_or_default();
+    let packages = config.packages.clone().unwrap_or_default();
+    for package in current_packages {
+        if !packages.contains(&package) {
+            let pm: Box<dyn PackageManager> =
+                match current_config.package_manager.as_ref().unwrap().as_str() {
+                    "homebrew" => Box::new(Homebrew::new()),
+                    "brew" => Box::new(Homebrew::new()),
+                    "pkgx" => Box::new(Pkgx::new()),
+                    "devbox" => Box::new(Devbox::new()),
+                    _ => panic!("Unknown package manager"),
+                };
+            pm.uninstall(&package)?;
+        }
+    }
+    Ok(())
+}
+
 pub fn install_packages(config: &Configuration) -> Result<(), Error> {
+    if fs::metadata(format!("{}/.envhub/envhub.toml", env::var("HOME")?)).is_ok() {
+        self::sync_packages(config)?;
+    }
+
     let packages = config.packages.clone().unwrap_or_default();
     let pm: Box<dyn PackageManager> = match config.package_manager.as_ref().unwrap().as_str() {
         "homebrew" => Box::new(Homebrew::new()),

crates/cli/src/main.rs

@@ -56,14 +56,17 @@ fn cli() -> Command<'static> {
                 .subcommand(
                     Command::new("add")
                         .about("Add a package to the environment")
-                        .arg(arg!(<package>)),
+                        .arg(arg!(<package>))
+                        .arg(arg!(--apply "Apply the configuration after adding a package")),
                 )
                 .subcommand(
                     Command::new("remove")
+                        .alias("rm")
                         .about("Remove a package from the environment")
+                        .arg(arg!(--apply "Apply the configuration after removing a package"))
                         .arg(arg!(<package>)),
                 )
-                .subcommand(Command::new("list").about("List all packages in the environment")),
+                .subcommand(Command::new("list").alias("ls").about("List all packages in the environment")),
         )
         .subcommand(
             Command::new("env")
@@ -76,10 +79,11 @@ fn cli() -> Command<'static> {
                 )
                 .subcommand(
                     Command::new("remove")
+                        .alias("rm")
                         .about("Remove an environment variable from the environment")
                         .arg(arg!(<key>).required(true).index(1)),
                 )
-                .subcommand(Command::new("list").about("List all environment variables")),
+                .subcommand(Command::new("list").alias("ls").about("List all environment variables")),
         )
         .subcommand(
             Command::new("file")
@@ -99,10 +103,11 @@ fn cli() -> Command<'static> {
                 )
                 .subcommand(
                     Command::new("remove")
+                        .alias("rm")
                         .about("Remove a file from the environment")
                         .arg(arg!(<key>).required(true).index(1)),
                 )
-                .subcommand(Command::new("list").about("List all files")),
+                .subcommand(Command::new("list").alias("ls").about("List all files")),
         )
         .subcommand(
             Command::new("use")
@@ -159,8 +164,12 @@ async fn main() -> Result<(), Error> {
             _ => cli().print_help().unwrap(),
         },
         Some(("package", args)) => match args.subcommand() {
-            Some(("add", args)) => cmd::package::add(args.value_of("package").unwrap())?,
-            Some(("remove", args)) => cmd::package::remove(args.value_of("package").unwrap())?,
+            Some(("add", args)) => {
+                cmd::package::add(args.value_of("package").unwrap(), args.is_present("apply"))?
+            }
+            Some(("remove", args)) => {
+                cmd::package::remove(args.value_of("package").unwrap(), args.is_present("apply"))?
+            }
             Some(("list", _)) => cmd::package::list()?,
             _ => cli().print_help().unwrap(),
         },

crates/pkgs/src/pkgx.rs

@@ -34,6 +34,21 @@ impl Pkgx {
         child.wait()?;
         Ok(())
     }
+
+    pub fn setup_path(&self, rc_file: &str) -> Result<(), Error> {
+        let mut child = Command::new("sh")
+            .arg("-c")
+            .arg(format!(
+                "type pkgx > /dev/null || echo \'PATH=$HOME/.local/bin:$PATH\' >> ~/{}",
+                rc_file
+            ))
+            .stdin(Stdio::inherit())
+            .stdout(Stdio::inherit())
+            .stderr(Stdio::inherit())
+            .spawn()?;
+        child.wait()?;
+        Ok(())
+    }
 }
 
 impl PackageManager for Pkgx {
@@ -70,6 +85,8 @@ impl PackageManager for Pkgx {
     }
 
     fn setup(&self) -> Result<(), Error> {
+        self.setup_path(".bashrc")?;
+        self.setup_path(".zshrc")?;
         let mut child = Command::new("sh")
             .arg("-c")
             .arg("type pkgx > /dev/null || curl -fsS https://pkgx.sh | sh")

crates/providers/src/github.rs

@@ -49,6 +49,9 @@ impl Github {
 }
 
 impl Provider for Github {
+    fn name(&self) -> &str {
+        "github"
+    }
     fn load(&self, repo: &str) -> Result<(), Error> {
         let url = format!("https://github.com/{}", repo);
         self.clone(&url, repo)?;

crates/providers/src/lib.rs

@@ -5,5 +5,6 @@ pub mod local;
 pub mod s3;
 
 pub trait Provider {
+    fn name(&self) -> &str;
     fn load(&self, name: &str) -> Result<(), Error>;
 }

crates/providers/src/local.rs

@@ -45,6 +45,9 @@ impl Local {
 }
 
 impl Provider for Local {
+    fn name(&self) -> &str {
+        "local"
+    }
     fn load(&self, name: &str) -> Result<(), Error> {
         self.copy(name)?;
         Ok(())

crates/providers/src/s3.rs

@@ -15,6 +15,9 @@ impl S3 {
 }
 
 impl Provider for S3 {
+    fn name(&self) -> &str {
+        "s3"
+    }
     fn load(&self, name: &str) -> Result<(), Error> {
         self.download(name)?;
         Ok(())

examples/pkgx/envhub.hcl

@@ -1,7 +1,7 @@
 packages = [
-  "jq",
   "vim.org/vim",
-  "aws"
+  "aws",
+  "jq"
 ]
 
 envs {
@@ -12,4 +12,4 @@ file ".screenrc" {
   source = "dotfiles/.screenrc"
 }
 
-package_manager = "pkgx"
+package_manager = "pkgx"