diff --git a/.gitignore b/.gitignore index a2804fe..4d9f94f 100644 --- a/.gitignore +++ b/.gitignore @@ -27,6 +27,3 @@ gdb.txt # Generated docs _docs/ /man/ - -# VLS logs -vls.log diff --git a/.woodpecker/.build.yml b/.woodpecker/.build.yml index 580fa69..7cb7d53 100644 --- a/.woodpecker/.build.yml +++ b/.woodpecker/.build.yml @@ -7,7 +7,7 @@ platform: ${PLATFORM} pipeline: install-modules: - image: 'chewingbever/vlang:0.3' + image: 'chewingbever/vlang:latest' pull: true commands: - export VMODULES=$PWD/.vmodules @@ -16,7 +16,7 @@ pipeline: event: [push, pull_request] debug: - image: 'chewingbever/vlang:0.3' + image: 'chewingbever/vlang:latest' commands: - export VMODULES=$PWD/.vmodules - make @@ -26,7 +26,7 @@ pipeline: exclude: [main] prod: - image: 'chewingbever/vlang:0.3' + image: 'chewingbever/vlang:latest' environment: - LDFLAGS=-lz -lbz2 -llzma -lexpat -lzstd -llz4 -lsqlite3 -static commands: @@ -44,7 +44,7 @@ pipeline: event: [push, pull_request] upload: - image: 'chewingbever/vlang:0.3' + image: 'chewingbever/vlang:latest' secrets: [ s3_username, s3_password ] commands: # https://gist.github.com/JustinTimperio/7c7115f87b775618637d67ac911e595f diff --git a/.woodpecker/.docs.yml b/.woodpecker/.docs.yml index da495fc..051d852 100644 --- a/.woodpecker/.docs.yml +++ b/.woodpecker/.docs.yml @@ -11,7 +11,7 @@ pipeline: - make docs api-docs: - image: 'chewingbever/vlang:0.3' + image: 'chewingbever/vlang:latest' pull: true group: 'generate' commands: diff --git a/.woodpecker/.gitea.yml b/.woodpecker/.gitea.yml index 55f991e..d0825c2 100644 --- a/.woodpecker/.gitea.yml +++ b/.woodpecker/.gitea.yml @@ -8,7 +8,7 @@ skip_clone: true pipeline: prepare: - image: 'chewingbever/vlang:0.3' + image: 'chewingbever/vlang:latest' pull: true secrets: [ s3_username, s3_password ] commands: diff --git a/.woodpecker/.lint.yml b/.woodpecker/.lint.yml index 75a8105..e70648d 100644 --- a/.woodpecker/.lint.yml +++ b/.woodpecker/.lint.yml @@ -5,7 +5,7 @@ platform: 'linux/amd64' pipeline: lint: - image: 'chewingbever/vlang:0.3' + image: 'chewingbever/vlang:latest' pull: true commands: - make lint diff --git a/.woodpecker/.man.yml b/.woodpecker/.man.yml index 1a30b03..0b80886 100644 --- a/.woodpecker/.man.yml +++ b/.woodpecker/.man.yml @@ -9,7 +9,7 @@ skip_clone: true pipeline: generate: - image: 'chewingbever/vlang:0.3' + image: 'chewingbever/vlang:latest' pull: true commands: - curl -o vieter -L "https://s3.rustybever.be/vieter/commits/$CI_COMMIT_SHA/vieter-linux-amd64" diff --git a/.woodpecker/.test.yml b/.woodpecker/.test.yml index 6c267fa..a19dbd4 100644 --- a/.woodpecker/.test.yml +++ b/.woodpecker/.test.yml @@ -9,7 +9,7 @@ platform: ${PLATFORM} pipeline: install-modules: - image: 'chewingbever/vlang:0.3' + image: 'chewingbever/vlang:latest' pull: true commands: - export VMODULES=$PWD/.vmodules @@ -18,7 +18,7 @@ pipeline: event: [pull_request] test: - image: 'chewingbever/vlang:0.3' + image: 'chewingbever/vlang:latest' pull: true commands: - export VMODULES=$PWD/.vmodules diff --git a/CHANGELOG.md b/CHANGELOG.md index a03c18c..cf2b829 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,7 +14,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 URL to a PKGBUILD * Targets with kind 'url' can provide a direct URL to a PKGBUILD instead of providing a Git repository -* CLI commands for searching the AUR & directly adding packages ### Changed diff --git a/Dockerfile b/Dockerfile index 7aed917..5997adc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM chewingbever/vlang:0.3 AS builder +FROM chewingbever/vlang:latest AS builder ARG TARGETPLATFORM ARG CI_COMMIT_SHA diff --git a/PKGBUILD b/PKGBUILD index 14ea71b..6b664d1 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -5,9 +5,9 @@ pkgbase='vieter' pkgname='vieter' pkgver='0.3.0' pkgrel=1 -pkgdesc="Lightweight Arch repository server & package build system" +pkgdesc="Vieter is a lightweight implementation of an Arch repository server." depends=('glibc' 'openssl' 'libarchive' 'sqlite') -makedepends=('git' 'vlang') +makedepends=('git' 'vieter-v') arch=('x86_64' 'aarch64') url='https://git.rustybever.be/vieter-v/vieter' license=('AGPL3') diff --git a/PKGBUILD.dev b/PKGBUILD.dev index 79c7f37..045e576 100644 --- a/PKGBUILD.dev +++ b/PKGBUILD.dev @@ -5,9 +5,9 @@ pkgbase='vieter-git' pkgname='vieter-git' pkgver=0.2.0.r25.g20112b8 pkgrel=1 -pkgdesc="Lightweight Arch repository server & package build system (development version)" +pkgdesc="Vieter is a lightweight implementation of an Arch repository server." depends=('glibc' 'openssl' 'libarchive' 'sqlite') -makedepends=('git' 'vlang') +makedepends=('git' 'vieter-v') arch=('x86_64' 'aarch64') url='https://git.rustybever.be/vieter-v/vieter' license=('AGPL3') diff --git a/src/console/aur/aur.v b/src/console/aur/aur.v deleted file mode 100644 index c98f8e6..0000000 --- a/src/console/aur/aur.v +++ /dev/null @@ -1,62 +0,0 @@ -module aur - -import cli -import console -import client -import vieter_v.aur -import vieter_v.conf as vconf - -struct Config { - address string [required] - api_key string [required] -} - -// cmd returns the cli module for interacting with the AUR API. -pub fn cmd() cli.Command { - return cli.Command{ - name: 'aur' - description: 'Interact with the AUR.' - commands: [ - cli.Command{ - name: 'search' - description: 'Search for packages.' - required_args: 1 - execute: fn (cmd cli.Command) ? { - c := aur.new() - pkgs := c.search(cmd.args[0])? - data := pkgs.map([it.name, it.description]) - - println(console.pretty_table(['name', 'description'], data)?) - } - }, - cli.Command{ - name: 'add' - usage: 'repo pkg-name [pkg-name...]' - description: 'Add the given AUR package(s) to Vieter. Non-existent packages will be silently ignored.' - required_args: 2 - execute: fn (cmd cli.Command) ? { - config_file := cmd.flags.get_string('config-file')? - conf := vconf.load(prefix: 'VIETER_', default_path: config_file)? - - c := aur.new() - pkgs := c.info(cmd.args[1..])? - - vc := client.new(conf.address, conf.api_key) - - for pkg in pkgs { - vc.add_target( - kind: 'git' - url: 'https://aur.archlinux.org/$pkg.package_base' + '.git' - repo: cmd.args[0] - ) or { - println('Failed to add $pkg.name: $err.msg()') - continue - } - - println('Added $pkg.name' + '.') - } - } - }, - ] - } -} diff --git a/src/main.v b/src/main.v index 4ade930..cba410c 100644 --- a/src/main.v +++ b/src/main.v @@ -7,7 +7,6 @@ import console.targets import console.logs import console.schedule import console.man -import console.aur import cron fn main() { @@ -32,7 +31,6 @@ fn main() { logs.cmd(), schedule.cmd(), man.cmd(), - aur.cmd(), ] } app.setup() diff --git a/src/v.mod b/src/v.mod index 710c976..5b89062 100644 --- a/src/v.mod +++ b/src/v.mod @@ -1,7 +1,6 @@ Module { dependencies: [ 'https://git.rustybever.be/vieter-v/conf', - 'https://git.rustybever.be/vieter-v/docker', - 'https://git.rustybever.be/vieter-v/aur' + 'https://git.rustybever.be/vieter-v/docker' ] }