refactor(cli): rewrite cli in rust - WIP #14
Conversation
mikonse
force-pushed
the
milo/rewrite-in-rust-lol
branch
3 times, most recently
from
59c1206 to
c505243
Compare
mikonse
force-pushed
the
milo/rewrite-in-rust-lol
branch
from
c505243 to
75ab1bb
Compare
mikonse
force-pushed
the
milo/rewrite-in-rust-lol
branch
from
8ce1e79 to
9dabf66
Compare
TheJJ
left a comment
TheJJ
left a comment
There was a problem hiding this comment.
awsum! added some ideas and small nits.
i think we should already separate between the rust-only cli entry point (which doesn't need pyo3/maturin) and potentially stuff being called from debmagic-pkg or others via python.
| "PATH": f"/usr/share/cargo/bin:{os.environ['PATH']}", | ||
| "CARGO": "/usr/share/cargo/bin/cargo", | ||
| "CARGO_HOME": f"{Path.cwd()}/debian/cargo_home", | ||
| "CARGO_REGISTRY": f"{Path.cwd()}/debian/cargo_registry", |
|
|
||
| os.environ.update({ | ||
| "PATH": f"/usr/share/cargo/bin:{os.environ['PATH']}", | ||
| "CARGO": "/usr/share/cargo/bin/cargo", |
There was a problem hiding this comment.
pls add a todo to move this to our not-yet-existing rust module.
|
|
||
| # Added by cargo | ||
|
|
||
| /target |
There was a problem hiding this comment.
move to 'building' section above.
| @@ -0,0 +1,3 @@ | |||
| [workspace] | |||
| resolver = "3" | |||
| members = ["packages/debmagic"] | |||
There was a problem hiding this comment.
rust edition, version and dependencies can be moved here ([workspace.package], [workspace.dependencies]
| manifest-path = "Cargo.toml" | ||
| module-name = "debmagic.cli" | ||
| strip = true | ||
| exclude = [] |
There was a problem hiding this comment.
why is the debmagic cli still needed as a python package?
if we need a python-api for it, we should have a separate crate. debmagic_api as lib with pyo3 python api, debmagic (=cli) using the api crate.
| let current_dir = env::current_dir()?; | ||
| match &cli.command { | ||
| Commands::Build(args) => { | ||
| let source_dir = args.source_dir.as_deref().unwrap_or(¤t_dir); |
There was a problem hiding this comment.
instead of current_dir, should be package_base_dir (detected by debian directory?)
|
|
||
| fn cleanup(&self); | ||
|
|
||
| fn drop_into_shell(&self) -> std::io::Result<()>; |
There was a problem hiding this comment.
name it just shell?
also, maybe have a difference between builddrivers and machine providers - the former are "how to build" and the latter are "how to launch and control machines (containers/vms...)"
| let mut full_cmd: Vec<String> = Vec::new(); | ||
|
|
||
| // Handle sudo logic | ||
| let is_root = unsafe { libc::getuid() == 0 }; |
|
|
||
| command.current_dir(cwd); | ||
|
|
||
| // Inherit stdout/stderr to match Python behavior |
|
|
||
| fn drop_into_shell(&self) -> std::io::Result<()> { | ||
| let mut shell = Command::new("/usr/bin/env"); | ||
| shell.arg("bash"); |
There was a problem hiding this comment.
todo: configurable. maybe default shell of build user, maybe just run login -f $user?
No description provided.