Update changelog

Bumps [tempfile](https://github.com/Stebalien/tempfile) from 3.4.0 to 3.5.0.
- [Release notes](https://github.com/Stebalien/tempfile/releases)
- [Changelog](https://github.com/Stebalien/tempfile/blob/master/NEWS)
- [Commits](https://github.com/Stebalien/tempfile/commits)

---
updated-dependencies:
- dependency-name: tempfile
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

.cargo/audit.toml

@@ -1,3 +1 @@
 [advisories]
-# TODO: check if chrono fixed this
-ignore = [ "RUSTSEC-2020-0159", "RUSTSEC-2020-0071" ]

.envrc

@@ -0,0 +1 @@
+eval "$(lorri direnv)"

.github/dependabot.yml

@@ -1,10 +1,12 @@
 version: 2
 updates:
-- package-ecosystem: cargo
-  directory: "/"
-  schedule:
-    interval: daily
-    time: "04:00"
-  open-pull-requests-limit: 10
-  assignees:
-  - vbrandl
+  - package-ecosystem: cargo
+    directory: "/"
+    schedule:
+      interval: daily
+      time: "04:00"
+    open-pull-requests-limit: 10
+    assignees:
+      - vbrandl
+    labels:
+      - dependencies

.github/workflows/audit.yml

@@ -3,26 +3,19 @@ on:
   schedule:
     - cron: '0 1 * * *'
   push:
+    branches:
+      - master
+  pull_request:
     paths:
       - '**/Cargo.toml'
       - '**/Cargo.lock'
-  pull_request:
+      - ".cargo/audit.toml"
 
 jobs:
   security_audit:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-
-      - name: Cache cargo registry, index and build directory
-        uses: actions/cache@v2
-        with:
-          path: |
-            ~/.cargo/registry
-            ~/.cargo/git
-            ./target
-          key: audit-${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
-
+      - uses: actions/checkout@v3
       - uses: actions-rs/audit-check@v1
         with:
           token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/release.yml

@@ -6,8 +6,12 @@ on:
       - 'v[0-9]+.[0-9]+.[0-9]+'
 
 jobs:
+  tests:
+    uses: vbrandl/hoc/.github/workflows/rust.yml@master
+
   publish:
     name: Publishing for ${{ matrix.os }}
+    needs: [tests]
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
@@ -29,7 +33,7 @@ jobs:
 
     steps:
       - name: Checkout sources
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Install stable toolchain
         uses: actions-rs/toolchain@v1
@@ -44,7 +48,7 @@ jobs:
             ~/.cargo/registry
             ~/.cargo/git
             ./target
-          key: release-${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
 
       - name: Cargo build
         uses: actions-rs/cargo@v1
@@ -74,3 +78,14 @@ jobs:
             target/${{ matrix.target }}/release/hoc-${{ matrix.artifact_prefix }}.sha256
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+  changelog:
+    name: Update Changelog
+    needs: [tests]
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: taiki-e/create-gh-release-action@v1
+        with:
+          changelog: CHANGELOG.md
+          token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/rust.yml

@@ -1,13 +1,19 @@
-on: [push, pull_request]
+on:
+  workflow_call:
+  push:
+    branches:
+      - master
+  pull_request:
+  schedule:
+    - cron: "0 0 * * *"
 
 jobs:
-
   rustfmt:
     name: Rustfmt
     runs-on: ubuntu-latest
     steps:
       - name: Checkout sources
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Install stable toolchain
         uses: actions-rs/toolchain@v1
@@ -17,15 +23,6 @@ jobs:
           override: true
           components: rustfmt
 
-      - name: Cache cargo registry, index and build directory
-        uses: actions/cache@v2
-        with:
-          path: |
-            ~/.cargo/registry
-            ~/.cargo/git
-            ./target
-          key: rustfmt-${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
-
       - name: Check Formatting
         uses: actions-rs/cargo@v1
         with:
@@ -37,7 +34,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout sources
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Install stable toolchain
         uses: actions-rs/toolchain@v1
@@ -48,13 +45,13 @@ jobs:
           components: rustfmt
 
       - name: Cache cargo registry, index and build directory
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: |
             ~/.cargo/registry
             ~/.cargo/git
             ./target
-          key: clippy-${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
 
       - name: Clippy Linting
         uses: actions-rs/cargo@v1
@@ -74,7 +71,7 @@ jobs:
 
     steps:
       - name: Checkout sources
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Install stable toolchain
         uses: actions-rs/toolchain@v1
@@ -84,13 +81,13 @@ jobs:
           override: true
 
       - name: Cache cargo registry, index and build directory
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: |
             ~/.cargo/registry
             ~/.cargo/git
             ./target
-          key: test-${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
 
       - name: Run Tests
         uses: actions-rs/cargo@v1

CHANGELOG.md

@@ -0,0 +1,188 @@
+# Changelog
+
+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).
+
+## [Unreleased]
+
+* Updated [`tracing-actix-web`](https://github.com/LukeMathWalker/tracing-actix-web) from 0.7.2 to 0.7.3 ([#578])
+* Updated [`serde`](https://github.com/serde-rs/serde) from 1.0.156 to 1.0.158 ([#580])
+* Updated [`mime`](https://github.com/hyperium/mime) from 0.3.16 to 0.3.17 ([#582])
+* Updated [`dotenvy`](https://github.com/allan2/dotenvy) from 0.15.6 to 0.15.7 ([#583])
+* Updated [`reqwest`](https://github.com/seanmonstar/reqwest) from 0.11.14 to 0.11.16 ([#586])
+* Updated [`tokio`](https://github.com/tokio-rs/tokio) from 1.26.0 to 1.27.0 ([#588])
+* Updated [`tempfile`](https://github.com/Stebalien/tempfile) from 3.4.0 to 3.5.0 ([#590])
+
+[#578]: https://github.com/vbrandl/hoc/pull/578
+[#580]: https://github.com/vbrandl/hoc/pull/580
+[#582]: https://github.com/vbrandl/hoc/pull/582
+[#583]: https://github.com/vbrandl/hoc/pull/583
+[#586]: https://github.com/vbrandl/hoc/pull/586
+[#588]: https://github.com/vbrandl/hoc/pull/588
+[#590]: https://github.com/vbrandl/hoc/pull/590
+
+
+## [0.33.0] 2023-03-16
+
+* Updated [`futures`](https://github.com/rust-lang/futures-rs) from 0.3.26 to 0.3.27 ([#575])
+* Updated [`serde`](https://github.com/serde-rs/serde) from 1.0.152 to 1.0.156 ([#576])
+* Use edition 2021 ([#577])
+
+
+[#575]: https://github.com/vbrandl/hoc/pull/575
+[#576]: https://github.com/vbrandl/hoc/pull/576
+[#577]: https://github.com/vbrandl/hoc/pull/577
+
+
+## [0.32.0] 2023-03-06
+
+* Updated [`actix-web`](https://github.com/actix/actix-web) from 4.3.0 to 4.3.1 ([#566])
+* Updated [`tempfile`](https://github.com/Stebalien/tempfile) from 3.3.0 to 3.4.0 ([#567])
+* Updated [`awc`](https://github.com/actix/actix-web) from 3.1.0 to 3.1.1 ([#568])
+* Updated [`tokio`](https://github.com/tokio-rs/tokio) from 1.25.0 to 1.26.0 ([#569])
+* Updated [`serde_json`](https://github.com/serde-rs/json) from 1.0.93 to 1.0.94 ([#570])
+
+[#566]: https://github.com/vbrandl/hoc/pull/566
+[#567]: https://github.com/vbrandl/hoc/pull/567
+[#568]: https://github.com/vbrandl/hoc/pull/568
+[#569]: https://github.com/vbrandl/hoc/pull/569
+[#570]: https://github.com/vbrandl/hoc/pull/570
+
+
+## [0.31.0] 2023-02-13
+
+### Dependency Updates
+
+* Updated [`tokio`](https://github.com/tokio-rs/tokio) from 1.24.1 to 1.24.2 ([#547])
+* Updated [`badgers`](https://github.com/vbrandl/badgers) from 1.1.0 to 1.2.0 ([#548])
+* Updated [`reqwest`](https://github.com/seanmonstar/reqwest) from 0.11.13 to 0.11.14 ([#549])
+* Updated [`bumpalo`](https://github.com/fitzgen/bumpalo) from 3.10.0 to 3.12.0 ([#550])
+* Updated [`libgit2-sys`](https://github.com/rust-lang/git2-rs) from 0.14.1+1.5.0 to 0.14.2+1.5.1 ([#551])
+* Updated [`git2`](https://github.com/rust-lang/git2-rs) from 0.16.0 to 0.16.1 ([#552])
+* Updated [`actix-rt`](https://github.com/actix/actix-net) from 2.7.0 to 2.8.0 ([#553])
+* Updated [`actix-web`](https://github.com/actix/actix-web) from 4.2.1 to 4.3.0 ([#554])
+* Updated [`awc`](https://github.com/actix/actix-web) from 3.0.1 to 3.1.0 ([#555])
+* Updated [`tokio`](https://github.com/tokio-rs/tokio) from 1.24.2 to 1.25.0 ([#558])
+* Updated [`ructe`](https://github.com/kaj/ructe) from 0.15.0 to 0.16.1 ([#559])
+* Updated [`futures`](https://github.com/rust-lang/futures-rs) from 0.3.25 to 0.3.26 ([#560])
+* Updated [`bytes`](https://github.com/tokio-rs/bytes) from 1.3.0 to 1.4.0 ([#561])
+* Updated [`serde_json`](https://github.com/serde-rs/json) from 1.0.91 to 1.0.92 ([#562])
+* Updated [`vergen`](https://github.com/rustyhorde/vergen) from 7.5.0 to 7.5.1 ([#563])
+* Updated [`serde_json`](https://github.com/serde-rs/json) from 1.0.92 to 1.0.93 ([#564])
+
+[#547]: https://github.com/vbrandl/hoc/pull/547
+[#548]: https://github.com/vbrandl/hoc/pull/548
+[#550]: https://github.com/vbrandl/hoc/pull/550
+[#551]: https://github.com/vbrandl/hoc/pull/551
+[#552]: https://github.com/vbrandl/hoc/pull/552
+[#553]: https://github.com/vbrandl/hoc/pull/553
+[#554]: https://github.com/vbrandl/hoc/pull/554
+[#555]: https://github.com/vbrandl/hoc/pull/555
+[#558]: https://github.com/vbrandl/hoc/pull/558
+[#559]: https://github.com/vbrandl/hoc/pull/559
+[#560]: https://github.com/vbrandl/hoc/pull/560
+[#561]: https://github.com/vbrandl/hoc/pull/561
+[#562]: https://github.com/vbrandl/hoc/pull/562
+[#563]: https://github.com/vbrandl/hoc/pull/563
+[#564]: https://github.com/vbrandl/hoc/pull/564
+
+
+## [0.30.0] 2023-01-16
+
+### New Features
+
+* Allow customization of the badge label ([#546])
+
+### Dependency Updates
+
+* Updated [`tracing-actix-web`](https://github.com/LukeMathWalker/tracing-actix-web) from 0.7.1 to 0.7.2 ([#542])
+* Updated [`git2`](https://github.com/rust-lang/git2-rs) from 0.15.0 to 0.16.0 ([#544])
+
+
+[#542]: https://github.com/vbrandl/hoc/pull/542
+[#544]: https://github.com/vbrandl/hoc/pull/544
+[#546]: https://github.com/vbrandl/hoc/pull/546
+
+## [0.29.0] 2023-01-07
+
+### Dependency Updates
+
+* Updated [`badgers`](https://github.com/vbrandl/badgers) from 1.0.0 to 1.1.0 ([#530])
+* Updated [`serde_json`](https://github.com/serde-rs/json) from 1.0.90 to 1.0.91 ([#531])
+* Updated [`vergen`](https://github.com/rustyhorde/vergen) from 7.3.1 to 7.4.4 ([#533])
+* Updated [`tracing-actix-web`](https://github.com/LukeMathWalker/tracing-actix-web) from 0.6.2 to 0.7.1 ([#534])
+* Updated [`serde`](https://github.com/serde-rs/serde) from 1.0.151 to 1.0.152 ([#535])
+* Updated [`tokio`](https://github.com/tokio-rs/tokio) from 1.23.0 to 1.23.1 ([#536])
+* Updated [`vergen`](https://github.com/rustyhorde/vergen) from 7.4.4 to 7.5.0 ([#537])
+* Updated [`tokio`](https://github.com/tokio-rs/tokio) from 1.23.1 to 1.24.1 ([#539])
+
+[#530]: https://github.com/vbrandl/hoc/pull/530
+[#531]: https://github.com/vbrandl/hoc/pull/531
+[#533]: https://github.com/vbrandl/hoc/pull/533
+[#534]: https://github.com/vbrandl/hoc/pull/534
+[#535]: https://github.com/vbrandl/hoc/pull/535
+[#536]: https://github.com/vbrandl/hoc/pull/536
+[#537]: https://github.com/vbrandl/hoc/pull/537
+[#539]: https://github.com/vbrandl/hoc/pull/539
+
+## [0.28.0] 2022-12-18
+
+### Fixes
+
+* Fixed clippy lint `needless_borrow` ([#526])
+
+### Dependency Updates
+
+* Updated [`bytes`](https://github.com/tokio-rs/bytes) from 1.2.1 to 1.3.0 ([#519])
+* Updated [`config`](https://github.com/mehcode/config-rs) from 0.13.2 to 0.13.3 ([#522])
+* Updated [`serde_json`](https://github.com/serde-rs/json) from 1.0.88 to 1.0.90 ([#527])
+* Updated [`serde`](https://github.com/serde-rs/serde) from 1.0.147 to 1.0.151 ([#528])
+
+[#519]: https://github.com/vbrandl/hoc/pull/519
+[#522]: https://github.com/vbrandl/hoc/pull/522
+[#526]: https://github.com/vbrandl/hoc/pull/526
+[#527]: https://github.com/vbrandl/hoc/pull/527
+[#528]: https://github.com/vbrandl/hoc/pull/528
+
+## [0.27.0] 2022-10-21
+
+### Dependency Updates
+
+* Updated [`futures`](https://github.com/rust-lang/futures-rs) from 0.3.24 to 0.3.25 ([#511])
+* Updated [`serde_json`](https://github.com/serde-rs/json) from 1.0.86 to 1.0.87 ([#510])
+* Updated [`serde`](https://github.com/serde-rs/serde) from 1.0.145 to 1.0.147 ([#512])
+* Updated [`tracing-actix-web`](https://github.com/LukeMathWalker/tracing-actix-web) from 0.6.1 to 0.6.2 ([#513])
+* Updated [`reqwest`](https://github.com/seanmonstar/reqwest) from 0.11.12 to 0.11.13 ([#515])
+* Updated [`tokio`](https://github.com/tokio-rs/tokio) from 1.21.2 to 1.22.0 ([#516])
+* Updated [`serde_json`](https://github.com/serde-rs/json) from 1.0.87 to 1.0.88 ([#517])
+
+
+### Fixes
+
+* Fix clippy lint `needless-borrow` ([#514])
+
+[#511]: https://github.com/vbrandl/hoc/pull/511
+[#510]: https://github.com/vbrandl/hoc/pull/510
+[#512]: https://github.com/vbrandl/hoc/pull/512
+[#513]: https://github.com/vbrandl/hoc/pull/513
+[#514]: https://github.com/vbrandl/hoc/pull/514
+[#515]: https://github.com/vbrandl/hoc/pull/515
+[#516]: https://github.com/vbrandl/hoc/pull/516
+[#517]: https://github.com/vbrandl/hoc/pull/517
+
+
+## [0.26.0] 2022-10-03
+
+### Changed
+
+* Updated [`tracing-subscriber`](https://github.com/tokio-rs/tracing) from 0.3.15 to 0.3.16 ([#501])
+* Updated [`tracing`](https://github.com/tokio-rs/tracing) from 0.1.36 to 0.1.37 ([#502])
+* Updated [`serde_json`](https://github.com/serde-rs/json) from 1.0.85 to 1.0.86 ([#503])
+* Updated [`tracing-bunyan-formatter`](https://github.com/LukeMathWalker/tracing-bunyan-formatter) from 0.3.3 to 0.3.4 ([#504])
+* Updated [`dotenvy`](https://github.com/allan2/dotenvy) from 0.15.5 to 0.15.6 ([#508])
+
+[#501]: https://github.com/vbrandl/hoc/pull/501
+[#502]: https://github.com/vbrandl/hoc/pull/502
+[#503]: https://github.com/vbrandl/hoc/pull/503
+[#504]: https://github.com/vbrandl/hoc/pull/504
+[#508]: https://github.com/vbrandl/hoc/pull/508

Cargo.toml

@@ -1,8 +1,8 @@
 [package]
 name = "hoc"
-version = "0.21.2"
+version = "0.33.0"
 authors = ["Valentin Brandl <vbrandl@riseup.net>"]
-edition = "2018"
+edition = "2021"
 build = "build.rs"
 
 [lib]
@@ -13,34 +13,35 @@ path = "src/main.rs"
 name = "hoc"
 
 [dependencies]
-actix-rt = "2.6.0"
-actix-web = "4.0.0-rc.3"
-badge = "0.3.0"
-bytes = "1.1.0"
-config = { version = "0.11.0", features = ["toml"] }
-dotenv = "0.15.0"
-futures = "0.3.21"
-git2 = "0.13.25"
+actix-rt = "2.8.0"
+actix-web = "4.3.1"
+badgers = "1.2.0"
+bytes = "1.4.0"
+config = { version = "0.13.3", features = ["toml"] }
+dotenvy = "0.15.7"
+futures = "0.3.27"
+git2 = "0.16.1"
 lazy_static = "1.4.0"
+mime = "0.3"
 number_prefix = "0.4.0"
 openssl-probe = "0.1.5"
-reqwest = "0.11.9"
-serde = "1.0.136"
-serde_derive = "1.0.136"
-serde_json = "1.0.79"
-tracing = "0.1.31"
-tracing-actix-web = "0.5.0-rc.3"
-tracing-bunyan-formatter = "0.3.2"
+reqwest = "0.11.16"
+serde = "1.0.158"
+serde_derive = "1.0.137"
+serde_json = "1.0.94"
+tracing = "0.1.37"
+tracing-actix-web = "0.7.3"
+tracing-bunyan-formatter = "0.3.6"
 tracing-futures = "0.2.5"
-tracing-log = "0.1.2"
-tracing-subscriber = { version = "0.3.9", features = ["registry", "env-filter"] }
+tracing-log = "0.1.3"
+tracing-subscriber = { version = "0.3.16", features = ["registry", "env-filter"] }
 
 [build-dependencies]
-ructe = "0.14.0"
-vergen = { version = "6.0.2", default-features = false, features = ["git"] }
+ructe = { version = "0.16.1", features = ["mime03"] }
+vergen = { version = "7.5.1", default-features = false, features = ["git"] }
 
 [dev-dependencies]
-awc = "3.0.0-beta.21"
-ructe = "0.14.0"
-tempfile = "3.3.0"
-tokio = "1.17.0"
+awc = "3.1.1"
+ructe = "0.16.1"
+tempfile = "3.5.0"
+tokio = "1.27.0"

Dockerfile

@@ -1,10 +1,13 @@
-FROM ekidd/rust-musl-builder:stable as builder
+# FROM ekidd/rust-musl-builder:stable as builder
+FROM clux/muslrust:stable as builder
 
 # create new cargo project
-RUN USER=rust cargo init --lib
+RUN cargo init --lib
+# RUN USER=rust cargo init --lib
 RUN echo 'fn main() { println!("Hello, world!"); }' >> src/main.rs
 # copy build config
-COPY --chown=rust ./Cargo.lock ./Cargo.lock
+# COPY --chown=rust ./Cargo.lock ./Cargo.lock
+COPY ./Cargo.lock ./Cargo.lock
 COPY ./Cargo.toml ./Cargo.toml
 # HACK: remove build-dependencies so we have at least some caching
 RUN head -n $(($(grep -n "\[build-dependencies\]" Cargo.toml | cut -f1 -d:) - 1)) Cargo.toml | sed '/build.rs/d' > \
@@ -38,6 +41,7 @@ USER hoc
 # FROM scratch
 # COPY --from=linuxkit/ca-certificates:v0.7 / /
 
-COPY --from=builder /home/rust/src/target/x86_64-unknown-linux-musl/release/hoc .
+# COPY --from=builder /home/rust/src/target/x86_64-unknown-linux-musl/release/hoc .
+COPY --from=builder /volume/target/x86_64-unknown-linux-musl/release/hoc .
 
 ENTRYPOINT ["/home/hoc/hoc"]

build.rs

@@ -8,5 +8,8 @@ fn main() -> Result<(), RucteError> {
     let mut config = Config::default();
     *config.git_mut().sha_kind_mut() = ShaKind::Short;
     vergen(config).expect("Unable to generate static repo info");
-    Ructe::from_env()?.compile_templates("templates")
+    let mut ructe = Ructe::from_env()?;
+    let mut statics = ructe.statics()?;
+    statics.add_files("static")?;
+    ructe.compile_templates("templates")
 }

crate-hashes.json

@@ -1 +0,0 @@
-{}

default.nix

@@ -1,56 +0,0 @@
-{ sources ? import ./nix/sources.nix
-, system ? builtins.currentSystem
-}:
-
-let
-  rustOverlay = import "${sources.nixpkgs-mozilla}/rust-overlay.nix";
-  cargo2nixOverlay = import "${sources.cargo2nix}/overlay";
-
-  pkgs = import sources.nixpkgs {
-  # pkgs = import <nixpkgs> {
-    inherit system;
-    overlays = [ cargo2nixOverlay rustOverlay ];
-  };
-
-  rustPkgs = pkgs.rustBuilder.makePackageSet' {
-    rustChannel = "stable";
-    packageFun = import ./Cargo.nix;
-    localPatterns =
-      [
-        ''^(src|tests)(/.*)?''
-        ''[^/]*\.(rs|toml)$''
-        # include other directory from the project repository
-        ''^templates(/.*)?''
-        ''^static(/.*)?''
-        ''^.git.*(/.*)?''
-      ];
-    # packageOverrides
-  };
-in
-rec {
-  inherit rustPkgs;
-  shell = pkgs.mkShell {
-    inputsFrom = pkgs.lib.mapAttrsToList (_: pkg: pkg { }) rustPkgs.noBuild.workspace;
-    nativeBuildInputs = with rustPkgs; [ cargo rustc ];
-  };
-  package = (rustPkgs.workspace.hoc {}).overrideAttrs (drv: {
-      buildInputs = drv.buildInputs or [ ] ++ [ pkgs.git ];
-  });
-  dockerImage =
-    pkgs.dockerTools.buildImage {
-      name = "vbrandl/hits-of-code";
-      tag = package.version;
-
-      contents =
-        [
-          package
-          pkgs.cacert
-          pkgs.gitMinimal
-        ];
-
-      config = {
-        Cmd = [ "/bin/hoc" ];
-        WorkingDir = "/home/hoc";
-      };
-    };
-}

nix/sources.json

@@ -1,50 +0,0 @@
-{
-    "cargo2nix": {
-        "branch": "master",
-        "description": "Convert a Cargo.lock to mkRustCrate statements for import in Nix",
-        "homepage": "",
-        "owner": "tenx-tech",
-        "repo": "cargo2nix",
-        "rev": "7bc062ccffc41dc7d3759b8b797e8b4f8dd23a15",
-        "sha256": "1z7xwk1hbp26aydsk3y07riy0ivwqss06n1470mvdl7allfcd1w5",
-        "type": "tarball",
-        "url": "https://github.com/tenx-tech/cargo2nix/archive/7bc062ccffc41dc7d3759b8b797e8b4f8dd23a15.tar.gz",
-        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
-    },
-    "niv": {
-        "branch": "master",
-        "description": "Easy dependency management for Nix projects",
-        "homepage": "https://github.com/nmattia/niv",
-        "owner": "nmattia",
-        "repo": "niv",
-        "rev": "98c74a80934123cb4c3bf3314567f67311eb711a",
-        "sha256": "1w8n54hapd4x9f1am33icvngkqns7m3hl9yair38yqq08ffwg0kn",
-        "type": "tarball",
-        "url": "https://github.com/nmattia/niv/archive/98c74a80934123cb4c3bf3314567f67311eb711a.tar.gz",
-        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
-    },
-    "nixpkgs": {
-        "branch": "nixpkgs-unstable",
-        "description": "A read-only mirror of NixOS/nixpkgs tracking the released channels. Send issues and PRs to",
-        "homepage": "https://github.com/NixOS/nixpkgs",
-        "owner": "NixOS",
-        "repo": "nixpkgs-channels",
-        "rev": "f6bfb371cba2b5a02f200c2747c1fe2c72bd782f",
-        "sha256": "0y3hlbyvznrpr1d2vxj2511hkjg733wdnxfaib3fgy9i9jr8ivzn",
-        "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs-channels/archive/f6bfb371cba2b5a02f200c2747c1fe2c72bd782f.tar.gz",
-        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
-    },
-    "nixpkgs-mozilla": {
-        "branch": "master",
-        "description": "mozilla related nixpkgs (extends nixos/nixpkgs repo)",
-        "homepage": null,
-        "owner": "mozilla",
-        "repo": "nixpkgs-mozilla",
-        "rev": "e912ed483e980dfb4666ae0ed17845c4220e5e7c",
-        "sha256": "08fvzb8w80bkkabc1iyhzd15f4sm7ra10jn32kfch5klgl0gj3j3",
-        "type": "tarball",
-        "url": "https://github.com/mozilla/nixpkgs-mozilla/archive/e912ed483e980dfb4666ae0ed17845c4220e5e7c.tar.gz",
-        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
-    }
-}

nix/sources.nix

@@ -1,134 +0,0 @@
-# This file has been generated by Niv.
-
-let
-
-  #
-  # The fetchers. fetch_<type> fetches specs of type <type>.
-  #
-
-  fetch_file = pkgs: spec:
-    if spec.builtin or true then
-      builtins_fetchurl { inherit (spec) url sha256; }
-    else
-      pkgs.fetchurl { inherit (spec) url sha256; };
-
-  fetch_tarball = pkgs: spec:
-    if spec.builtin or true then
-      builtins_fetchTarball { inherit (spec) url sha256; }
-    else
-      pkgs.fetchzip { inherit (spec) url sha256; };
-
-  fetch_git = spec:
-    builtins.fetchGit { url = spec.repo; inherit (spec) rev ref; };
-
-  fetch_builtin-tarball = spec:
-    builtins.trace
-      ''
-        WARNING:
-          The niv type "builtin-tarball" will soon be deprecated. You should
-          instead use `builtin = true`.
-
-          $ niv modify <package> -a type=tarball -a builtin=true
-      ''
-      builtins_fetchTarball { inherit (spec) url sha256; };
-
-  fetch_builtin-url = spec:
-    builtins.trace
-      ''
-        WARNING:
-          The niv type "builtin-url" will soon be deprecated. You should
-          instead use `builtin = true`.
-
-          $ niv modify <package> -a type=file -a builtin=true
-      ''
-      (builtins_fetchurl { inherit (spec) url sha256; });
-
-  #
-  # Various helpers
-  #
-
-  # The set of packages used when specs are fetched using non-builtins.
-  mkPkgs = sources:
-    let
-      sourcesNixpkgs =
-        import (builtins_fetchTarball { inherit (sources.nixpkgs) url sha256; }) {};
-      hasNixpkgsPath = builtins.any (x: x.prefix == "nixpkgs") builtins.nixPath;
-      hasThisAsNixpkgsPath = <nixpkgs> == ./.;
-    in
-      if builtins.hasAttr "nixpkgs" sources
-      then sourcesNixpkgs
-      else if hasNixpkgsPath && ! hasThisAsNixpkgsPath then
-        import <nixpkgs> {}
-      else
-        abort
-          ''
-            Please specify either <nixpkgs> (through -I or NIX_PATH=nixpkgs=...) or
-            add a package called "nixpkgs" to your sources.json.
-          '';
-
-  # The actual fetching function.
-  fetch = pkgs: name: spec:
-
-    if ! builtins.hasAttr "type" spec then
-      abort "ERROR: niv spec ${name} does not have a 'type' attribute"
-    else if spec.type == "file" then fetch_file pkgs spec
-    else if spec.type == "tarball" then fetch_tarball pkgs spec
-    else if spec.type == "git" then fetch_git spec
-    else if spec.type == "builtin-tarball" then fetch_builtin-tarball spec
-    else if spec.type == "builtin-url" then fetch_builtin-url spec
-    else
-      abort "ERROR: niv spec ${name} has unknown type ${builtins.toJSON spec.type}";
-
-  # Ports of functions for older nix versions
-
-  # a Nix version of mapAttrs if the built-in doesn't exist
-  mapAttrs = builtins.mapAttrs or (
-    f: set: with builtins;
-    listToAttrs (map (attr: { name = attr; value = f attr set.${attr}; }) (attrNames set))
-  );
-
-  # fetchTarball version that is compatible between all the versions of Nix
-  builtins_fetchTarball = { url, sha256 }@attrs:
-    let
-      inherit (builtins) lessThan nixVersion fetchTarball;
-    in
-      if lessThan nixVersion "1.12" then
-        fetchTarball { inherit url; }
-      else
-        fetchTarball attrs;
-
-  # fetchurl version that is compatible between all the versions of Nix
-  builtins_fetchurl = { url, sha256 }@attrs:
-    let
-      inherit (builtins) lessThan nixVersion fetchurl;
-    in
-      if lessThan nixVersion "1.12" then
-        fetchurl { inherit url; }
-      else
-        fetchurl attrs;
-
-  # Create the final "sources" from the config
-  mkSources = config:
-    mapAttrs (
-      name: spec:
-        if builtins.hasAttr "outPath" spec
-        then abort
-          "The values in sources.json should not have an 'outPath' attribute"
-        else
-          spec // { outPath = fetch config.pkgs name spec; }
-    ) config.sources;
-
-  # The "config" used by the fetchers
-  mkConfig =
-    { sourcesFile ? ./sources.json
-    , sources ? builtins.fromJSON (builtins.readFile sourcesFile)
-    , pkgs ? mkPkgs sources
-    }: rec {
-      # The sources, i.e. the attribute set of spec name to spec
-      inherit sources;
-
-      # The "pkgs" (evaluated nixpkgs) to use for e.g. non-builtin fetchers
-      inherit pkgs;
-    };
-in
-mkSources (mkConfig {}) // { __functor = _: settings: mkSources (mkConfig settings); }

shell.nix

@@ -1 +1,8 @@
-with import ./. { }; shell
+{ pkgs ? import <nixpkgs> {} }:
+
+pkgs.mkShell {
+  buildInputs = with pkgs; [
+    openssl
+    pkg-config
+  ];
+}

src/config.rs

@@ -18,21 +18,16 @@ pub struct Settings {
 }
 
 impl Settings {
-    #[deprecated]
-    pub fn new() -> Result<Self, ConfigError> {
-        Self::load()
-    }
-
     pub fn load() -> Result<Self, ConfigError> {
-        let mut config = Config::new();
-        config
-            .merge(File::with_name("hoc.toml").required(false))?
-            .merge(Environment::with_prefix("hoc"))?
+        Config::builder()
+            .add_source(File::with_name("hoc.toml").required(false))
+            .add_source(Environment::with_prefix("hoc"))
             .set_default("repodir", "./repos")?
             .set_default("cachedir", "./cache")?
             .set_default("workers", 4)?
             .set_default("port", 8080)?
-            .set_default("host", "0.0.0.0")?;
-        config.try_into()
+            .set_default("host", "0.0.0.0")?
+            .build()?
+            .try_deserialize()
     }
 }

src/count.rs

@@ -1,27 +1,30 @@
 use crate::error::Result;
-use std::{fs::read_dir, path::Path, result::Result as StdResult};
+use std::{
+    fs::{read_dir, ReadDir},
+    iter::once,
+    path::Path,
+    result::Result as StdResult,
+};
 
+/// The on disk layout for served repos is `<service>/<user>/<repo>`
+/// so to get the amount of repos, we just have to count everything
+/// in `*/*/*` to get the count.
 #[instrument]
-pub(crate) fn count_repositories<P>(repo_path: P) -> Result<usize>
+pub fn count_repositories<P>(repo_path: P) -> Result<usize>
 where
     P: AsRef<Path> + std::fmt::Debug,
 {
     trace!("Counting repositories");
     std::fs::create_dir_all(&repo_path)?;
-    Ok(read_dir(repo_path)?
-        .filter_map(StdResult::ok)
-        .filter(|entry| entry.file_type().map(|ft| ft.is_dir()).unwrap_or(false))
-        .map(|entry| read_dir(entry.path()))
-        .filter_map(StdResult::ok)
-        .flat_map(|dir| {
-            dir.filter_map(StdResult::ok)
-                .filter(|entry| entry.file_type().map(|ft| ft.is_dir()).unwrap_or(false))
-        })
-        .map(|entry| read_dir(entry.path()))
-        .filter_map(StdResult::ok)
-        .flat_map(|dir| {
-            dir.filter_map(StdResult::ok)
-                .filter(|entry| entry.file_type().map(|ft| ft.is_dir()).unwrap_or(false))
-        })
+    Ok(once(read_dir(repo_path)?)
+        .flat_map(sub_directories)
+        .flat_map(sub_directories)
+        .flat_map(sub_directories)
         .count())
 }
+
+fn sub_directories(dir: ReadDir) -> impl Iterator<Item = ReadDir> {
+    dir.filter_map(StdResult::ok)
+        .filter(|entry| entry.file_type().map(|ft| ft.is_dir()).unwrap_or(false))
+        .filter_map(|entry| read_dir(entry.path()).ok())
+}

src/error.rs

@@ -5,7 +5,7 @@ use std::fmt;
 pub(crate) type Result<T> = std::result::Result<T, Error>;
 
 #[derive(Debug)]
-pub(crate) enum Error {
+pub enum Error {
     Badge(String),
     Client(reqwest::Error),
     Git(git2::Error),
@@ -19,13 +19,13 @@ pub(crate) enum Error {
 impl fmt::Display for Error {
     fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
         match self {
-            Error::Badge(s) => write!(fmt, "Badge({})", s),
-            Error::Client(e) => write!(fmt, "Client({})", e),
-            Error::Git(e) => write!(fmt, "Git({})", e),
+            Error::Badge(s) => write!(fmt, "Badge({s})"),
+            Error::Client(e) => write!(fmt, "Client({e})"),
+            Error::Git(e) => write!(fmt, "Git({e})"),
             Error::Internal => write!(fmt, "Internal Error"),
-            Error::Io(e) => write!(fmt, "Io({})", e),
-            Error::Parse(e) => write!(fmt, "Parse({})", e),
-            Error::Serial(e) => write!(fmt, "Serial({})", e),
+            Error::Io(e) => write!(fmt, "Io({e})"),
+            Error::Parse(e) => write!(fmt, "Parse({e})"),
+            Error::Serial(e) => write!(fmt, "Serial({e})"),
             Error::BranchNotFound => write!(fmt, "Repo doesn't have master branch"),
         }
     }
@@ -43,11 +43,11 @@ impl ResponseError for Error {
         let mut buf = Vec::new();
         match self {
             Error::BranchNotFound => {
-                templates::p404_no_master(&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)
             }
             _ => {
-                templates::p500(&mut buf, VERSION_INFO, 0).unwrap();
+                templates::p500_html(&mut buf, VERSION_INFO, 0).unwrap();
                 HttpResponse::InternalServerError()
                     .content_type("text/html")
                     .body(buf)

src/lib.rs

@@ -11,7 +11,7 @@ extern crate tracing;
 
 mod cache;
 pub mod config;
-mod count;
+pub mod count;
 mod error;
 mod service;
 mod statics;
@@ -23,8 +23,8 @@ use crate::{
     config::Settings,
     error::{Error, Result},
     service::{Bitbucket, FormService, GitHub, Gitlab, Service, Sourcehut},
-    statics::{CLIENT, CSS, FAVICON, VERSION_INFO},
-    template::RepoInfo,
+    statics::{CLIENT, VERSION_INFO},
+    template::{RepoGeneratorInfo, RepoInfo},
 };
 use actix_web::{
     dev::Server,
@@ -32,7 +32,7 @@ use actix_web::{
     middleware::{self, TrailingSlash},
     web, App, HttpResponse, HttpServer, Responder,
 };
-use badge::{Badge, BadgeOptions};
+use badgers::{Badge, BadgeOptions};
 use git2::{BranchType, Repository};
 use number_prefix::NumberPrefix;
 use std::{
@@ -46,6 +46,7 @@ use std::{
     sync::atomic::Ordering,
     time::{Duration, SystemTime},
 };
+use templates::statics::{self as template_statics, StaticFile};
 use tracing::Instrument;
 
 include!(concat!(env!("OUT_DIR"), "/templates.rs"));
@@ -55,6 +56,7 @@ struct GeneratorForm<'a> {
     service: FormService,
     user: Cow<'a, str>,
     repo: Cow<'a, str>,
+    branch: Option<Cow<'a, str>>,
 }
 
 #[derive(Debug)]
@@ -81,8 +83,14 @@ struct JsonResponse<'a> {
 }
 
 #[derive(Deserialize, Debug)]
-struct BranchQuery {
+struct BadgeQuery {
     branch: Option<String>,
+    #[serde(default = "default_label")]
+    label: String,
+}
+
+fn default_label() -> String {
+    "Hits-of-Code".to_string()
 }
 
 fn pull(path: impl AsRef<Path>) -> Result<()> {
@@ -93,8 +101,8 @@ fn pull(path: impl AsRef<Path>) -> Result<()> {
 }
 
 fn hoc(repo: &str, repo_dir: &str, cache_dir: &str, branch: &str) -> Result<(u64, String, u64)> {
-    let repo_dir = format!("{}/{}", repo_dir, repo);
-    let cache_dir = format!("{}/{}.json", cache_dir, repo);
+    let repo_dir = format!("{repo_dir}/{repo}");
+    let cache_dir = format!("{cache_dir}/{repo}.json");
     let cache_dir = Path::new(&cache_dir);
     let repo = Repository::open_bare(&repo_dir)?;
     // TODO: do better...
@@ -116,7 +124,7 @@ fn hoc(repo: &str, repo_dir: &str, cache_dir: &str, branch: &str) -> Result<(u64
         "-M".to_string(),
         "--diff-filter=ACDM".to_string(),
     ];
-    let cache = CacheState::read_from_file(&cache_dir, branch, &head)?;
+    let cache = CacheState::read_from_file(cache_dir, branch, &head)?;
     match &cache {
         CacheState::Current { count, commits, .. } => {
             info!("Using cache");
@@ -124,8 +132,8 @@ fn hoc(repo: &str, repo_dir: &str, cache_dir: &str, branch: &str) -> Result<(u64
         }
         CacheState::Old { head, .. } => {
             info!("Updating cache");
-            arg.push(format!("{}..{}", head, branch));
-            arg_commit_count.push(format!("{}..{}", head, branch));
+            arg.push(format!("{head}..{branch}"));
+            arg_commit_count.push(format!("{head}..{branch}"));
         }
         CacheState::No | CacheState::NoneForBranch(..) => {
             info!("Creating cache");
@@ -206,16 +214,16 @@ where
             data.1.to_lowercase()
         );
         info!("Deleting cache and repository");
-        let cache_dir = format!("{}/{}.json", &state.cache(), repo);
-        let repo_dir = format!("{}/{}", &state.repos(), repo);
-        std::fs::remove_file(&cache_dir).or_else(|e| {
+        let cache_dir = format!("{}/{repo}.json", &state.cache());
+        let repo_dir = format!("{}/{repo}", &state.repos());
+        std::fs::remove_file(cache_dir).or_else(|e| {
             if e.kind() == io::ErrorKind::NotFound {
                 Ok(())
             } else {
                 Err(e)
             }
         })?;
-        std::fs::remove_dir_all(&repo_dir).or_else(|e| {
+        std::fs::remove_dir_all(repo_dir).or_else(|e| {
             if e.kind() == io::ErrorKind::NotFound {
                 Ok(())
             } else {
@@ -254,10 +262,10 @@ where
     );
     let future = async {
         let repo = format!("{}/{}", data.0.to_lowercase(), data.1.to_lowercase());
-        let service_path = format!("{}/{}", T::url_path(), repo);
-        let service_url = format!("{}/{}", T::domain(), repo);
-        let path = format!("{}/{}", state.repos(), service_url);
-        let url = format!("https://{}", service_url);
+        let service_path = format!("{}/{repo}", T::url_path());
+        let service_url = format!("{}/{repo}", T::domain());
+        let path = format!("{}/{service_url}", state.repos());
+        let url = format!("https://{service_url}");
         let remote_exists = remote_exists(&url).await?;
         let file = Path::new(&path);
         if !file.exists() {
@@ -276,7 +284,7 @@ where
         let (hoc, head, commits) = hoc(&service_url, &state.repos(), &state.cache(), branch)?;
         let hoc_pretty = match NumberPrefix::decimal(hoc as f64) {
             NumberPrefix::Standalone(hoc) => hoc.to_string(),
-            NumberPrefix::Prefixed(prefix, hoc) => format!("{:.1}{}", hoc, prefix),
+            NumberPrefix::Prefixed(prefix, hoc) => format!("{hoc:.1}{prefix}"),
         };
         let res = HocResult::Hoc {
             hoc,
@@ -296,7 +304,7 @@ pub(crate) async fn json_hoc<T: Service>(
     state: web::Data<State>,
     repo_count: web::Data<AtomicUsize>,
     data: web::Path<(String, String)>,
-    branch: web::Query<BranchQuery>,
+    branch: web::Query<BadgeQuery>,
 ) -> Result<HttpResponse> {
     let branch = branch.branch.as_deref().unwrap_or("master");
     let rc_clone = repo_count.clone();
@@ -332,14 +340,15 @@ pub(crate) async fn calculate_hoc<T: Service>(
     state: web::Data<State>,
     repo_count: web::Data<AtomicUsize>,
     data: web::Path<(String, String)>,
-    branch: web::Query<BranchQuery>,
+    query: web::Query<BadgeQuery>,
 ) -> HttpResponse {
     let rc_clone = repo_count.clone();
+    let label = query.label.clone();
     let mapper = move |r| match r {
         HocResult::NotFound => p404(rc_clone),
         HocResult::Hoc { hoc_pretty, .. } => {
             let badge_opt = BadgeOptions {
-                subject: "Hits-of-Code".to_string(),
+                subject: label,
                 color: "#007ec6".to_string(),
                 status: hoc_pretty,
             };
@@ -350,10 +359,10 @@ pub(crate) async fn calculate_hoc<T: Service>(
             Ok(no_cache_response(body))
         }
     };
-    let branch = branch.branch.as_deref().unwrap_or("master");
+    let branch = query.branch.as_deref().unwrap_or("master");
     let error_badge = |_| {
         let error_badge = Badge::new(BadgeOptions {
-            subject: "Hits-of-Code".to_string(),
+            subject: query.label.clone(),
             color: "#ff0000".to_string(),
             status: "error".to_string(),
         })
@@ -370,9 +379,10 @@ async fn overview<T: Service>(
     state: web::Data<State>,
     repo_count: web::Data<AtomicUsize>,
     data: web::Path<(String, String)>,
-    branch: web::Query<BranchQuery>,
+    query: web::Query<BadgeQuery>,
 ) -> Result<HttpResponse> {
-    let branch = branch.branch.as_deref().unwrap_or("master");
+    let branch = query.branch.as_deref().unwrap_or("master");
+    let label = query.label.clone();
     let base_url = state.settings.base_url.clone();
     let rc_clone = repo_count.clone();
     let mapper = move |r| match r {
@@ -398,11 +408,12 @@ async fn overview<T: Service>(
                 url: &url,
                 branch,
             };
-            templates::overview(
+            templates::overview_html(
                 &mut buf,
                 VERSION_INFO,
                 rc_clone.load(Ordering::Relaxed),
                 repo_info,
+                label,
             )?;
 
             Ok(HttpResponse::Ok().content_type("text/html").body(buf))
@@ -422,7 +433,7 @@ async fn index(
     repo_count: web::Data<AtomicUsize>,
 ) -> Result<HttpResponse> {
     let mut buf = Vec::new();
-    templates::index(
+    templates::index_html(
         &mut buf,
         VERSION_INFO,
         repo_count.load(Ordering::Relaxed),
@@ -437,16 +448,23 @@ async fn generate(
     state: web::Data<State>,
     repo_count: web::Data<AtomicUsize>,
 ) -> Result<HttpResponse> {
-    let repo = format!("{}/{}", params.user, params.repo);
     let mut buf = Vec::new();
-    templates::generate(
+    let repo_info = RepoGeneratorInfo {
+        service: params.service,
+        user: &params.user,
+        repo: &params.repo,
+        branch: params
+            .branch
+            .as_deref()
+            .filter(|s| !s.is_empty())
+            .unwrap_or("master"),
+    };
+    templates::generate_html(
         &mut buf,
         VERSION_INFO,
         repo_count.load(Ordering::Relaxed),
         &state.settings.base_url,
-        params.service.url(),
-        params.service.service(),
-        &repo,
+        &repo_info,
     )?;
 
     Ok(HttpResponse::Ok().content_type("text/html").body(buf))
@@ -454,7 +472,7 @@ async fn generate(
 
 fn p404(repo_count: web::Data<AtomicUsize>) -> Result<HttpResponse> {
     let mut buf = Vec::new();
-    templates::p404(&mut buf, VERSION_INFO, repo_count.load(Ordering::Relaxed))?;
+    templates::p404_html(&mut buf, VERSION_INFO, repo_count.load(Ordering::Relaxed))?;
     Ok(HttpResponse::NotFound().content_type("text/html").body(buf))
 }
 
@@ -462,14 +480,32 @@ async fn async_p404(repo_count: web::Data<AtomicUsize>) -> Result<HttpResponse>
     p404(repo_count)
 }
 
-#[get("/tacit-css.min.css")]
-async fn css() -> HttpResponse {
-    HttpResponse::Ok().content_type("text/css").body(CSS)
+/// A duration to add to current time for a far expires header.
+static FAR: Duration = Duration::from_secs(180 * 24 * 60 * 60);
+
+#[get("/static/{filename}")]
+async fn static_file(
+    path: web::Path<String>,
+    repo_count: web::Data<AtomicUsize>,
+) -> Result<HttpResponse> {
+    StaticFile::get(&path)
+        .map(|data| {
+            let far_expires = SystemTime::now() + FAR;
+            HttpResponse::Ok()
+                .insert_header(Expires(far_expires.into()))
+                .content_type(data.mime.clone())
+                .body(data.content)
+        })
+        .map(Result::Ok)
+        .unwrap_or_else(|| p404(repo_count))
 }
 
 #[get("/favicon.ico")]
 async fn favicon32() -> HttpResponse {
-    HttpResponse::Ok().content_type("image/png").body(FAVICON)
+    let data = &template_statics::favicon32_png;
+    HttpResponse::Ok()
+        .content_type(data.mime.clone())
+        .body(data.content)
 }
 
 async fn start_server(listener: TcpListener, settings: Settings) -> std::io::Result<Server> {
@@ -486,7 +522,7 @@ async fn start_server(listener: TcpListener, settings: Settings) -> std::io::Res
             .wrap(middleware::NormalizePath::new(TrailingSlash::Trim))
             .service(index)
             .service(health_check)
-            .service(css)
+            .service(static_file)
             .service(favicon32)
             .service(generate)
             .default_service(web::to(async_p404));

src/main.rs

@@ -3,7 +3,7 @@ use hoc::{config::Settings, telemetry};
 use std::net::TcpListener;
 
 fn init() {
-    dotenv::dotenv().ok();
+    dotenvy::dotenv().ok();
     openssl_probe::init_ssl_cert_env_vars();
 
     telemetry::init_subscriber(telemetry::get_subscriber("hoc", "info"))

src/service.rs

@@ -28,8 +28,8 @@ pub(crate) trait Service: Sized + 'static {
     }
 }
 
-#[derive(Deserialize, Serialize)]
-pub(crate) enum FormService {
+#[derive(Deserialize, Serialize, Clone, Copy)]
+pub enum FormService {
     #[serde(rename = "github")]
     GitHub,
     #[serde(rename = "gitlab")]

src/statics.rs

@@ -7,8 +7,6 @@ pub(crate) const VERSION_INFO: VersionInfo = VersionInfo {
     commit: env!("VERGEN_GIT_SHA_SHORT"),
     version: env!("CARGO_PKG_VERSION"),
 };
-pub(crate) const CSS: &str = include_str!("../static/tacit-css.min.css");
-pub(crate) const FAVICON: &[u8] = include_bytes!("../static/favicon32.png");
 
 lazy_static! {
     pub(crate) static ref CLIENT: reqwest::Client = reqwest::Client::new();

src/template.rs

@@ -1,3 +1,5 @@
+use crate::service::FormService;
+
 pub struct RepoInfo<'a> {
     pub commit_url: &'a str,
     pub commits: u64,
@@ -9,3 +11,10 @@ pub struct RepoInfo<'a> {
     pub url: &'a str,
     pub branch: &'a str,
 }
+
+pub struct RepoGeneratorInfo<'a> {
+    pub service: FormService,
+    pub user: &'a str,
+    pub repo: &'a str,
+    pub branch: &'a str,
+}

templates/base.rs.html

@@ -1,3 +1,4 @@
+@use super::statics::*;
 @use crate::statics::VersionInfo;
 
 @(title: &str, header: &str, content: Content, version_info: VersionInfo, repo_count: usize)
@@ -9,7 +10,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <meta name="keywords" content="Hits-of-Code, GitHub, Badge" />
     <meta name="description" content="Hits-of-Code Badges for Git repositories" />
-    <link rel="stylesheet" href="/tacit-css.min.css" />
+    <link rel="stylesheet" href="/static/@tacit_css_min_css.name" />
     <title>@title</title>
 </head>
 <body>

templates/generate.rs.html

@@ -1,16 +1,16 @@
-@use super::base;
-@use crate::statics::VersionInfo;
+@use super::base_html;
+@use crate::{statics::VersionInfo, template::RepoGeneratorInfo};
 
-@(version_info: VersionInfo, repo_count: usize, base_url: &str, url: &str, service: &str, path: &str)
+@(version_info: VersionInfo, repo_count: usize, base_url: &str, repo_info: &RepoGeneratorInfo)
 
-@:base("Hits-of-Code Badges", "Badge Generator", {
+@:base_html("Hits-of-Code Badges", "Badge Generator", {
 
 <p>
-Here is the markdown for the badge for <a href="https://@url/@path">@url/@path</a>
+Here is the markdown for the badge for <a href="https://@repo_info.service.url()/@repo_info.user/@repo_info.repo">@repo_info.user/@repo_info.repo</a>
 </p>
 
 <pre>
-[![Hits-of-Code](@base_url/@service/@path)](@base_url/@service/@path/view)
+[![Hits-of-Code](@base_url/@repo_info.service.service()/@repo_info.user/@repo_info.repo?branch=@repo_info.branch)](@base_url/@repo_info.service.service()/@repo_info.user/@repo_info.repo/view?branch=@repo_info.branch)
 </pre>
 
 <p>
@@ -18,6 +18,6 @@ It will be rendered like this
 </p>
 
 <pre>
-<a href="@base_url/@service/@path/view"><img src="@base_url/@service/@path" alt="example badge" /></a>
+<a href="@base_url/@repo_info.service.service()/@repo_info.user/@repo_info.repo/view?branch=@repo_info.branch"><img src="@base_url/@repo_info.service.service()/@repo_info.user/@repo_info.repo?branch=@repo_info.branch" alt="example badge" /></a>
 </pre>
 }, version_info, repo_count)

templates/index.rs.html

@@ -1,9 +1,9 @@
-@use super::base;
+@use super::base_html;
 @use crate::statics::VersionInfo;
 
 @(version_info: VersionInfo, repo_count: usize, base_url: &str)
 
-@:base("Hits-of-Code Badges", "Hits-of-Code Badges", {
+@:base_html("Hits-of-Code Badges", "Hits-of-Code Badges", {
 
 <p>
 This API offers badges for the Hits-of-Code metric for your repositories. This metric was proposed by
@@ -51,6 +51,10 @@ in your repository or you want a badge for another branch of your repository, ju
 <code>?branch=&lt;branch-name&gt;</code> to the URL.
 </p>
 
+<p>
+The badge label can be customized using the <code>label=&lt;some-label&gt;</code> query parameter. It defaults to <code>Hits-of-Code</code>.
+</p>
+
 <p>
 You can also request the HoC as JSON by appending <code>/json</code> to the request path. This will return a JSON object
 with three fields: <code>count</code> (the HoC value), <code>commits</code> (the number of commits) and
@@ -80,6 +84,8 @@ the lines of
     <input name="user" id="user" type="text" placeholder="user" />
     <label>/</label>
     <input name="repo" id="repo" type="text" placeholder="repository" />
+    <label>:</label>
+    <input name="branch" id="branch" type="text" placeholder="branch (defaults to `master`)" />
     <button type="submit">Generate</button>
 </form>
 

templates/overview.rs.html

@@ -1,10 +1,10 @@
-@use super::base;
+@use super::base_html;
 @use crate::statics::VersionInfo;
 @use crate::template::RepoInfo;
 
-@(version_info: VersionInfo, repo_count: usize, repo_info: RepoInfo)
+@(version_info: VersionInfo, repo_count: usize, repo_info: RepoInfo, label: String)
 
-@:base("Hits-of-Code Badges", "Overview", {
+@:base_html("Hits-of-Code Badges", "Overview", {
 
 <p>
 The project <a href="@repo_info.url">@repo_info.url</a> has
@@ -19,7 +19,7 @@ To include the badge in your readme, use the following markdown:
 </p>
 
 <pre>
-[![Hits-of-Code](@repo_info.base_url/@repo_info.path?branch=@repo_info.branch)](@repo_info.base_url/@repo_info.path/view?branch=@repo_info.branch)
+[![@label](@repo_info.base_url/@repo_info.path?branch=@repo_info.branch&label=@label)](@repo_info.base_url/@repo_info.path/view?branch=@repo_info.branch&label=@label)
 </pre>
 
 

templates/p404.rs.html

@@ -1,9 +1,9 @@
-@use super::base;
+@use super::base_html;
 @use crate::statics::VersionInfo;
 
 @(version_info: VersionInfo, repo_count: usize)
 
-@:base("Page not Found - Hits-of-Code Badges", "404 - Page not Found", {
+@:base_html("Page not Found - Hits-of-Code Badges", "404 - Page not Found", {
 <p>
 <big>Sorry</big>. I couldn't find the page you are looking for. Please go <a href="/">back to the homepage</a>.
 </p>

templates/p404_no_master.rs.html

@@ -1,9 +1,9 @@
-@use super::base;
+@use super::base_html;
 @use crate::statics::VersionInfo;
 
 @(version_info: VersionInfo, repo_count: usize)
 
-@:base("Branch not Found - Hits-of-Code Badges", "404 - Branch not Found", {
+@:base_html("Branch not Found - Hits-of-Code Badges", "404 - Branch not Found", {
 <p>
 <big>Sorry</big>. I couldn't find the requested branch of your repositroy.  Currently this service assumes the
 extistence of a branch named <code>master</code>. If you'd like to request a badge for another branch, you can do so by

templates/p500.rs.html

@@ -1,9 +1,9 @@
-@use super::base;
+@use super::base_html;
 @use crate::statics::VersionInfo;
 
 @(version_info: VersionInfo, repo_count: usize)
 
-@:base("Internal Server Error - Hits-of-Code Badges", "500 - Internal Server Error", {
+@:base_html("Internal Server Error - Hits-of-Code Badges", "500 - Internal Server Error", {
 <p>
 <big>Oops</big>. Looks like a made a mistake. Please go <a href="/">back to the homepage</a> and try again.
 </p>

tests/count.rs

@@ -0,0 +1,66 @@
+use hoc::count::count_repositories;
+
+use tempfile::TempDir;
+
+#[test]
+fn no_repos() {
+    let repos = TempDir::new().unwrap();
+    assert_eq!(0, count_repositories(&repos).unwrap())
+}
+
+#[test]
+fn no_repos_for_provider() {
+    let repos = TempDir::new().unwrap();
+    let _provider = TempDir::new_in(&repos).unwrap();
+    assert_eq!(0, count_repositories(&repos).unwrap())
+}
+
+#[test]
+fn no_repos_for_owner() {
+    let repos = TempDir::new().unwrap();
+    let provider = TempDir::new_in(&repos).unwrap();
+    let _owner = TempDir::new_in(&provider).unwrap();
+    assert_eq!(0, count_repositories(&repos).unwrap())
+}
+
+#[test]
+fn one_repo_for_owner() {
+    let repos = TempDir::new().unwrap();
+    let provider = TempDir::new_in(&repos).unwrap();
+    let owner = TempDir::new_in(&provider).unwrap();
+    let _repo = TempDir::new_in(&owner).unwrap();
+    assert_eq!(1, count_repositories(&repos).unwrap())
+}
+
+#[test]
+fn two_repos_for_owner() {
+    let repos = TempDir::new().unwrap();
+    let provider = TempDir::new_in(&repos).unwrap();
+    let owner = TempDir::new_in(&provider).unwrap();
+    let _repo1 = TempDir::new_in(&owner).unwrap();
+    let _repo2 = TempDir::new_in(&owner).unwrap();
+    assert_eq!(2, count_repositories(&repos).unwrap())
+}
+
+#[test]
+fn two_repos_for_two_providers() {
+    let repos = TempDir::new().unwrap();
+    let provider1 = TempDir::new_in(&repos).unwrap();
+    let owner1 = TempDir::new_in(&provider1).unwrap();
+    let _repo1 = TempDir::new_in(&owner1).unwrap();
+    let provider2 = TempDir::new_in(&repos).unwrap();
+    let owner2 = TempDir::new_in(&provider2).unwrap();
+    let _repo2 = TempDir::new_in(&owner2).unwrap();
+    assert_eq!(2, count_repositories(&repos).unwrap())
+}
+
+#[test]
+fn two_subdirs_in_one_repo() {
+    let repos = TempDir::new().unwrap();
+    let provider = TempDir::new_in(&repos).unwrap();
+    let owner = TempDir::new_in(&provider).unwrap();
+    let repo = TempDir::new_in(&owner).unwrap();
+    let _subdir1 = TempDir::new_in(&repo).unwrap();
+    let _subdir2 = TempDir::new_in(&repo).unwrap();
+    assert_eq!(1, count_repositories(&repos).unwrap())
+}

tests/resources.rs

@@ -14,18 +14,3 @@ async fn favicon() {
 
     assert!(response.status().is_success());
 }
-
-#[actix_rt::test]
-async fn tacit_css() {
-    let test_app = util::spawn_app().await;
-
-    let client = awc::Client::default();
-
-    let response = client
-        .get(&format!("{}/tacit-css.min.css", test_app.address))
-        .send()
-        .await
-        .expect("Failed to execute request");
-
-    assert!(response.status().is_success());
-}

tests/util/mod.rs

@@ -14,8 +14,9 @@ lazy_static::lazy_static! {
 
 pub struct TestApp {
     pub address: String,
-    repo_dir: TempDir,
-    cache_dir: TempDir,
+    // Those are unused but are hold to be dropped and deleted after the TestApp goes out of scope
+    _repo_dir: TempDir,
+    _cache_dir: TempDir,
 }
 
 pub async fn spawn_app() -> TestApp {
@@ -26,15 +27,12 @@ pub async fn spawn_app() -> TestApp {
     let port = listener.local_addr().unwrap().port();
     let address = format!("http://127.0.0.1:{}", port);
 
-    let repo_dir = tempdir().expect("Cannot create repo_dir");
-    let cache_dir = tempdir().expect("Cannot create cache_dir");
+    let _repo_dir = tempdir().expect("Cannot create repo_dir");
+    let _cache_dir = tempdir().expect("Cannot create cache_dir");
 
     let mut settings = Settings::load().expect("Failed to read configuration.");
-    settings.repodir = repo_dir.path().to_path_buf();
-    settings.cachedir = cache_dir.path().to_path_buf();
-    // configuration.database.database_name = Uuid::new_v4().to_string();
-
-    // let connection_pool = configure_database(&configuration.database).await;
+    settings.repodir = _repo_dir.path().to_path_buf();
+    settings.cachedir = _cache_dir.path().to_path_buf();
 
     let server = hoc::run(listener, settings)
         .await
@@ -44,7 +42,7 @@ pub async fn spawn_app() -> TestApp {
 
     TestApp {
         address,
-        repo_dir,
-        cache_dir,
+        _repo_dir,
+        _cache_dir,
     }
 }

vm.nix

@@ -1,80 +0,0 @@
-# Nix configuration for a VM to run a custom configured Vim
-#
-# It is intended as an example of building a VM that builds Vim for testing
-# and evaluation purposes. It does not represent a production or secure
-# deployment.
-
-{ sources ? import ./nix/sources.nix
-, pkgs ? import sources.nixpkgs { }
-, callPackage ? pkgs.callPackage
-, config
-, lib
-, ...
-}:
-  # config, pkgs, lib, ... }:
-
-let
-  hoc = pkgs.callPackage ./default.nix { };
-
-  # hoc = cargoNix.rootCrate.build;
-in
-{
-  environment = {
-    systemPackages = with pkgs; [
-      (
-        hoc
-        # import ./default.nix
-      )
-    ];
-  };
-
-
-  networking.hostName = "hoc";   # Define your hostname.
-
-  system.stateVersion = "19.09";    # The version of NixOS originally installed
-
-  # Set security options:
-  security = {
-    sudo = {
-      enable = true;                # Enable sudo
-      wheelNeedsPassword = false;   # Allow wheel members to run sudo without a passowrd
-    };
-  };
-
-  networking.firewall.allowedTCPPorts = [ 80 ];
-
-  # List services that you want to enable:
-  services.openssh = {
-    enable = true;                             # Enable the OpenSSH daemon.
-    #permitRootLogin = "yes";                  # Probably want to change this in production
-    #challengeResponseAuthentication = true;   # Probably want to change this in production
-    #passwordAuthentication = true;            # Probably want to change this in production
-    openFirewall = true;
-    hostKeys = [
-      {
-        path = "/etc/ssh/ssh_host_ed25519_key";   # Generate a key for the vm
-        type = "ed25519";                         # Use the current best key type
-      }
-    ];
-  };
-
-  # Users of the Vim VM:
-  users.mutableUsers = false;        # Remove any users not defined in here
-
-  users.users.root = {
-    password = "123456";             # Probably want to change this in production
-  };
-
-  # Misc groups:
-  users.groups.nixos.gid = 1000;
-
-  # NixOS users
-  users.users.nixos = {
-    isNormalUser = true;
-    uid = 1000;
-    group = "nixos";
-    extraGroups = [ "wheel" ];
-    password = "123456";             # Probably want to change this in production
-  };
-
-}