diff --git a/.gitignore b/.gitignore index 31bd090..c3f9a7e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1 @@ -webmock-1.9.0.gem/webmock-1.17.1.gem -/webmock-1.21.0.gem -/webmock-2.3.2.gem +/webmock-*.gem diff --git a/rubygem-webmock.spec b/rubygem-webmock.spec index f237c93..a164338 100644 --- a/rubygem-webmock.spec +++ b/rubygem-webmock.spec @@ -2,15 +2,12 @@ %global gem_name webmock Name: rubygem-%{gem_name} -Version: 2.3.2 -Release: 5%{?dist} +Version: 3.5.1 +Release: 1%{?dist} Summary: Library for stubbing HTTP requests in Ruby License: MIT URL: http://github.com/bblimke/webmock Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem -# Disable some tests requiring network connection. -# https://github.com/bblimke/webmock/pull/682 -Patch0: webmock-2.3.2-Some-tests-require-network-connectivity.patch BuildRequires: ruby(release) BuildRequires: rubygems-devel BuildRequires: ruby @@ -41,24 +38,20 @@ BuildArch: noarch Documentation for %{name}. %prep -%setup -q -c -T -%gem_install -n %{SOURCE0} +%setup -q -n %{gem_name}-%{version} -pushd .%{gem_instdir} -%patch0 -p1 -popd +sed -i '/^#!\/usr\/bin\/env\ rake/ d' Rakefile +chmod -x Rakefile %build +gem build ../%{gem_name}-%{version}.gemspec +%gem_install %install mkdir -p %{buildroot}%{gem_dir} cp -a .%{gem_dir}/* \ %{buildroot}%{gem_dir}/ -sed -i s-/usr/bin/env\ rake-/usr/bin/rake- %{buildroot}%{gem_instdir}/Rakefile - - - # Run the test suite %check pushd .%{gem_instdir} @@ -94,6 +87,9 @@ popd %{gem_instdir}/webmock.gemspec %changelog +* Mon Mar 04 2019 Pavel Valena - 3.5.1-1 +- Update to WebMock 3.5.1. + * Sat Feb 02 2019 Fedora Release Engineering - 2.3.2-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index 66cbd93..16b751d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (webmock-2.3.2.gem) = bb61b645b287d15690aa81db4d4c937d3456e1911d394ef1fb31e8ff3530d47b865aa039c8aaa4d4b6a72132dfcdd06be66adf1b53793384dc27ac1c9f9c01e6 +SHA512 (webmock-3.5.1.gem) = 6096ebe84140e7385ac941c2f63951d19523b2f7e3330fb38181f19c423b4c4d47828d200d8921e02850374b048902191f96f8d693746bcdf284cf0c5eacd924 diff --git a/webmock-2.3.2-Some-tests-require-network-connectivity.patch b/webmock-2.3.2-Some-tests-require-network-connectivity.patch deleted file mode 100644 index f22ef48..0000000 --- a/webmock-2.3.2-Some-tests-require-network-connectivity.patch +++ /dev/null @@ -1,34 +0,0 @@ -From dba98127443791ae02f2caee19f84f1c41dea654 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?V=C3=ADt=20Ondruch?= -Date: Tue, 7 Feb 2017 10:02:11 +0100 -Subject: [PATCH] Some tests require network connectivity. - ---- - spec/acceptance/httpclient/httpclient_spec.rb | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/spec/acceptance/httpclient/httpclient_spec.rb b/spec/acceptance/httpclient/httpclient_spec.rb -index 5a367e9..dc1b128 100644 ---- a/spec/acceptance/httpclient/httpclient_spec.rb -+++ b/spec/acceptance/httpclient/httpclient_spec.rb -@@ -182,7 +182,7 @@ describe "HTTPClient" do - end - end - -- context 'httpclient streams response' do -+ context 'httpclient streams response', net_connect: true do - before do - WebMock.allow_net_connect! - WebMock.after_request(except: [:other_lib]) do |_, response| -@@ -199,7 +199,7 @@ describe "HTTPClient" do - end - end - -- context 'credentials' do -+ context 'credentials', net_connect: true do - it 'are detected when manually specifying Authorization header' do - stub_request(:get, 'username:password@www.example.com').to_return(status: 200) - headers = {'Authorization' => 'Basic dXNlcm5hbWU6cGFzc3dvcmQ='} --- -2.11.0 -