Upgrade to 0.7.1, build from sources, remove buggy .install

3 files changed, 69 insertions, 63 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2d68ebfcf90a..b5d8304222e5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,35 +1,34 @@
 pkgbase = ruby-mailcatcher
-	pkgdesc = Catches mail and serves it through a dream.
-	pkgver = 0.6.5
+	pkgdesc = Catches mail and serves it through a dream
+	pkgver = 0.7.1
 	pkgrel = 1
-	url = http://mailcatcher.me
-	install = ruby-mailcatcher.install
+	url = https://mailcatcher.me/
 	arch = any
 	license = MIT
-	makedepends = rubygems
+	makedepends = ruby-bundler
+	makedepends = ruby
+	makedepends = nodejs
 	depends = ruby-eventmachine-1.0
 	depends = ruby-mail
-	depends = ruby-rack-1
+	depends = ruby-rack-1.5
 	depends = ruby-sinatra-1
 	depends = ruby-skinny
 	depends = ruby-sqlite3
 	depends = ruby-thin-1.5
 	provides = mailcatcher
 	conflicts = mailcatcher
-	noextract = mailcatcher-0.6.5.gem
-	options = !emptydirs
-	source = https://rubygems.org/downloads/mailcatcher-0.6.5.gem
-	source = mailcatcher.service
-	source = mailcatcher-http@.socket
+	source = https://github.com/sj26/mailcatcher/archive/v0.7.1.tar.gz
 	source = mailcatcher-http.service
-	source = mailcatcher-smtp@.socket
+	source = mailcatcher-http@.socket
 	source = mailcatcher-smtp.service
-	md5sums = SKIP
-	md5sums = c6e70c3b5b061fb3e13ad56fea757b01
-	md5sums = 5058d837ddef08507197a1cb17dcab34
-	md5sums = a3be575ff001fedc044ba43e6fdd31f7
-	md5sums = 354d0e3422ef2f890ad5c598c709372b
-	md5sums = be35bfe4c621b7f2ff733e2c21bee54d
+	source = mailcatcher-smtp@.socket
+	source = mailcatcher.service
+	sha512sums = 068603a417a570265cda24f45cddd11a6170a022917edf646721c339ead59a328632b1d70e35feeef5a169d50257737acbe5149790ec65d4729ddf6f1d8a161d
+	sha512sums = 1cee14c7fe9e5c5550e4273f6e8c1188f774f95a0ab1523ae2c3f101003dab20f00f31591618adb7ef930db65913804aca790d4a83356830b5fa7bcbdefe43a3
+	sha512sums = 4cd6044c2f291ea292abbc175765748f4da6ea23f593689b35397def69d413101ff358db2d19e3596fbd6f6009ad5426d0787cedab4ead0a9a7a8a8e998533e8
+	sha512sums = 1b390ce75e803e55e95720f562569f630ae7aa4e03f4bfd76e6ee53c0cae048a774bc837a922989a5c2e400624967c4373cb6eeb58afb0b696ffc0ca51465212
+	sha512sums = ae8801a4d6dfab7fcb2fea2e4e45c0e6a8e9ed25e6ce1a7d4fd620fadcd2c7cee3c6f78fa10d912e643f2e0126e4e2add2253fb8a445f8ebe448573650b73e5d
+	sha512sums = 9d5e1081e794465d48e327ff5401aa113d9777f1adca650496735247d2e9ec4bfbb07a0325b472caca0613b448ac6c6e068112950c1785e6ef6157739fa18e42
 
 pkgname = ruby-mailcatcher
 
diff --git a/PKGBUILD b/PKGBUILD
index 6e357110ad97..b077790894b3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,47 +1,65 @@
+# Maintainer: William Gathoye <william + aur at gathoye dot be>
 # Maintainer: James An <james@jamesan.ca>
 # Contributor: fzerorubigd <fzerorubigd {AT} gmail>
 
 pkgname=ruby-mailcatcher
 _pkgname="${pkgname#ruby-}"
-pkgver=0.6.5
+pkgver=0.7.1
 pkgrel=1
-pkgdesc='Catches mail and serves it through a dream.'
+pkgdesc='Catches mail and serves it through a dream'
 arch=('any')
-url="http://$_pkgname.me"
+url='https://mailcatcher.me/'
 license=('MIT')
-depends=('ruby-eventmachine-1.0' 'ruby-mail' 'ruby-rack-1' 'ruby-sinatra-1' 'ruby-skinny' 'ruby-sqlite3' 'ruby-thin-1.5')
-makedepends=('rubygems')
-provides=("$_pkgname")
-conflicts=("$_pkgname")
-options=(!emptydirs)
-install="$pkgname.install"
+
+depends=('ruby-eventmachine-1.0' 'ruby-mail' 'ruby-rack-1.5' 'ruby-sinatra-1' 'ruby-skinny' 'ruby-sqlite3' 'ruby-thin-1.5')
+makedepends=(
+  'ruby-bundler'
+  'ruby'
+  # Nodejs is needed otherwise rake will complain with
+  # ExecJS::RuntimeUnavailable: Could not find a JavaScript runtime. See https://github.com/rails/execjs for a list of available runtimes.
+  'nodejs'
+)
+provides=("${_pkgname}")
+conflicts=("${_pkgname}")
 source=(
-  "https://rubygems.org/downloads/$_pkgname-$pkgver.gem"
-  "$_pkgname.service"
-  "$_pkgname-http@.socket"
-  "$_pkgname-http.service"
-  "$_pkgname-smtp@.socket"
-  "$_pkgname-smtp.service"
+    "https://github.com/sj26/mailcatcher/archive/v${pkgver}.tar.gz"
+    "${_pkgname}-http.service"
+    "${_pkgname}-http@.socket"
+    "${_pkgname}-smtp.service"
+    "${_pkgname}-smtp@.socket"
+    "${_pkgname}.service"
+)
+sha512sums=(
+    '068603a417a570265cda24f45cddd11a6170a022917edf646721c339ead59a328632b1d70e35feeef5a169d50257737acbe5149790ec65d4729ddf6f1d8a161d'
+    '1cee14c7fe9e5c5550e4273f6e8c1188f774f95a0ab1523ae2c3f101003dab20f00f31591618adb7ef930db65913804aca790d4a83356830b5fa7bcbdefe43a3'
+    '4cd6044c2f291ea292abbc175765748f4da6ea23f593689b35397def69d413101ff358db2d19e3596fbd6f6009ad5426d0787cedab4ead0a9a7a8a8e998533e8'
+    '1b390ce75e803e55e95720f562569f630ae7aa4e03f4bfd76e6ee53c0cae048a774bc837a922989a5c2e400624967c4373cb6eeb58afb0b696ffc0ca51465212'
+    'ae8801a4d6dfab7fcb2fea2e4e45c0e6a8e9ed25e6ce1a7d4fd620fadcd2c7cee3c6f78fa10d912e643f2e0126e4e2add2253fb8a445f8ebe448573650b73e5d'
+    '9d5e1081e794465d48e327ff5401aa113d9777f1adca650496735247d2e9ec4bfbb07a0325b472caca0613b448ac6c6e068112950c1785e6ef6157739fa18e42'
 )
-md5sums=('SKIP'
-         'c6e70c3b5b061fb3e13ad56fea757b01'
-         '5058d837ddef08507197a1cb17dcab34'
-         'a3be575ff001fedc044ba43e6fdd31f7'
-         '354d0e3422ef2f890ad5c598c709372b'
-         'be35bfe4c621b7f2ff733e2c21bee54d')
-noextract=("$_pkgname-$pkgver.gem")
+
+prepare() {
+    cd "${_pkgname}-${pkgver}"
+    bundle install --path .bundle
+}
+
+build() {
+    cd "${_pkgname}-${pkgver}"
+    bundle exec rake package
+}
 
 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.
-  _gemdir="$pkgdir$(ruby -e'puts Gem.default_dir')"
-  _gemspec="$_gemdir/specifications/$_pkgname-$pkgver.gemspec"
-
-  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"
-
-  # Install systemd units
-  for file in "$_pkgname"{.service,{-http,-smtp}{.service,@.socket}}; do
-    install -Dm644 "$file" "$pkgdir/usr/lib/systemd/system/$file"
-  done
+
+    # Install systemd units
+    for file in "${_pkgname}"{.service,{-http,-smtp}{.service,@.socket}}; do
+        install -Dm644 "${file}" "${pkgdir}/usr/lib/systemd/system/${file}"
+    done
+
+    cd "${_pkgname}-${pkgver}"
+
+    # _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.
+    _gemdir="${pkgdir}$(ruby -e'puts Gem.default_dir')"
+
+    gem install --no-document --no-user-install --ignore-dependencies --install-dir "${_gemdir}" --bindir "${pkgdir}/usr/bin" "${_pkgname}-${pkgver}.gem"
 }
diff --git a/ruby-mailcatcher.install b/ruby-mailcatcher.install
deleted file mode 100644
index aabd97d8a879..000000000000
--- a/ruby-mailcatcher.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  echo ">>> Start mailcatcher using the mailcatcher.service unit file. (The default SMTP and HTTP ports are 1025 and 1080, respectively.)"
-  echo ">>> Or, socket-activate mailcatcher with another port for either or both using: mailcatcher-smtp@.socket or mailcatcher-http@.socket."
-}
-
-pre_remove() {
-  for unit in mailcatcher{.service,-{http,smtp}{.service,@.socket}}; do
-    systemctl --quiet is-active $unit && systemctl stop $unit
-    systemctl --quiet is-enabled $unit && systemctl disable $unit
-  done
-}