From 6b03bd80280dd77135de3577575a70aa7e40b2e5 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 18 Nov 2024 16:00:07 +0900 Subject: [PATCH 1/7] Make testsuite compatible with ruby34 formatting change --- flexmock-3.0.1-testsuite-ruby34-formatting.patch | 13 +++++++++++++ rubygem-flexmock.spec | 12 +++++++++++- 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 flexmock-3.0.1-testsuite-ruby34-formatting.patch diff --git a/flexmock-3.0.1-testsuite-ruby34-formatting.patch b/flexmock-3.0.1-testsuite-ruby34-formatting.patch new file mode 100644 index 0000000..991e7b6 --- /dev/null +++ b/flexmock-3.0.1-testsuite-ruby34-formatting.patch @@ -0,0 +1,13 @@ +diff -urp flexmock.orig/test/partial_mock_test.rb flexmock/test/partial_mock_test.rb +--- flexmock.orig/test/partial_mock_test.rb 2024-11-18 15:38:57.625597258 +0900 ++++ flexmock/test/partial_mock_test.rb 2024-11-18 15:44:56.469851634 +0900 +@@ -633,7 +633,7 @@ class TestStubbing < Minitest::Test + exception = assert_raises(NameError) do + obj.mocked_method + end +- assert_match /undefined method `does_not_exist' for/, exception.message ++ assert_match /undefined method [`']does_not_exist' for/, exception.message + end + + def test_it_checks_whether_mocks_are_forbidden_before_forwarding_the_call +Only in flexmock/test: partial_mock_test.rb~ diff --git a/rubygem-flexmock.spec b/rubygem-flexmock.spec index 131fadf..47dbb1a 100644 --- a/rubygem-flexmock.spec +++ b/rubygem-flexmock.spec @@ -3,13 +3,15 @@ Summary: Mock object library for ruby Name: rubygem-%{gem_name} Version: 3.0.1 -Release: 1%{?dist} +Release: 2%{?dist} License: MIT URL: https://github.com/doudou/flexmock Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem Source1: %{gem_name}-%{version}-test-missing-files.tar.gz # Source1 is created fron Source2 Source2: flexmock-create-missing-test-files.sh +# make testsuite compatible for ruby34 formatting change +Patch0: flexmock-3.0.1-testsuite-ruby34-formatting.patch Requires: ruby(release) BuildRequires: ruby(release) @@ -35,6 +37,11 @@ This package contains documentation for %{name}. %setup -q -n %{gem_name}-%{version} -a 1 mv ../%{gem_name}-%{version}.gemspec . +( +cd flexmock/test +%patch -P0 -p2 +) + find . -name \*.rb | xargs sed -i -e '\@/usr/bin/env@d' find . -name \*.gem -or -name \*.rb -or -name \*.rdoc | xargs chmod 0644 @@ -92,6 +99,9 @@ popd %{gem_docdir}/ %changelog +* Mon Nov 18 2024 Mamoru TASAKA - 3.0.1-2 +- Make testsuite compatible with ruby34 formatting change + * Wed Sep 11 2024 Mamoru TASAKA - 3.0.1-1 - 3.0.1 From b854ecd8df8beb27ab947fae7ed7ca3b1ae7a62d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 18 Jan 2025 23:15:26 +0000 Subject: [PATCH 2/7] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- rubygem-flexmock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-flexmock.spec b/rubygem-flexmock.spec index 47dbb1a..4a5e1e4 100644 --- a/rubygem-flexmock.spec +++ b/rubygem-flexmock.spec @@ -3,7 +3,7 @@ Summary: Mock object library for ruby Name: rubygem-%{gem_name} Version: 3.0.1 -Release: 2%{?dist} +Release: 3%{?dist} License: MIT URL: https://github.com/doudou/flexmock Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem @@ -99,6 +99,9 @@ popd %{gem_docdir}/ %changelog +* Sat Jan 18 2025 Fedora Release Engineering - 3.0.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Mon Nov 18 2024 Mamoru TASAKA - 3.0.1-2 - Make testsuite compatible with ruby34 formatting change From 1ac95b83dbd96266d4aa089fd14d7b6a217a291c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 12:24:36 +0000 Subject: [PATCH 3/7] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- rubygem-flexmock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-flexmock.spec b/rubygem-flexmock.spec index 4a5e1e4..c03af0f 100644 --- a/rubygem-flexmock.spec +++ b/rubygem-flexmock.spec @@ -3,7 +3,7 @@ Summary: Mock object library for ruby Name: rubygem-%{gem_name} Version: 3.0.1 -Release: 3%{?dist} +Release: 4%{?dist} License: MIT URL: https://github.com/doudou/flexmock Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem @@ -99,6 +99,9 @@ popd %{gem_docdir}/ %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 3.0.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Sat Jan 18 2025 Fedora Release Engineering - 3.0.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 77919d8d64865d2e8c7b9492daa82746df2e97ad Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 13 Aug 2025 16:40:39 +0900 Subject: [PATCH 4/7] rename --- ...ting.patch => flexmock-3.0.2-testsuite-ruby34-formatting.patch | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename flexmock-3.0.1-testsuite-ruby34-formatting.patch => flexmock-3.0.2-testsuite-ruby34-formatting.patch (100%) diff --git a/flexmock-3.0.1-testsuite-ruby34-formatting.patch b/flexmock-3.0.2-testsuite-ruby34-formatting.patch similarity index 100% rename from flexmock-3.0.1-testsuite-ruby34-formatting.patch rename to flexmock-3.0.2-testsuite-ruby34-formatting.patch From ca5a1817cd1f69bcaf3e056f0fe7779e2a15c12f Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 13 Aug 2025 16:43:45 +0900 Subject: [PATCH 5/7] 3.0.2 --- rubygem-flexmock.spec | 9 ++++++--- sources | 4 ++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/rubygem-flexmock.spec b/rubygem-flexmock.spec index c03af0f..b4e7edc 100644 --- a/rubygem-flexmock.spec +++ b/rubygem-flexmock.spec @@ -2,8 +2,8 @@ Summary: Mock object library for ruby Name: rubygem-%{gem_name} -Version: 3.0.1 -Release: 4%{?dist} +Version: 3.0.2 +Release: 1%{?dist} License: MIT URL: https://github.com/doudou/flexmock Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem @@ -11,7 +11,7 @@ Source1: %{gem_name}-%{version}-test-missing-files.tar.gz # Source1 is created fron Source2 Source2: flexmock-create-missing-test-files.sh # make testsuite compatible for ruby34 formatting change -Patch0: flexmock-3.0.1-testsuite-ruby34-formatting.patch +Patch0: flexmock-3.0.2-testsuite-ruby34-formatting.patch Requires: ruby(release) BuildRequires: ruby(release) @@ -99,6 +99,9 @@ popd %{gem_docdir}/ %changelog +* Wed Aug 13 2025 Mamoru TASAKA - 3.0.2-1 +- 3.0.2 + * Fri Jul 25 2025 Fedora Release Engineering - 3.0.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild diff --git a/sources b/sources index c70812d..9188481 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (flexmock-3.0.1.gem) = 3cc339d553b60b827ef970054a6afbb45b607697b74dca5850031bbf7520de9251092fe09f49a8c7c34aa49441080e847ac6a63bfc8e6124f2d2f10a14ac5734 -SHA512 (flexmock-3.0.1-test-missing-files.tar.gz) = f8567a323adbbafefd466b3f1024db2a4dc2ab4008bbd8cbd03c027c130492b317c8d0dbff9bfaef22cbbbe3313b7227291ab69b11ade290429beb14ce177cdc +SHA512 (flexmock-3.0.2.gem) = 07902e5641e2d014e626c1b64f65aeae493fff88ea4f7be42816e63f7609db92ff5fa3b1ad3010e6c352c88f81480667326d83257f55de17b388f3ab68ece827 +SHA512 (flexmock-3.0.2-test-missing-files.tar.gz) = 3660f0f4cdeab1f92d5b89a57217effdacfdf91fa80eea22fb0baa4bba99bed99b5a8f6c918fd6e008bd2c5d3005ec5a9bd18feb11d9c56c03b292a3a9cc3abd From 559502a2e931ba15433d74453fee5833ebcc00c0 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 13 Aug 2025 18:45:03 +0900 Subject: [PATCH 6/7] modify patch --- flexmock-3.0.2-testsuite-ruby34-formatting.patch | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/flexmock-3.0.2-testsuite-ruby34-formatting.patch b/flexmock-3.0.2-testsuite-ruby34-formatting.patch index 991e7b6..b37f0dd 100644 --- a/flexmock-3.0.2-testsuite-ruby34-formatting.patch +++ b/flexmock-3.0.2-testsuite-ruby34-formatting.patch @@ -5,9 +5,8 @@ diff -urp flexmock.orig/test/partial_mock_test.rb flexmock/test/partial_mock_tes exception = assert_raises(NameError) do obj.mocked_method end -- assert_match /undefined method `does_not_exist' for/, exception.message -+ assert_match /undefined method [`']does_not_exist' for/, exception.message +- assert_match(/undefined method `does_not_exist' for/, exception.message) ++ assert_match(/undefined method [`']does_not_exist' for/, exception.message) end def test_it_checks_whether_mocks_are_forbidden_before_forwarding_the_call -Only in flexmock/test: partial_mock_test.rb~ From 308e7d504e23c521336315006fb16c6b76a72d74 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 13 Aug 2025 18:45:23 +0900 Subject: [PATCH 7/7] Fix warnigs for string literal being frozen in the future ruby --- ...k-3.0.2-ruby34-string-literal-frozen.patch | 33 +++++++++++++++++++ rubygem-flexmock.spec | 13 +++++--- 2 files changed, 41 insertions(+), 5 deletions(-) create mode 100644 flexmock-3.0.2-ruby34-string-literal-frozen.patch diff --git a/flexmock-3.0.2-ruby34-string-literal-frozen.patch b/flexmock-3.0.2-ruby34-string-literal-frozen.patch new file mode 100644 index 0000000..8f12f6a --- /dev/null +++ b/flexmock-3.0.2-ruby34-string-literal-frozen.patch @@ -0,0 +1,33 @@ +diff -urp '--exclude=*~' flexmock-3.0.2.orig/lib/flexmock/spy_describers.rb flexmock-3.0.2/lib/flexmock/spy_describers.rb +--- flexmock-3.0.2.orig/lib/flexmock/spy_describers.rb 2025-08-13 16:49:42.102930421 +0900 ++++ flexmock-3.0.2/lib/flexmock/spy_describers.rb 2025-08-13 16:56:27.493387656 +0900 +@@ -18,7 +18,7 @@ class FlexMock + end + + def describe_spy(spy, sym, args, kw, options, not_clause="") +- result = "expected " ++ result = "expected ".dup + result << FlexMock.format_call(sym, args, kw) + result << " to#{not_clause} be received by " << spy.inspect + result << times_description(options[:times]) +@@ -29,7 +29,7 @@ class FlexMock + end + + def describe_calls(spy) +- result = '' ++ result = ''.dup + if spy.flexmock_calls.empty? + result << "No messages have been received\n" + else +diff -urp '--exclude=*~' flexmock-3.0.2.orig/test/container_methods_test.rb flexmock-3.0.2/test/container_methods_test.rb +--- flexmock-3.0.2.orig/test/container_methods_test.rb 2025-08-13 16:49:41.505249913 +0900 ++++ flexmock-3.0.2/test/container_methods_test.rb 2025-08-13 18:12:33.787388043 +0900 +@@ -112,7 +112,7 @@ class TestFlexmockContainerMethods < Min + end + + def test_stubbing_a_string +- s = "hello" ++ s = "hello".dup + flexmock(:base, s, :length => 2) + assert_equal 2, s.length + end diff --git a/rubygem-flexmock.spec b/rubygem-flexmock.spec index b4e7edc..be3040e 100644 --- a/rubygem-flexmock.spec +++ b/rubygem-flexmock.spec @@ -12,6 +12,8 @@ Source1: %{gem_name}-%{version}-test-missing-files.tar.gz Source2: flexmock-create-missing-test-files.sh # make testsuite compatible for ruby34 formatting change Patch0: flexmock-3.0.2-testsuite-ruby34-formatting.patch +# Remove warnings for string literal being frozen in the future +Patch1: flexmock-3.0.2-ruby34-string-literal-frozen.patch Requires: ruby(release) BuildRequires: ruby(release) @@ -37,10 +39,10 @@ This package contains documentation for %{name}. %setup -q -n %{gem_name}-%{version} -a 1 mv ../%{gem_name}-%{version}.gemspec . -( -cd flexmock/test -%patch -P0 -p2 -) +mv flexmock/test . + +%patch -P0 -p1 +%patch -P1 -p1 find . -name \*.rb | xargs sed -i -e '\@/usr/bin/env@d' find . -name \*.gem -or -name \*.rb -or -name \*.rdoc | xargs chmod 0644 @@ -69,7 +71,7 @@ popd rm -f %{buildroot}%{gem_cache} %check -cp -a flexmock/test .%{gem_instdir} +cp -a test .%{gem_instdir} pushd .%{gem_instdir} export RUBYOPT=-W:deprecated @@ -101,6 +103,7 @@ popd %changelog * Wed Aug 13 2025 Mamoru TASAKA - 3.0.2-1 - 3.0.2 +- Fix warnigs for string literal being frozen in the future ruby * Fri Jul 25 2025 Fedora Release Engineering - 3.0.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild