From c90968f649ccf7cfbe8962ba92d1e33f7649e0fe Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 15 May 2025 14:50:56 +0900 Subject: [PATCH 1/7] 3.13.4 --- rspec-related-create-full-tarball.sh | 7 +++---- rubygem-rspec-mocks.spec | 16 +++++----------- sources | 4 ++-- 3 files changed, 10 insertions(+), 17 deletions(-) diff --git a/rspec-related-create-full-tarball.sh b/rspec-related-create-full-tarball.sh index a847c6c..c0ba6bf 100644 --- a/rspec-related-create-full-tarball.sh +++ b/rspec-related-create-full-tarball.sh @@ -14,10 +14,9 @@ CURRDIR=$(pwd) TMPDIRPATH=$(mktemp -d /var/tmp/rspec-tar-XXXXXX) pushd $TMPDIRPATH -git clone https://github.com/rspec/$1.git -pushd $1 -git reset --hard v$2 -popd +git clone https://github.com/rspec/rspec.git +pushd rspec +git reset --hard $1-v$2 ln -sf $1 $1-$2 tar czf ${CURRDIR}/rubygem-$1-$2-full.tar.gz $1-$2/./ diff --git a/rubygem-rspec-mocks.spec b/rubygem-rspec-mocks.spec index 91cc323..e6a3a93 100644 --- a/rubygem-rspec-mocks.spec +++ b/rubygem-rspec-mocks.spec @@ -1,9 +1,9 @@ -%global majorver 3.13.2 +%global majorver 3.13.4 #%%global preminorver .rc6 %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} -%global baserelease 4 +%global baserelease 1 %global gem_name rspec-mocks @@ -23,12 +23,6 @@ Source0: https://rubygems.org/gems/%{gem_name}-%{fullver}.gem # %%{SOURCE2} %%{name} %%{version} Source1: rubygem-%{gem_name}-%{version}-full.tar.gz Source2: rspec-related-create-full-tarball.sh -# https://github.com/rspec/rspec-mocks/pull/1597 -# support ruby3.4 formatting -Patch0: rspec-mocks-pr1597-ruby34-formatting.patch -# https://github.com/rspec/rspec/pull/164 -# rspec-support side changed, rspec-mock need coordinating with the change -Patch1: rspec-mocks-pr164-ruby34-hash-syntax.patch BuildRequires: rubygems-devel %if %{without bootstrap} @@ -66,9 +60,6 @@ gem unpack %{SOURCE0} sed -i cucumber.yml -e "s|~@wip|not @wip|" sed -i features/support/disallow_certain_apis.rb -e "s|~@allow-old-syntax|not @allow-old-syntax|" -%patch -P0 -p1 -%patch -P1 -p2 - gem specification %{SOURCE0} -l --ruby > %{gem_name}.gemspec %build @@ -127,6 +118,9 @@ cucumber %{gem_docdir} %changelog +* Thu May 15 2025 Mamoru TASAKA - 3.13.4-1 +- 3.13.4 + * Sat Jan 18 2025 Fedora Release Engineering - 3.13.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild diff --git a/sources b/sources index b62a81b..025ae7e 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rspec-mocks-3.13.2.gem) = 3284411d5f9c3b10aca0ca41bfeec4ec423b1d2effb1942a36ff61c741ff8b1281ae69d46086881f99fc3e70522cf6a31805e980fe270e35cc35c6d8376c9152 -SHA512 (rubygem-rspec-mocks-3.13.2-full.tar.gz) = 79a22d5356247e4d563868589f512018f51a235aafa9d001d81673c73bc1d0a04be7c4770518744f77dfb4e7f726b5c037384a5f14cd853202466b68e4398e9c +SHA512 (rspec-mocks-3.13.4.gem) = 3d8253db68c821398018de027d1e61add5616d2e8eaeb4d224e28d3693bdb96b9af9ae8c0357438a54053240adff6975704a4576f491d087182d6be7efc2281b +SHA512 (rubygem-rspec-mocks-3.13.4-full.tar.gz) = 4217cf0e88067abd2725d4ff5c1c5ab07a6b9b4216d32960fe069596cc6f148c59c0f21a3abee07d37615833c7906bca3355200059597ae46c617e7af7987f9c From e8c6bb2889d9519081a88ca0fa79c8aeffff7c2f Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 29 May 2025 17:33:05 +0900 Subject: [PATCH 2/7] 3.13.5 --- rubygem-rspec-mocks.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/rubygem-rspec-mocks.spec b/rubygem-rspec-mocks.spec index e6a3a93..eb3b5e6 100644 --- a/rubygem-rspec-mocks.spec +++ b/rubygem-rspec-mocks.spec @@ -1,4 +1,4 @@ -%global majorver 3.13.4 +%global majorver 3.13.5 #%%global preminorver .rc6 %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} @@ -18,7 +18,7 @@ Release: %{?preminorver:0.}%{baserelease}%{?preminorver:%{rpmminorver}}%{?dist} # SPDX confirmed License: MIT -URL: http://github.com/rspec/rspec-mocks +URL: https://rspec.info Source0: https://rubygems.org/gems/%{gem_name}-%{fullver}.gem # %%{SOURCE2} %%{name} %%{version} Source1: rubygem-%{gem_name}-%{version}-full.tar.gz @@ -118,6 +118,9 @@ cucumber %{gem_docdir} %changelog +* Thu May 29 2025 Mamoru TASAKA - 3.13.5-1 +- 3.13.5 + * Thu May 15 2025 Mamoru TASAKA - 3.13.4-1 - 3.13.4 diff --git a/sources b/sources index 025ae7e..3615ca4 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rspec-mocks-3.13.4.gem) = 3d8253db68c821398018de027d1e61add5616d2e8eaeb4d224e28d3693bdb96b9af9ae8c0357438a54053240adff6975704a4576f491d087182d6be7efc2281b -SHA512 (rubygem-rspec-mocks-3.13.4-full.tar.gz) = 4217cf0e88067abd2725d4ff5c1c5ab07a6b9b4216d32960fe069596cc6f148c59c0f21a3abee07d37615833c7906bca3355200059597ae46c617e7af7987f9c +SHA512 (rspec-mocks-3.13.5.gem) = 130e1c9e71a5d8d863a4a6d1b394f4eee680642810fcdd11c49cbfc6dc1adc6d6b9fdc492b2a2975d0900bec00e12f18fbe2b86b9d5a27bb48f5d3dbf154f9dc +SHA512 (rubygem-rspec-mocks-3.13.5-full.tar.gz) = 1496caf9765ffb71a9a9c930269c2980806004fe4e9edfb4326631da39de5b98532a91c6739ae041f7763c06b8faf1f0af3995bb747a58254f35264de72f4e4c From ea7c65f9470c4df84f36d91e9200b5f2f54eb4d0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 12:45:43 +0000 Subject: [PATCH 3/7] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- rubygem-rspec-mocks.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-rspec-mocks.spec b/rubygem-rspec-mocks.spec index eb3b5e6..c60959e 100644 --- a/rubygem-rspec-mocks.spec +++ b/rubygem-rspec-mocks.spec @@ -3,7 +3,7 @@ %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} -%global baserelease 1 +%global baserelease 2 %global gem_name rspec-mocks @@ -118,6 +118,9 @@ cucumber %{gem_docdir} %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 3.13.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Thu May 29 2025 Mamoru TASAKA - 3.13.5-1 - 3.13.5 From 9630dad5dfc370d7fb3eac0811c583da2ed87d83 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 17 Oct 2025 16:09:32 +0900 Subject: [PATCH 4/7] 3.13.6 --- rubygem-rspec-mocks.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/rubygem-rspec-mocks.spec b/rubygem-rspec-mocks.spec index c60959e..3f1ffe2 100644 --- a/rubygem-rspec-mocks.spec +++ b/rubygem-rspec-mocks.spec @@ -1,9 +1,9 @@ -%global majorver 3.13.5 +%global majorver 3.13.6 #%%global preminorver .rc6 %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} -%global baserelease 2 +%global baserelease 1 %global gem_name rspec-mocks @@ -118,6 +118,9 @@ cucumber %{gem_docdir} %changelog +* Fri Oct 17 2025 Mamoru TASAKA - 3.13.6-1 +- 3.13.6 + * Fri Jul 25 2025 Fedora Release Engineering - 3.13.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild diff --git a/sources b/sources index 3615ca4..2f17ca9 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rspec-mocks-3.13.5.gem) = 130e1c9e71a5d8d863a4a6d1b394f4eee680642810fcdd11c49cbfc6dc1adc6d6b9fdc492b2a2975d0900bec00e12f18fbe2b86b9d5a27bb48f5d3dbf154f9dc -SHA512 (rubygem-rspec-mocks-3.13.5-full.tar.gz) = 1496caf9765ffb71a9a9c930269c2980806004fe4e9edfb4326631da39de5b98532a91c6739ae041f7763c06b8faf1f0af3995bb747a58254f35264de72f4e4c +SHA512 (rspec-mocks-3.13.6.gem) = 768199567b3220707d0294afb9d2e56a6e95e705f58ecae87cc1070de317d5883c41722bcc0f8445db582b341234553b1e3a583a66d5e18c81a5e1b23b5d8d70 +SHA512 (rubygem-rspec-mocks-3.13.6-full.tar.gz) = 47da2ab21faffa2e382c699580243ec1c3e0b8c7ba5885efc605ab777ebca28d4429b6e6988b4f64fddceb0230759a764dc0c8bf37d226c876b42120c21415d0 From a36833c28caf52e202274921e4839559a8668073 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 24 Nov 2025 10:18:24 +0900 Subject: [PATCH 5/7] 3.13.7 --- rubygem-rspec-mocks.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/rubygem-rspec-mocks.spec b/rubygem-rspec-mocks.spec index 3f1ffe2..7a9a72f 100644 --- a/rubygem-rspec-mocks.spec +++ b/rubygem-rspec-mocks.spec @@ -1,4 +1,4 @@ -%global majorver 3.13.6 +%global majorver 3.13.7 #%%global preminorver .rc6 %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} @@ -7,7 +7,7 @@ %global gem_name rspec-mocks -%bcond_with bootstrap +%bcond_without bootstrap %undefine __brp_mangle_shebangs @@ -118,6 +118,9 @@ cucumber %{gem_docdir} %changelog +* Mon Nov 24 2025 Mamoru TASAKA - 3.13.7-1 +- 3.13.7 + * Fri Oct 17 2025 Mamoru TASAKA - 3.13.6-1 - 3.13.6 diff --git a/sources b/sources index 2f17ca9..38528a1 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rspec-mocks-3.13.6.gem) = 768199567b3220707d0294afb9d2e56a6e95e705f58ecae87cc1070de317d5883c41722bcc0f8445db582b341234553b1e3a583a66d5e18c81a5e1b23b5d8d70 -SHA512 (rubygem-rspec-mocks-3.13.6-full.tar.gz) = 47da2ab21faffa2e382c699580243ec1c3e0b8c7ba5885efc605ab777ebca28d4429b6e6988b4f64fddceb0230759a764dc0c8bf37d226c876b42120c21415d0 +SHA512 (rspec-mocks-3.13.7.gem) = fa30824f1d7ab82e2c0d1cde1f076cb84b9a9e1e9e7292e33bcfda934468a50f2b59a1dc539137be14ad5b86465ed6fa12c32af2e3a79992c3ce5d278072861c +SHA512 (rubygem-rspec-mocks-3.13.7-full.tar.gz) = 7666b07e6b9806e36d53ede810c6efc0ceb57bc554c96e0fdf44efbfd9dd027a8e999ce942d20bf46f93f93bfae1a88c7ffd0bfbf2cdf08601093a98218a059a From 84c1aaf5666d21de8361a7eee2ad00296e412506 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 24 Nov 2025 10:26:50 +0900 Subject: [PATCH 6/7] kill bootstrap --- rubygem-rspec-mocks.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rubygem-rspec-mocks.spec b/rubygem-rspec-mocks.spec index 7a9a72f..46dc520 100644 --- a/rubygem-rspec-mocks.spec +++ b/rubygem-rspec-mocks.spec @@ -7,7 +7,7 @@ %global gem_name rspec-mocks -%bcond_without bootstrap +%bcond_with bootstrap %undefine __brp_mangle_shebangs From 18f1a225467f551fbb235963662d048c53befa4d Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 2 Dec 2025 16:42:08 +0900 Subject: [PATCH 7/7] Backport upstream patch to skip mock for Kernel#inspect on ruby4_0 --- ...-pr282-skip-mock-for-ruby4_0-inspect.patch | 35 +++++++++++++++++++ rubygem-rspec-mocks.spec | 9 ++++- 2 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 rspec-mocks-pr282-skip-mock-for-ruby4_0-inspect.patch diff --git a/rspec-mocks-pr282-skip-mock-for-ruby4_0-inspect.patch b/rspec-mocks-pr282-skip-mock-for-ruby4_0-inspect.patch new file mode 100644 index 0000000..d1c309b --- /dev/null +++ b/rspec-mocks-pr282-skip-mock-for-ruby4_0-inspect.patch @@ -0,0 +1,35 @@ +From 939c4799993b7ff7e524fac701ae6490772ca6de Mon Sep 17 00:00:00 2001 +From: Jon Rowe +Date: Mon, 1 Dec 2025 14:08:25 +0000 +Subject: [PATCH] Skip mock for calls to `:respond_to?` from `Kernel#inspect` + +--- + rspec-mocks/lib/rspec/mocks/method_double.rb | 15 +++++++++++++-- + 1 file changed, 13 insertions(+), 2 deletions(-) + +diff --git a/rspec-mocks/lib/rspec/mocks/method_double.rb b/rspec-mocks/lib/rspec/mocks/method_double.rb +index e2edb1e21..3276c49a5 100644 +--- a/rspec-mocks/lib/rspec/mocks/method_double.rb ++++ b/rspec-mocks/lib/rspec/mocks/method_double.rb +@@ -68,8 +68,19 @@ def define_proxy_method + + save_original_implementation_callable! + definition_target.class_exec(self, method_name, @original_visibility || visibility) do |method_double, method_name, visibility| +- define_method(method_name) do |*args, &block| +- method_double.proxy_method_invoked(self, *args, &block) ++ if RUBY_VERSION.to_f > 3 && method_name == :respond_to? ++ define_method(method_name) do |*args, &block| ++ # This is a work around for a respond_to? check within kernel_inspect ++ if caller_locations[0].label == "Kernel#inspect" ++ super(*args, &block) ++ else ++ method_double.proxy_method_invoked(self, *args, &block) ++ end ++ end ++ else ++ define_method(method_name) do |*args, &block| ++ method_double.proxy_method_invoked(self, *args, &block) ++ end + end + # This can't be `if respond_to?(:ruby2_keywords, true)`, + # see https://github.com/rspec/rspec-mocks/pull/1385#issuecomment-755340298 diff --git a/rubygem-rspec-mocks.spec b/rubygem-rspec-mocks.spec index 46dc520..2a2f1da 100644 --- a/rubygem-rspec-mocks.spec +++ b/rubygem-rspec-mocks.spec @@ -3,7 +3,7 @@ %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} -%global baserelease 1 +%global baserelease 2 %global gem_name rspec-mocks @@ -23,6 +23,9 @@ Source0: https://rubygems.org/gems/%{gem_name}-%{fullver}.gem # %%{SOURCE2} %%{name} %%{version} Source1: rubygem-%{gem_name}-%{version}-full.tar.gz Source2: rspec-related-create-full-tarball.sh +# https://github.com/rspec/rspec/pull/282/commits/939c4799993b7ff7e524fac701ae6490772ca6de +# Skip mock for ruby4_0 Kernel#inspect +Patch0: rspec-mocks-pr282-skip-mock-for-ruby4_0-inspect.patch BuildRequires: rubygems-devel %if %{without bootstrap} @@ -55,6 +58,7 @@ This package contains documentation for %{name}. gem unpack %{SOURCE0} %setup -q -D -T -n %{gem_name}-%{version} -b 1 +%patch -P0 -p2 # Cucumber 7 syntax change sed -i cucumber.yml -e "s|~@wip|not @wip|" @@ -118,6 +122,9 @@ cucumber %{gem_docdir} %changelog +* Tue Dec 02 2025 Mamoru TASAKA - 3.13.7-2 +- Backport upstream patch to skip mock for Kernel#inspect on ruby4_0 + * Mon Nov 24 2025 Mamoru TASAKA - 3.13.7-1 - 3.13.7