-
Notifications
You must be signed in to change notification settings - Fork 52
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
switch back to dynamic subcommand so that default case is better
- Loading branch information
Showing
5 changed files
with
145 additions
and
76 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,5 +5,4 @@ pub mod run; | |
| pub mod script; | ||
| pub mod utils; | ||
|
|
||
| pub use cli::DefaultDynamic; | ||
| pub use exec::{Driver, DriverBuilder}; | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,68 +1,111 @@ | ||
| use std::{fs, path::Path, process::Command}; | ||
| use std::{fs, path::Path, process::Command, sync::OnceLock}; | ||
|
|
||
| use argh::FromArgs; | ||
| use fud_core::{cli::FakeSubCommand, config}; | ||
| use argh::{CommandInfo, DynamicSubCommand, FromArgs}; | ||
| use fud_core::{cli::FakeCliExt, config}; | ||
|
|
||
| /// initialize a fud2 python environment | ||
| #[derive(FromArgs)] | ||
| #[argh(subcommand, name = "env")] | ||
| pub struct PyenvCommand {} | ||
|
|
||
| impl FakeSubCommand for PyenvCommand { | ||
| pub enum Fud2CliExt { | ||
| Pyenv(PyenvCommand), | ||
| } | ||
|
|
||
| impl DynamicSubCommand for Fud2CliExt { | ||
| fn commands() -> &'static [&'static CommandInfo] { | ||
| static RET: OnceLock<Vec<&'static CommandInfo>> = OnceLock::new(); | ||
| RET.get_or_init(|| { | ||
| vec![&*Box::leak(Box::new(CommandInfo { | ||
| name: "env", | ||
| description: "initialize a fud2 python environment", | ||
| }))] | ||
| }) | ||
| } | ||
|
|
||
| fn try_redact_arg_values( | ||
| command_name: &[&str], | ||
| args: &[&str], | ||
| ) -> Option<Result<Vec<String>, argh::EarlyExit>> { | ||
| if let Some(&"env") = command_name.last() { | ||
| return Some(PyenvCommand::redact_arg_values(command_name, args)); | ||
| } | ||
| None | ||
| } | ||
|
|
||
| fn try_from_args( | ||
| command_name: &[&str], | ||
| args: &[&str], | ||
| ) -> Option<Result<Self, argh::EarlyExit>> { | ||
| if let Some(&"env") = command_name.last() { | ||
| return Some( | ||
| PyenvCommand::from_args(command_name, args) | ||
| .map(Fud2CliExt::Pyenv), | ||
| ); | ||
| } | ||
| None | ||
| } | ||
| } | ||
|
|
||
| impl FakeCliExt for Fud2CliExt { | ||
| fn run(&self, driver: &fud_core::Driver) -> anyhow::Result<()> { | ||
| let data_dir = config::data_dir(&driver.name); | ||
|
|
||
| fs::create_dir_all(&data_dir)?; | ||
|
|
||
| let pyenv = data_dir.join("venv"); | ||
|
|
||
| // create new venv | ||
| Command::new("python3") | ||
| .args(["-m", "venv"]) | ||
| .arg(&pyenv) | ||
| .stdout(std::io::stdout()) | ||
| .output()?; | ||
|
|
||
| // install flit | ||
| Command::new(pyenv.join("bin").join("pip")) | ||
| .arg("install") | ||
| .arg("flit") | ||
| .stdout(std::io::stdout()) | ||
| .output()?; | ||
|
|
||
| // grab the location of the calyx base install | ||
| let config = config::load_config(&driver.name); | ||
| let calyx_base: String = config.extract_inner("calyx.base")?; | ||
|
|
||
| // install fud python library | ||
| Command::new(pyenv.join("bin").join("python")) | ||
| .args(["-m", "flit", "install"]) | ||
| .current_dir(Path::new(&calyx_base).join("fud")) | ||
| .stdout(std::io::stdout()) | ||
| .output()?; | ||
|
|
||
| // install calyx-py library | ||
| Command::new(pyenv.join("bin").join("python")) | ||
| .args(["-m", "flit", "install"]) | ||
| .current_dir(Path::new(&calyx_base).join("calyx-py")) | ||
| .stdout(std::io::stdout()) | ||
| .output()?; | ||
|
|
||
| // add python location to fud2.toml | ||
| let config_path = config::config_path(&driver.name); | ||
| let contents = fs::read_to_string(&config_path)?; | ||
| let mut toml_doc: toml_edit::DocumentMut = contents.parse()?; | ||
|
|
||
| toml_doc["python"] = toml_edit::value( | ||
| pyenv | ||
| .join("bin") | ||
| .join("python") | ||
| .to_string_lossy() | ||
| .to_string(), | ||
| ); | ||
|
|
||
| fs::write(&config_path, toml_doc.to_string())?; | ||
|
|
||
| Ok(()) | ||
| match self { | ||
| Fud2CliExt::Pyenv(_cmd) => { | ||
| let data_dir = config::data_dir(&driver.name); | ||
|
|
||
| fs::create_dir_all(&data_dir)?; | ||
|
|
||
| let pyenv = data_dir.join("venv"); | ||
|
|
||
| // create new venv | ||
| Command::new("python3") | ||
| .args(["-m", "venv"]) | ||
| .arg(&pyenv) | ||
| .stdout(std::io::stdout()) | ||
| .output()?; | ||
|
|
||
| // install flit | ||
| Command::new(pyenv.join("bin").join("pip")) | ||
| .arg("install") | ||
| .arg("flit") | ||
| .stdout(std::io::stdout()) | ||
| .output()?; | ||
|
|
||
| // grab the location of the calyx base install | ||
| let config = config::load_config(&driver.name); | ||
| let calyx_base: String = config.extract_inner("calyx.base")?; | ||
|
|
||
| // install fud python library | ||
| Command::new(pyenv.join("bin").join("python")) | ||
| .args(["-m", "flit", "install"]) | ||
| .current_dir(Path::new(&calyx_base).join("fud")) | ||
| .stdout(std::io::stdout()) | ||
| .output()?; | ||
|
|
||
| // install calyx-py library | ||
| Command::new(pyenv.join("bin").join("python")) | ||
| .args(["-m", "flit", "install"]) | ||
| .current_dir(Path::new(&calyx_base).join("calyx-py")) | ||
| .stdout(std::io::stdout()) | ||
| .output()?; | ||
|
|
||
| // add python location to fud2.toml | ||
| let config_path = config::config_path(&driver.name); | ||
| let contents = fs::read_to_string(&config_path)?; | ||
| let mut toml_doc: toml_edit::DocumentMut = contents.parse()?; | ||
|
|
||
| toml_doc["python"] = toml_edit::value( | ||
| pyenv | ||
| .join("bin") | ||
| .join("python") | ||
| .to_string_lossy() | ||
| .to_string(), | ||
| ); | ||
|
|
||
| fs::write(&config_path, toml_doc.to_string())?; | ||
|
|
||
| Ok(()) | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| mod cli_pyenv; | ||
| pub use cli_pyenv::PyenvCommand; | ||
| pub use cli_pyenv::Fud2CliExt; | ||
|
|
||
| use std::str::FromStr; | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters