feat(cli): persistent shell attachments, lots of cleanups

Author: mikonse

.gitignore

@@ -24,6 +24,8 @@ venv*
 MANIFEST
 dist/
 src/*/*.lock
+# Rust
+/target
 
 # testing
 /*.conf
@@ -51,10 +53,3 @@ Thumbs.db
 # local
 todo.md
 todo.org
-
-
-
-
-# Added by cargo
-
-/target

Cargo.lock

@@ -1,3 +1,7 @@
 [workspace]
 resolver = "3"
 members = ["packages/debmagic"]
+
+[workspace.package]
+edition = "2024"
+rust-version = "1.89"

Cargo.toml

@@ -1,4 +1,4 @@
-debmagic (0.0.1-alpha1) UNRELEASED; urgency=medium
+debmagic (0.0.1-alpha1) forky; urgency=medium
 
   * WIP: Initial release.
 

debian/changelog

@@ -21,11 +21,12 @@ pkg = package(
     preset=[dhp],
 )
 
+# TODO: add this section to our rust debmagic module to make setting this up less annoying
 os.environ.update({
     "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",
+    "CARGO_HOME": f"{pkg.base_dir}/debian/cargo_home",
+    "CARGO_REGISTRY": f"{pkg.base_dir}/debian/cargo_registry",
     "DEB_CARGO_CRATE": f"{pkg.build_env.DEB_SOURCE}_{pkg.build_env.DEB_VERSION_UPSTREAM}"
 })
 

debian/rules

@@ -1,10 +1,11 @@
 [package]
 name = "debmagic"
 version = "0.0.1-alpha1"
-edition = "2024"
 documentation = "https://debmagic.readthedocs.org"
 homepage = "https://github.com/SFTtech/debmagic"
 repository = "https://github.com/SFTtech/debmagic.git"
+rust-version.workspace = true
+edition.workspace = true
 
 [dependencies]
 clap = { version = ">=4.5.23", features = ["derive"] }