diff --git a/trunk/PKGBUILD b/trunk/PKGBUILD index 08b00ab..4339b88 100644 --- a/trunk/PKGBUILD +++ b/trunk/PKGBUILD @@ -6,60 +6,67 @@ _gemname='faraday' pkgname="ruby-${_gemname}" -pkgver=1.9.1 +pkgver=2.7.4 pkgrel=1 pkgdesc='HTTP/REST API client library.' arch=('any') url="https://github.com/lostisland/${_gemname}" license=('MIT') -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' 'ruby-faraday-retry' 'ruby-faraday-multipart') +depends=('ruby' 'ruby-ruby2_keywords' 'ruby-faraday-net_http') makedepends=('ruby-rdoc' 'ruby-rake' 'ruby-rspec') -checkdepends=('ruby-rack' 'ruby-webmock' 'ruby-rspec-expectations' 'ruby-multipart-parser' 'ruby-rack-test') +checkdepends=('ruby-rack' 'ruby-webmock' 'ruby-rspec-expectations' 'ruby-rack-test') options=('!emptydirs') -source=("${url}/archive/v${pkgver}/${_gemname}-v${pkgver}.tar.gz" 'disable-simplecov-and-coveralls.patch') -sha512sums=('6e2943fa542d9e6807cdcefcd1d2553e8f9dd8bc2ec0625938d840a940547fcd0c1c2a03342fbcaa3e73d9fb11ada4d1901d6161437ab83acb4ca05968df48c4' - '8ab1687d1c0e7d217b20df673acc8038507dd8a24e2f833e32de8da4e0034b73f7140df750c74733b8c9260e190f271620171aeeb600cc04c056d4a77ccf4480') +source=("${url}/archive/v${pkgver}/${_gemname}-v${pkgver}.tar.gz" 'disable-simplecov-and-coveralls.patch' 'ruby-faraday-2.7.4-rack-3.0.7.patch') +sha512sums=('97c84fa95ed9f4d26ca12d4e4ef2faee1738f656cb919c9609c84d7c9f275452862bbf5334e5d66ab88c3e9ff5cb060805d9b519319d72c98556eb1c2e5610e1' + '8ab1687d1c0e7d217b20df673acc8038507dd8a24e2f833e32de8da4e0034b73f7140df750c74733b8c9260e190f271620171aeeb600cc04c056d4a77ccf4480' + 'c97813503288a329938f5029403b678031c9d15b2c4eeb3538f412d9e78745b781b2eb430e076812c43cd90c9424e797a6a5d05dbb916cab72d9d86997c88cf1') 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}/ruby-faraday-2.7.4-rack-3.0.7.patch" + + # drop coverage reporting. 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}" + cd "${_gemname}-${pkgver}" + + local _gemdir="$(gem env gemdir)" + gem build "${_gemname}.gemspec" + + gem install \ + --local \ + --verbose \ + --ignore-dependencies \ + --no-user-install \ + --install-dir "tmp_install/${_gemdir}" \ + --bindir "tmp_install/usr/bin" \ + "${_gemname}-${pkgver}.gem" + + # remove unrepreducible files + rm -rf "tmp_install/${_gemdir}/cache/" } check() { - cd "${srcdir}/${_gemname}-${pkgver}" - # tests don't yet pass because some deps are missing in the repos - rake spec -} + cd "${_gemname}-${pkgver}" -package() { -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}/" + GEM_HOME="tmp_install/${_gemdir}" rake spec +} + +package() { + cd "${_gemname}-${pkgver}" - install -Dm 644 README.md UPGRADING.md CHANGELOG.md -t "${pkgdir}/usr/share/doc/${pkgname}" + cp -a tmp_install/* "${pkgdir}" - rm -rf "${pkgdir}/${_gemdir}/cache" + install -Dm 0644 LICENSE.md -t "${pkgdir}/usr/share/licenses/${pkgname}/" + install -Dm 0644 README.md UPGRADING.md CHANGELOG.md -t "${pkgdir}/usr/share/doc/${pkgname}" } diff --git a/trunk/ruby-faraday-2.7.4-rack-3.0.7.patch b/trunk/ruby-faraday-2.7.4-rack-3.0.7.patch new file mode 100644 index 0000000..0645b02 --- /dev/null +++ b/trunk/ruby-faraday-2.7.4-rack-3.0.7.patch @@ -0,0 +1,13 @@ +diff --git a/spec/faraday/params_encoders/nested_spec.rb b/spec/faraday/params_encoders/nested_spec.rb +index 4631204..883cbcd 100644 +--- a/spec/faraday/params_encoders/nested_spec.rb ++++ b/spec/faraday/params_encoders/nested_spec.rb +@@ -61,7 +61,7 @@ RSpec.describe Faraday::NestedParamsEncoder do + + it 'encodes rack compat' do + params = { a: [{ one: '1', two: '2' }, '3', ''] } +- result = Faraday::Utils.unescape(Faraday::NestedParamsEncoder.encode(params)).split('&') ++ result = Faraday::NestedParamsEncoder.encode(params).split('&') + expected = Rack::Utils.build_nested_query(params).split('&') + expect(result).to match_array(expected) + end