Bump to 0.34

4 files changed, 80 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b6a41b39db13..84ef1cb7edf7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,21 @@
-# Generated by mksrcinfo v8
-# Thu Nov 16 12:16:34 UTC 2017
 pkgbase = ruby-gettext-setup
 	pkgdesc = A gem that configures gettext for internationalization.
-	pkgver = 0.28
+	pkgver = 0.34
 	pkgrel = 1
 	url = https://github.com/puppetlabs/gettext-setup-gem
 	arch = any
-	license = Apache-2.0
+	license = Apache
+	checkdepends = ruby-rspec
+	makedepends = rubygems
+	makedepends = ruby-rdoc
 	depends = ruby
 	depends = ruby-gettext
 	depends = ruby-fast_gettext
-	noextract = gettext-setup-0.28.gem
 	options = !emptydirs
-	source = https://rubygems.org/downloads/gettext-setup-0.28.gem
-	sha256sums = 4c6febf6eb86f52663e64ff666cd8a7a3c8b4aa124969dff90fabc697e5dbc0a
+	source = https://github.com/puppetlabs/gettext-setup-gem/archive/0.34/gettext-setup-gem-0.34.tar.gz
+	source = disable-simplecov.patch
+	sha256sums = f9a64ba9dab5af20a20abdf035b56f2a1d4cad67076add72b5de23a14e1b8efc
+	sha256sums = 935d995bca7ff5f196c5d66dcfbfc86766043b548a48782db5a6be641150e0a4
 
 pkgname = ruby-gettext-setup
 
diff --git a/.gitignore b/.gitignore
index f71c635dafda..f019f2fb57b8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 !.gitignore
 !PKGBUILD
 !.SRCINFO
+!disable-simplecov.patch
diff --git a/PKGBUILD b/PKGBUILD
index 26925a865000..85b6e5dca8fb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,22 +1,66 @@
 # Maintainer: Mario Finelli <mario at finel dot li>
+# Contributor: Tim Meusel <tim at bastelfreak dot de>
 
 _gemname=gettext-setup
 pkgname=ruby-$_gemname
-pkgver=0.28
+pkgver=0.34
 pkgrel=1
 pkgdesc='A gem that configures gettext for internationalization.'
 arch=(any)
 url='https://github.com/puppetlabs/gettext-setup-gem'
-license=('Apache-2.0')
+license=('Apache')
 depends=(ruby ruby-gettext ruby-fast_gettext)
+makedepends=(rubygems ruby-rdoc)
+checkdepends=(ruby-rspec)
 options=(!emptydirs)
-source=(https://rubygems.org/downloads/$_gemname-$pkgver.gem)
-noextract=($_gemname-$pkgver.gem)
-sha256sums=('4c6febf6eb86f52663e64ff666cd8a7a3c8b4aa124969dff90fabc697e5dbc0a')
+source=(https://github.com/puppetlabs/gettext-setup-gem/archive/${pkgver}/${_gemname}-gem-${pkgver}.tar.gz disable-simplecov.patch)
+options=(!emptydirs)
+sha256sums=('f9a64ba9dab5af20a20abdf035b56f2a1d4cad67076add72b5de23a14e1b8efc'
+            '935d995bca7ff5f196c5d66dcfbfc86766043b548a48782db5a6be641150e0a4')
+
+prepare() {
+  cd ${_gemname}-gem-${pkgver}
+
+  # allow latest dependencies
+  sed -i 's|~>|>=|g' ${_gemname}.gemspec
+
+  # allow to build without git
+  sed -i "s/spec.version.*/spec.version       = '${pkgver}'/" \
+    ${_gemname}.gemspec
+
+  # The Rakefile and a helper file try to load a bunch of gems to report the
+  # CI status to a cloud provider, it also tries to execute a ruby linter for
+  # a legacy Ruby version and all those tools aren't required to build and
+  # test the software, also we don't have them in the repos.
+  sed -i "/spec.add_development_dependency 'rubocop'/d" ${_gemname}.gemspec
+  sed -i "/spec.add_development_dependency 'simplecov'/d" ${_gemname}.gemspec
+
+  # allow latest gettext version (removes explicit upper boundary)
+  sed -i "s/.*'gettext'.*/  spec.add_dependency 'gettext'/" ${_gemname}.gemspec
+
+  patch -p1 -N -i "${srcdir}/disable-simplecov.patch"
+}
+
+check() {
+  cd ${_gemname}-gem-${pkgver}
+  rspec spec
+}
+
+build() {
+  cd ${_gemname}-gem-${pkgver}
+  gem build ${_gemname}.gemspec
+}
 
 package() {
-  cd "$srcdir"
   local _gemdir="$(ruby -e'puts Gem.default_dir')"
+  cd ${_gemname}-gem-${pkgver}
+
+  gem install \
+    --ignore-dependencies \
+    --no-user-install \
+    -i "$pkgdir/$_gemdir" \
+    -n "$pkgdir/usr/bin" \
+    $_gemname-$pkgver.gem
 
-  gem install --ignore-dependencies --no-user-install -i "$pkgdir/$_gemdir" -n "$pkgdir/usr/bin" $_gemname-$pkgver.gem
+  rm "$pkgdir/$_gemdir/cache/$_gemname-$pkgver.gem"
 }
diff --git a/disable-simplecov.patch b/disable-simplecov.patch
new file mode 100644
index 000000000000..2754edba44a3
--- /dev/null
+++ b/disable-simplecov.patch
@@ -0,0 +1,19 @@
+diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
+index 1120dfc..ca4560a 100644
+--- a/spec/spec_helper.rb
++++ b/spec/spec_helper.rb
+@@ -1,14 +1,9 @@
+ # frozen_string_literal: true
+
+-require 'simplecov'
+ require_relative '../lib/gettext-setup'
+
+ GettextSetup.initialize(File.join(File.dirname(__FILE__), 'fixtures', 'locales'))
+
+-SimpleCov.start do
+-  add_filter '/spec/'
+-end
+-
+ def cmd_present?(cmd)
+   # Try to call out to msgcmp, if it doesn't error, we have the tool
+   `#{cmd} --version`