[gentoo-commits] repo/gentoo:master commit in: dev-ruby/fakeweb/files/
commit: 8e7eb90c59e419c9467ce902243cb3fd3cd0f339 Author: Michael Mair-Keimberger gmail com> AuthorDate: Fri Mar 1 17:29:23 2019 + Commit: Hans de Graaff gentoo org> CommitDate: Sun Mar 3 06:02:57 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e7eb90c dev-ruby/fakeweb: remove unused patch(es) Signed-off-by: Michael Mair-Keimberger gmail.com> Signed-off-by: Hans de Graaff gentoo.org> dev-ruby/fakeweb/files/fakeweb-ruby22.patch | 24 dev-ruby/fakeweb/files/fakeweb-ruby23.patch | 27 --- 2 files changed, 51 deletions(-) diff --git a/dev-ruby/fakeweb/files/fakeweb-ruby22.patch b/dev-ruby/fakeweb/files/fakeweb-ruby22.patch deleted file mode 100644 index 7c44aef6892..000 --- a/dev-ruby/fakeweb/files/fakeweb-ruby22.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 1647ca210691429a75eb159814f42e68c3c1ce4c Mon Sep 17 00:00:00 2001 -From: Josef Stribny -Date: Thu, 19 Mar 2015 09:32:50 +0100 -Subject: [PATCH] Fix tests by expecting TypeError for Ruby 2.2 - - test/test_fake_web.rb | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/test/test_fake_web.rb b/test/test_fake_web.rb -index f344612..682c43d 100644 a/test/test_fake_web.rb -+++ b/test/test_fake_web.rb -@@ -35,7 +35,9 @@ def test_response_for_with_wrong_number_of_arguments - end - - def test_register_uri_without_domain_name --assert_raises URI::InvalidURIError do -+# Ruby 2.1 and lower raises URI::InvalidURIError -+# Ruby 2.2 and higher raises TypeError -+assert_raises URI::InvalidURIError, TypeError do - FakeWeb.register_uri(:get, 'test_example2.txt', fixture_path("test_example.txt")) - end - end diff --git a/dev-ruby/fakeweb/files/fakeweb-ruby23.patch b/dev-ruby/fakeweb/files/fakeweb-ruby23.patch deleted file mode 100644 index 0a1c6db6b3e..000 --- a/dev-ruby/fakeweb/files/fakeweb-ruby23.patch +++ /dev/null @@ -1,27 +0,0 @@ -From c42a354eda2f6bfe8dc7c1176e085dda6867f4d0 Mon Sep 17 00:00:00 2001 -From: Christian Hofstaedtler -Date: Thu, 3 Mar 2016 17:42:30 -0300 -Subject: [PATCH] Fix tests for ruby 2.3 (new connect_nonblock call) - -Applies on top of the changes for 2.2 (#53). - test/test_helper.rb | 6 +- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/test/test_helper.rb b/test/test_helper.rb -index e9a36af..8ce492d 100644 a/test/test_helper.rb -+++ b/test/test_helper.rb -@@ -119,7 +119,11 @@ def setup_expectations_for_real_request(options = {}) - OpenSSL::SSL::SSLSocket.expects(:===).with(socket).returns(true).at_least_once - OpenSSL::SSL::SSLSocket.expects(:new).with(socket, instance_of(OpenSSL::SSL::SSLContext)).returns(socket).at_least_once - socket.stubs(:sync_close=).returns(true) -- socket.expects(:connect).with().at_least_once -+ if RUBY_VERSION >= "2.3.0" -+socket.expects(:connect_nonblock).with(:exception => false).at_least_once -+ else -+socket.expects(:connect).with().at_least_once -+ end - if RUBY_VERSION >= "2.0.0" && RUBY_PLATFORM != "java" - socket.expects(:session).with().at_least_once - end
[gentoo-commits] repo/gentoo:master commit in: dev-ruby/fakeweb/files/, dev-ruby/fakeweb/
commit: 340c3aec732de7f8f1bac0dce62aff2f74b1bb86 Author: Manuel Rüger gentoo org> AuthorDate: Tue Nov 8 23:14:04 2016 + Commit: Manuel Rüger gentoo org> CommitDate: Tue Nov 8 23:14:04 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=340c3aec dev-ruby/fakeweb: Add ruby23 Package-Manager: portage-2.3.2 dev-ruby/fakeweb/fakeweb-1.3.0.20131201-r1.ebuild | 55 +++ dev-ruby/fakeweb/files/fakeweb-ruby23.patch | 27 +++ 2 files changed, 82 insertions(+) diff --git a/dev-ruby/fakeweb/fakeweb-1.3.0.20131201-r1.ebuild b/dev-ruby/fakeweb/fakeweb-1.3.0.20131201-r1.ebuild new file mode 100644 index ..89668be --- /dev/null +++ b/dev-ruby/fakeweb/fakeweb-1.3.0.20131201-r1.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +USE_RUBY="ruby20 ruby21 ruby22 ruby23" + +RUBY_FAKEGEM_RECIPE_DOC="rdoc" +RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.rdoc" + +COMMIT=48208f9bf053577befe5723746b6ff35b99b45d0 + +inherit ruby-fakegem + +DESCRIPTION="Helper for faking web requests in Ruby" +HOMEPAGE="https://github.com/chrisk/fakeweb"; +SRC_URI="https://github.com/chrisk/fakeweb/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" +RUBY_S="${PN}-${COMMIT}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86" +IUSE="" + +RUBY_PATCHES=( fakeweb-ruby22.patch + fakeweb-ruby23.patch ) + +ruby_add_bdepend " + test? ( + dev-ruby/mocha:0.14 + dev-ruby/test-unit + )" + +all_ruby_prepare() { + # The package bundles samuel and right_http_connection, remove + # them + rm -r test/vendor || die "failed to remove bundled gems" + + # We don't package sdoc and we don't have the direct template. + sed -i -e 's/sdoc/rdoc/' -e '/template/d' Rakefile || die + + # Require an old enough version of mocha + sed -i -e '1igem "mocha", "~> 0.14.0"' test/test_helper.rb || die + + # Use the test-unit gem to make jruby compatible with newer mocha. + sed -i -e '1igem "test-unit"' \ + -e '/bundler/I s:^:#:' \ + -e '/simplecov/ s:^:#:' test/test_helper.rb || die + + # Avoid test dependencies on unmaintained packages that no longer work + rm test/test_other_net_http_libraries.rb || die + + sed -i -e '/test:preflight/ s:^:#:' Rakefile || die +} diff --git a/dev-ruby/fakeweb/files/fakeweb-ruby23.patch b/dev-ruby/fakeweb/files/fakeweb-ruby23.patch new file mode 100644 index ..0a1c6db --- /dev/null +++ b/dev-ruby/fakeweb/files/fakeweb-ruby23.patch @@ -0,0 +1,27 @@ +From c42a354eda2f6bfe8dc7c1176e085dda6867f4d0 Mon Sep 17 00:00:00 2001 +From: Christian Hofstaedtler +Date: Thu, 3 Mar 2016 17:42:30 -0300 +Subject: [PATCH] Fix tests for ruby 2.3 (new connect_nonblock call) + +Applies on top of the changes for 2.2 (#53). +--- + test/test_helper.rb | 6 +- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/test/test_helper.rb b/test/test_helper.rb +index e9a36af..8ce492d 100644 +--- a/test/test_helper.rb b/test/test_helper.rb +@@ -119,7 +119,11 @@ def setup_expectations_for_real_request(options = {}) + OpenSSL::SSL::SSLSocket.expects(:===).with(socket).returns(true).at_least_once + OpenSSL::SSL::SSLSocket.expects(:new).with(socket, instance_of(OpenSSL::SSL::SSLContext)).returns(socket).at_least_once + socket.stubs(:sync_close=).returns(true) +- socket.expects(:connect).with().at_least_once ++ if RUBY_VERSION >= "2.3.0" ++socket.expects(:connect_nonblock).with(:exception => false).at_least_once ++ else ++socket.expects(:connect).with().at_least_once ++ end + if RUBY_VERSION >= "2.0.0" && RUBY_PLATFORM != "java" + socket.expects(:session).with().at_least_once + end
[gentoo-commits] repo/gentoo:master commit in: dev-ruby/fakeweb/files/, dev-ruby/fakeweb/
commit: 3ab474733f85f3620e9695b64042bdeab301b42d Author: Hans de Graaff gentoo org> AuthorDate: Thu Nov 3 07:00:16 2016 + Commit: Hans de Graaff gentoo org> CommitDate: Thu Nov 3 07:00:16 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ab47473 dev-ruby/fakeweb: add snapshot with ruby22 support Package-Manager: portage-2.3.0 dev-ruby/fakeweb/Manifest | 1 + dev-ruby/fakeweb/fakeweb-1.3.0.20131201.ebuild | 54 ++ dev-ruby/fakeweb/files/fakeweb-ruby22.patch| 24 3 files changed, 79 insertions(+) diff --git a/dev-ruby/fakeweb/Manifest b/dev-ruby/fakeweb/Manifest index cf291b7..d85007e 100644 --- a/dev-ruby/fakeweb/Manifest +++ b/dev-ruby/fakeweb/Manifest @@ -1 +1,2 @@ +DIST fakeweb-1.3.0.20131201.tar.gz 60162 SHA256 44f599eb76b4996c53a3f047b3f37c72d93bac967893dcb1da18e5f8270b4f14 SHA512 f3bd40680b7eefe90d3fee67f5282dbe4c67d46a1f1040d0d0d62c978b69d08987581a53495bb56e32ebcc6679c84f03c2e26c51d2bd98daa80554d3424c6603 WHIRLPOOL 5cdb5faf3932614838fb9e1bb5f01a115c087af396df6bbecab421ea0d97f24377c06ab41f1919b339f76137d4c1ea1186a4269052163f0942cd9ee9ca1f8900 DIST fakeweb-1.3.0.gem 58368 SHA256 1ec996be13020a00b3464560c09180b424477c698f59f82edf2b99b16cfa09a8 SHA512 5785bf8e17f9b9b73a9fd2b581c6c5dcf466a5d68c2dbea593bca7cd5d385b5b1315ca777c39bce2a8077ccab6d5df7f031435c9227931c3d2a84512da9cb423 WHIRLPOOL 976e48b1e66e951a22fa28970356c3e85927027fd7262242a50ecac55771fc2ed7c1830d4dcc0566f479fa5c844a0d59b2b268ebd26ba87988f543b982e51214 diff --git a/dev-ruby/fakeweb/fakeweb-1.3.0.20131201.ebuild b/dev-ruby/fakeweb/fakeweb-1.3.0.20131201.ebuild new file mode 100644 index ..f9aa352 --- /dev/null +++ b/dev-ruby/fakeweb/fakeweb-1.3.0.20131201.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +USE_RUBY="ruby20 ruby21 ruby22" + +RUBY_FAKEGEM_RECIPE_DOC="rdoc" +RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.rdoc" + +COMMIT=48208f9bf053577befe5723746b6ff35b99b45d0 + +inherit ruby-fakegem + +DESCRIPTION="Helper for faking web requests in Ruby" +HOMEPAGE="https://github.com/chrisk/fakeweb"; +SRC_URI="https://github.com/chrisk/fakeweb/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" +RUBY_S="${PN}-${COMMIT}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86" +IUSE="" + +RUBY_PATCHES=( fakeweb-ruby22.patch ) + +ruby_add_bdepend " + test? ( + dev-ruby/mocha:0.14 + dev-ruby/test-unit + )" + +all_ruby_prepare() { + # The package bundles samuel and right_http_connection, remove + # them + rm -r test/vendor || die "failed to remove bundled gems" + + # We don't package sdoc and we don't have the direct template. + sed -i -e 's/sdoc/rdoc/' -e '/template/d' Rakefile || die + + # Require an old enough version of mocha + sed -i -e '1igem "mocha", "~> 0.14.0"' test/test_helper.rb || die + + # Use the test-unit gem to make jruby compatible with newer mocha. + sed -i -e '1igem "test-unit"' \ + -e '/bundler/I s:^:#:' \ + -e '/simplecov/ s:^:#:' test/test_helper.rb || die + + # Avoid test dependencies on unmaintained packages that no longer work + rm test/test_other_net_http_libraries.rb || die + + sed -i -e '/test:preflight/ s:^:#:' Rakefile || die +} diff --git a/dev-ruby/fakeweb/files/fakeweb-ruby22.patch b/dev-ruby/fakeweb/files/fakeweb-ruby22.patch new file mode 100644 index ..7c44aef --- /dev/null +++ b/dev-ruby/fakeweb/files/fakeweb-ruby22.patch @@ -0,0 +1,24 @@ +From 1647ca210691429a75eb159814f42e68c3c1ce4c Mon Sep 17 00:00:00 2001 +From: Josef Stribny +Date: Thu, 19 Mar 2015 09:32:50 +0100 +Subject: [PATCH] Fix tests by expecting TypeError for Ruby 2.2 + +--- + test/test_fake_web.rb | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/test/test_fake_web.rb b/test/test_fake_web.rb +index f344612..682c43d 100644 +--- a/test/test_fake_web.rb b/test/test_fake_web.rb +@@ -35,7 +35,9 @@ def test_response_for_with_wrong_number_of_arguments + end + + def test_register_uri_without_domain_name +-assert_raises URI::InvalidURIError do ++# Ruby 2.1 and lower raises URI::InvalidURIError ++# Ruby 2.2 and higher raises TypeError ++assert_raises URI::InvalidURIError, TypeError do + FakeWeb.register_uri(:get, 'test_example2.txt', fixture_path("test_example.txt")) + end + end