release 2.15.9-1

5 files changed, 79 insertions, 36 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d1e6950717a8..9efb99296883 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,23 @@
 pkgbase = ruby-cri
-	pkgdesc = A library for building easy-to-use commandline tools.
-	pkgver = 2.15.3
+	pkgdesc = Library for building easy-to-use command-line tools with support for nested commands
+	pkgver = 2.15.9
 	pkgrel = 1
-	url = https://rubygems.org/gems/cri
+	url = https://github.com/ddfreyne/cri
 	arch = any
 	license = MIT
 	makedepends = ruby-rdoc
-	depends = ruby-colored>=1.2
-	noextract = cri-2.15.3.gem
+	makedepends = ruby-rake
+	makedepends = ruby-bundler
+	makedepends = ruby-yard
+	makedepends = ruby-minitest
+	depends = ruby
 	options = !emptydirs
-	source = http://rubygems.org/downloads/cri-2.15.3.gem
-	sha256sums = 70c6c790d813fa8b165c24ec67ac8d51ac48a74f65c9b1bf40f6fc2718b79ac9
+	source = https://github.com/ddfreyne/cri/archive/2.15.9/cri-2.15.9.tar.gz
+	source = Rakefile
+	source = disable-coveralls.patch
+	sha512sums = 6c9c57863eac89078145a037d6ee4ba34529f5a61a992f70c7a832dc5cee0e0677dc3d61f71e01b02754d79573730a9b6752d6365e6a71b67b0867d76d2b63e5
+	sha512sums = 34e13fa1d9dfd85bf3d9ded8d7bffd2f8416e10a88de12889b077f9148293e04a9eb89d7523885af2378397aba3f3d500312886ce76d2b464260e7d4ecd60288
+	sha512sums = a6ff67046e306b199973754f5526367df5d4b1420ed1cb387a35756d1558eda92e0de481ebb83051cb0126f0c1565bcd4192c9808344a2cb8c212a66bbacb680
 
 pkgname = ruby-cri
 
diff --git a/.gitignore b/.gitignore
index 4df5cbd2d036..e0cafe82ff62 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,6 @@
 *
+!Rakefile
+!disable-coveralls.patch
 !.SRCINFO
 !.gitignore
 !PKGBUILD
diff --git a/PKGBUILD b/PKGBUILD
index 81d1a90c2872..54b5088ffd8f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,37 +1,51 @@
-# Maintainer: Jeremy Audet <jerebear@protonmail.com>
+# Maintainer: Tim Meusel <tim@bastelfreak.de>
+# Contributor: Jeremy Audet <jerebear@protonmail.com>
 # Contributor: Lucky <archlinux@builds.lucky.li>
-#
-# Note: namcap warns that ruby-colored is an unnecessary dependency. This is
-# untrue.
 
-pkgname=ruby-cri
-_gemname="${pkgname#ruby-}"
-pkgver='2.15.3'
+_gemname='cri'
+pkgname="ruby-${_gemname}"
+pkgver=2.15.9
 pkgrel=1
-pkgdesc='A library for building easy-to-use commandline tools.'
-arch=(any)
-url='https://rubygems.org/gems/cri'
-license=(MIT)
-depends=('ruby-colored>=1.2')
-makedepends=(ruby-rdoc)
+pkgdesc='Library for building easy-to-use command-line tools with support for nested commands'
+arch=('any')
+url='https://github.com/ddfreyne/cri'
+license=('MIT')
+makedepends=('ruby-rdoc' 'ruby-rake' 'ruby-bundler' 'ruby-yard' 'ruby-minitest')
+depends=('ruby')
 options=(!emptydirs)
-source=("http://rubygems.org/downloads/${_gemname}-${pkgver}.gem")
-noextract=("${_gemname}-${pkgver}.gem")
-sha256sums=('70c6c790d813fa8b165c24ec67ac8d51ac48a74f65c9b1bf40f6fc2718b79ac9')
+source=("https://github.com/ddfreyne/${_gemname}/archive/${pkgver}/${_gemname}-${pkgver}.tar.gz" 'Rakefile' 'disable-coveralls.patch')
+
+sha512sums=('6c9c57863eac89078145a037d6ee4ba34529f5a61a992f70c7a832dc5cee0e0677dc3d61f71e01b02754d79573730a9b6752d6365e6a71b67b0867d76d2b63e5'
+            '34e13fa1d9dfd85bf3d9ded8d7bffd2f8416e10a88de12889b077f9148293e04a9eb89d7523885af2378397aba3f3d500312886ce76d2b464260e7d4ecd60288'
+            'a6ff67046e306b199973754f5526367df5d4b1420ed1cb387a35756d1558eda92e0de481ebb83051cb0126f0c1565bcd4192c9808344a2cb8c212a66bbacb680')
+
+# The Rakefile and a helper file try to load a bunch of gems to report the CI status to a cloud provider
+# Also it tries to execute a ruby linter for a legacy Ruby version
+# all those tools aren't required to build and test the software, also we don't have them in the repos.
+prepare() {
+  cd "${_gemname}-${pkgver}"
+  cp "${srcdir}/Rakefile" .
+  patch -p1 -N -i "${srcdir}/disable-coveralls.patch"
+}
+
+build() {
+  cd "${_gemname}-${pkgver}"
+  gem build "${_gemname}.gemspec"
+}
+
+check() {
+  cd "${_gemname}-${pkgver}"
+  rake test_unit
+}
 
 package() {
-  # install gem
-  HOME=/tmp gem install \
-    --no-user-install \
-    --ignore-dependencies \
-    --install-dir "${pkgdir}$(ruby -e 'puts Gem.default_dir')" \
-    --bindir "${pkgdir}/usr/bin" \
-    "${srcdir}/${_gemname}-${pkgver}.gem"
-
-  # install license
-  install -Dm 644 \
-    "${pkgdir}"/usr/lib/ruby/gems/*/gems/"${_gemname}-${pkgver}"/LICENSE \
-    "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  cd "${_gemname}-${pkgver}"
+  local _gemdir="$(gem env gemdir)"
+  gem install --verbose --ignore-dependencies --no-user-install --install-dir "${pkgdir}/${_gemdir}" --bindir "${pkgdir}/usr/bin" "${_gemname}-${pkgver}.gem"
+
+  install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}/"
+
+  rm -rf "${pkgdir}/${_gemdir}/cache"
 }
 
-# vim:set ts=2 sw=2 et:
+# vim: ts=2 sw=2 et:
diff --git a/Rakefile b/Rakefile
new file mode 100644
index 000000000000..1db9e9e064bc
--- /dev/null
+++ b/Rakefile
@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+require 'rake/testtask'
+
+Rake::TestTask.new(:test_unit) do |t|
+  t.test_files = Dir['test/**/*_spec.rb'] + Dir['test/**/test_*.rb']
+  t.libs << 'test'
+end
diff --git a/disable-coveralls.patch b/disable-coveralls.patch
new file mode 100644
index 000000000000..ed74c8348043
--- /dev/null
+++ b/disable-coveralls.patch
@@ -0,0 +1,12 @@
+diff --git a/test/helper.rb b/test/helper.rb
+index ee4fc27..afd3b01 100644
+--- a/test/helper.rb
++++ b/test/helper.rb
+@@ -1,8 +1,5 @@
+ # frozen_string_literal: true
+ 
+-require 'coveralls'
+-Coveralls.wear!
+-
+ require 'minitest'
+ require 'minitest/autorun'