[arch-commits] Commit in ruby-mocha/trunk (2 files)

[Christian Rebischke]

    Date: Wednesday, January 22, 2020 @ 17:30:39
  Author: shibumi
Revision: 554371

upgpkg: ruby-mocha 1.11.2-2

Added:
  ruby-mocha/trunk/remove-unneeded-dependencies.patch
Modified:
  ruby-mocha/trunk/PKGBUILD

------------------------------------+
 PKGBUILD                           |   31 +++++++++++++++++--------------
 remove-unneeded-dependencies.patch |   21 +++++++++++++++++++++
 2 files changed, 38 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-01-22 17:20:57 UTC (rev 554370)
+++ PKGBUILD	2020-01-22 17:30:39 UTC (rev 554371)
@@ -3,7 +3,7 @@
 
 _gemname=mocha
 pkgname="ruby-${_gemname}"
-pkgver=1.9.0
+pkgver=1.11.2
 pkgrel=2
 pkgdesc='Mocha is a mocking and stubbing library for Ruby'
 arch=('any')
@@ -10,19 +10,20 @@
 url='https://github.com/freerange/mocha'
 license=('Custom')
 depends=('ruby')
-checkdepends=('ruby-rake' 'ruby-minitest' 'ruby-bundler')
+checkdepends=('ruby-rake' 'ruby-bundler')
+makedepends=('ruby-minitest')
 options=('!emptydirs')
 source=("${pkgname}-${pkgver}.tar.gz::https://github.com/freerange/mocha/archive/v${pkgver}.tar.gz"
-        'removemetaclassdependency.patch::https://github.com/freerange/mocha/commit/e3db6e608c0b98ddcfc0c1f540d508004cde55bd.patch')
-sha512sums=('e2cd4afe3023c269fffb8f328fed17e965fe0bcce299ed87e46ae824e9a95ec294b0615fcd08af8f606a590395da5bcf4e93d91a79a537441dfab029f9b73a38'
-            'da0d443cc81dd0cda383e34674b3271ef6493bef3e7e3f179f7c2ccb02670fe5876569cebe140e0fecbc2b56c8f34303a35b0fecb25c059317ff6ed3791863c2')
+        'remove-unneeded-dependencies.patch')
+sha512sums=('3c547c6b38eb6cdff06f9e7a7061d6f47d0181161852b9fec143b71244eb4b67c650dcf20e6ba88ce62f337b3c67e1120e88276ccd98983b403a10b9e57cf5af'
+            '6a3c4568b6cf8009aed70935ddcff96a75d8d92b2e87a2a332a71ec569ed28c7c83e507ad408a0f62f93fc16b066133ba184f13a3e5b9a14bf90dc6276acde60')
 
 prepare() {
   cd "${_gemname}-${pkgver}"
 
-  # release 1.9.0 still depends on the metaclass gem, which is dead.
-  #This patch is in master and gets rid of it.
-  patch --forward --verbose --strip=1 --input='../removemetaclassdependency.patch'
+  # remove unneeded dependencies
+  # bundler might require them if they are still in the gemspec file
+  patch --forward --verbose --strip=1 --input='../remove-unneeded-dependencies.patch'
 
   # replace upper version boundaries for ruby gems
   sed -r 's|~>|>=|g' -i ${_gemname}.gemspec
@@ -29,12 +30,6 @@
 
   # `git` doesn't work within src dir, because we downloaded an archive
   sed --in-place 's|git ls-files|find|' "${_gemname}.gemspec"
-
-  # sed introspection gem is heavily broken. Also it depends on metaclass.
-  # It will be removed in a future release.
-  sed --in-place '/introspection/d' "${_gemname}.gemspec"
-
-  sed --in-place '/rubocop/d' "${_gemname}.gemspec"
 }
 
 check() {
@@ -53,7 +48,15 @@
   gem install --ignore-dependencies --no-user-install --install-dir "${pkgdir}${_gemdir}" --bindir "${pkgdir}/usr/bin" "${_gemname}-${pkgver}.gem"
   install -Dm 644 README.md RELEASE.md --target-directory "${pkgdir}/usr/share/doc/${pkgname}"
   install -Dm 644 COPYING.md MIT-LICENSE.md --target-directory "${pkgdir}/usr/share/licenses/${pkgname}"
+
+  # delete unneeded files
   rm "${pkgdir}/${_gemdir}/cache/${_gemname}-${pkgver}.gem"
+  echo
+  echo
+  ls "${pkgdir}/${_gemdir}/gems/${_gemname}-${pkgver}/"{test,yard-templates,gemfiles,bin,.github,.gemtest}
+  echo
+  echo
+  rm -rf "${pkgdir}/${_gemdir}/gems/${_gemname}-${pkgver}/"{test,yard-templates,gemfiles,bin,.github,.gemtest}
 }
 
 # vim: ts=2 sw=2 et:

Added: remove-unneeded-dependencies.patch
===================================================================
--- remove-unneeded-dependencies.patch	                        (rev 0)
+++ remove-unneeded-dependencies.patch	2020-01-22 17:30:39 UTC (rev 554371)
@@ -0,0 +1,21 @@
+diff --git a/mocha.gemspec b/mocha.gemspec
+index e6e6e93..0c53d33 100644
+--- a/mocha.gemspec
++++ b/mocha.gemspec
+@@ -34,16 +34,8 @@ Gem::Specification.new do |s| # rubocop:disable Metrics/BlockLength
+     # Rake >= v11 does not support Ruby < v1.9.3 so use
+     s.add_development_dependency('rake', '~> 10.0')
+   end
+-  s.add_development_dependency('introspection', '~> 0.0.1')
+   if RUBY_VERSION >= '2.2.0'
+     # No test libraries in standard library
+     s.add_development_dependency('minitest')
+   end
+-  if RUBY_VERSION >= '1.9.2'
+-    s.add_development_dependency('rubocop', '<= 0.58.2')
+-  end
+-  if ENV['MOCHA_GENERATE_DOCS']
+-    s.add_development_dependency('redcarpet')
+-    s.add_development_dependency('yard')
+-  end
+ end