Compare commits

..

18 commits

Author SHA1 Message Date
Mamoru TASAKA
474d1f7c63 Backport upstream patch to support ruby4_0 source_location behavior change 2025-12-02 16:42:35 +09:00
Mamoru TASAKA
7effbf81cb 3.13.6 2025-10-21 15:07:20 +09:00
Fedora Release Engineering
e8c2a97d1a Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild 2025-07-25 12:45:26 +00:00
Mamoru TASAKA
3f7c63406e 3.13.5 2025-06-27 22:39:02 +09:00
Mamoru TASAKA
87bc1190a3 3.13.4 2025-05-29 17:33:15 +09:00
Mamoru TASAKA
45cdfd6fec 3.13.3 2025-02-12 16:12:01 +09:00
Fedora Release Engineering
29635ced96 Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild 2025-01-18 23:57:21 +00:00
Mamoru TASAKA
cdd2413fa0 Workaround syntax_suggest 2.0.2 change 2024-11-17 16:59:26 +09:00
Mamoru TASAKA
91ba31bd1c Fix for ruby34 string behavior to be chilled 2024-11-15 15:07:10 +09:00
Mamoru TASAKA
ca81d02368 add BR: rubygem(drb) for ruby34 2024-11-06 22:21:07 +09:00
Mamoru TASAKA
0e1e9960be 3.13.2 2024-10-22 14:17:02 +09:00
Mamoru TASAKA
5453556202 3.13.1
3.13.1
2024-09-08 00:03:34 +09:00
Fedora Release Engineering
229ca4c56a Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild 2024-07-19 19:54:36 +00:00
Mamoru TASAKA
7cd8e81307 enable test again 2024-02-09 15:46:06 +09:00
Mamoru TASAKA
c9fcb4c160 3.13.0 2024-02-09 15:22:51 +09:00
Fedora Release Engineering
27cebec369 Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-26 17:26:24 +00:00
Mamoru TASAKA
01442efdd9 Fix one failing test related to thread local variable 2023-07-22 07:31:10 +09:00
Fedora Release Engineering
81ab95aa61 Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-07-21 18:20:06 +00:00
4 changed files with 119 additions and 9 deletions

View file

@ -0,0 +1,51 @@
From 1c20fa80772ca7a1ed0512056ce7cd6a94f8e68d Mon Sep 17 00:00:00 2001
From: Jon Rowe <hello@jonrowe.co.uk>
Date: Fri, 28 Nov 2025 10:59:10 +0000
Subject: [PATCH] Cope with the changes to block source_location in Ruby 4
---
rspec-core/lib/rspec/core/hooks.rb | 2 +-
rspec-core/lib/rspec/core/metadata.rb | 2 +-
rspec-core/lib/rspec/core/shared_example_group.rb | 2 +-
.../lib/rspec/expectations/block_snippet_extractor.rb | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/rspec-core/lib/rspec/core/hooks.rb b/rspec-core/lib/rspec/core/hooks.rb
index f97962ce9..77eecc776 100644
--- a/rspec-core/lib/rspec/core/hooks.rb
+++ b/rspec-core/lib/rspec/core/hooks.rb
@@ -395,7 +395,7 @@ def execute_with(example, procsy)
if Proc.method_defined?(:source_location)
def hook_description
- "around hook at #{Metadata.relative_path(block.source_location.join(':'))}"
+ "around hook at #{Metadata.relative_path(block.source_location.take(2).join(':'))}"
end
else # for 1.8.7
# :nocov:
diff --git a/rspec-core/lib/rspec/core/metadata.rb b/rspec-core/lib/rspec/core/metadata.rb
index e887cb1c5..ed47bc07b 100644
--- a/rspec-core/lib/rspec/core/metadata.rb
+++ b/rspec-core/lib/rspec/core/metadata.rb
@@ -146,7 +146,7 @@ def populate_location_attributes
file_path, line_number = if backtrace
file_path_and_line_number_from(backtrace)
elsif block.respond_to?(:source_location)
- block.source_location
+ block.source_location.take(2)
else
file_path_and_line_number_from(caller)
end
diff --git a/rspec-core/lib/rspec/core/shared_example_group.rb b/rspec-core/lib/rspec/core/shared_example_group.rb
index b4a5dc317..1f2b9d623 100644
--- a/rspec-core/lib/rspec/core/shared_example_group.rb
+++ b/rspec-core/lib/rspec/core/shared_example_group.rb
@@ -243,7 +243,7 @@ def warn_if_key_taken(context, key, new_block)
if RUBY_VERSION.to_f >= 1.9
def formatted_location(block)
- block.source_location.join(":")
+ block.source_location.take(2).join(":")
end
else # 1.8.7
# :nocov:

View file

@ -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/./

View file

@ -1,9 +1,9 @@
%global majorver 3.12.2
%global majorver 3.13.6
#%%global preminorver .rc6
%global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||')
%global fullver %{majorver}%{?preminorver}
%global baserelease 1
%global baserelease 2
%global gem_name rspec-core
@ -28,7 +28,7 @@ Release: %{?preminorver:0.}%{baserelease}%{?preminorver:%{rpmminorver}}%{?dist}
# SPDX confirmed
License: MIT
URL: http://github.com/rspec/rspec-core
URL: https://rspec.info
Source0: http://rubygems.org/gems/%{gem_name}-%{fullver}.gem
# %%{SOURCE2} %%{name} %%{version}
Source1: rubygem-%{gem_name}-%{version}-full.tar.gz
@ -36,6 +36,9 @@ Source2: rspec-related-create-full-tarball.sh
# Adjust backtrace filter for Fedora placement of StdLib.
# https://github.com/rspec/rspec-core/pull/2881
Patch0: rubygem-rspec-core-3.10.1-Filter-content-of-usr-share-ruby.patch
# https://github.com/rspec/rspec/pull/282/commits/1c20fa80772ca7a1ed0512056ce7cd6a94f8e68d
# Support ruby4_0 source_location behavior change
Patch1: rspec-core-pr282-ruby4_0-source_location.patch
#BuildRequires: ruby(release)
BuildRequires: rubygems-devel
@ -45,6 +48,7 @@ BuildRequires: rubygem(rake)
BuildRequires: rubygem(rspec)
BuildRequires: rubygem(test-unit)
BuildRequires: rubygem(coderay)
BuildRequires: rubygem(drb)
BuildRequires: rubygem(thread_order)
BuildRequires: git
@ -89,6 +93,7 @@ This package contains documentation for %{name}.
%prep
%setup -q -T -n %{gem_name}-%{version} -b 1
%patch -P0 -p1
%patch -P1 -p2
gem specification %{SOURCE0} -l --ruby > %{gem_name}.gemspec
%build
@ -131,6 +136,10 @@ sed -i spec/integration/spec_file_load_errors_spec.rb \
sed -i spec/rspec/core/example_spec.rb \
-e '\@defined.*RUBY_ENGINE.*truffleruby@s|^\(.*\)$|\1 \&\& false|'
# RSpec uses only one thread local variable: disable for now
sed -i spec/rspec/core_spec.rb \
-e '\@only one thread local variable@s| it | xit |'
# FIXME seed 33413 sees test failure
ruby -Ilib -S exe/rspec --seed 1 #33413
@ -204,6 +213,57 @@ done
%{gem_docdir}
%changelog
* Tue Dec 02 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.13.6-2
- Backport upstream patch to support ruby4_0 source_location behavior change
* Mon Oct 20 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.13.6-1
- 3.13.6
* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 3.13.5-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
* Fri Jun 27 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.13.5-1
- 3.13.5
* Thu May 29 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.13.4-1
- 3.13.4
* Tue Feb 11 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.13.3-1
- 3.13.3
* Sat Jan 18 2025 Fedora Release Engineering <releng@fedoraproject.org> - 3.13.2-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
* Sun Nov 17 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.13.2-4
- Workaround syntax_suggest 2.0.2 change
* Fri Nov 15 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.13.2-3
- Fix for ruby34 string behavior to be chilled
* Wed Nov 06 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.13.2-2
- add BR: rubygem(drb) for ruby34
* Mon Oct 21 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.13.2-1
- 3.13.2
* Thu Sep 05 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.13.1-1
- 3.13.1
* Fri Jul 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.13.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Fri Feb 09 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.13.0-1
- 3.13.0
* Fri Jan 26 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.12.2-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Sat Jul 22 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.12.2-3
- Fix one failing test related to thread local variable
* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.12.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Wed Apr 19 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.12.2-1
- 3.12.2

View file

@ -1,2 +1,2 @@
SHA512 (rspec-core-3.12.2.gem) = b798d0624eb53ca866a76cac74885bfb37a2715d21346e097c0a9282a10581219cb7305212f89b14fc57f90fbc03fbd2655079c764902c556b7f174415c9e295
SHA512 (rubygem-rspec-core-3.12.2-full.tar.gz) = 220becce9e96eaebb1280dfb52e8920e687069a09bcceeefe3e2cd8ef0cc0cb97ceec9e11fbd1e899e0b4e8f0c9317dc82a16a7b4ca7b2102c671d600bd1aad0
SHA512 (rspec-core-3.13.6.gem) = 8456a4505bd990a968630da475fd5222a15e0641db26d0efbf63e5d1d8edea702c7982297c4fd7e647167b7204127e4dd6d49480a9556faa65f06e0ce8ad3513
SHA512 (rubygem-rspec-core-3.13.6-full.tar.gz) = 2cb5c5ffe9c76a58385ccac68fbbc696e6c542cf68007ab81b29e5ad6ecc97ec05cd34eb1006b2be1d70c826ab520b32e37182bbd14f662260996a1e5aa1bf06