Compare commits

..

No commits in common. "rawhide" and "f33" have entirely different histories.

6 changed files with 51 additions and 140 deletions

37
.gitignore vendored
View file

@ -1,2 +1,35 @@
/flexmock-*.gem
/flexmock-*-test-missing-files.tar.gz
flexmock-0.8.7.gem
/flexmock-0.8.11.gem
/flexmock-0.9.0.gem
/flexmock-1.0.2.gem
/flexmock-1.0.3.gem
/flexmock-1.1.0.gem
/flexmock-1.2.0.gem
/flexmock-1.3.0.gem
/flexmock-1.3.1.gem
/flexmock-1.3.2.gem
/flexmock-1.3.3.gem
/flexmock-2.0.0.gem
/flexmock-v2.0.0-test-missing-files.tar.gz
/flexmock-2.0.1.gem
/flexmock-v2.0.1-test-missing-files.tar.gz
/flexmock-2.0.2.gem
/flexmock-v2.0.2-test-missing-files.tar.gz
/flexmock-2.0.3.gem
/flexmock-v2.0.3-test-missing-files.tar.gz
/flexmock-2.0.4.gem
/flexmock-v2.0.4-test-missing-files.tar.gz
/flexmock-2.0.5.gem
/flexmock-v2.0.5-test-missing-files.tar.gz
/flexmock-2.1.0.gem
/flexmock-v2.1.0-test-missing-files.tar.gz
/flexmock-2.2.1.gem
/flexmock-v2.2.1-test-missing-files.tar.gz
/flexmock-2.3.0.gem
/flexmock-v2.3.0-test-missing-files.tar.gz
/flexmock-2.3.4.gem
/flexmock-v2.3.4-test-missing-files.tar.gz
/flexmock-2.3.5.gem
/flexmock-v2.3.5-test-missing-files.tar.gz
/flexmock-2.3.6.gem
/flexmock-v2.3.6-test-missing-files.tar.gz

View file

@ -1,33 +0,0 @@
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

View file

@ -1,12 +0,0 @@
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

View file

@ -22,7 +22,7 @@ pushd $TMPDIR
git clone https://github.com/doudou/flexmock.git
cd flexmock
git reset --hard v$VERSION
git reset --hard $VERSION
cd ..
tar czf $CURDIR/flexmock-${VERSION}-test-missing-files.tar.gz flexmock/test/

View file

@ -2,18 +2,14 @@
Summary: Mock object library for ruby
Name: rubygem-%{gem_name}
Version: 3.0.2
Release: 1%{?dist}
Version: 2.3.6
Release: 7%{?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: %{gem_name}-v%{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.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)
@ -36,20 +32,14 @@ Requires: %{name} = %{version}-%{release}
This package contains documentation for %{name}.
%prep
%setup -q -n %{gem_name}-%{version} -a 1
mv ../%{gem_name}-%{version}.gemspec .
%setup -q -c -T
mv flexmock/test .
%patch -P0 -p1
%patch -P1 -p1
%gem_install -n %{SOURCE0}
find . -name \*.rb | xargs sed -i -e '\@/usr/bin/env@d'
find . -name \*.gem -or -name \*.rb -or -name \*.rdoc | xargs chmod 0644
%build
gem build %{gem_name}-%{version}.gemspec
%gem_install
%install
mkdir -p %{buildroot}%{gem_dir}
@ -58,41 +48,32 @@ cp -a .%{gem_dir}/* %{buildroot}%{gem_dir}/
pushd %{buildroot}%{gem_instdir}
rm -rf \
.autotest .gitignore .togglerc .travis.yml .yardopts \
.github \
Gemfile \
Rakefile \
flexmock.blurb \
flexmock.gemspec \
install.rb \
test/ \
%{nil}
install.rb
popd
rm -f %{buildroot}%{gem_cache}
%check
cp -a test .%{gem_instdir}
pushd .%{gem_instdir}
export RUBYOPT=-W:deprecated
export RUBYLIB=$(pwd)/lib:$(pwd):$(pwd)/test
ruby \
-e 'Dir.glob("test/*_test.rb").each {|f| require f}'
tar xf %{SOURCE1}
mv flexmock/test .
# Note: exclude failing tests for now
rspec test/rspec_integration/ \
--exclude-pattern 'test/rspec_integration/spy_example_spec.rb' \
%{nil}
ruby -Ilib:.:test \
-e 'Dir.glob("test/*_test.rb").each {|f| require f}'
rspec test/rspec_integration/
popd
%files
%dir %{gem_instdir}
%license %{gem_instdir}/LICENSE.txt
%doc %{gem_instdir}/[A-CR-Z]*
%doc %{gem_instdir}/[A-Z]*
%{gem_libdir}
%{gem_instdir}/rakelib/
%exclude %{gem_cache}
%{gem_spec}
%files doc
@ -101,64 +82,6 @@ popd
%{gem_docdir}/
%changelog
* Wed Aug 13 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 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 <releng@fedoraproject.org> - 3.0.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
* Sat Jan 18 2025 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
* Mon Nov 18 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.0.1-2
- Make testsuite compatible with ruby34 formatting change
* Wed Sep 11 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.0.1-1
- 3.0.1
* Tue Sep 03 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.0.0-1
- 3.0.0
* Fri Jul 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.8-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Fri Jan 26 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.8-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.8-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Mon Aug 14 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.3.8-1
- 2.3.8
* Tue Aug 08 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.3.6-15
- Handle MiniTest 5.19+
* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.6-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.6-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.6-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.6-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.6-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.6-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Sun Jan 24 2021 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.3.6-8
- Patch to support ruby 3.0
- Use binding.source_location for test
- Properly accept argument and keywords
- Relax error message on test a bit
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.6-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild

View file

@ -1,2 +1,2 @@
SHA512 (flexmock-3.0.2.gem) = 07902e5641e2d014e626c1b64f65aeae493fff88ea4f7be42816e63f7609db92ff5fa3b1ad3010e6c352c88f81480667326d83257f55de17b388f3ab68ece827
SHA512 (flexmock-3.0.2-test-missing-files.tar.gz) = 3660f0f4cdeab1f92d5b89a57217effdacfdf91fa80eea22fb0baa4bba99bed99b5a8f6c918fd6e008bd2c5d3005ec5a9bd18feb11d9c56c03b292a3a9cc3abd
SHA512 (flexmock-2.3.6.gem) = 9db8c95d8784e66743f089e7f1660a8205f6fbd63c820126ce551c581fe242b601cdcf34dfa2b93576ef83aaded29bedd6c0506d358d12fad9e423982b35f848
SHA512 (flexmock-v2.3.6-test-missing-files.tar.gz) = d6265af9d3aa1d546046f985afd45da4de17342ba5897690708d420d7b695e75ed2f9c81fe17a2036cabbdcb0e81a1a233f4494ddc98f6625b88ceea3c959a93