Add home to Config (#810)

cnpryer · Nov 3, 2023 · 2557377 · 2557377
1 parent 6ab6e36
commit 2557377
Show file tree

Hide file tree

Showing 16 changed files with 39 additions and 1 deletion.
diff --git a/crates/huak-cli/src/cli.rs b/crates/huak-cli/src/cli.rs
@@ -375,6 +375,7 @@ fn get_config(cwd: PathBuf, cli: &Cli) -> Config {
         workspace_root,
         cwd,
         terminal_options,
+        home: huak_home_dir(),
     };
     if cli.no_color {
         config.terminal_options = TerminalOptions {

diff --git a/crates/huak-package-manager/src/config.rs b/crates/huak-package-manager/src/config.rs
@@ -1,5 +1,7 @@
 use std::path::PathBuf;
 
+use huak_home::huak_home_dir;
+
 use crate::{sys::Terminal, workspace::Workspace, TerminalOptions};
 
 /// The main `Config` for Huak.
@@ -21,14 +23,16 @@ use crate::{sys::Terminal, workspace::Workspace, TerminalOptions};
 ///
 /// let workspace = config.workspace();
 /// ```
-#[derive(Clone, Default)]
+#[derive(Clone)]
 pub struct Config {
     /// The configured `Workspace` root path.
     pub workspace_root: PathBuf,
     /// The current working directory.
     pub cwd: PathBuf,
     /// `Terminal` options to use.
     pub terminal_options: TerminalOptions,
+    /// Huak's home directory.
+    pub home: Option<PathBuf>,
 }
 
 impl Config {
@@ -51,6 +55,18 @@ impl Config {
             workspace_root: self.workspace_root,
             cwd: self.cwd,
             terminal_options,
+            ..Default::default()
+        }
+    }
+}
+
+impl Default for Config {
+    fn default() -> Self {
+        Self {
+            workspace_root: PathBuf::default(),
+            cwd: PathBuf::default(),
+            terminal_options: TerminalOptions::default(),
+            home: huak_home_dir(),
         }
     }
 }
diff --git a/crates/huak-package-manager/src/ops/add.rs b/crates/huak-package-manager/src/ops/add.rs
@@ -126,6 +126,7 @@ mod tests {
             workspace_root,
             cwd,
             terminal_options,
+            ..Default::default()
         };
         let ws = config.workspace();
         let venv = ws.resolve_python_environment().unwrap();
@@ -162,6 +163,7 @@ mod tests {
             workspace_root,
             cwd,
             terminal_options,
+            ..Default::default()
         };
         let ws = config.workspace();
         initialize_venv(ws.root().join(".venv"), &ws.environment()).unwrap();

diff --git a/crates/huak-package-manager/src/ops/build.rs b/crates/huak-package-manager/src/ops/build.rs
@@ -75,6 +75,7 @@ mod tests {
             workspace_root,
             cwd,
             terminal_options,
+            ..Default::default()
         };
         let ws = config.workspace();
         initialize_venv(ws.root().join(".venv"), &ws.environment()).unwrap();

diff --git a/crates/huak-package-manager/src/ops/clean.rs b/crates/huak-package-manager/src/ops/clean.rs
@@ -73,6 +73,7 @@ mod tests {
             workspace_root,
             cwd,
             terminal_options,
+            ..Default::default()
         };
         let options = CleanOptions {
             include_pycache: true,

diff --git a/crates/huak-package-manager/src/ops/format.rs b/crates/huak-package-manager/src/ops/format.rs
@@ -99,6 +99,7 @@ mod tests {
             workspace_root,
             cwd,
             terminal_options,
+            ..Default::default()
         };
         let ws = config.workspace();
         initialize_venv(ws.root().join(".venv"), &ws.environment()).unwrap();

diff --git a/crates/huak-package-manager/src/ops/init.rs b/crates/huak-package-manager/src/ops/init.rs
@@ -57,6 +57,7 @@ mod tests {
             workspace_root,
             cwd,
             terminal_options,
+            ..Default::default()
         };
         let options = WorkspaceOptions { uses_git: false };
         init_lib_project(&config, &options).unwrap();
@@ -84,6 +85,7 @@ mod tests {
             workspace_root,
             cwd,
             terminal_options,
+            ..Default::default()
         };
         let options = WorkspaceOptions { uses_git: false };
 

diff --git a/crates/huak-package-manager/src/ops/install.rs b/crates/huak-package-manager/src/ops/install.rs
@@ -85,6 +85,7 @@ mod tests {
             workspace_root,
             cwd,
             terminal_options,
+            ..Default::default()
         };
         let ws = config.workspace();
         initialize_venv(ws.root().join(".venv"), &ws.environment()).unwrap();
@@ -118,6 +119,7 @@ mod tests {
             workspace_root,
             cwd,
             terminal_options,
+            ..Default::default()
         };
         let ws = config.workspace();
         initialize_venv(ws.root().join(".venv"), &ws.environment()).unwrap();

diff --git a/crates/huak-package-manager/src/ops/lint.rs b/crates/huak-package-manager/src/ops/lint.rs
@@ -105,6 +105,7 @@ mod tests {
             workspace_root,
             cwd,
             terminal_options,
+            ..Default::default()
         };
         let options = LintOptions {
             values: None,
@@ -134,6 +135,7 @@ mod tests {
             workspace_root,
             cwd,
             terminal_options,
+            ..Default::default()
         };
         let ws = config.workspace();
         initialize_venv(ws.root().join(".venv"), &ws.environment()).unwrap();

diff --git a/crates/huak-package-manager/src/ops/new.rs b/crates/huak-package-manager/src/ops/new.rs
@@ -83,6 +83,7 @@ mod tests {
             workspace_root,
             cwd,
             terminal_options,
+            ..Default::default()
         };
         let options = WorkspaceOptions { uses_git: false };
 
@@ -125,6 +126,7 @@ def test_version():
             workspace_root,
             cwd,
             terminal_options,
+            ..Default::default()
         };
         let options = WorkspaceOptions { uses_git: false };
 

diff --git a/crates/huak-package-manager/src/ops/python.rs b/crates/huak-package-manager/src/ops/python.rs
@@ -112,6 +112,7 @@ mod tests {
             workspace_root,
             cwd,
             terminal_options,
+            ..Default::default()
         };
 
         use_python(&version, &config).unwrap();

diff --git a/crates/huak-package-manager/src/ops/remove.rs b/crates/huak-package-manager/src/ops/remove.rs
@@ -77,6 +77,7 @@ mod tests {
             workspace_root,
             cwd,
             terminal_options,
+            ..Default::default()
         };
         let options = RemoveOptions {
             install_options: InstallOptions { values: None },
@@ -124,6 +125,7 @@ mod tests {
             workspace_root,
             cwd,
             terminal_options,
+            ..Default::default()
         };
         let options = RemoveOptions {
             install_options: InstallOptions { values: None },

diff --git a/crates/huak-package-manager/src/ops/run.rs b/crates/huak-package-manager/src/ops/run.rs
@@ -42,6 +42,7 @@ mod tests {
             workspace_root,
             cwd,
             terminal_options,
+            ..Default::default()
         };
         let ws = config.workspace();
         // For some reason this test fails with multiple threads used. Workspace.resolve_python_environment()

diff --git a/crates/huak-package-manager/src/ops/test.rs b/crates/huak-package-manager/src/ops/test.rs
@@ -81,6 +81,7 @@ mod tests {
             workspace_root,
             cwd,
             terminal_options,
+            ..Default::default()
         };
         let ws = config.workspace();
         initialize_venv(ws.root().join(".venv"), &ws.environment()).unwrap();

diff --git a/crates/huak-package-manager/src/ops/update.rs b/crates/huak-package-manager/src/ops/update.rs
@@ -104,6 +104,7 @@ mod tests {
             workspace_root,
             cwd,
             terminal_options,
+            ..Default::default()
         };
         let ws = config.workspace();
         initialize_venv(ws.root().join(".venv"), &ws.environment()).unwrap();
@@ -133,6 +134,7 @@ mod tests {
             workspace_root,
             cwd,
             terminal_options,
+            ..Default::default()
         };
         let ws = config.workspace();
         initialize_venv(ws.root().join(".venv"), &ws.environment()).unwrap();

diff --git a/crates/huak-package-manager/src/python_environment.rs b/crates/huak-package-manager/src/python_environment.rs
@@ -610,6 +610,7 @@ mod tests {
             workspace_root,
             cwd,
             terminal_options,
+            ..Default::default()
         };
         let ws = config.workspace();
         let venv = ws.resolve_python_environment().unwrap();