git-aggregate-rs 0.0.4__tar.gz → 0.0.6__tar.gz

{git_aggregate_rs-0.0.4 → git_aggregate_rs-0.0.6}/Cargo.lock

@@ -727,7 +727,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "117725a109d387c937a1533ce01b450cbde6b88abceea8473c4d7a85853cda3c"
 dependencies = [
  "lazy_static",
- "windows-sys 0.52.0",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -1541,7 +1541,7 @@ dependencies = [
 
 [[package]]
 name = "git-aggregate-rs"
-version = "0.0.4"
+version = "0.0.6"
 dependencies = [
  "assert_cmd",
  "clap",
@@ -2658,7 +2658,7 @@ dependencies = [
 
 [[package]]
 name = "odx-aggregate"
-version = "0.0.4"
+version = "0.0.6"
 dependencies = [
  "odx-config",
  "odx-core",
@@ -2671,7 +2671,7 @@ dependencies = [
 
 [[package]]
 name = "odx-analyze"
-version = "0.0.4"
+version = "0.0.6"
 dependencies = [
  "serde",
  "tempfile",
@@ -2680,11 +2680,11 @@ dependencies = [
 
 [[package]]
 name = "odx-bot"
-version = "0.0.4"
+version = "0.0.6"
 
 [[package]]
 name = "odx-cli"
-version = "0.0.4"
+version = "0.0.6"
 dependencies = [
  "assert_cmd",
  "clap",
@@ -2697,6 +2697,7 @@ dependencies = [
  "odx-core",
  "odx-dashboard",
  "odx-dev",
+ "odx-env",
  "odx-forge",
  "odx-git",
  "odx-index",
@@ -2717,7 +2718,7 @@ dependencies = [
 
 [[package]]
 name = "odx-config"
-version = "0.0.4"
+version = "0.0.6"
 dependencies = [
  "insta",
  "odx-core",
@@ -2732,11 +2733,11 @@ dependencies = [
 
 [[package]]
 name = "odx-core"
-version = "0.0.4"
+version = "0.0.6"
 
 [[package]]
 name = "odx-dashboard"
-version = "0.0.4"
+version = "0.0.6"
 dependencies = [
  "ratatui",
  "serde",
@@ -2745,7 +2746,7 @@ dependencies = [
 
 [[package]]
 name = "odx-dev"
-version = "0.0.4"
+version = "0.0.6"
 dependencies = [
  "odx-config",
  "serde",
@@ -2755,11 +2756,16 @@ dependencies = [
 
 [[package]]
 name = "odx-env"
-version = "0.0.4"
+version = "0.0.6"
+dependencies = [
+ "odx-config",
+ "pep440_rs",
+ "toml_edit 0.25.17+spec-1.1.0",
+]
 
 [[package]]
 name = "odx-forge"
-version = "0.0.4"
+version = "0.0.6"
 dependencies = [
  "apple-native-keyring-store",
  "keyring-core",
@@ -2775,7 +2781,7 @@ dependencies = [
 
 [[package]]
 name = "odx-git"
-version = "0.0.4"
+version = "0.0.6"
 dependencies = [
  "futures-util",
  "odx-core",
@@ -2787,7 +2793,7 @@ dependencies = [
 
 [[package]]
 name = "odx-index"
-version = "0.0.4"
+version = "0.0.6"
 dependencies = [
  "odx-analyze",
  "odx-core",
@@ -2800,7 +2806,7 @@ dependencies = [
 
 [[package]]
 name = "odx-lint"
-version = "0.0.4"
+version = "0.0.6"
 dependencies = [
  "odoo-lint",
  "tempfile",
@@ -2808,7 +2814,7 @@ dependencies = [
 
 [[package]]
 name = "odx-platform"
-version = "0.0.4"
+version = "0.0.6"
 dependencies = [
  "odx-analyze",
  "odx-config",
@@ -2823,7 +2829,7 @@ dependencies = [
 
 [[package]]
 name = "odx-port"
-version = "0.0.4"
+version = "0.0.6"
 dependencies = [
  "odx-core",
  "regex",
@@ -2834,7 +2840,7 @@ dependencies = [
 
 [[package]]
 name = "odx-sync"
-version = "0.0.4"
+version = "0.0.6"
 dependencies = [
  "serde",
  "serde_json",
@@ -2844,7 +2850,7 @@ dependencies = [
 
 [[package]]
 name = "odx-vendor"
-version = "0.0.4"
+version = "0.0.6"
 dependencies = [
  "odx-analyze",
  "odx-config",
@@ -2861,7 +2867,7 @@ dependencies = [
 
 [[package]]
 name = "odx-verdicts"
-version = "0.0.4"
+version = "0.0.6"
 dependencies = [
  "serde",
  "tempfile",
@@ -4026,9 +4032,9 @@ checksum = "eec689c0bc40ff2458a5977b6619cb718087084a18e02a131c599b62d05e1a5f"
 
 [[package]]
 name = "rustls-webpki"
-version = "0.103.15"
+version = "0.103.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3c3cf1d8b1e7d4927e2d154c3fcb02979afb9939629c62cd9048d4f07b60ac2"
+checksum = "4443b1b6d39d7c663139942cc4558262562d2c84123bb6282ef177009ca8b281"
 dependencies = [
  "ring",
  "rustls-pki-types",
@@ -5278,9 +5284,9 @@ dependencies = [
 
 [[package]]
 name = "webpki-root-certs"
-version = "1.0.9"
+version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b96554aa2acc8ccdb7e1c9a58a7a68dd5d13bccc69cd124cb09406db612a1c9b"
+checksum = "58ec80e73fd8baf57bf0d9615554c75348bda990d6d5bbeab964dd068319fecb"
 dependencies = [
  "rustls-pki-types",
 ]

{git_aggregate_rs-0.0.4 → git_aggregate_rs-0.0.6}/Cargo.toml

@@ -3,35 +3,36 @@ resolver = "3"
 members = ["crates/*"]
 
 [workspace.package]
-version = "0.0.4"
+version = "0.0.6"
 edition = "2024"
 rust-version = "1.97"
 license = "MIT"
 authors = ["Strategic Efficiency B.V."]
 repository = "https://github.com/getfluvo/odx"
-homepage = "https://github.com/getfluvo/odx"
+homepage = "https://odx.readthedocs.io"
 readme = "README.md"
 keywords = ["odoo", "oca", "git", "workspace", "cli"]
 categories = ["command-line-utilities", "development-tools"]
 
 [workspace.dependencies]
 # Internal crates.
-odx-core = { path = "crates/odx-core", version = "0.0.4" }
-git-aggregate-rs = { path = "crates/git-aggregate-rs", version = "0.0.4" }
-odx-config = { path = "crates/odx-config", version = "0.0.4" }
-odx-git = { path = "crates/odx-git", version = "0.0.4" }
-odx-aggregate = { path = "crates/odx-aggregate", version = "0.0.4" }
-odx-forge = { path = "crates/odx-forge", version = "0.0.4" }
-odx-analyze = { path = "crates/odx-analyze", version = "0.0.4" }
-odx-dashboard = { path = "crates/odx-dashboard", version = "0.0.4" }
-odx-index = { path = "crates/odx-index", version = "0.0.4" }
-odx-port = { path = "crates/odx-port", version = "0.0.4" }
-odx-lint = { path = "crates/odx-lint", version = "0.0.4" }
-odx-verdicts = { path = "crates/odx-verdicts", version = "0.0.4" }
-odx-platform = { path = "crates/odx-platform", version = "0.0.4" }
-odx-vendor = { path = "crates/odx-vendor", version = "0.0.4" }
-odx-dev = { path = "crates/odx-dev", version = "0.0.4" }
-odx-sync = { path = "crates/odx-sync", version = "0.0.4" }
+odx-core = { path = "crates/odx-core", version = "0.0.6" }
+git-aggregate-rs = { path = "crates/git-aggregate-rs", version = "0.0.6" }
+odx-config = { path = "crates/odx-config", version = "0.0.6" }
+odx-git = { path = "crates/odx-git", version = "0.0.6" }
+odx-aggregate = { path = "crates/odx-aggregate", version = "0.0.6" }
+odx-forge = { path = "crates/odx-forge", version = "0.0.6" }
+odx-analyze = { path = "crates/odx-analyze", version = "0.0.6" }
+odx-dashboard = { path = "crates/odx-dashboard", version = "0.0.6" }
+odx-index = { path = "crates/odx-index", version = "0.0.6" }
+odx-port = { path = "crates/odx-port", version = "0.0.6" }
+odx-lint = { path = "crates/odx-lint", version = "0.0.6" }
+odx-verdicts = { path = "crates/odx-verdicts", version = "0.0.6" }
+odx-platform = { path = "crates/odx-platform", version = "0.0.6" }
+odx-vendor = { path = "crates/odx-vendor", version = "0.0.6" }
+odx-dev = { path = "crates/odx-dev", version = "0.0.6" }
+odx-sync = { path = "crates/odx-sync", version = "0.0.6" }
+odx-env = { path = "crates/odx-env", version = "0.0.6" }
 
 # External crates. Versions are pinned in Cargo.lock.
 clap = { version = "4.5", features = ["derive"] }

{git_aggregate_rs-0.0.4 → git_aggregate_rs-0.0.6}/PKG-INFO

@@ -1,19 +1,22 @@
 Metadata-Version: 2.4
 Name: git-aggregate-rs
-Version: 0.0.4
+Version: 0.0.6
 Classifier: Development Status :: 2 - Pre-Alpha
 Classifier: Environment :: Console
 Classifier: Programming Language :: Rust
 Classifier: Topic :: Software Development :: Version Control :: Git
 Summary: Drop-in replacement for git-aggregator's gitaggregate, written in Rust
 Keywords: odoo,oca,git,git-aggregator
-Home-Page: https://github.com/getfluvo/odx
+Home-Page: https://odx.readthedocs.io
 Author: Strategic Efficiency B.V.
 License-Expression: MIT
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown; charset=UTF-8; variant=GFM
-Project-URL: Homepage, https://github.com/getfluvo/odx
+Project-URL: Changelog, https://github.com/getfluvo/odx/releases
+Project-URL: Documentation, https://odx.readthedocs.io/compatibility.html
+Project-URL: Homepage, https://odx.readthedocs.io/compatibility.html
 Project-URL: Issues, https://github.com/getfluvo/odx/issues
+Project-URL: Source, https://github.com/getfluvo/odx/tree/main/crates/git-aggregate-rs
 
 # git-aggregate-rs
 
@@ -23,6 +26,11 @@ same flags (`-c`, `-p`, `-d`, `-e`, `--env-file`, `-f`, `-j`, `--log-level`,
 `--no-color`), with opt-in extensions: `--allow-shell`, `--rebase`, `--mergiraf`
 and `--json`.
 
+```console
+$ uv tool install git-aggregate-rs     # or: pipx install git-aggregate-rs
+$ cargo install git-aggregate-rs
+```
+
 ```console
 $ git-aggregate-rs -c repos.yaml
 $ git-aggregate-rs -c repos.yaml -d '*/sale-*' -j 8

{git_aggregate_rs-0.0.4/crates/git-aggregate-rs → git_aggregate_rs-0.0.6}/README.md

@@ -6,6 +6,11 @@ same flags (`-c`, `-p`, `-d`, `-e`, `--env-file`, `-f`, `-j`, `--log-level`,
 `--no-color`), with opt-in extensions: `--allow-shell`, `--rebase`, `--mergiraf`
 and `--json`.
 
+```console
+$ uv tool install git-aggregate-rs     # or: pipx install git-aggregate-rs
+$ cargo install git-aggregate-rs
+```
+
 ```console
 $ git-aggregate-rs -c repos.yaml
 $ git-aggregate-rs -c repos.yaml -d '*/sale-*' -j 8

{git_aggregate_rs-0.0.4 → git_aggregate_rs-0.0.6/crates/git-aggregate-rs}/README.md

@@ -6,6 +6,11 @@ same flags (`-c`, `-p`, `-d`, `-e`, `--env-file`, `-f`, `-j`, `--log-level`,
 `--no-color`), with opt-in extensions: `--allow-shell`, `--rebase`, `--mergiraf`
 and `--json`.
 
+```console
+$ uv tool install git-aggregate-rs     # or: pipx install git-aggregate-rs
+$ cargo install git-aggregate-rs
+```
+
 ```console
 $ git-aggregate-rs -c repos.yaml
 $ git-aggregate-rs -c repos.yaml -d '*/sale-*' -j 8

git_aggregate_rs-0.0.6/crates/odx-aggregate/README.md

@@ -0,0 +1,19 @@
+# odx-aggregate
+
+Aggregation, locking, vaulting, the force-push guard rail, auto-update and verification for odx.
+
+Part of [odx](https://github.com/getfluvo/odx), the Odoo Developer eXtension.
+This crate is one of the building blocks of the `odx` command
+([`odx-cli`](https://crates.io/crates/odx-cli)); its API follows what odx needs
+and is not stable. To use odx, install the command:
+
+```console
+$ uv tool install odx-cli
+$ cargo install odx-cli
+```
+
+- User documentation: [odx.readthedocs.io](https://odx.readthedocs.io/)
+- API documentation: [docs.rs/odx-aggregate](https://docs.rs/odx-aggregate)
+- Source and issues: [github.com/getfluvo/odx](https://github.com/getfluvo/odx)
+
+MIT licensed. Built with Rust & AI-accelerated engineering.

git_aggregate_rs-0.0.6/crates/odx-config/README.md

@@ -0,0 +1,19 @@
+# odx-config
+
+Configuration for odx: [tool.odx], dependency groups, uv sources, odx.lock, mutes and repos.yaml/addons.yaml compatibility.
+
+Part of [odx](https://github.com/getfluvo/odx), the Odoo Developer eXtension.
+This crate is one of the building blocks of the `odx` command
+([`odx-cli`](https://crates.io/crates/odx-cli)); its API follows what odx needs
+and is not stable. To use odx, install the command:
+
+```console
+$ uv tool install odx-cli
+$ cargo install odx-cli
+```
+
+- User documentation: [odx.readthedocs.io](https://odx.readthedocs.io/)
+- API documentation: [docs.rs/odx-config](https://docs.rs/odx-config)
+- Source and issues: [github.com/getfluvo/odx](https://github.com/getfluvo/odx)
+
+MIT licensed. Built with Rust & AI-accelerated engineering.

{git_aggregate_rs-0.0.4 → git_aggregate_rs-0.0.6}/crates/odx-config/src/deps.rs

@@ -408,6 +408,109 @@ pub fn all_requirements(doc: &DocumentMut) -> Vec<(Option<String>, Requirement)>
     found
 }
 
+/// The requirement strings of `dist` as written, with their group (none
+/// for `[project] dependencies`), in the order [`all_requirements`] uses.
+pub fn written_requirements(doc: &DocumentMut, dist: &str) -> Vec<(Option<String>, String)> {
+    let wanted = normalize_name(dist);
+    let of = |item: &Item| -> Vec<String> {
+        item.as_array()
+            .into_iter()
+            .flat_map(|array| array.iter())
+            .filter_map(|value| value.as_str())
+            .filter(|text| {
+                parse_requirement(text).is_ok_and(|req| normalize_name(&req.name) == wanted)
+            })
+            .map(str::to_owned)
+            .collect()
+    };
+    let mut found: Vec<(Option<String>, String)> = get_path(doc, &["project", "dependencies"])
+        .map(of)
+        .unwrap_or_default()
+        .into_iter()
+        .map(|text| (None, text))
+        .collect();
+    for table in [
+        GroupTable::OptionalDependencies,
+        GroupTable::DependencyGroups,
+    ] {
+        let groups = get_path(doc, table.path()).and_then(Item::as_table_like);
+        for (name, item) in groups.iter().flat_map(|groups| groups.iter()) {
+            found.extend(
+                of(item)
+                    .into_iter()
+                    .map(|text| (Some(name.to_owned()), text)),
+            );
+        }
+    }
+    found
+}
+
+/// The requirement array of `group` (none: `[project] dependencies`).
+fn group_array_mut<'a>(
+    doc: &'a mut DocumentMut,
+    group: Option<&str>,
+) -> Option<&'a mut toml_edit::Array> {
+    let path: Vec<&str> = match group {
+        None => vec!["project", "dependencies"],
+        Some(name) => {
+            let table = [
+                GroupTable::OptionalDependencies,
+                GroupTable::DependencyGroups,
+            ]
+            .into_iter()
+            .find(|table| {
+                get_path(doc, table.path())
+                    .and_then(Item::as_table_like)
+                    .is_some_and(|groups| groups.contains_key(name))
+            })?;
+            table.path().iter().copied().chain([name]).collect()
+        }
+    };
+    get_path_mut(doc, &path)?.as_array_mut()
+}
+
+/// Make `requirement` the one requirement of `dist` in `group` (none:
+/// `[project] dependencies`): in place of the first one there, else
+/// appended, keeping the list's layout.
+///
+/// Returns `false` when the group does not exist.
+pub fn set_requirement(
+    doc: &mut DocumentMut,
+    group: Option<&str>,
+    dist: &str,
+    requirement: &str,
+) -> bool {
+    let wanted = normalize_name(dist);
+    let Some(array) = group_array_mut(doc, group) else {
+        return false;
+    };
+    let ours = |value: &Value| {
+        value
+            .as_str()
+            .and_then(|text| parse_requirement(text).ok())
+            .is_some_and(|req| normalize_name(&req.name) == wanted)
+    };
+    let first = array.iter().position(&ours);
+    let neighbour = first.map_or_else(|| array.iter().last(), |first| array.get(first));
+    let mut value = Value::from(requirement);
+    value.decor_mut().clone_from(
+        &neighbour
+            .map(|item| item.decor().clone())
+            .unwrap_or_default(),
+    );
+    if let Some(first) = first {
+        array.replace_formatted(first, value);
+        let mut index = 0;
+        array.retain(|item| {
+            index += 1;
+            index - 1 == first || !ours(item)
+        });
+    } else {
+        array.push_formatted(value);
+    }
+    true
+}
+
 /// Append a requirement string to group `name`, keeping the list's layout.
 ///
 /// Returns `false` when the group does not exist.
@@ -590,6 +693,58 @@ pub fn remove_uv_source(doc: &mut DocumentMut, dist: &str) -> bool {
 mod tests {
     use super::*;
 
+    #[test]
+    fn written_and_set_requirements() {
+        let mut doc: DocumentMut = "[project]\nname = \"p\"\ndependencies = [\"odoo-addon-a==1\", \"other\"]\n\n\
+             [project.optional-dependencies]\noca = [\n    \"odoo-addon-b==1\",\n    \"odoo_addon_b>=0\",\n]\n\n\
+             [dependency-groups]\ndev = []\n"
+            .parse()
+            .unwrap();
+        assert_eq!(
+            written_requirements(&doc, "odoo_addon_a"),
+            [(None, "odoo-addon-a==1".to_owned())]
+        );
+        assert_eq!(written_requirements(&doc, "odoo-addon-b").len(), 2);
+        assert!(set_requirement(
+            &mut doc,
+            Some("oca"),
+            "odoo-addon-b",
+            "odoo-addon-b==2"
+        ));
+        assert!(set_requirement(
+            &mut doc,
+            None,
+            "odoo-addon-a",
+            "odoo-addon-a==2"
+        ));
+        assert!(set_requirement(
+            &mut doc,
+            Some("dev"),
+            "odoo-addon-c",
+            "odoo-addon-c==1"
+        ));
+        assert!(set_requirement(
+            &mut doc,
+            Some("oca"),
+            "odoo-addon-d",
+            "odoo-addon-d==1"
+        ));
+        assert!(!set_requirement(
+            &mut doc,
+            Some("nope"),
+            "odoo-addon-d",
+            "x"
+        ));
+        assert_eq!(
+            doc.to_string(),
+            "[project]\nname = \"p\"\ndependencies = [\"odoo-addon-a==2\", \"other\"]\n\n\
+             [project.optional-dependencies]\noca = [\n    \"odoo-addon-b==2\",\n    \"odoo-addon-d==1\",\n]\n\n\
+             [dependency-groups]\ndev = [\"odoo-addon-c==1\"]\n"
+        );
+        let mut bare: DocumentMut = "[project]\nname = \"p\"\n".parse().unwrap();
+        assert!(!set_requirement(&mut bare, None, "a", "a"));
+    }
+
     #[test]
     fn every_requirement_with_its_group() {
         let doc: DocumentMut = "[project]\ndependencies = [\"odoo-addon-a\", 1]\n[project.optional-dependencies]\noca = [\"odoo-addon-b>=1\"]\nbad = 3\n[dependency-groups]\ndev = [\"pytest\"]\n"