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

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

@@ -727,7 +727,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "117725a109d387c937a1533ce01b450cbde6b88abceea8473c4d7a85853cda3c"
 dependencies = [
  "lazy_static",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -988,9 +988,9 @@ dependencies = [
 
 [[package]]
 name = "ctutils"
-version = "0.4.3"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03bb0e1cc970d482d121d9a1744999169b69a07470b3d644a7894e53fcaf4574"
+checksum = "38d28fb6aa7dd680b3ffd1a3e64e115c177bdba63c0ae7f9cd48129ff05c4fa0"
 dependencies = [
  "cmov",
 ]
@@ -1541,7 +1541,7 @@ dependencies = [
 
 [[package]]
 name = "git-aggregate-rs"
-version = "0.0.6"
+version = "0.0.7"
 dependencies = [
  "assert_cmd",
  "clap",
@@ -1581,9 +1581,9 @@ dependencies = [
 
 [[package]]
 name = "granit-parser"
-version = "1.3.0"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e20f99e46474f56bd905c56e817ebddcf377a611f94c53ac4649e4d3fa3c0cd0"
+checksum = "da55feca5d1625466bae068f9fd4b87892caeae70c3fe671ddb0f50d41aebf37"
 dependencies = [
  "arraydeque",
  "smallvec",
@@ -2624,9 +2624,9 @@ dependencies = [
 
 [[package]]
 name = "odoo-lint"
-version = "0.1.0-alpha.14"
+version = "0.1.0-alpha.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30cc86daa0fcf1d83cc32a933859e73bf9ef40e31df71a3790a047a24a27ef39"
+checksum = "aa5adca538c23ff9fb17a8c4c0d865dba562ff8fbe10960002f0eb377e753fd3"
 dependencies = [
  "clap",
  "comrak",
@@ -2642,6 +2642,7 @@ dependencies = [
  "oxc_ast_visit",
  "oxc_parser",
  "oxc_span",
+ "oxc_syntax",
  "rayon",
  "regex",
  "roxmltree",
@@ -2651,6 +2652,7 @@ dependencies = [
  "ruff_text_size",
  "serde",
  "serde_json",
+ "sha2 0.10.9",
  "similar",
  "toml 0.8.23",
  "walkdir",
@@ -2658,7 +2660,7 @@ dependencies = [
 
 [[package]]
 name = "odx-aggregate"
-version = "0.0.6"
+version = "0.0.7"
 dependencies = [
  "odx-config",
  "odx-core",
@@ -2671,7 +2673,7 @@ dependencies = [
 
 [[package]]
 name = "odx-analyze"
-version = "0.0.6"
+version = "0.0.7"
 dependencies = [
  "serde",
  "tempfile",
@@ -2680,11 +2682,15 @@ dependencies = [
 
 [[package]]
 name = "odx-bot"
-version = "0.0.6"
+version = "0.0.7"
+dependencies = [
+ "odx-dashboard",
+ "odx-forge",
+]
 
 [[package]]
 name = "odx-cli"
-version = "0.0.6"
+version = "0.0.7"
 dependencies = [
  "assert_cmd",
  "clap",
@@ -2693,6 +2699,7 @@ dependencies = [
  "insta",
  "odx-aggregate",
  "odx-analyze",
+ "odx-bot",
  "odx-config",
  "odx-core",
  "odx-dashboard",
@@ -2710,7 +2717,7 @@ dependencies = [
  "ratatui",
  "serde",
  "serde_json",
- "sha2 0.10.9",
+ "sha2 0.11.1",
  "tempfile",
  "toml_edit 0.25.17+spec-1.1.0",
  "zip",
@@ -2718,7 +2725,7 @@ dependencies = [
 
 [[package]]
 name = "odx-config"
-version = "0.0.6"
+version = "0.0.7"
 dependencies = [
  "insta",
  "odx-core",
@@ -2733,11 +2740,11 @@ dependencies = [
 
 [[package]]
 name = "odx-core"
-version = "0.0.6"
+version = "0.0.7"
 
 [[package]]
 name = "odx-dashboard"
-version = "0.0.6"
+version = "0.0.7"
 dependencies = [
  "ratatui",
  "serde",
@@ -2746,7 +2753,7 @@ dependencies = [
 
 [[package]]
 name = "odx-dev"
-version = "0.0.6"
+version = "0.0.7"
 dependencies = [
  "odx-config",
  "serde",
@@ -2756,7 +2763,7 @@ dependencies = [
 
 [[package]]
 name = "odx-env"
-version = "0.0.6"
+version = "0.0.7"
 dependencies = [
  "odx-config",
  "pep440_rs",
@@ -2765,7 +2772,7 @@ dependencies = [
 
 [[package]]
 name = "odx-forge"
-version = "0.0.6"
+version = "0.0.7"
 dependencies = [
  "apple-native-keyring-store",
  "keyring-core",
@@ -2781,7 +2788,7 @@ dependencies = [
 
 [[package]]
 name = "odx-git"
-version = "0.0.6"
+version = "0.0.7"
 dependencies = [
  "futures-util",
  "odx-core",
@@ -2793,7 +2800,7 @@ dependencies = [
 
 [[package]]
 name = "odx-index"
-version = "0.0.6"
+version = "0.0.7"
 dependencies = [
  "odx-analyze",
  "odx-core",
@@ -2806,7 +2813,7 @@ dependencies = [
 
 [[package]]
 name = "odx-lint"
-version = "0.0.6"
+version = "0.0.7"
 dependencies = [
  "odoo-lint",
  "tempfile",
@@ -2814,14 +2821,14 @@ dependencies = [
 
 [[package]]
 name = "odx-platform"
-version = "0.0.6"
+version = "0.0.7"
 dependencies = [
  "odx-analyze",
  "odx-config",
  "pep440_rs",
  "serde",
  "serde_json",
- "sha2 0.10.9",
+ "sha2 0.11.1",
  "tempfile",
  "toml 1.1.8+spec-1.1.0",
  "zip",
@@ -2829,7 +2836,7 @@ dependencies = [
 
 [[package]]
 name = "odx-port"
-version = "0.0.6"
+version = "0.0.7"
 dependencies = [
  "odx-core",
  "regex",
@@ -2840,7 +2847,7 @@ dependencies = [
 
 [[package]]
 name = "odx-sync"
-version = "0.0.6"
+version = "0.0.7"
 dependencies = [
  "serde",
  "serde_json",
@@ -2850,7 +2857,7 @@ dependencies = [
 
 [[package]]
 name = "odx-vendor"
-version = "0.0.6"
+version = "0.0.7"
 dependencies = [
  "odx-analyze",
  "odx-config",
@@ -2858,7 +2865,7 @@ dependencies = [
  "odx-platform",
  "serde",
  "serde_json",
- "sha2 0.10.9",
+ "sha2 0.11.1",
  "tempfile",
  "thiserror 2.0.21",
  "toml 1.1.8+spec-1.1.0",
@@ -2867,7 +2874,7 @@ dependencies = [
 
 [[package]]
 name = "odx-verdicts"
-version = "0.0.6"
+version = "0.0.7"
 dependencies = [
  "serde",
  "tempfile",
@@ -4155,9 +4162,9 @@ dependencies = [
 
 [[package]]
 name = "serde-saphyr"
-version = "1.3.0"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8050abb251097357e24aff63ba2c52a6309ecb7d23a5474023df960a02694d8"
+checksum = "a253edfdea34032da21af84e16fcc94f4c7a6ba237f9f3bc2dbf43cea8535c44"
 dependencies = [
  "annotate-snippets",
  "encoding_rs_io",
@@ -4753,9 +4760,9 @@ dependencies = [
 
 [[package]]
 name = "tokio"
-version = "1.53.2"
+version = "1.54.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e95f91fcc7a621e8b030f6aa23c71fe9838ae2fb4d8118b75602a328f5144044"
+checksum = "b52fd3255258d26fac7264ab5a76b53c13367136dc011d3d6ad4f8ed070396a3"
 dependencies = [
  "bytes",
  "libc",
@@ -5843,9 +5850,9 @@ dependencies = [
 
 [[package]]
 name = "zip"
-version = "9.0.2"
+version = "9.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e2fc56a6707efb066c40aead2409ebb1224e6dde24a074e9fbc78ced500507b"
+checksum = "6e04976da629d3b04204ba8105b396a193af8ad2583b2c79bfb3ab8af580a11e"
 dependencies = [
  "crc32fast",
  "flate2",

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

@@ -3,7 +3,7 @@ resolver = "3"
 members = ["crates/*"]
 
 [workspace.package]
-version = "0.0.6"
+version = "0.0.7"
 edition = "2024"
 rust-version = "1.97"
 license = "MIT"
@@ -16,23 +16,24 @@ categories = ["command-line-utilities", "development-tools"]
 
 [workspace.dependencies]
 # Internal crates.
-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" }
+odx-core = { path = "crates/odx-core", version = "0.0.7" }
+git-aggregate-rs = { path = "crates/git-aggregate-rs", version = "0.0.7" }
+odx-config = { path = "crates/odx-config", version = "0.0.7" }
+odx-git = { path = "crates/odx-git", version = "0.0.7" }
+odx-aggregate = { path = "crates/odx-aggregate", version = "0.0.7" }
+odx-forge = { path = "crates/odx-forge", version = "0.0.7" }
+odx-analyze = { path = "crates/odx-analyze", version = "0.0.7" }
+odx-dashboard = { path = "crates/odx-dashboard", version = "0.0.7" }
+odx-index = { path = "crates/odx-index", version = "0.0.7" }
+odx-port = { path = "crates/odx-port", version = "0.0.7" }
+odx-lint = { path = "crates/odx-lint", version = "0.0.7" }
+odx-verdicts = { path = "crates/odx-verdicts", version = "0.0.7" }
+odx-platform = { path = "crates/odx-platform", version = "0.0.7" }
+odx-vendor = { path = "crates/odx-vendor", version = "0.0.7" }
+odx-dev = { path = "crates/odx-dev", version = "0.0.7" }
+odx-sync = { path = "crates/odx-sync", version = "0.0.7" }
+odx-env = { path = "crates/odx-env", version = "0.0.7" }
+odx-bot = { path = "crates/odx-bot", version = "0.0.7" }
 
 # External crates. Versions are pinned in Cargo.lock.
 clap = { version = "4.5", features = ["derive"] }
@@ -44,7 +45,7 @@ serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 regex = "1"
 ratatui = "0.30"
-serde-saphyr = { version = "1", default-features = false, features = ["deserialize"] }
+serde-saphyr = { version = "2", default-features = false, features = ["deserialize"] }
 thiserror = "2"
 tokio = { version = "1.47", features = ["rt", "rt-multi-thread", "sync", "macros", "signal", "time"] }
 tokio-util = "0.7"
@@ -52,7 +53,7 @@ toml = "1"
 toml_edit = "0.25"
 tokei = { version = "15", default-features = false }
 pep440_rs = "0.7"
-sha2 = "0.10"
+sha2 = "0.11"
 keyring-core = "1"
 zip = { version = "9", default-features = false, features = ["deflate-flate2-zlib-rs"] }
 

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: git-aggregate-rs
-Version: 0.0.6
+Version: 0.0.7
 Classifier: Development Status :: 2 - Pre-Alpha
 Classifier: Environment :: Console
 Classifier: Programming Language :: Rust

{git_aggregate_rs-0.0.6 → git_aggregate_rs-0.0.7}/crates/odx-config/src/environments.rs

@@ -319,6 +319,16 @@ impl Model {
         self.promotion.iter().any(|[a, b]| a == from && b == to)
     }
 
+    /// The environments `from` may be promoted into, in configuration order.
+    #[must_use]
+    pub fn targets(&self, from: &str) -> Vec<&str> {
+        self.promotion
+            .iter()
+            .filter(|[a, _]| a == from)
+            .map(|[_, b]| b.as_str())
+            .collect()
+    }
+
     /// The environment a promotion into `to` comes from when `--from` is
     /// not given: the one allowed source that is not disposable, else the
     /// one allowed source.
@@ -469,6 +479,7 @@ mod tests {
         assert_eq!(main.get("test").unwrap().branch, "main");
         assert!(main.allows("test", "prod") && main.allows("prod", "test"));
         assert!(!main.allows("test", "test"));
+        assert_eq!(main.targets("test"), ["prod"]);
         let sh = model("[tool.odx.environments]\npreset = \"odoo-sh\"\n")
             .unwrap()
             .unwrap();

{git_aggregate_rs-0.0.6 → git_aggregate_rs-0.0.7}/crates/odx-forge/src/cache.rs

@@ -87,6 +87,16 @@ impl<H: Http> Http for CachedHttp<H> {
     ) -> Result<HttpResponse, ForgeError> {
         self.inner.put(url, headers, body)
     }
+
+    /// Not cached either.
+    fn patch(
+        &self,
+        url: &str,
+        headers: &[(&str, String)],
+        body: &serde_json::Value,
+    ) -> Result<HttpResponse, ForgeError> {
+        self.inner.patch(url, headers, body)
+    }
 }
 
 #[cfg(test)]
@@ -161,6 +171,14 @@ mod tests {
                 .status,
             200
         );
+        let patching = CachedHttp::new(Scripted::new(vec![Ok(reply(200, ""))]), tmp.path());
+        assert_eq!(
+            patching
+                .patch("https://x/a", &[], &serde_json::json!({}))
+                .unwrap()
+                .status,
+            200
+        );
         let failing = CachedHttp::new(
             Scripted::new(vec![Err(ForgeError::Http("down".into()))]),
             tmp.path(),

{git_aggregate_rs-0.0.6 → git_aggregate_rs-0.0.7}/crates/odx-forge/src/client.rs

@@ -216,6 +216,16 @@ impl<'a> ForgeClient<'a> {
         self.http.put(url, &self.headers(repo, kind), body)
     }
 
+    pub(crate) fn patch(
+        &self,
+        url: &str,
+        repo: &RepoUrl,
+        kind: ForgeKind,
+        body: &Value,
+    ) -> Result<HttpResponse, ForgeError> {
+        self.http.patch(url, &self.headers(repo, kind), body)
+    }
+
     fn get(&self, url: &str, repo: &RepoUrl, kind: ForgeKind) -> Result<HttpResponse, ForgeError> {
         let headers = self.headers(repo, kind);
         for _ in 0..ATTEMPTS {

{git_aggregate_rs-0.0.6 → git_aggregate_rs-0.0.7}/crates/odx-forge/src/contribute.rs

@@ -33,7 +33,7 @@ pub struct Proposal<'a> {
 }
 
 /// The JSON of a `200` or `201` answer.
-fn created(response: &HttpResponse, repo: &RepoUrl) -> Result<Value, ForgeError> {
+pub(crate) fn created(response: &HttpResponse, repo: &RepoUrl) -> Result<Value, ForgeError> {
     if !matches!(response.status, 200..=202) {
         return Err(ForgeError::Status {
             host: repo.host.clone(),

{git_aggregate_rs-0.0.6 → git_aggregate_rs-0.0.7}/crates/odx-forge/src/http.rs

@@ -57,6 +57,25 @@ pub trait Http: fmt::Debug + Send + Sync {
         headers: &[(&str, String)],
         body: &serde_json::Value,
     ) -> Result<HttpResponse, ForgeError>;
+
+    /// PATCH `body` as JSON to `url` with `headers`. Clients that only
+    /// read, or only create, need not answer it.
+    ///
+    /// # Errors
+    ///
+    /// [`ForgeError::Http`] when no response arrives (DNS, TLS, connection),
+    /// or when the client does not send PATCH requests.
+    fn patch(
+        &self,
+        url: &str,
+        headers: &[(&str, String)],
+        body: &serde_json::Value,
+    ) -> Result<HttpResponse, ForgeError> {
+        let _ = (url, headers, body);
+        Err(ForgeError::Http(
+            "this client does not send PATCH requests".to_owned(),
+        ))
+    }
 }
 
 /// [`Http`] over `reqwest` with rustls, verifying certificates against the
@@ -146,6 +165,15 @@ impl Http for ReqwestHttp {
     ) -> Result<HttpResponse, ForgeError> {
         Self::execute(self.client.put(url).json(body), headers)
     }
+
+    fn patch(
+        &self,
+        url: &str,
+        headers: &[(&str, String)],
+        body: &serde_json::Value,
+    ) -> Result<HttpResponse, ForgeError> {
+        Self::execute(self.client.patch(url).json(body), headers)
+    }
 }
 
 #[cfg(test)]
@@ -189,6 +217,51 @@ mod tests {
         assert!(request.contains("user-agent: odx/"), "{request}");
     }
 
+    #[test]
+    fn patches() {
+        /// A client that only reads.
+        #[derive(Debug)]
+        struct Reader;
+        impl Http for Reader {
+            fn get(&self, _: &str, _: &[(&str, String)]) -> Result<HttpResponse, ForgeError> {
+                Ok(HttpResponse::default())
+            }
+            fn post(
+                &self,
+                _: &str,
+                _: &[(&str, String)],
+                _: &serde_json::Value,
+            ) -> Result<HttpResponse, ForgeError> {
+                Ok(HttpResponse::default())
+            }
+            fn put(
+                &self,
+                _: &str,
+                _: &[(&str, String)],
+                _: &serde_json::Value,
+            ) -> Result<HttpResponse, ForgeError> {
+                Ok(HttpResponse::default())
+            }
+        }
+        let (url, server) = serve_once(b"HTTP/1.1 200 OK\r\nContent-Length: 2\r\n\r\n{}");
+        let http = ReqwestHttp::new().unwrap();
+        let response = http.patch(&url, &[], &serde_json::json!({"a": 1})).unwrap();
+        assert_eq!(response.status, 200);
+        let request = server.join().unwrap();
+        assert!(request.starts_with("PATCH /repos/a/b "), "{request}");
+        assert!(request.ends_with(r#"{"a":1}"#), "{request}");
+
+        assert!(Reader.get("u", &[]).is_ok());
+        assert!(Reader.post("u", &[], &serde_json::json!({})).is_ok());
+        assert!(Reader.put("u", &[], &serde_json::json!({})).is_ok());
+        assert_eq!(
+            Reader.patch("u", &[], &serde_json::json!({})),
+            Err(ForgeError::Http(
+                "this client does not send PATCH requests".to_owned()
+            ))
+        );
+    }
+
     #[test]
     fn connection_and_body_failures() {
         let http = ReqwestHttp::new().unwrap();