Changed source URL to original upstream and added a pkver() to derive the version string based on the latest release.

2 files changed, 23 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e01a0fd98cff..ed93770d323e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = ruby-mailcatcher
 	pkgdesc = Catches mail and serves it through a dream.
 	pkgver = 0.6.3
-	pkgrel = 1
+	pkgrel = 2
 	url = http://mailcatcher.me
 	install = ruby-mailcatcher.install
 	arch = any
@@ -19,13 +19,13 @@ pkgbase = ruby-mailcatcher
 	conflicts = mailcatcher
 	noextract = mailcatcher-0.6.3.gem
 	options = !emptydirs
-	source = http://gems.rubyforge.org/gems/mailcatcher-0.6.3.gem
+	source = https://github.com/sj26/mailcatcher/releases/download/v0.6.3/mailcatcher-0.6.3.gem
 	source = mailcatcher.service
 	source = mailcatcher-http@.socket
 	source = mailcatcher-http.service
 	source = mailcatcher-smtp@.socket
 	source = mailcatcher-smtp.service
-	md5sums = 80bd456e6245ae801881bd7f458a81ae
+	md5sums = SKIP
 	md5sums = c6e70c3b5b061fb3e13ad56fea757b01
 	md5sums = 5058d837ddef08507197a1cb17dcab34
 	md5sums = a3be575ff001fedc044ba43e6fdd31f7
diff --git a/PKGBUILD b/PKGBUILD
index c6984710f288..ae792a340404 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,10 +1,10 @@
 # Maintainer: James An <james@jamesan.ca>
 # Contributor: fzerorubigd <fzerorubigd {AT} gmail>
 
-_pkgname=mailcatcher
-pkgname=ruby-$_pkgname
+pkgname=ruby-mailcatcher
+_pkgname="${pkgname#ruby-}"
 pkgver=0.6.3
-pkgrel=1
+pkgrel=2
 pkgdesc='Catches mail and serves it through a dream.'
 arch=('any')
 url="http://$_pkgname.me"
@@ -16,14 +16,14 @@ conflicts=("$_pkgname")
 options=(!emptydirs)
 install="$pkgname.install"
 source=(
-  "http://gems.rubyforge.org/gems/$_pkgname-$pkgver.gem"
+  "https://github.com/sj26/$_pkgname/releases/download/v$pkgver/$_pkgname-$pkgver.gem"
   "$_pkgname.service"
   "$_pkgname-http@.socket"
   "$_pkgname-http.service"
   "$_pkgname-smtp@.socket"
   "$_pkgname-smtp.service"
 )
-md5sums=('80bd456e6245ae801881bd7f458a81ae'
+md5sums=('SKIP'
          'c6e70c3b5b061fb3e13ad56fea757b01'
          '5058d837ddef08507197a1cb17dcab34'
          'a3be575ff001fedc044ba43e6fdd31f7'
@@ -31,11 +31,24 @@ md5sums=('80bd456e6245ae801881bd7f458a81ae'
          'be35bfe4c621b7f2ff733e2c21bee54d')
 noextract=("$_pkgname-$pkgver.gem")
 
+# Derive the latest release's version string from its tag name.
+pkgver() {
+    (
+        set -o pipefail
+        curl https://api.github.com/repos/sj26/mailcatcher/releases/latest |
+        sed -n '/"tag_name"/{s/^ \+"tag_name": "v\?\([^"]*\)",/\1/;p}'
+    )
+}
+
 package() {
   # _gemdir is defined inside package() because if ruby[gems] is not installed on
   # the system, makepkg will exit with an error when sourcing the PKGBUILD.
-  local _gemdir="$pkgdir$(ruby -rubygems -e'puts Gem.default_dir')"
-  local _gemspec="$_gemdir/specifications/$_pkgname-$pkgver.gemspec"
+  _gemdir="$pkgdir$(ruby -rubygems -e'puts Gem.default_dir')"
+  _gemspec="$_gemdir/specifications/$_pkgname-$pkgver.gemspec"
+
+  echo $_gemdir
+  echo $_gemspec
+  echo "$_pkgname-$pkgver.gem"
 
   gem install --no-document --no-user-install --ignore-dependencies --install-dir "$_gemdir" --bindir "$pkgdir/usr/bin" "$_pkgname-$pkgver.gem"
   rm "$_gemdir/cache/$_pkgname-$pkgver.gem"