Compare commits

..

No commits in common. "master" and "dependabot/cargo/vergen-8.2.3" have entirely different histories.

16 changed files with 989 additions and 1104 deletions

View File

@ -22,15 +22,3 @@ updates:
labels: labels:
- dependabot - dependabot
- dependencies - dependencies
- package-ecosystem: docker
directory: "/"
schedule:
interval: daily
time: "04:00"
open-pull-requests-limit: 10
assignees:
- vbrandl
labels:
- dependencies
- dependabot

View File

@ -15,7 +15,7 @@ jobs:
security_audit: security_audit:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v3
- uses: rustsec/audit-check@v1 - uses: rustsec/audit-check@v1
with: with:
token: ${{ secrets.GITHUB_TOKEN }} token: ${{ secrets.GITHUB_TOKEN }}

View File

@ -15,12 +15,12 @@ jobs:
permissions: permissions:
contents: write contents: write
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v3
with: with:
token: ${{ secrets.ACTION_TOKEN }} token: ${{ secrets.ACTION_TOKEN }}
- uses: dangoslen/dependabot-changelog-helper@v3 - uses: dangoslen/dependabot-changelog-helper@v3
with: with:
activationLabel: 'dependabot' activationLabel: 'dependabot'
- uses: stefanzweifel/git-auto-commit-action@v5 - uses: stefanzweifel/git-auto-commit-action@v4
with: with:
commit_message: "Update Changelog" commit_message: "Update Changelog"

View File

@ -33,7 +33,7 @@ jobs:
steps: steps:
- name: Checkout sources - name: Checkout sources
uses: actions/checkout@v4 uses: actions/checkout@v3
- name: Install stable toolchain - name: Install stable toolchain
uses: actions-rs/toolchain@v1 uses: actions-rs/toolchain@v1
@ -42,7 +42,7 @@ jobs:
override: true override: true
- name: Cache cargo registry, index and build directory - name: Cache cargo registry, index and build directory
uses: actions/cache@v4 uses: actions/cache@v3
with: with:
path: | path: |
~/.cargo/registry ~/.cargo/registry
@ -71,7 +71,7 @@ jobs:
fi fi
- name: Releasing assets - name: Releasing assets
uses: softprops/action-gh-release@v2 uses: softprops/action-gh-release@v1
with: with:
files: | files: |
target/${{ matrix.target }}/release/hoc-${{ matrix.artifact_prefix }}.tar.gz target/${{ matrix.target }}/release/hoc-${{ matrix.artifact_prefix }}.tar.gz
@ -84,7 +84,7 @@ jobs:
needs: [tests] needs: [tests]
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v3
- uses: taiki-e/create-gh-release-action@v1 - uses: taiki-e/create-gh-release-action@v1
with: with:
changelog: CHANGELOG.md changelog: CHANGELOG.md

View File

@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Checkout sources - name: Checkout sources
uses: actions/checkout@v4 uses: actions/checkout@v3
- name: Install stable toolchain - name: Install stable toolchain
uses: dtolnay/rust-toolchain@stable uses: dtolnay/rust-toolchain@stable
@ -27,13 +27,13 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Checkout sources - name: Checkout sources
uses: actions/checkout@v4 uses: actions/checkout@v3
- name: Install stable toolchain - name: Install stable toolchain
uses: dtolnay/rust-toolchain@stable uses: dtolnay/rust-toolchain@stable
- name: Cache cargo registry, index and build directory - name: Cache cargo registry, index and build directory
uses: actions/cache@v4 uses: actions/cache@v3
with: with:
path: | path: |
~/.cargo/registry ~/.cargo/registry
@ -42,9 +42,13 @@ jobs:
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }} key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
- name: Clippy Linting - name: Clippy Linting
run: cargo clippy --all-features -- -Dclippy::all -Dclippy::pedantic run: cargo clippy --all-features -- -Dclippy::all
# TODO
# run: cargo clippy --all-features -- -Dclippy::all -Dclippy::pedantic
- name: Clippy Test Linting - name: Clippy Test Linting
run: cargo clippy --tests -- -Dclippy::all -Dclippy::pedantic run: cargo clippy --tests -- -Dclippy::all
# TODO
# run: cargo clippy --tests -- -Dclippy::all -Dclippy::pedantic
test: test:
@ -58,13 +62,13 @@ jobs:
steps: steps:
- name: Checkout sources - name: Checkout sources
uses: actions/checkout@v4 uses: actions/checkout@v3
- name: Install stable toolchain - name: Install stable toolchain
uses: dtolnay/rust-toolchain@stable uses: dtolnay/rust-toolchain@stable
- name: Cache cargo registry, index and build directory - name: Cache cargo registry, index and build directory
uses: actions/cache@v4 uses: actions/cache@v3
with: with:
path: | path: |
~/.cargo/registry ~/.cargo/registry

View File

@ -4,55 +4,17 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## [Unreleased] ## [Unreleased]
### Dependencies ### Dependencies
- Bump `serde` from 1.0.192 to 1.0.204 ([#704](https://github.com/vbrandl/hoc/pull/704), [#719](https://github.com/vbrandl/hoc/pull/719), [#726](https://github.com/vbrandl/hoc/pull/726), [#736](https://github.com/vbrandl/hoc/pull/736), [#761](https://github.com/vbrandl/hoc/pull/761), [#766](https://github.com/vbrandl/hoc/pull/766), [#767](https://github.com/vbrandl/hoc/pull/767), [#771](https://github.com/vbrandl/hoc/pull/771), [#775](https://github.com/vbrandl/hoc/pull/775), [#787](https://github.com/vbrandl/hoc/pull/787)) - Bump `serde` from 1.0.160 to 1.0.166 (#613, #617, #627, #636)
- Bump `config` from 0.13.3 to 0.14.0 ([#705](https://github.com/vbrandl/hoc/pull/705), [#729](https://github.com/vbrandl/hoc/pull/729))
- Bump `openssl` from 0.10.55 to 0.10.60 ([#706](https://github.com/vbrandl/hoc/pull/706))
- Bump `tokio` from 1.34.0 to 1.38.0 ([#707](https://github.com/vbrandl/hoc/pull/707), [#709](https://github.com/vbrandl/hoc/pull/709), [#732](https://github.com/vbrandl/hoc/pull/732), [#756](https://github.com/vbrandl/hoc/pull/756), [#776](https://github.com/vbrandl/hoc/pull/776))
- Bump `reqwest` from 0.11.22 to 0.12.5 ([#708](https://github.com/vbrandl/hoc/pull/708), [#728](https://github.com/vbrandl/hoc/pull/728), [#741](https://github.com/vbrandl/hoc/pull/741), [#745](https://github.com/vbrandl/hoc/pull/745), [#749](https://github.com/vbrandl/hoc/pull/749), [#750](https://github.com/vbrandl/hoc/pull/750), [#754](https://github.com/vbrandl/hoc/pull/754), [#758](https://github.com/vbrandl/hoc/pull/758), [#765](https://github.com/vbrandl/hoc/pull/765), [#781](https://github.com/vbrandl/hoc/pull/781))
- Bump `anyhow` from 1.0.75 to 1.0.86 ([#710](https://github.com/vbrandl/hoc/pull/710), [#714](https://github.com/vbrandl/hoc/pull/714), [#720](https://github.com/vbrandl/hoc/pull/720), [#737](https://github.com/vbrandl/hoc/pull/737), [#744](https://github.com/vbrandl/hoc/pull/744), [#759](https://github.com/vbrandl/hoc/pull/759), [#768](https://github.com/vbrandl/hoc/pull/768), [#772](https://github.com/vbrandl/hoc/pull/772))
- Bump `futures` from 0.3.29 to 0.3.30 ([#711](https://github.com/vbrandl/hoc/pull/711))
- Bump `awc` from 3.2.0 to 3.5.0 ([#712](https://github.com/vbrandl/hoc/pull/712), [#731](https://github.com/vbrandl/hoc/pull/731), [#774](https://github.com/vbrandl/hoc/pull/774))
- Bump `actix-web` from 4.4.0 to 4.8.0 ([#713](https://github.com/vbrandl/hoc/pull/713), [#739](https://github.com/vbrandl/hoc/pull/739), [#773](https://github.com/vbrandl/hoc/pull/773), [#782](https://github.com/vbrandl/hoc/pull/782))
- Bump `tempfile` from 3.8.1 to 3.10.1 ([#715](https://github.com/vbrandl/hoc/pull/715), [#752](https://github.com/vbrandl/hoc/pull/752))
- Bump `serde_json` from 1.0.108 to 1.0.120 ([#717](https://github.com/vbrandl/hoc/pull/717), [#722](https://github.com/vbrandl/hoc/pull/722), [#727](https://github.com/vbrandl/hoc/pull/727), [#738](https://github.com/vbrandl/hoc/pull/738), [#760](https://github.com/vbrandl/hoc/pull/760), [#770](https://github.com/vbrandl/hoc/pull/770), [#784](https://github.com/vbrandl/hoc/pull/784), [#786](https://github.com/vbrandl/hoc/pull/786))
- Bump `vergen` from 8.2.6 to 8.3.1 ([#721](https://github.com/vbrandl/hoc/pull/721), [#730](https://github.com/vbrandl/hoc/pull/730))
- Bump `actions/cache` from 3 to 4 ([#724](https://github.com/vbrandl/hoc/pull/724))
- Bump `h2` from 0.3.20 to 0.3.26 ([#725](https://github.com/vbrandl/hoc/pull/725), [#757](https://github.com/vbrandl/hoc/pull/757))
- Bump `git2` from 0.18.1 to 0.18.3 ([#734](https://github.com/vbrandl/hoc/pull/734), [#748](https://github.com/vbrandl/hoc/pull/748))
- Bump `tracing-actix-web` from 0.7.9 to 0.7.11 ([#742](https://github.com/vbrandl/hoc/pull/742), [#777](https://github.com/vbrandl/hoc/pull/777))
- Bump `mio` from 0.8.9 to 0.8.11 ([#740](https://github.com/vbrandl/hoc/pull/740))
- Bump `softprops/action-gh-release` from 1 to 2 ([#743](https://github.com/vbrandl/hoc/pull/743))
- Bump `bytes` from 1.5.0 to 1.6.0 ([#751](https://github.com/vbrandl/hoc/pull/751))
- Bump `actix-rt` from 2.9.0 to 2.10.0 ([#779](https://github.com/vbrandl/hoc/pull/779))
- Bump `lazy_static` from 1.4.0 to 1.5.0 ([#783](https://github.com/vbrandl/hoc/pull/783))
## [0.36.0] 2023-11-17
### Dependencies
- Bump `serde` from 1.0.160 to 1.0.192 (#613, #617, #627, #636, #639, #640, #645, [#648](https://github.com/vbrandl/hoc/pull/648), [#650](https://github.com/vbrandl/hoc/pull/650), [#652](https://github.com/vbrandl/hoc/pull/652), [#653](https://github.com/vbrandl/hoc/pull/653), [#654](https://github.com/vbrandl/hoc/pull/654), [#655](https://github.com/vbrandl/hoc/pull/655), [#657](https://github.com/vbrandl/hoc/pull/657), [#669](https://github.com/vbrandl/hoc/pull/669), [#687](https://github.com/vbrandl/hoc/pull/687), [#692](https://github.com/vbrandl/hoc/pull/692), [#698](https://github.com/vbrandl/hoc/pull/698))
- Bump `actions/cache` from 2 to 3 (#616) - Bump `actions/cache` from 2 to 3 (#616)
- Bump `tokio` from 1.28.0 to 1.34.0 (#618, #625, #633, #634, [#659](https://github.com/vbrandl/hoc/pull/659), [#660](https://github.com/vbrandl/hoc/pull/660), [#665](https://github.com/vbrandl/hoc/pull/665), [#686](https://github.com/vbrandl/hoc/pull/686), [#699](https://github.com/vbrandl/hoc/pull/699)) - Bump `tokio` from 1.28.0 to 1.29.1 (#618, #625, #633, #634)
- Bump `reqwest` from 0.11.17 to 0.11.22 (#619, [#672](https://github.com/vbrandl/hoc/pull/672), [#683](https://github.com/vbrandl/hoc/pull/683), [#684](https://github.com/vbrandl/hoc/pull/684)) - Bump `reqwest` from 0.11.17 to 0.11.18 (#619)
- Bump `vergen` from 8.1.3 to 8.2.6 (#621, #622, #635, #638, [#679](https://github.com/vbrandl/hoc/pull/679), [#697](https://github.com/vbrandl/hoc/pull/697)) - Bump `vergen` from 8.1.3 to 8.2.3 (#621, #622, #635)
- Bump `tracing-actix-web` from 0.7.4 to 0.7.9 (#623, [#656](https://github.com/vbrandl/hoc/pull/656), [#682](https://github.com/vbrandl/hoc/pull/682), [#690](https://github.com/vbrandl/hoc/pull/690), [#701](https://github.com/vbrandl/hoc/pull/701)) - Bump `tracing-actix-web` from 0.7.4 to 0.7.5 (#623)
- Bump `git2` from 0.17.1 to 0.18.1 (#624, [#674](https://github.com/vbrandl/hoc/pull/674), [#681](https://github.com/vbrandl/hoc/pull/681)) - Bump `git2` from 0.17.1 to 0.17.2 (#624)
- Bump `tempfile` from 3.5.0 to 3.8.1 (#626, [#646](https://github.com/vbrandl/hoc/pull/646), [#658](https://github.com/vbrandl/hoc/pull/658), [#667](https://github.com/vbrandl/hoc/pull/667), [#695](https://github.com/vbrandl/hoc/pull/695)) - Bump `tempfile` from 3.5.0 to 3.6.0 (#626)
- Bump `serde_json` from 1.0.96 to 1.0.108 (#630, #632, #637, #641, #644, [#649](https://github.com/vbrandl/hoc/pull/649), [#663](https://github.com/vbrandl/hoc/pull/663), [#678](https://github.com/vbrandl/hoc/pull/678), [#680](https://github.com/vbrandl/hoc/pull/680), [#696](https://github.com/vbrandl/hoc/pull/696)) - Bump `serde_json` from 1.0.96 to 1.0.99 (#630, #632)
- Bump `openssl` from 0.10.50 to 0.10.55 (#631) - Bump `openssl` from 0.10.50 to 0.10.55 (#631)
- Bump `tracing-bunyan-formatter` from 0.3.7 to 0.3.9 (#642, [#661](https://github.com/vbrandl/hoc/pull/661))
- Bump `anyhow` from 1.0.71 to 1.0.75 (#643, [#662](https://github.com/vbrandl/hoc/pull/662), [#664](https://github.com/vbrandl/hoc/pull/664))
- Bump `ructe` from 0.16.1 to 0.17.0 ([#647](https://github.com/vbrandl/hoc/pull/647))
- Bump `actix-rt` from 2.8.0 to 2.9.0 ([#670](https://github.com/vbrandl/hoc/pull/670))
- Bump `actix-web` from 4.3.1 to 4.4.0 ([#673](https://github.com/vbrandl/hoc/pull/673))
- Bump `awc` from 3.1.1 to 3.2.0 ([#675](https://github.com/vbrandl/hoc/pull/675))
- Bump `actions/checkout` from 3 to 4 ([#676](https://github.com/vbrandl/hoc/pull/676))
- Bump `bytes` from 1.4.0 to 1.5.0 ([#677](https://github.com/vbrandl/hoc/pull/677))
- Bump `stefanzweifel/git-auto-commit-action` from 4 to 5 ([#685](https://github.com/vbrandl/hoc/pull/685))
- Bump `tracing` from 0.1.37 to 0.1.40 ([#688](https://github.com/vbrandl/hoc/pull/688), [#689](https://github.com/vbrandl/hoc/pull/689))
- Bump `tracing-log` from 0.1.3 to 0.2.0 ([#691](https://github.com/vbrandl/hoc/pull/691), [#693](https://github.com/vbrandl/hoc/pull/693))
- Bump `futures` from 0.3.28 to 0.3.29 ([#694](https://github.com/vbrandl/hoc/pull/694))
- Bump `tracing-subscriber` from 0.3.17 to 0.3.18 ([#702](https://github.com/vbrandl/hoc/pull/702))
## [0.35.0] 2023-05-04 ## [0.35.0] 2023-05-04

1883
Cargo.lock generated

File diff suppressed because it is too large Load Diff

View File

@ -1,6 +1,6 @@
[package] [package]
name = "hoc" name = "hoc"
version = "0.36.0" version = "0.35.0"
authors = ["Valentin Brandl <vbrandl@riseup.net>"] authors = ["Valentin Brandl <vbrandl@riseup.net>"]
edition = "2021" edition = "2021"
build = "src/build.rs" build = "src/build.rs"
@ -13,36 +13,36 @@ path = "src/main.rs"
name = "hoc" name = "hoc"
[dependencies] [dependencies]
actix-rt = "2.10.0" actix-rt = "2.8.0"
actix-web = "4.8.0" actix-web = "4.3.1"
badgers = "1.2.0" badgers = "1.2.0"
bytes = "1.6.0" bytes = "1.4.0"
config = { version = "0.14.0", features = ["toml"], default-features = false } config = { version = "0.13.3", features = ["toml"] }
dotenvy = "0.15.7" dotenvy = "0.15.7"
futures = "0.3.30" futures = "0.3.28"
git2 = "0.19.0" git2 = "0.17.2"
lazy_static = "1.5.0" lazy_static = "1.4.0"
mime = "0.3" mime = "0.3"
number_prefix = "0.4.0" number_prefix = "0.4.0"
openssl-probe = "0.1.5" openssl-probe = "0.1.5"
reqwest = "0.12.5" reqwest = "0.11.18"
serde = "1.0.204" serde = "1.0.166"
serde_derive = "1.0.204" serde_derive = "1.0.166"
serde_json = "1.0.120" serde_json = "1.0.99"
tracing = "0.1.40" tracing = "0.1.37"
tracing-actix-web = "0.7.11" tracing-actix-web = "0.7.5"
tracing-bunyan-formatter = "0.3.9" tracing-bunyan-formatter = "0.3.7"
tracing-futures = "0.2.5" tracing-futures = "0.2.5"
tracing-log = "0.2.0" tracing-log = "0.1.3"
tracing-subscriber = { version = "0.3.18", features = ["registry", "env-filter"] } tracing-subscriber = { version = "0.3.17", features = ["registry", "env-filter"] }
[build-dependencies] [build-dependencies]
anyhow = "1.0.86" anyhow = "1.0.71"
ructe = { version = "0.17.2", features = ["mime03"] } ructe = { version = "0.16.1", features = ["mime03"] }
vergen = { version = "8.3.1", default-features = false, features = ["git", "gitoxide"] } vergen = { version = "8.2.3", default-features = false, features = ["git", "gitoxide"] }
[dev-dependencies] [dev-dependencies]
awc = "3.5.0" awc = "3.1.1"
ructe = "0.17.2" ructe = "0.16.1"
tempfile = "3.10.1" tempfile = "3.6.0"
tokio = "1.38.0" tokio = "1.29.1"

View File

@ -1,6 +0,0 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": [
"local>renovate-bot/renovate-config"
]
}

View File

@ -74,7 +74,7 @@ impl<'a> CacheState<'a> {
trace!("Calculating new cache"); trace!("Calculating new cache");
match self { match self {
CacheState::Old { mut cache, .. } => { CacheState::Old { mut cache, .. } => {
if let Some(cache) = cache.entries.get_mut(branch) { if let Some(mut cache) = cache.entries.get_mut(branch) {
cache.head = head; cache.head = head;
cache.count += count; cache.count += count;
cache.commits += commits; cache.commits += commits;

View File

@ -41,16 +41,19 @@ impl ResponseError for Error {
fn error_response(&self) -> HttpResponse { fn error_response(&self) -> HttpResponse {
let mut buf = Vec::new(); let mut buf = Vec::new();
if let Error::BranchNotFound = self { match self {
Error::BranchNotFound => {
templates::p404_no_master_html(&mut buf, VERSION_INFO, 0).unwrap(); templates::p404_no_master_html(&mut buf, VERSION_INFO, 0).unwrap();
HttpResponse::NotFound().content_type("text/html").body(buf) HttpResponse::NotFound().content_type("text/html").body(buf)
} else { }
_ => {
templates::p500_html(&mut buf, VERSION_INFO, 0).unwrap(); templates::p500_html(&mut buf, VERSION_INFO, 0).unwrap();
HttpResponse::InternalServerError() HttpResponse::InternalServerError()
.content_type("text/html") .content_type("text/html")
.body(buf) .body(buf)
} }
} }
}
} }
impl std::error::Error for Error {} impl std::error::Error for Error {}

View File

@ -282,7 +282,6 @@ where
} }
pull(&path)?; pull(&path)?;
let (hoc, head, commits) = hoc(&service_url, &state.repos(), &state.cache(), branch)?; let (hoc, head, commits) = hoc(&service_url, &state.repos(), &state.cache(), branch)?;
#[allow(clippy::cast_precision_loss)]
let hoc_pretty = match NumberPrefix::decimal(hoc as f64) { let hoc_pretty = match NumberPrefix::decimal(hoc as f64) {
NumberPrefix::Standalone(hoc) => hoc.to_string(), NumberPrefix::Standalone(hoc) => hoc.to_string(),
NumberPrefix::Prefixed(prefix, hoc) => format!("{hoc:.1}{prefix}"), NumberPrefix::Prefixed(prefix, hoc) => format!("{hoc:.1}{prefix}"),

View File

@ -6,7 +6,7 @@ fn init() {
dotenvy::dotenv().ok(); dotenvy::dotenv().ok();
openssl_probe::init_ssl_cert_env_vars(); openssl_probe::init_ssl_cert_env_vars();
telemetry::init_subscriber(telemetry::get_subscriber("hoc", "info")); telemetry::init_subscriber(telemetry::get_subscriber("hoc", "info"))
} }
#[actix_rt::main] #[actix_rt::main]

View File

@ -15,10 +15,6 @@ pub fn get_subscriber(name: &str, env_filter: &str) -> impl Subscriber + Send +
.with(formatting_layer) .with(formatting_layer)
} }
/// # Panics
///
/// This panics if the `LogTracer` cannot be initialized or `subscriber` cannot be set as global
/// default.
pub fn init_subscriber(subscriber: impl Subscriber + Send + Sync) { pub fn init_subscriber(subscriber: impl Subscriber + Send + Sync) {
LogTracer::init().expect("Failed to set logger"); LogTracer::init().expect("Failed to set logger");
set_global_default(subscriber).expect("Failed to set tracing subscriber"); set_global_default(subscriber).expect("Failed to set tracing subscriber");

View File

@ -5,14 +5,14 @@ use tempfile::TempDir;
#[test] #[test]
fn no_repos() { fn no_repos() {
let repos = TempDir::new().unwrap(); let repos = TempDir::new().unwrap();
assert_eq!(0, count_repositories(&repos).unwrap()); assert_eq!(0, count_repositories(&repos).unwrap())
} }
#[test] #[test]
fn no_repos_for_provider() { fn no_repos_for_provider() {
let repos = TempDir::new().unwrap(); let repos = TempDir::new().unwrap();
let _provider = TempDir::new_in(&repos).unwrap(); let _provider = TempDir::new_in(&repos).unwrap();
assert_eq!(0, count_repositories(&repos).unwrap()); assert_eq!(0, count_repositories(&repos).unwrap())
} }
#[test] #[test]
@ -20,7 +20,7 @@ fn no_repos_for_owner() {
let repos = TempDir::new().unwrap(); let repos = TempDir::new().unwrap();
let provider = TempDir::new_in(&repos).unwrap(); let provider = TempDir::new_in(&repos).unwrap();
let _owner = TempDir::new_in(&provider).unwrap(); let _owner = TempDir::new_in(&provider).unwrap();
assert_eq!(0, count_repositories(&repos).unwrap()); assert_eq!(0, count_repositories(&repos).unwrap())
} }
#[test] #[test]
@ -29,7 +29,7 @@ fn one_repo_for_owner() {
let provider = TempDir::new_in(&repos).unwrap(); let provider = TempDir::new_in(&repos).unwrap();
let owner = TempDir::new_in(&provider).unwrap(); let owner = TempDir::new_in(&provider).unwrap();
let _repo = TempDir::new_in(&owner).unwrap(); let _repo = TempDir::new_in(&owner).unwrap();
assert_eq!(1, count_repositories(&repos).unwrap()); assert_eq!(1, count_repositories(&repos).unwrap())
} }
#[test] #[test]
@ -39,7 +39,7 @@ fn two_repos_for_owner() {
let owner = TempDir::new_in(&provider).unwrap(); let owner = TempDir::new_in(&provider).unwrap();
let _repo1 = TempDir::new_in(&owner).unwrap(); let _repo1 = TempDir::new_in(&owner).unwrap();
let _repo2 = TempDir::new_in(&owner).unwrap(); let _repo2 = TempDir::new_in(&owner).unwrap();
assert_eq!(2, count_repositories(&repos).unwrap()); assert_eq!(2, count_repositories(&repos).unwrap())
} }
#[test] #[test]
@ -51,7 +51,7 @@ fn two_repos_for_two_providers() {
let provider2 = TempDir::new_in(&repos).unwrap(); let provider2 = TempDir::new_in(&repos).unwrap();
let owner2 = TempDir::new_in(&provider2).unwrap(); let owner2 = TempDir::new_in(&provider2).unwrap();
let _repo2 = TempDir::new_in(&owner2).unwrap(); let _repo2 = TempDir::new_in(&owner2).unwrap();
assert_eq!(2, count_repositories(&repos).unwrap()); assert_eq!(2, count_repositories(&repos).unwrap())
} }
#[test] #[test]
@ -62,5 +62,5 @@ fn two_subdirs_in_one_repo() {
let repo = TempDir::new_in(&owner).unwrap(); let repo = TempDir::new_in(&owner).unwrap();
let _subdir1 = TempDir::new_in(&repo).unwrap(); let _subdir1 = TempDir::new_in(&repo).unwrap();
let _subdir2 = TempDir::new_in(&repo).unwrap(); let _subdir2 = TempDir::new_in(&repo).unwrap();
assert_eq!(1, count_repositories(&repos).unwrap()); assert_eq!(1, count_repositories(&repos).unwrap())
} }

View File

@ -25,14 +25,14 @@ pub async fn spawn_app() -> TestApp {
let listener = TcpListener::bind("127.0.0.1:0").expect("Failed to bind random port"); let listener = TcpListener::bind("127.0.0.1:0").expect("Failed to bind random port");
let port = listener.local_addr().unwrap().port(); let port = listener.local_addr().unwrap().port();
let address = format!("http://127.0.0.1:{port}"); let address = format!("http://127.0.0.1:{}", port);
let repo_dir = tempdir().expect("Cannot create repo_dir"); let _repo_dir = tempdir().expect("Cannot create repo_dir");
let cache_dir = tempdir().expect("Cannot create cache_dir"); let _cache_dir = tempdir().expect("Cannot create cache_dir");
let mut settings = Settings::load().expect("Failed to read configuration."); let mut settings = Settings::load().expect("Failed to read configuration.");
settings.repodir = repo_dir.path().to_path_buf(); settings.repodir = _repo_dir.path().to_path_buf();
settings.cachedir = cache_dir.path().to_path_buf(); settings.cachedir = _cache_dir.path().to_path_buf();
let server = hoc::run(listener, settings) let server = hoc::run(listener, settings)
.await .await
@ -44,7 +44,7 @@ pub async fn spawn_app() -> TestApp {
TestApp { TestApp {
address, address,
_repo_dir: repo_dir, _repo_dir,
_cache_dir: cache_dir, _cache_dir,
} }
} }