Commit in sheldon/trunk (PKGBUILD)

[George Rawlinson]

    Date: Thursday, October 13, 2022 @ 23:23:22
  Author: grawlinson
Revision: 1328074

upgpkg: sheldon 0.7.0-1; new upstream release.

* New upstream release.
* Remove backported fixes for tests.
* Re-enable disabled tests.
* Split package for documentation.
* Add documentation - HTML manual.

Modified:
  sheldon/trunk/PKGBUILD

----------+
 PKGBUILD |   62 ++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 33 insertions(+), 29 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2022-10-13 23:15:42 UTC (rev 1328073)
+++ PKGBUILD    2022-10-13 23:23:22 UTC (rev 1328074)
@@ -1,37 +1,34 @@
 # Maintainer: George Rawlinson <grawlin...@archlinux.org>
 
-pkgname=sheldon
-pkgver=0.6.6
-pkgrel=3
-pkgdesc="A fast and configurable shell plugin manager"
+pkgbase=sheldon
+pkgname=('sheldon' 'sheldon-docs')
+pkgver=0.7.0
+pkgrel=1
+pkgdesc='A fast and configurable shell plugin manager'
 arch=('x86_64')
-url="https://sheldon.cli.rs";
+url='https://sheldon.cli.rs'
 license=('Apache' 'MIT')
-depends=('curl')
-makedepends=('git' 'rust' 'mdbook-linkcheck')
+makedepends=('git' 'rust' 'mdbook-linkcheck' 'curl')
 options=('!lto')
-_commit='31c6df8f7da1d9aed7b46d75bc6c0fd8a0616c54'
+_commit='1d91370e0b63da3c5a1e5fd63f7292bbb7ff7168'
 source=("git+https://github.com/rossmacarthur/sheldon.git#commit=$_commit";)
 b2sums=('SKIP')
 
 pkgver() {
-  cd "$pkgname"
+  cd "$pkgbase"
 
   git describe --tags | sed 's/^v//'
 }
 
 prepare() {
-  cd "$pkgname"
+  cd "$pkgbase"
 
-  # backport fix for tests
-  git cherry-pick --no-commit 9aa06fdd5cb284daae8c48648d614e3823f3f9f3
-
   # download dependencies
   cargo fetch --locked --target "$CARCH-unknown-linux-gnu"
 }
 
 build() {
-  cd "$pkgname"
+  cd "$pkgbase"
 
   # binary
   cargo build --frozen --release --all-features
@@ -41,29 +38,36 @@
 }
 
 check() {
-  cd "$pkgname"
+  cd "$pkgbase"
 
-  # temporarily disable tests related to github's
-  # disabling of specific requests
-  cargo test --frozen --all-features -- \
-    --skip lock::tests::locked_config_clean \
-    --skip lock::tests::source_lock_git_git_with_checkout \
-    --skip lock_and_source_github_git
+  cargo test --frozen --all-features
 }
 
-package() {
-  cd "$pkgname"
+package_sheldon() {
+  depends=('curl')
+  optdepends=('sheldon-docs: documentation')
 
+  cd "$pkgbase"
+
   # binary
-  install -vDm755 -t "$pkgdir/usr/bin" target/release/sheldon
+  install -vDm755 -t "$pkgdir/usr/bin" "target/release/$pkgbase"
 
   # license
-  install -vDm644 -t "$pkgdir/usr/share/licenses/$pkgname" LICENSE*
+  install -vDm644 -t "$pkgdir/usr/share/licenses/$pkgbase" LICENSE*
 
+  # completions
+  install -vDm644 completions/sheldon.bash 
"$pkgdir/usr/share/bash-completion/completions/$pkgbase"
+  install -vDm644 completions/sheldon.zsh 
"$pkgdir/usr/share/zsh/site-functions/_$pkgbase"
+}
+
+package_sheldon-docs() {
+  pkgdesc+=' (documentation)'
+
+  cd "$pkgbase"
+
   # documentation
-  install -vDm644 -t "$pkgdir/usr/share/doc/$pkgname" *.md
+  install -vDm644 -t "$pkgdir/usr/share/doc/$pkgbase" ./*.md
 
-  # completions
-  install -vDm644 completions/sheldon.bash 
"$pkgdir/usr/share/bash-completion/completions/$pkgname"
-  install -vDm644 completions/sheldon.zsh 
"$pkgdir/usr/share/zsh/site-functions/_$pkgname"
+  # html manual
+  cp -vr docs/book/html "$pkgdir/usr/share/doc/$pkgbase"
 }