From cbf0e9d308fc7ace9788fa18ecbc19b0499909dc Mon Sep 17 00:00:00 2001 From: Christine Dodrill Date: Thu, 9 Jul 2020 13:06:07 -0400 Subject: [PATCH] end to end test --- Cargo.lock | 58 +++++++++++++++++++++++++++++ Cargo.toml | 2 + gitea/src/lib.rs | 67 ++++++++++++++++++++++++++++++++- src/cmd/cut.rs | 14 ++----- src/git.rs | 38 ++++++++----------- src/main.rs | 2 +- tests/cut.rs | 96 ++++++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 242 insertions(+), 35 deletions(-) create mode 100644 tests/cut.rs diff --git a/Cargo.lock b/Cargo.lock index dc72d90..956e74c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -198,6 +198,19 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b5320ae4c3782150d900b79807611a59a99fc9a1d61d686faafc24b93fc8d7ca" +[[package]] +name = "env_logger" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36" +dependencies = [ + "atty", + "humantime", + "log", + "regex", + "termcolor", +] + [[package]] name = "fake-simd" version = "0.1.2" @@ -344,6 +357,8 @@ dependencies = [ "gitea", "http", "kankyo", + "log", + "pretty_env_logger", "reqwest", "serde", "serde_json", @@ -417,6 +432,15 @@ version = "1.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9" +[[package]] +name = "humantime" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f" +dependencies = [ + "quick-error", +] + [[package]] name = "hyper" version = "0.13.6" @@ -819,6 +843,16 @@ version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "237a5ed80e274dbc66f86bd59c1e25edc039660be53194b5fe0a482e0f2612ea" +[[package]] +name = "pretty_env_logger" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "926d36b9553851b8b0005f1275891b392ee4d2d833852c417ed025477350fb9d" +dependencies = [ + "env_logger", + "log", +] + [[package]] name = "proc-macro-error" version = "1.0.2" @@ -854,6 +888,12 @@ dependencies = [ "unicode-xid", ] +[[package]] +name = "quick-error" +version = "1.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" + [[package]] name = "quote" version = "1.0.6" @@ -1203,6 +1243,15 @@ dependencies = [ "winapi 0.3.8", ] +[[package]] +name = "termcolor" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb6bfa289a4d7c5766392812c0a1f4c1ba45afa1ad47803c11e1f407d846d75f" +dependencies = [ + "winapi-util", +] + [[package]] name = "textwrap" version = "0.11.0" @@ -1552,6 +1601,15 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" +[[package]] +name = "winapi-util" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +dependencies = [ + "winapi 0.3.8", +] + [[package]] name = "winapi-x86_64-pc-windows-gnu" version = "0.4.0" diff --git a/Cargo.toml b/Cargo.toml index 8b39d15..d3d1ce8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,6 +12,7 @@ comrak = "0.7" git2 = "0.13" http = "0.2" kankyo = "0.3" +log = "0.4" reqwest = { version = "0.10", features = ["json"] } serde_json = "1.0" serde = { version = "1.0", features = ["derive"] } @@ -24,6 +25,7 @@ gitea = { path = "./gitea" } [dev-dependencies] tempfile = "3" elfs = { path = "./elfs" } +pretty_env_logger = "0.4" [profile.release] lto = true diff --git a/gitea/src/lib.rs b/gitea/src/lib.rs index ce9d964..eeac0fc 100644 --- a/gitea/src/lib.rs +++ b/gitea/src/lib.rs @@ -1,5 +1,4 @@ /// The main Gitea client. You will need an API token as described [here](https://docs.gitea.io/en-us/api-usage/). - use reqwest::header; use serde::{Deserialize, Serialize}; use std::result::Result as StdResult; @@ -70,6 +69,20 @@ pub struct Attachment { pub browser_download_url: String, } +/// Inputs to create a gitea repo. +/// https://try.gitea.io/api/swagger#model-CreateRepoOption +#[derive(Default, Debug, Clone, PartialEq, Serialize, Deserialize)] +pub struct CreateRepo { + pub auto_init: bool, + pub description: String, + pub gitignores: String, + pub issue_labels: String, + pub license: String, + pub name: String, + pub private: bool, + pub readme: String, +} + /// A git repository. /// https://try.gitea.io/api/swagger#model-Repository #[derive(Default, Debug, Clone, PartialEq, Serialize, Deserialize)] @@ -234,6 +247,46 @@ impl Client { } } + /// Creates a new gitea repo for the currently authenticated user with given details. + pub async fn create_user_repo(&self, cr: CreateRepo) -> Result { + Ok(self + .cli + .post(&format!("{}/api/v1/user/repos", self.base_url)) + .json(&cr) + .send() + .await? + .error_for_status()? + .json() + .await?) + } + + /// Creates a new gitea repo for a given organization with given details. + pub async fn create_org_repo(&self, org: String, cr: CreateRepo) -> Result { + Ok(self + .cli + .post(&format!("{}/api/v1/org/{}/repos", self.base_url, org)) + .json(&cr) + .send() + .await? + .error_for_status()? + .json() + .await?) + } + + /// Deletes a gitea repo by owner and name. + pub async fn delete_repo(&self, owner: String, repo: String) -> Result<()> { + self.cli + .delete(&format!( + "{}/api/v1/repos/{}/{}", + self.base_url, owner, repo + )) + .send() + .await? + .error_for_status()?; + + Ok(()) + } + /// Gets a gitea repo by name. /// /// ```rust @@ -357,4 +410,16 @@ impl Client { Ok(()) } + + /// Returns information about the currently authenticated user. + pub async fn whoami(&self) -> Result { + Ok(self + .cli + .get(&format!("{}/api/v1/user", self.base_url)) + .send() + .await? + .error_for_status()? + .json() + .await?) + } } diff --git a/src/cmd/cut.rs b/src/cmd/cut.rs index 9cfe7e3..636857d 100644 --- a/src/cmd/cut.rs +++ b/src/cmd/cut.rs @@ -10,21 +10,15 @@ pub async fn run( ) -> Result<()> { let repo = git2::Repository::open(".")?; let tag = tag.unwrap_or(version::read_version("VERSION".into())?); - let desc = changelog::read(fname.clone(), tag.clone())?; - let sig = git2::Signature::now(&common.username, &common.email)?; - if !git::has_tag(&repo, tag.clone())? { - git::tag_version(&repo, &sig, tag.clone(), desc.clone())?; - let _ = git::push(&repo, common.token.clone(), git::TAGS); - } else - /* The tag already exists */ - { - return Ok(()); + if git::has_tag(&repo, tag.clone())? { + return Err(anyhow::anyhow!("what")); } let desc = changelog::read(fname, tag.clone())?; let cli = gitea::Client::new(common.server, common.token, crate::APP_USER_AGENT)?; let vtag = format!("v{}", tag); + let repo = cli.get_repo(common.owner.clone(), common.repo.clone()).await?; let cr = gitea::CreateRelease { body: desc, @@ -32,7 +26,7 @@ pub async fn run( name: rm.name.or(Some(format!("Version {}", tag))).unwrap(), prerelease: rm.pre_release, tag_name: vtag, - target_commitish: "HEAD".into(), + target_commitish: repo.default_branch, }; let _ = cli.create_release(common.owner, common.repo, cr).await?; diff --git a/src/git.rs b/src/git.rs index 2578d97..d56676e 100644 --- a/src/git.rs +++ b/src/git.rs @@ -11,40 +11,32 @@ pub fn pull(repo: &Repository, token: String, what: &[&str]) -> Result<()> { let mut remote = repo.find_remote("origin")?; let mut fo = FetchOptions::new(); - let mut callbacks = RemoteCallbacks::new(); - callbacks.credentials(|_u, _username, allowed_types| { - if allowed_types.contains(CredentialType::SSH_KEY) { - let user = "git"; - Cred::ssh_key_from_agent(user) - } else { - Cred::userpass_plaintext(&token, "") - } - }); - - fo.remote_callbacks(callbacks); - - remote.connect(Direction::Fetch)?; + remote.connect_auth(Direction::Fetch, Some(callbacks(token.clone())), None)?; + fo.remote_callbacks(callbacks(token)); remote.fetch(what, Some(&mut fo), None)?; Ok(()) } -pub fn push(repo: &Repository, token: String, what: &[&str]) -> Result<()> { - let mut remote = repo.find_remote("origin")?; - let mut po = PushOptions::new(); - +fn callbacks<'a>(token: String) -> RemoteCallbacks<'a> { let mut callbacks = RemoteCallbacks::new(); - callbacks.credentials(|_u, _username, allowed_types| { + callbacks.credentials(move |_u, _username, allowed_types| { if allowed_types.contains(CredentialType::SSH_KEY) { let user = "git"; Cred::ssh_key_from_agent(user) } else { - Cred::userpass_plaintext(&token, "") + Cred::userpass_plaintext(&token, "x-oauth-basic") } }); + callbacks +} - po.remote_callbacks(callbacks); +pub fn push(repo: &Repository, token: String, what: &[&str]) -> Result<()> { + let mut remote = repo.find_remote("origin")?; - remote.connect(Direction::Push)?; + remote.connect_auth(Direction::Push, Some(callbacks(token.clone())), None)?; + + let mut po = PushOptions::new(); + po.remote_callbacks(callbacks(token)); remote.push(what, Some(&mut po))?; Ok(()) } @@ -78,6 +70,7 @@ pub fn has_tag(repo: &Repository, tag: String) -> Result { } let tag_name = tag_obj.unwrap(); + log::debug!("tag: {}", tag_name.to_string()); if tag == tag_name.to_string() { return Ok(true); } @@ -104,8 +97,7 @@ mod tests { let sig = &Signature::now("Gitea Release Tool", "gitea-release@tulpa.dev")?; super::commit(&repo, &sig, "test commit please ignore", &["VERSION"])?; - - super::tag_version(&repo, TAG.into(), format!("version {}", TAG), &sig)?; + super::tag_version(&repo, &sig, TAG.into(), format!("version {}", TAG))?; assert!(super::has_tag(&repo, TAG.into())?); Ok(()) diff --git a/src/main.rs b/src/main.rs index 271bb06..8330fab 100644 --- a/src/main.rs +++ b/src/main.rs @@ -6,7 +6,7 @@ use ::gitea_release::{cmd::{self, Cmd}}; #[tokio::main] async fn main() -> Result<()> { let _ = kankyo::init(); - let cmd = cmd::Cmd::from_args(); + let cmd = Cmd::from_args(); match cmd { Cmd::Cut { diff --git a/tests/cut.rs b/tests/cut.rs new file mode 100644 index 0000000..7ed6008 --- /dev/null +++ b/tests/cut.rs @@ -0,0 +1,96 @@ +use ::gitea_release::{cmd, git, APP_USER_AGENT}; +use anyhow::Result; +use git2::{Repository, Signature}; +use log::debug; +use std::{fs::File, io::Write}; + +const TAG: &'static str = "0.1.0"; + +#[tokio::test] +async fn cut() -> Result<()> { + let _ = pretty_env_logger::try_init(); + let name = elfs::next(); + let token = std::env::var("DOMO_GITEA_TOKEN")?; + + let cli = gitea::Client::new("https://tulpa.dev".into(), token.clone(), APP_USER_AGENT)?; + debug!("created gitea client"); + + let gitea_repo = cli + .create_user_repo(gitea::CreateRepo { + auto_init: false, + description: format!("https://tulpa.dev/cadey/gitea-release test repo"), + gitignores: "".into(), + issue_labels: "".into(), + license: "".into(), + name: name.clone(), + private: true, + readme: "".into(), + }) + .await?; + debug!("created repo domo/{}", name); + + let dir = tempfile::tempdir()?; + let repo = Repository::init(&dir)?; + let sig = &Signature::now("Domo Arigato", "domo@tulpa.dev")?; + debug!("initialized repo in {:?}", dir.path()); + + let mut fout = File::create(&dir.path().join("VERSION"))?; + write!(fout, "{}", TAG)?; + drop(fout); + + let mut fout = File::create(&dir.path().join("CHANGELOG.md"))?; + fout.write_all(include_bytes!("../testdata/basic.md"))?; + drop(fout); + + git::commit(&repo, &sig, TAG.into(), &["VERSION", "CHANGELOG.md"])?; + debug!("committed files"); + + repo.remote("origin", &gitea_repo.clone_url)?; + debug!("set up origin remote to {}", gitea_repo.clone_url); + + git::push( + &repo, + token.clone(), + &["refs/heads/master:refs/heads/master"], + )?; + debug!("pushed to {} with token {}", gitea_repo.clone_url, token); + + std::env::set_current_dir(dir.path())?; + cmd::cut::run( + cmd::Common { + server: "https://tulpa.dev".into(), + token: token, + auth_user: gitea_repo.owner.login.clone(), + owner: gitea_repo.owner.login.clone(), + repo: gitea_repo.name, + email: "domo@tulpa.dev".into(), + username: "Domo Arigato".into(), + }, + "CHANGELOG.md".into(), + None, + cmd::ReleaseMeta { + name: None, + draft: false, + pre_release: false, + }, + ) + .await?; + + let rls = cli + .get_release_by_tag( + gitea_repo.owner.login.clone(), + name.clone(), + format!("v{}", TAG), + ) + .await?; + + assert_eq!( + rls.body, + "Hi there this is a test\\!\n### ADDED\n - something\n" + ); + + cli.delete_repo(gitea_repo.owner.login, name).await?; + debug!("deleted repo {}", gitea_repo.clone_url); + + Ok(()) +}