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

[Tim Meusel]

    Date: Tuesday, August 3, 2021 @ 08:35:32
  Author: bastelfreak
Revision: 993470

update faraday to 1.6.0

Added:
  ruby-faraday/trunk/disable-simplecov-and-coveralls.patch
Modified:
  ruby-faraday/trunk/PKGBUILD

---------------------------------------+
 PKGBUILD                              |   68 +++++++++++++++++++++++++-------
 disable-simplecov-and-coveralls.patch |   24 +++++++++++
 2 files changed, 78 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-08-03 08:29:39 UTC (rev 993469)
+++ PKGBUILD	2021-08-03 08:35:32 UTC (rev 993470)
@@ -1,25 +1,65 @@
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Maintainer: Tim Meusel <tim at bastelfreak.de>
+# Contributor: Felix Yan <felixonmars at archlinux.org>
 # Contributor: Anatol Pomozov <anatol.pomozov at gmail.com>
 # Contributor: Alfredo Palhares <masterkorp at masterkorp.net>
 # Contributor: Jochen Schalanda <jochen+aur at schalanda.name>
 
-pkgname=ruby-faraday
-pkgver=1.3.0
-pkgrel=2
+_gemname='faraday'
+pkgname="ruby-${_gemname}"
+pkgver=1.6.0
+pkgrel=1
 pkgdesc='HTTP/REST API client library.'
 arch=('any')
-url='https://github.com/lostisland/faraday'
+url="https://github.com/lostisland/${_gemname}"
 license=('MIT')
-depends=('ruby' 'ruby-multipart-post')
-makedepends=('ruby-rdoc')
+depends=('ruby' 'ruby-multipart-post' 'ruby-ruby2_keywords' 'ruby-faraday-net_http' 'ruby-faraday-em_http' 'ruby-faraday-em_synchrony' 'ruby-faraday-excon' 'ruby-faraday-httpclient' 'ruby-faraday-net_http' 'ruby-faraday-net_http_persistent' 'ruby-faraday-patron' 'ruby-faraday-rack')
+makedepends=('ruby-rdoc' 'ruby-rake' 'ruby-rspec')
+checkdepends=('ruby-rack' 'ruby-webmock' 'ruby-rspec-expectations' 'ruby-multipart-parser' 'ruby-rack-test')
 options=('!emptydirs')
-source=("https://rubygems.org/downloads/faraday-$pkgver.gem")
-noextract=("faraday-$pkgver.gem")
-sha512sums=('a31e92201a02b266f943666f900916f78e88485abf41d515db6b2e0807644cde460307c5fef95ba70c9dff818c35e775607b03b3279392e2f3960acd80d78910')
+source=("${url}/archive/v${pkgver}/${_gemname}-v${pkgver}.tar.gz" 'disable-simplecov-and-coveralls.patch')
+sha512sums=('67d47d4548d35532cc93b74c736b64ce952af4084f5c6c5357fe719f27309f64db35d939f53f51da6283f2fc324600976d5b0aff8413147d958099d1d515f6e2'
+            '8ab1687d1c0e7d217b20df673acc8038507dd8a24e2f833e32de8da4e0034b73f7140df750c74733b8c9260e190f271620171aeeb600cc04c056d4a77ccf4480')
 
+prepare() {
+  cd "${srcdir}/${_gemname}-${pkgver}"
+  # allow latest dependencies
+  sed --in-place 's|~>|>=|g' "${_gemname}.gemspec"
+
+  # drop coverage reporting. We don't have simplecov in our repos
+  patch -p1 -N -i "${srcdir}/disable-simplecov-and-coveralls.patch"
+  # don't load pry during tests. that's only required for interactive debugging
+  sed --in-place '/pry/d' spec/spec_helper.rb
+  # disable testing/support for faraday with em-http. We don't have em-http in our repos
+  rm spec/faraday/adapter/em_http_spec.rb
+  # disable testing for em-synchrony. We don't have the gem in our repos
+  rm spec/faraday/adapter/em_synchrony_spec.rb
+  # We don't have exon in the repos
+  rm spec/faraday/adapter/excon_spec.rb
+  # we don't have typheus in the repos
+  rm spec/faraday/adapter/typhoeus_spec.rb
+  # we don't have patron in our repos
+  rm spec/faraday/adapter/patron_spec.rb
+}
+
+build() {
+  cd "${srcdir}/${_gemname}-${pkgver}"
+  gem build "${_gemname}.gemspec"
+}
+
+check() {
+  cd "${srcdir}/${_gemname}-${pkgver}"
+  # tests don't yet pass because some deps are missing in the repos
+  rake spec
+}
+
 package() {
-  local _gemdir="$(ruby -e'puts Gem.default_dir')"
-  gem install --ignore-dependencies --no-user-install -i "$pkgdir/$_gemdir" -n "$pkgdir/usr/bin" faraday-$pkgver.gem
-  rm "$pkgdir/$_gemdir/cache/faraday-$pkgver.gem"
-  install -D -m644 "$pkgdir/$_gemdir/gems/faraday-$pkgver/LICENSE.md" "$pkgdir/usr/share/licenses/$pkgname/LICENSE.md"
+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.md -t "${pkgdir}/usr/share/licenses/${pkgname}/"
+
+  install -Dm 644 README.md UPGRADING.md CHANGELOG.md -t "${pkgdir}/usr/share/doc/${pkgname}"
+
+  rm -rf "${pkgdir}/${_gemdir}/cache"
 }

Added: disable-simplecov-and-coveralls.patch
===================================================================
--- disable-simplecov-and-coveralls.patch	                        (rev 0)
+++ disable-simplecov-and-coveralls.patch	2021-08-03 08:35:32 UTC (rev 993470)
@@ -0,0 +1,24 @@
+diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
+index 5fcddd5..ae1a04e 100644
+--- a/spec/spec_helper.rb
++++ b/spec/spec_helper.rb
+@@ -16,19 +16,9 @@
+ #
+ # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
+ 
+-require 'simplecov'
+-require 'coveralls'
+ require 'webmock/rspec'
+ WebMock.disable_net_connect!(allow_localhost: true)
+ 
+-SimpleCov.formatters = [SimpleCov::Formatter::HTMLFormatter, Coveralls::SimpleCov::Formatter]
+-
+-SimpleCov.start do
+-  add_filter '/spec/'
+-  minimum_coverage 84
+-  minimum_coverage_by_file 26
+-end
+-
+ # Ensure all /lib files are loaded
+ # so they will be included in the test coverage report.
+ Dir['./lib/**/*.rb'].sort.each { |file| require file }