!6 Upgrade to 2.5.0

From: @starlet-dx 
Reviewed-by: @lyn1001 
Signed-off-by: @lyn1001
This commit is contained in:
openeuler-ci-bot 2023-11-14 03:21:22 +00:00 committed by Gitee
commit 4421184ba4
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
8 changed files with 11 additions and 65 deletions

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
fakefs-2.5.0-tests.tar.gz Normal file

Binary file not shown.

BIN
fakefs-2.5.0.gem Normal file

Binary file not shown.

View File

@ -1,23 +0,0 @@
From 94432675ed3bc75af66c412ddf5fc658084448ec Mon Sep 17 00:00:00 2001
From: Peter Goldstein <peter.m.goldstein@gmail.com>
Date: Tue, 18 Jan 2022 00:53:13 -0800
Subject: [PATCH] Add Ruby 3.1 and ruby-head to CI and fix undef that fails on
ruby-head
---
.github/workflows/actions.yml | 2 +-
lib/fakefs/pathname.rb | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/fakefs/pathname.rb b/lib/fakefs/pathname.rb
index 5398494..120aa74 100644
--- a/lib/fakefs/pathname.rb
+++ b/lib/fakefs/pathname.rb
@@ -1035,6 +1035,6 @@ def empty?
# Pathname class
class Pathname
- undef =~
+ undef =~ if respond_to?(:=~)
end
end

View File

@ -1,25 +0,0 @@
From b73f5b7b4fb4b5f436570c91214356487224e7df Mon Sep 17 00:00:00 2001
From: Michael Grosser <michael@grosser.it>
Date: Sun, 13 Nov 2022 21:31:04 -0800
Subject: [PATCH 1/2] fix 3.2 bug
---
test/fakefs_test.rb | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/test/fakefs_test.rb b/test/fakefs_test.rb
index 4873d0f..71c68b8 100644
--- a/test/fakefs_test.rb
+++ b/test/fakefs_test.rb
@@ -2031,7 +2031,8 @@ def test_should_set_pos_with_tell_method
# omit methods from io/wait
:nread, :pwrite, :pread,
:ready?,
- :wait, :wait_readable, :wait_writable
+ :wait, :wait_readable, :wait_writable, :wait_priority,
+ :timeout, :timeout=
].freeze
OMITTED_JRUBY_FILE_METHODS = [

View File

@ -1,24 +1,20 @@
%global gem_name fakefs %global gem_name fakefs
Name: rubygem-%{gem_name} Name: rubygem-%{gem_name}
Version: 1.2.2 Version: 2.5.0
Release: 2 Release: 1
Summary: A fake filesystem. Use it in your tests Summary: A fake filesystem. Use it in your tests
License: MIT License: MIT
URL: https://github.com/fakefs/fakefs URL: https://github.com/fakefs/fakefs
Source0: https://rubygems.org/gems/fakefs-%{version}.gem Source0: https://rubygems.org/gems/fakefs-%{version}.gem
Source1: https://github.com/fakefs/fakefs/archive/v%{version}/fakefs-%{version}-tests.tar.gz # git clone https://github.com/fakefs/fakefs.git && cd fakefs/
# Skip test of methods introduced in Ruby 2.5. # git archive -v -o fakefs-2.5.0-tests.tar.gz v2.5.0 spec/ test/
# https://github.com/fakefs/fakefs/issues/390 Source1: fakefs-%{version}-tests.tar.gz
# From https://github.com/fakefs/fakefs/pull/467
# ruby3.2 does not respond to Pathname#=~
Patch0: rubygem-fakefs-1.4.1-regexmatch-for-pathname-ruby32.patch
# From https://github.com/fakefs/fakefs/pull/480
# Test suite needs more filtering for ruby3.2
Patch1: rubygem-fakefs-1.9.0-ruby32-testsuite.patch
BuildRequires: ruby(release) rubygems-devel ruby rubygem(rspec) rubygem(minitest) BuildRequires: ruby(release) rubygems-devel ruby rubygem(rspec) rubygem(minitest)
BuildRequires: rubygem(pry) ruby(irb)
# https://github.com/fakefs/fakefs/pull/488
Requires: ruby(irb)
BuildArch: noarch BuildArch: noarch
%description %description
@ -34,11 +30,6 @@ Documentation for %{name}.
%prep %prep
%setup -q -n %{gem_name}-%{version} -b 1 %setup -q -n %{gem_name}-%{version} -b 1
%patch0 -p1
cd %{_builddir}/test
%patch1 -p2
%build %build
gem build ../%{gem_name}-%{version}.gemspec gem build ../%{gem_name}-%{version}.gemspec
%gem_install %gem_install
@ -69,6 +60,9 @@ popd
%doc %{gem_instdir}/README.md %doc %{gem_instdir}/README.md
%changelog %changelog
* Tue Nov 14 2023 yaoxin <yao_xin001@hoperun.com> - 2.5.0-1
- Upgrade to 2.5.0
* Tue Aug 01 2023 chenchen <chen_aka_jan@163.com> - 1.2.2-2 * Tue Aug 01 2023 chenchen <chen_aka_jan@163.com> - 1.2.2-2
- fix build error for ruby upgrade to 3.2.2 - fix build error for ruby upgrade to 3.2.2