2.15.10-1

5 files changed, 50 insertions, 30 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9efb99296883..8dcf6a8fdd65 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,21 @@
 pkgbase = ruby-cri
 	pkgdesc = Library for building easy-to-use command-line tools with support for nested commands
-	pkgver = 2.15.9
+	pkgver = 2.15.10
 	pkgrel = 1
 	url = https://github.com/ddfreyne/cri
 	arch = any
 	license = MIT
+	checkdepends = ruby-minitest
 	makedepends = ruby-rdoc
-	makedepends = ruby-rake
-	makedepends = ruby-bundler
 	makedepends = ruby-yard
-	makedepends = ruby-minitest
+	makedepends = ruby-rake
 	depends = ruby
 	options = !emptydirs
-	source = https://github.com/ddfreyne/cri/archive/2.15.9/cri-2.15.9.tar.gz
-	source = Rakefile
+	source = https://github.com/ddfreyne/cri/archive/2.15.10/cri-2.15.10.tar.gz
+	source = Rakefile.patch
 	source = disable-coveralls.patch
-	sha512sums = 6c9c57863eac89078145a037d6ee4ba34529f5a61a992f70c7a832dc5cee0e0677dc3d61f71e01b02754d79573730a9b6752d6365e6a71b67b0867d76d2b63e5
-	sha512sums = 34e13fa1d9dfd85bf3d9ded8d7bffd2f8416e10a88de12889b077f9148293e04a9eb89d7523885af2378397aba3f3d500312886ce76d2b464260e7d4ecd60288
+	sha512sums = b18971cb2f7db6dff3e0f6074d770a062f021d35640e9f010a1e31e1bf2286ff60aafe145589fb16b3805a586eecee00fa14239967b9630efee23966c2f4e023
+	sha512sums = 44d3db7dfda851d432ff293e178c31e513dfd902cbbf3c7862857b479562f091cd8afcac7c68a4fb4c825286fd6d62c5956be54eeb4e1640cf04bb7d1f71d764
 	sha512sums = a6ff67046e306b199973754f5526367df5d4b1420ed1cb387a35756d1558eda92e0de481ebb83051cb0126f0c1565bcd4192c9808344a2cb8c212a66bbacb680
 
 pkgname = ruby-cri
diff --git a/.gitignore b/.gitignore
index e0cafe82ff62..3bc0d301784b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 !.SRCINFO
 !.gitignore
 !PKGBUILD
+!Rakefile.patch
diff --git a/PKGBUILD b/PKGBUILD
index 54b5088ffd8f..d920191b9cab 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,46 +4,52 @@
 
 _gemname='cri'
 pkgname="ruby-${_gemname}"
-pkgver=2.15.9
+pkgver=2.15.10
 pkgrel=1
 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')
+makedepends=('ruby-rdoc' 'ruby-yard' 'ruby-rake')
+checkdepends=('ruby-minitest')
 depends=('ruby')
 options=(!emptydirs)
-source=("https://github.com/ddfreyne/${_gemname}/archive/${pkgver}/${_gemname}-${pkgver}.tar.gz" 'Rakefile' 'disable-coveralls.patch')
+source=("${url}/archive/${pkgver}/${_gemname}-${pkgver}.tar.gz" 'Rakefile.patch' 'disable-coveralls.patch')
 
-sha512sums=('6c9c57863eac89078145a037d6ee4ba34529f5a61a992f70c7a832dc5cee0e0677dc3d61f71e01b02754d79573730a9b6752d6365e6a71b67b0867d76d2b63e5'
-            '34e13fa1d9dfd85bf3d9ded8d7bffd2f8416e10a88de12889b077f9148293e04a9eb89d7523885af2378397aba3f3d500312886ce76d2b464260e7d4ecd60288'
+sha512sums=('b18971cb2f7db6dff3e0f6074d770a062f021d35640e9f010a1e31e1bf2286ff60aafe145589fb16b3805a586eecee00fa14239967b9630efee23966c2f4e023'
+            '44d3db7dfda851d432ff293e178c31e513dfd902cbbf3c7862857b479562f091cd8afcac7c68a4fb4c825286fd6d62c5956be54eeb4e1640cf04bb7d1f71d764'
             '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"
+  cd "${srcdir}/${_gemname}-${pkgver}"
+
+  # 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.
+  patch --forward --verbose --strip=1 --input='../Rakefile.patch'
+  patch --forward --verbose --strip=1 --input='../disable-coveralls.patch'
 }
 
 build() {
-  cd "${_gemname}-${pkgver}"
+  cd "${srcdir}/${_gemname}-${pkgver}"
   gem build "${_gemname}.gemspec"
 }
 
 check() {
-  cd "${_gemname}-${pkgver}"
+  cd "${srcdir}/${_gemname}-${pkgver}"
   rake test_unit
+  rake doc
 }
 
 package() {
-  cd "${_gemname}-${pkgver}"
+  cd "${srcdir}/${_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}/"
+  install -Dm 644 README.md CODE_OF_CONDUCT.md NEWS.md -t "${pkgdir}/usr/share/doc/${pkgname}/"
+  mv doc/yardoc "${pkgdir}/usr/share/doc/${pkgname}/"
+  rm -rf "${pkgdir}/${_gemdir}/gems/${_gemname}-${pkgver}/"{README.md,CODE_OF_CONDUCT.md,NEWS.md,.gitignore,.rubocop.yml,.travis.yml,test,LICENSE}
 
   rm -rf "${pkgdir}/${_gemdir}/cache"
 }
diff --git a/Rakefile b/Rakefile
deleted file mode 100644
index 1db9e9e064bc..000000000000
--- a/Rakefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/Rakefile.patch b/Rakefile.patch
new file mode 100644
index 000000000000..b99ab5930423
--- /dev/null
+++ b/Rakefile.patch
@@ -0,0 +1,22 @@
+diff --git a/Rakefile b/Rakefile
+index 968a3e8..52b3bca 100644
+--- a/Rakefile
++++ b/Rakefile
+@@ -1,7 +1,6 @@
+ # frozen_string_literal: true
+ 
+ require 'rake/testtask'
+-require 'rubocop/rake_task'
+ require 'yard'
+ 
+ YARD::Rake::YardocTask.new(:doc) do |yard|
+@@ -18,9 +17,3 @@ Rake::TestTask.new(:test_unit) do |t|
+   t.test_files = Dir['test/**/*_spec.rb'] + Dir['test/**/test_*.rb']
+   t.libs << 'test'
+ end
+-
+-RuboCop::RakeTask.new(:test_style)
+-
+-task test: %i[test_unit test_style]
+-
+-task default: :test