bump version

3 files changed, 121 insertions, 44 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7347fbd935c8..aae0fca4211e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,23 +1,25 @@
 pkgbase = ruby-gollum-lib
-	pkgdesc = A simple, Git-powered wiki.
-	pkgver = 5.1.3
+	pkgdesc = A simple, Git-powered wiki with a sweet API.
+	pkgver = 6.0
 	pkgrel = 1
 	url = http://github.com/gollum/gollum-lib
-	arch = any
+	arch = x86_64
 	license = MIT
-	makedepends = ruby-rdoc
-	depends = ruby
-	depends = ruby-gemojione
-	depends = ruby-github-markup
-	depends = ruby-gollum-rugged_adapter
-	depends = ruby-loofah
-	depends = ruby-nokogiri
-	depends = ruby-octicons
+	checkdepends = ruby-rack-test
+	checkdepends = ruby-shoulda
+	checkdepends = ruby-minitest-reporters
+	checkdepends = ruby-mocha
+	checkdepends = ruby-test-unit
+	checkdepends = ruby-twitter_cldr
+	makedepends = git
+	makedepends = rubygems
 	depends = ruby-rouge
-	depends = ruby-twitter-text=1.14.7
-	noextract = gollum-lib-5.1.3.gem
-	options = !emptydirs
-	source = https://rubygems.org/downloads/gollum-lib-5.1.3.gem
-	sha1sums = b82cce5d74630fb2e661339f0127b66dce424e0a
+	depends = ruby-nokogiri
+	depends = ruby-loofah
+	depends = ruby-github-markup
+	depends = ruby-gemojione
+	depends = ruby-twitter-text
+	source = git+https://github.com/gollum/gollum-lib.git#commit=15aae49016860a7fa3c04bd6f48fee9fd43a518d
+	sha1sums = SKIP
 
 pkgname = ruby-gollum-lib
diff --git a/.gitignore b/.gitignore
index c111b331371a..6ede0ec263d0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
-*.gem
+src/
+pkg
+gollum-lib/
diff --git a/PKGBUILD b/PKGBUILD
index 3e11f60574d4..3ed11dcbcbdd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,33 +1,106 @@
-# Generated by gem2arch (https://github.com/anatol/gem2arch)
-# Maintainer: Anatoly Bashmakov <anatoly at posteo dot net>
-# Maintainer: Grey Christoforo <first name at last name dot net>
-
-_gemname=gollum-lib
-pkgname=ruby-$_gemname
-pkgver=5.1.3
+pkgname=ruby-gollum-lib
+_name=gollum-lib
+pkgver=6.0
+_commit=15aae49016860a7fa3c04bd6f48fee9fd43a518d
 pkgrel=1
-pkgdesc='A simple, Git-powered wiki.'
-arch=(any)
+pkgdesc='A simple, Git-powered wiki with a sweet API.'
+arch=(x86_64)
 url='http://github.com/gollum/gollum-lib'
 license=(MIT)
-depends=(ruby
-         ruby-gemojione
-         ruby-github-markup
-         ruby-gollum-rugged_adapter
-         ruby-loofah
-         ruby-nokogiri
-         ruby-octicons
-         ruby-rouge
-         'ruby-twitter-text=1.14.7')
-makedepends=(ruby-rdoc)
-options=(!emptydirs)
-source=(https://rubygems.org/downloads/$_gemname-$pkgver.gem)
-noextract=($_gemname-$pkgver.gem)
-sha1sums=('b82cce5d74630fb2e661339f0127b66dce424e0a')
+depends=(
+ruby-rouge
+ruby-nokogiri
+ruby-loofah
+ruby-github-markup
+ruby-gemojione
+ruby-twitter-text
+)
+makedepends=(
+git
+rubygems
+)
+checkdepends=(
+ruby-rack-test
+ruby-shoulda
+ruby-minitest-reporters
+ruby-mocha
+ruby-test-unit
+ruby-twitter_cldr
+)
+#options=(!emptydirs)
+source=("git+https://github.com/gollum/gollum-lib.git#commit=${_commit}")
+sha1sums=('SKIP')
+
+pkgver() {
+	cd gollum-lib
+	git describe --tags | sed 's/^v//'
+}
+
+
+prepare() {
+  cd gollum-lib
+
+  # update gemspec/Gemfile to allow newer version of the dependencies
+  sed --in-place --regexp-extended 's|~>|>=|g' "${_name}.gemspec"
+}
+
+build() {
+  cd gollum-lib
+
+  local _gemdir="$(gem env gemdir)"
+
+  gem build "${_name}.gemspec"
+
+  gem install \
+    --local \
+    --verbose \
+    --ignore-dependencies \
+    --no-user-install \
+    --install-dir "tmp_install/${_gemdir}" \
+    --bindir "tmp_install/usr/bin" \
+    "${_name}-${pkgver}.gem"
+
+  # remove unrepreducible files
+  rm --force --recursive --verbose \
+    "tmp_install/${_gemdir}/cache/" \
+    "tmp_install/${_gemdir}/gems/${_name}-${pkgver}/vendor/" \
+    "tmp_install/${_gemdir}/doc/${_name}-${pkgver}/ri/ext/"
+
+  find "tmp_install/${_gemdir}/gems/" \
+    -type f \
+    \( \
+      -iname "*.o" -o \
+      -iname "*.c" -o \
+      -iname "*.so" -o \
+      -iname "*.time" -o \
+      -iname "gem.build_complete" -o \
+      -iname "Makefile" \
+    \) \
+    -delete
+
+  find "tmp_install/${_gemdir}/extensions/" \
+    -type f \
+    \( \
+      -iname "mkmf.log" -o \
+      -iname "gem_make.out" \
+    \) \
+    -delete
+}
+
+check() {
+  cd gollum-lib
+
+  local _gemdir="$(gem env gemdir)"
+
+  GEM_HOME="tmp_install/${_gemdir}" rake test | true  # needs ruby-nokogiri-diff at least
+}
 
 package() {
-  local _gemdir="$(ruby -e 'puts Gem.default_dir')"
-  gem install --ignore-dependencies --no-user-install -i "$pkgdir/$_gemdir" -n "$pkgdir/usr/bin" $_gemname-$pkgver.gem
-  rm "$pkgdir/$_gemdir/cache/$_gemname-$pkgver.gem"
-  install -D -m644 "$pkgdir/$_gemdir/gems/$_gemname-$pkgver/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  cd gollum-lib
+
+  cp --archive --verbose tmp_install/* "${pkgdir}"
+
+  install --verbose -D --mode=0644 LICENSE --target-directory "${pkgdir}/usr/share/licenses/${pkgname}"
+  install --verbose -D --mode=0644 *.md --target-directory "${pkgdir}/usr/share/doc/${pkgname}"
 }
+