From 5f4c220a2c97dbf0af83022e14a86a00d3acf2fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christina=20S=C3=B8rensen?= <christina@cafkafk.com>
Date: Mon, 29 Apr 2024 08:34:50 +0200
Subject: [PATCH] chore: improvement to be squashed
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Christina Sørensen <christina@cafkafk.com>
---
 CHANGELOG.md | 234 ---------------------------------------------------
 build.rs     |   4 +-
 cliff.toml   |   2 +-
 flake.nix    |  16 ++--
 justfile     | 157 +---------------------------------
 5 files changed, 13 insertions(+), 400 deletions(-)
 delete mode 100644 CHANGELOG.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
deleted file mode 100644
index 3cd41f1..0000000
--- a/CHANGELOG.md
+++ /dev/null
@@ -1,234 +0,0 @@
-<!--
-SPDX-FileCopyrightText: 2023 Christina Sørensen
-SPDX-FileContributor: Christina Sørensen
-
-SPDX-License-Identifier: AGPL-3.0-only
--->
-
-# Changelog
-
-All notable changes to this project will be documented in this file.
-
-## [0.1.8] - 2024-02-01
-
-### Bug Fixes
-
-- Remove next.forgejo.org testing
-
-### Miscellaneous Tasks
-
-- Bump clap from 4.4.10 to 4.4.11
-- Bump tokio from 1.34.0 to 1.35.0
-- Bump h2 from 0.3.21 to 0.3.24
-- Bump flake inputs
-- Bump hyper from 1.0.1 to 1.1.0
-- Bump tokio from 1.35.0 to 1.35.1
-- Bump reqwest from 0.11.22 to 0.11.23
-
-### Build
-
-- Single command integration tests
-- Bump serde_yaml from 0.9.27 to 0.9.29
-
-## [0.1.7] - 2023-12-07
-
-### Bug Fixes
-
-- Axum 0.7.2 breaking changes
-
-### Miscellaneous Tasks
-
-- Bump clap from 4.4.8 to 4.4.10
-- Bump axum from 0.6.20 to 0.7.2
-- Release rime v0.1.7
-
-## [0.1.6] - 2023-11-30
-
-### Features
-
-- Add integration testing against freedesktops gitlab
-
-### Miscellaneous Tasks
-
-- Bump serde from 1.0.192 to 1.0.193
-- Bump form_urlencoded from 1.2.0 to 1.2.1
-- Bump hyper from 0.14.27 to 1.0.1
-- Bump openssl from 0.10.57 to 0.10.60
-- Release rime v0.1.6
-
-## [0.1.5] - 2023-11-23
-
-### Bug Fixes
-
-- Remove redundant comment
-
-### Miscellaneous Tasks
-
-- Update flake inputs
-- Bump http-body-util from 0.1.0-rc.3 to 0.1.0
-- Release rime v0.1.5
-
-### Testing
-
-- Update itest-live
-
-## [0.1.4] - 2023-11-16
-
-### Miscellaneous Tasks
-
-- Bump tokio from 1.33.0 to 1.34.0
-- Bump clap from 4.4.7 to 4.4.8
-- Bump serde from 1.0.190 to 1.0.192
-- Release rime v0.1.4
-
-### Refactor
-
-- Make ForgeReleases.matching more functional
-
-## [0.1.3] - 2023-11-09
-
-### Documentation
-
-- Update the comment about url encoding
-
-### Features
-
-- Support including pre-releases
-- Add flagship routes for (git.)sr.ht
-- Add an endpoint for semver locking
-- Allow more complex semver locking
-- Add support for release-based endpoints
-- Try extracting a semver more aggressively
-
-### Miscellaneous Tasks
-
-- Add more treefmt'ers, precommit hack
-- Bump serde_json from 1.0.107 to 1.0.108
-- Release rime v0.1.3
-
-### Refactor
-
-- Refactor the release discovery
-- Configurable forge API page size
-- Lift out the release list fetching
-- Lift out a lot of shared code
-- Use flagship routes for Codeberg
-- Greatly simplify the handlers
-- Turn auto-discovery into a "Forge"
-- Lift routing out of the Forge trait
-- Drop `new()` from the Forge trait
-- Allow some shortcuts for implementors
-- Lift out the .tar.gz stripping
-- Use the original URI for NoTarGz
-- Re-export ForgeReleases from api::v1::forge
-- Lift out some shared code
-
-### Testing
-
-- Add testing for pre-releases
-- Codeberg must now pass
-- Add testing for the semver endpoint
-- Add testing for the release endpoint
-- Temporarily disable gitlab.com autodiscovery
-
-### Bug
-
-- Improved auto-detection
-
-## [0.1.2] - 2023-11-02
-
-### Bug Fixes
-
-- Add SystemConfiguration, refactor slightly
-
-### Documentation
-
-- Fix typo
-- Revamped readme
-
-### Features
-
-- Add sourcehut version endpoints
-- Add ref endpoint
-- Branch endpoint
-
-### Miscellaneous Tasks
-
-- Release rime v0.1.1
-- Bump flake inputs
-- Gracefully handle partial configs
-- Release rime v0.1.2
-
-### Testing
-
-- Add integration tests for the live server
-- Add testing of slashes in branches
-
-### Bug
-
-- Sanitize the tarball name in get_repo_ref
-- Handle branch names with slashes in them
-- Fix Forgejo & GitLab latest tag APIs
-
-### Build
-
-- Change all flake inputs to rime.cx
-- Change most flake inputs to semnix
-
-## [0.1.1] - 2023-10-30
-
-### Documentation
-
-- Create SECURITY.md
-- Add CONTRIBUTING.md
-- Fix broken markdown link
-
-### Features
-
-- Make root route redirect to github repo for now
-- Introduce flakehub api endpoint (version only)
-- Introduce self-hosted forgejo api endpoint
-- Introduce codeberg api endpoint
-- Add a gitea route
-- Introduce a self-hosted gitlab endpoint
-- Try auto-discovering forges
-- Direct mapping for github.com & flakehub.com
-
-### Miscellaneous Tasks
-
-- Add dependabot.yml
-- Bump serde from 1.0.188 to 1.0.190
-- Bump regex from 1.9.5 to 1.10.2
-- Add REUSE headers to SECURITY.md, dependabot.yml
-- Bump serde_yaml from 0.9.25 to 0.9.27
-- Make `cafkafk` codeowner of everything
-
-### Refactor
-
-- Fix oversight in suffix check
-- Deny unwrap_used in clippy
-- Remove commented out code
-- Move routing out into tree structure
-- Use nested routing
-
-### Testing
-
-- Add simple integration tests for most forges
-- Add autodiscovery integration tests
-
-### Build
-
-- Make cross compilation skip uncompilable
-- Automate release of tagged containers
-
-## [0.1.0] - 2023-10-28
-
-### Features
-
-- Add CHANGELOG.md
-
-### Miscellaneous Tasks
-
-- Make rime public
-- Release rime v0.1.0
-
diff --git a/build.rs b/build.rs
index 65f8227..d3226e1 100644
--- a/build.rs
+++ b/build.rs
@@ -26,10 +26,10 @@ fn main() -> Result<(), Error> {
 
     let mut cmd = build_cli();
     for &shell in Shell::value_variants() {
-        generate_to(shell, &mut cmd, "rime", &outdir)?;
+        generate_to(shell, &mut cmd, "ha-registry", &outdir)?;
     }
 
-    let file = PathBuf::from(&outdir).join("rime.1");
+    let file = PathBuf::from(&outdir).join("ha-registry.1");
     let mut file = File::create(file)?;
 
     Man::new(cmd).render(&mut file)?;
diff --git a/cliff.toml b/cliff.toml
index e321206..88603b9 100644
--- a/cliff.toml
+++ b/cliff.toml
@@ -9,7 +9,7 @@
 # changelog header
 header = """
 <!--
-SPDX-FileCopyrightText: 2023 Christina Sørensen
+SPDX-FileCopyrightText: 2024 Christina Sørensen
 SPDX-FileContributor: Christina Sørensen
 
 SPDX-License-Identifier: AGPL-3.0-only
diff --git a/flake.nix b/flake.nix
index 941460c..4c3a001 100644
--- a/flake.nix
+++ b/flake.nix
@@ -112,29 +112,29 @@
             '';
 
             preInstall = ''
-              installManPage man/rime.1
+              installManPage man/ha-registry.1
               installShellCompletion \
-                --fish man/rime.fish \
-                --bash man/rime.bash \
-                --zsh  man/_rime
+                --fish man/ha-registry.fish \
+                --bash man/ha-registry.bash \
+                --zsh  man/_ha-registry
               mkdir -p $out
             '';
           };
 
           container = pkgs.dockerTools.buildLayeredImage {
-            name = "rime";
+            name = "ha-tregistry";
             tag = "latest";
             contents = [packages.default pkgs.cacert];
             config = {
               Labels = {
-                "org.opencontainers.image.source" = "https://github.com/cafkafk/rime";
-                "org.opencontainers.image.description" = "rime:  Nix Flake Input Versioning";
+                "org.opencontainers.image.source" = "https://github.com/cafkafk/ha-registry";
+                "org.opencontainers.image.description" = "ha-registry: High Availability Container Registry";
                 "org.opencontainers.image.license" = "AGPL-3.0-only";
               };
               Env = [
                 "RUST_LOG=trace"
               ];
-              Cmd = ["/bin/rime"];
+              Cmd = ["/bin/ha-registry"];
             };
           };
 
diff --git a/justfile b/justfile
index 27e5b30..5c6c5d3 100644
--- a/justfile
+++ b/justfile
@@ -1,16 +1,9 @@
-# SPDX-FileCopyrightText: 2023 Christina Sørensen
+# SPDX-FileCopyrightText: 2024 Christina Sørensen
 # SPDX-FileContributor: Christina Sørensen
 #
 # SPDX-License-Identifier: AGPL-3.0-only
 
-name := "rime"
-
-genDemo:
-    fish_prompt="> " fish_history="rime_history" vhs < docs/tapes/demo.tape
-    librewolf docs/images/demo.gif
-
-cropHeader:
-    convert docs/images/Rimed_hexagonal_snow_crystal.TIF.jpg -crop 1024x325+0+380 docs/images/rime.jpg && kitty +icat docs/images/rime.jpg
+name := "ha-registry"
 
 buildContainer:
     nix build ./#container
@@ -169,149 +162,3 @@ alias c := cross
 
     # Generate Checksums
     # TODO: moved to gh-release just checksum
-
-testString := "The fault, dear Brutus, is not in our flakes, but in our governance, that we aren't moderators."
-
-run_test TARGET:
-    #!/usr/bin/env bash
-    set -euxo pipefail
-    test_dir=`mktemp -d -t "XXXXXXX-rime-itest"`
-    nix run {{TARGET}} --refresh 2> $test_dir/nix-run.log 1> $test_dir/nix-run.out
-    diff -U3 --color=auto <(cat $test_dir/nix-run.out) <(echo "{{testString}}")
-    if grep -q 'warning: error:' $test_dir/nix-run.log; then
-        cat $test_dir/nix-run.log;
-        rm $test_dir -r
-        echo "tests failed >_<"
-        exit 1
-    fi
-    rm $test_dir -r
-
-testStringPre := "The fault, dear pre-release-Brutus, is not in our flakes, but in our governance, that we aren't moderators."
-
-run_test_pre TARGET:
-    #!/usr/bin/env bash
-    set -euxo pipefail
-    test_dir=`mktemp -d -t "XXXXXXX-rime-itest"`
-    nix run {{TARGET}} --refresh 2> $test_dir/nix-run.log 1> $test_dir/nix-run.out
-    diff -U3 --color=auto <(cat $test_dir/nix-run.out) <(echo "{{testStringPre}}")
-    if grep -q 'warning: error:' $test_dir/nix-run.log; then
-        cat $test_dir/nix-run.log;
-        rm $test_dir -r
-        echo "tests failed >_<"
-        exit 1
-    fi
-    rm $test_dir -r
-
-
-# Integration Testing (requires Nix)
-itest:
-    # TODO: self hosted gitlab
-
-    # Default Endpoints
-    just run_test "http://localhost:3000/v1/codeberg/cafkafk/hello.tar.gz"
-    just run_test "http://localhost:3000/v1/github/cafkafk/hello.tar.gz"
-    just run_test "http://localhost:3000/v1/gitlab/gitlab.com/cafkafk/hello.tar.gz"
-    just run_test "http://localhost:3000/v1/gitlab/gitlab.freedesktop.org/cafkafk/hello.tar.gz"
-    just run_test "http://localhost:3000/v1/flakehub/cafkafk/hello.tar.gz"
-
-    # Version Endpoints
-    just run_test "http://localhost:3000/v1/flakehub/cafkafk/hello/v/v0.0.1.tar.gz"
-    just run_test "http://localhost:3000/v1/sourcehut/git.sr.ht/cafkafk/hello/v/v0.0.1.tar.gz"
-
-    # Branch Endpoints
-    just run_test_pre "http://localhost:3000/v1/sourcehut/git.sr.ht/cafkafk/hello/b/main.tar.gz"
-
-    # Tags Endpoints
-    just run_test     "http://localhost:3000/v1/sourcehut/git.sr.ht/cafkafk/hello/t/v0.0.1.tar.gz"
-    just run_test_pre "http://localhost:3000/v1/sourcehut/git.sr.ht/cafkafk/hello/t/main.tar.gz"
-
-    # Autodiscovery
-    just run_test "http://localhost:3000/v1/codeberg.org/cafkafk/hello.tar.gz"
-    just run_test "http://localhost:3000/v1/github.com/cafkafk/hello.tar.gz"
-    -just run_test "http://localhost:3000/v1/gitlab.com/cafkafk/hello.tar.gz"
-    just run_test "http://localhost:3000/v1/flakehub.com/cafkafk/hello/v/v0.0.1.tar.gz"
-
-    # Filter pre-releases
-    just run_test "http://localhost:3000/v1/codeberg/cafkafk/hello.tar.gz?include_prereleases=false"
-    just run_test "http://localhost:3000/v1/github/cafkafk/hello.tar.gz?include_prereleases=false"
-    just run_test "http://localhost:3000/v1/gitlab/gitlab.com/cafkafk/hello.tar.gz?include_prereleases=false"
-
-    # Don't filter pre-releases (gitlab doesn't support pre-releases)
-    just run_test_pre "http://localhost:3000/v1/codeberg/cafkafk/hello.tar.gz?include_prereleases=true"
-    just run_test_pre "http://localhost:3000/v1/github/cafkafk/hello.tar.gz?include_prereleases=true"
-    just run_test     "http://localhost:3000/v1/gitlab/gitlab.com/cafkafk/hello.tar.gz?include_prereleases=true"
-
-    # Test branches with questionable amount of slashes
-    just run_test "http://localhost:3000/v1/codeberg/cafkafk/hello/b/a-/t/e/s/t/i/n/g/b/r/a/n/c/h-th@t-should-be-/ha/rd/to/d/e/a/l/wi/th.tar.gz"
-    just run_test "http://localhost:3000/v1/github/cafkafk/hello/b/a-/t/e/s/t/i/n/g/b/r/a/n/c/h-th@t-should-be-/ha/rd/to/d/e/a/l/wi/th.tar.gz"
-    just run_test "http://localhost:3000/v1/gitlab/gitlab.com/cafkafk/hello/b/a-/t/e/s/t/i/n/g/b/r/a/n/c/h-th@t-should-be-/ha/rd/to/d/e/a/l/wi/th.tar.gz"
-    just run_test "http://localhost:3000/v1/git.madhouse-project.org/cafkafk/hello/b/a-/t/e/s/t/i/n/g/b/r/a/n/c/h-th@t-should-be-/ha/rd/to/d/e/a/l/wi/th.tar.gz"
-
-    # Test semantic versioning
-    just run_test "http://localhost:3000/v1/github/cafkafk/hello/s/*.tar.gz"
-    just run_test_pre "http://localhost:3000/v1/github/cafkafk/hello/s/0.0.2-pre.1.tar.gz"
-    # ?version=>=0.0.1,<=0.0.2-pre.5
-    just run_test_pre "http://localhost:3000/v1/github/cafkafk/hello/s/*.tar.gz?version=%3e%3d0.0.1%2c%3c%3d0.0.2-pre.5"
-    just run_test "http://localhost:3000/v1/flakehub/cafkafk/hello/s/*.tar.gz"
-    # ?version=>=0.0.1,<=0.0.2-pre.5
-    just run_test_pre "http://localhost:3000/v1/flakehub/cafkafk/hello/s/*.tar.gz?version=%3e%3d0.0.1%2c%3c%3d0.0.2-pre.5"
-
-    @echo "tests passsed :3"
-
-# Integration Testing of rime.cx (requires Nix)
-itest-live:
-    # Default Endpoints
-    just run_test "http://rime.cx/v1/codeberg/cafkafk/hello.tar.gz"
-    just run_test "http://rime.cx/v1/github/cafkafk/hello.tar.gz"
-    just run_test "http://rime.cx/v1/gitlab/gitlab.com/cafkafk/hello.tar.gz"
-    just run_test "http://rime.cx/v1/gitlab/gitlab.freedesktop.org/cafkafk/hello.tar.gz"
-    just run_test "http://rime.cx/v1/flakehub/cafkafk/hello.tar.gz"
-
-    # Version Endpoints
-    just run_test "http://rime.cx/v1/flakehub/cafkafk/hello/v/v0.0.1.tar.gz"
-    just run_test "http://rime.cx/v1/sourcehut/git.sr.ht/cafkafk/hello/v/v0.0.1.tar.gz"
-
-    # Branch Endpoints
-    just run_test_pre "http://rime.cx/v1/sourcehut/git.sr.ht/cafkafk/hello/b/main.tar.gz"
-
-    # Tags Endpoints
-    just run_test     "http://rime.cx/v1/sourcehut/git.sr.ht/cafkafk/hello/t/v0.0.1.tar.gz"
-    just run_test_pre "http://rime.cx/v1/sourcehut/git.sr.ht/cafkafk/hello/t/main.tar.gz"
-
-    # Autodiscovery
-    just run_test "http://rime.cx/v1/codeberg.org/cafkafk/hello.tar.gz"
-    just run_test "http://rime.cx/v1/github.com/cafkafk/hello.tar.gz"
-    -just run_test "http://rime.cx/v1/gitlab.com/cafkafk/hello.tar.gz"
-    just run_test "http://rime.cx/v1/flakehub.com/cafkafk/hello/v/v0.0.1.tar.gz"
-
-    # Filter pre-releases
-    just run_test "http://rime.cx/v1/codeberg/cafkafk/hello.tar.gz?include_prereleases=false"
-    just run_test "http://rime.cx/v1/github/cafkafk/hello.tar.gz?include_prereleases=false"
-    just run_test "http://rime.cx/v1/gitlab/gitlab.com/cafkafk/hello.tar.gz?include_prereleases=false"
-
-    # Don't filter pre-releases (gitlab doesn't support pre-releases)
-    just run_test_pre "http://rime.cx/v1/codeberg/cafkafk/hello.tar.gz?include_prereleases=true"
-    just run_test_pre "http://rime.cx/v1/github/cafkafk/hello.tar.gz?include_prereleases=true"
-    just run_test     "http://rime.cx/v1/gitlab/gitlab.com/cafkafk/hello.tar.gz?include_prereleases=true"
-
-    # Test branches with questionable amount of slashes
-    just run_test "http://rime.cx/v1/codeberg/cafkafk/hello/b/a-/t/e/s/t/i/n/g/b/r/a/n/c/h-th@t-should-be-/ha/rd/to/d/e/a/l/wi/th.tar.gz"
-    just run_test "http://rime.cx/v1/github/cafkafk/hello/b/a-/t/e/s/t/i/n/g/b/r/a/n/c/h-th@t-should-be-/ha/rd/to/d/e/a/l/wi/th.tar.gz"
-    just run_test "http://rime.cx/v1/gitlab/gitlab.com/cafkafk/hello/b/a-/t/e/s/t/i/n/g/b/r/a/n/c/h-th@t-should-be-/ha/rd/to/d/e/a/l/wi/th.tar.gz"
-    just run_test "http://rime.cx/v1/git.madhouse-project.org/cafkafk/hello/b/a-/t/e/s/t/i/n/g/b/r/a/n/c/h-th@t-should-be-/ha/rd/to/d/e/a/l/wi/th.tar.gz"
-
-    # Test semantic versioning
-    just run_test "http://rime.cx/v1/github/cafkafk/hello/s/*.tar.gz"
-    just run_test_pre "http://rime.cx/v1/github/cafkafk/hello/s/0.0.2-pre.1.tar.gz"
-    # ?version=>=0.0.1,<=0.0.2-pre.5
-    just run_test_pre "http://rime.cx/v1/github/cafkafk/hello/s/*.tar.gz?version=%3e%3d0.0.1%2c%3c%3d0.0.2-pre.5"
-    just run_test "http://rime.cx/v1/flakehub/cafkafk/hello/s/*.tar.gz"
-    # ?version=>=0.0.1,<=0.0.2-pre.5
-    just run_test_pre "http://rime.cx/v1/flakehub/cafkafk/hello/s/*.tar.gz?version=%3e%3d0.0.1%2c%3c%3d0.0.2-pre.5"
-
-    @echo "tests passsed :3"
-
-# Easy itest... idk I don't wanna type something long
-etest:
-    #!/usr/bin/env fish
-    cargo build && cargo run &; sleep 2; just itest; pkill rime