WIP: add github crate

crates/forge-forgejo/src/lib.rs

@@ -1,9 +1,5 @@
 pub mod branch;
 
-#[cfg(test)]
-mod tests;
-
-use git_next_config as config;
 use git_next_git as git;
 
 use kxio::network::{self, Network};
@@ -25,10 +21,6 @@ impl git::ForgeLike for ForgeJo {
         "forgejo".to_string()
     }
 
-    async fn branches_get_all(&self) -> Result<Vec<config::BranchName>, git::branch::Error> {
-        branch::get_all(&self.repo_details, &self.net).await
-    }
-
     async fn commit_status(&self, commit: &git::Commit) -> git::commit::Status {
         let repo_details = &self.repo_details;
         let hostname = &repo_details.forge.hostname();

crates/forge-forgejo/src/tests/data-forgejo-branches-get.json

@@ -1,50 +0,0 @@
-[
-  {
-    "commit": {
-      "added": [
-        "string"
-      ],
-      "author": {
-        "email": "user@example.com",
-        "name": "string",
-        "username": "string"
-      },
-      "committer": {
-        "email": "user@example.com",
-        "name": "string",
-        "username": "string"
-      },
-      "id": "string",
-      "message": "string",
-      "modified": [
-        "string"
-      ],
-      "removed": [
-        "string"
-      ],
-      "timestamp": "2024-04-16T21:35:56.331Z",
-      "url": "string",
-      "verification": {
-        "payload": "string",
-        "reason": "string",
-        "signature": "string",
-        "signer": {
-          "email": "user@example.com",
-          "name": "string",
-          "username": "string"
-        },
-        "verified": true
-      }
-    },
-    "effective_branch_protection_name": "string",
-    "enable_status_check": true,
-    "name": "string",
-    "protected": true,
-    "required_approvals": 0,
-    "status_check_contexts": [
-      "string"
-    ],
-    "user_can_merge": true,
-    "user_can_push": true
-  }
-]

crates/forge-forgejo/src/tests/mod.rs

@@ -1,102 +0,0 @@
-//
-use assert2::let_assert;
-use kxio::network::{MockNetwork, Network, StatusCode};
-use std::path::Path;
-
-use crate as forgejo;
-use git::ForgeLike as _;
-use git_next_config as config;
-use git_next_git as git;
-
-mod branch {
-    use super::*;
-    mod get_all {
-
-        use super::*;
-
-        #[tokio::test]
-        async fn test_branches_get() {
-            let_assert!(Ok(fs) = kxio::fs::temp());
-            let mut net = MockNetwork::new();
-            //given
-            given_forgejo_has_branches(&mut net, 1);
-            let repo_details = given_repo_details(fs.base(), 1);
-
-            let net = Network::from(net);
-            let forge = forgejo::ForgeJo::new(repo_details, net.clone());
-
-            //when
-            let_assert!(Ok(branches) = forge.branches_get_all().await);
-
-            //then
-            let_assert!(Some(requests) = net.mocked_requests());
-            assert_eq!(requests.len(), 1);
-            assert_eq!(branches, vec![config::BranchName::new("string")]);
-        }
-    }
-    // mod validate_positions {
-    //
-    //     use git::ForgeLike;
-    //
-    //     use super::*;
-    //
-    //     #[test]
-    //     fn should_ok_all_branches_on_same_commit() {
-    //         let_assert!(Ok(fs) = kxio::fs::temp());
-    //         let mut net = MockNetwork::new();
-    //         //given
-    //         let repo_details = given_repo_details(fs.base(), 1);
-    //         let net = Network::from(net);
-    //         let (repo, _reality) = git::repository::mock();
-    //         let forge = given_a_forge(repo_details, &net, repo);
-    //         let open_repository = given_an_open_repository();
-    //         let repo_config = given_a_repo_config();
-    //
-    //         let forge = forgejo::ForgeJo::new(repo_details, net.clone(), repo);
-    //
-    //         let_assert!(
-    //             Ok(positions) = forge
-    //                 .branches_validate_positions(open_repository, repo_config)
-    //                 .await
-    //         );
-    //     }
-    //
-    //     fn given_a_forge(
-    //         repo_details: git::RepoDetails,
-    //         net: &Network,
-    //         repo: git::Repository,
-    //     ) -> forgejo::ForgeJo {
-    //         forgejo::ForgeJo::new(repo_details, net.clone(), repo)
-    //     }
-    //     fn given_an_open_repository() -> git::OpenRepository {
-    //         todo!()
-    //     }
-    //     fn given_a_repo_config() -> config::RepoConfig {
-    //         todo!()
-    //     }
-    // }
-}
-
-fn given_forgejo_has_branches(net: &mut MockNetwork, i: u32) {
-    let hostname = config::common::hostname(i);
-    let path = config::common::repo_path(i);
-    let api_token = config::common::api_token(i);
-    use secrecy::ExposeSecret;
-    let token = api_token.expose_secret();
-    let url = format!("https://{hostname}/api/v1/repos/{path}/branches?token={token}");
-    let body = include_str!("./data-forgejo-branches-get.json");
-    net.add_get_response(&url, StatusCode::OK, body);
-}
-
-fn given_repo_details(path: &Path, i: u32) -> git::RepoDetails {
-    git::common::repo_details(
-        i,
-        git::Generation::new(),
-        config::common::forge_details(i, config::ForgeType::ForgeJo),
-        Some(config::common::repo_config(
-            i,
-            config::RepoConfigSource::Repo,
-        )),
-        config::GitDir::new(path),
-    )
-}

crates/forge/src/mock_forge.rs

@@ -14,10 +14,6 @@ impl git::ForgeLike for MockForge {
         "mock".to_string()
     }
 
-    async fn branches_get_all(&self) -> Result<Vec<config::BranchName>, git::branch::Error> {
-        todo!()
-    }
-
     async fn commit_status(&self, _commit: &git::Commit) -> git::commit::Status {
         todo!()
     }

crates/git/src/forge_like.rs

@@ -1,13 +1,9 @@
 use crate as git;
-use git_next_config as config;
 
 #[async_trait::async_trait]
 pub trait ForgeLike {
     fn name(&self) -> String;
 
-    /// Returns a list of all branches in the repo.
-    async fn branches_get_all(&self) -> Result<Vec<config::BranchName>, git::branch::Error>;
-
     /// Checks the results of any (e.g. CI) status checks for the commit.
     async fn commit_status(&self, commit: &git::Commit) -> git::commit::Status;
 }

crates/repo-actor/src/lib.rs

@@ -121,12 +121,11 @@ impl Handler<LoadConfigFromRepo> for RepoActor {
     fn handle(&mut self, _msg: LoadConfigFromRepo, ctx: &mut Self::Context) -> Self::Result {
         let details = self.repo_details.clone();
         let addr = ctx.address();
-        let forge = self.forge.clone();
         let Some(open_repository) = self.open_repository.clone() else {
             warn!("missing open repository - can't load configuration");
             return;
         };
-        repo_actor::load::load_file(details, addr, forge, open_repository)
+        repo_actor::load::load_file(details, addr, open_repository)
             .in_current_span()
             .into_actor(self)
             .wait(ctx);

crates/repo-actor/src/load.rs

@@ -1,10 +1,9 @@
 //
 use actix::prelude::*;
 
-use tracing::{error, info, warn};
+use tracing::{error, info};
 
 use git_next_config as config;
-use git_next_forge as forge;
 use git_next_git as git;
 
 use super::{LoadedConfig, RepoActor};
@@ -14,11 +13,10 @@ use super::{LoadedConfig, RepoActor};
 pub async fn load_file(
     repo_details: git::RepoDetails,
     addr: Addr<RepoActor>,
-    forge: forge::Forge,
     open_repository: git::OpenRepository,
 ) {
     info!("Loading .git-next.toml from repo");
-    let repo_config = match load(&repo_details, &forge, &open_repository).await {
+    let repo_config = match load(&repo_details, &open_repository).await {
         Ok(repo_config) => repo_config,
         Err(err) => {
             error!(?err, "Failed to load config");
@@ -31,12 +29,11 @@ pub async fn load_file(
 
 async fn load(
     details: &git::RepoDetails,
-    forge: &forge::Forge,
     open_repository: &git::OpenRepository,
 ) -> Result<config::RepoConfig, Error> {
     let contents = open_repository.read_file(&details.branch, ".git-next.toml")?;
     let config = config::RepoConfig::load(&contents)?;
-    let config = validate(config, forge, open_repository).await?;
+    let config = validate(config, open_repository).await?;
     Ok(config)
 }
 
@@ -51,40 +48,9 @@ pub enum Error {
 
 pub async fn validate(
     config: config::RepoConfig,
-    forge: &forge::Forge,
     open_repository: &git::OpenRepository,
 ) -> Result<config::RepoConfig, Error> {
-    let new = open_repository.remote_branches();
-    let branches = forge.branches_get_all().await.map_err(|e| {
-        error!(?e, "Failed to list branches");
-        Error::Branch(e)
-    });
-    let branches = match (branches, new) {
-        (Ok(old), Ok(new)) => {
-            if old == new {
-                info!("remote_branches old and new match");
-            } else {
-                warn!("remote_branches old and new differ:");
-                warn!("old: {old:?}");
-                warn!("new: {new:?}");
-            }
-            Ok(old)
-        }
-        (Ok(old), Err(new)) => {
-            warn!("remote_branches old okay, new error: {new:?}");
-            Ok(old)
-        }
-        (Err(old), Ok(_new)) => {
-            warn!("remote_branches new okay, old error: {old:?}");
-            Err(old)
-        }
-        (Err(old), Err(new)) => {
-            warn!("remote_branches both error:");
-            warn!("old: {old:?}");
-            warn!("new: {new:?}");
-            Err(old)
-        }
-    }?;
+    let branches = open_repository.remote_branches()?;
     if !branches
         .iter()
         .any(|branch| branch == &config.branches().main())