Update to Active Support 5.1.5.

f38
Pavel Valena 7 years ago
parent 534b291c36
commit c279244dbd

81
.gitignore vendored

@ -1,79 +1,2 @@
activesupport-2.3.5.gem
activesupport-2.3.8.gem
/activesupport-3.0.3.gem
/activesupport-3.0.5.gem
/activesupport-tests.tgz
/activesupport-3.0.9-tests.tgz
/activesupport-3.0.9.gem
/activesupport-3.0.10-tests.tgz
/activesupport-3.0.10.gem
/activesupport-3.0.11-tests.tgz
/activesupport-3.0.11.gem
/activesupport-3.0.13-tests.tgz
/activesupport-3.0.13.gem
/activesupport-3.0.15-tests.tgz
/activesupport-3.0.15.gem
/activesupport-3.2.6-tests.tgz
/activesupport-3.2.6.gem
/activesupport-3.2.7-tests.tgz
/activesupport-3.2.7.gem
/activesupport-3.2.8-tests.tgz
/activesupport-3.2.8.gem
/activesupport-3.2.10-tests.tgz
/activesupport-3.2.10.gem
/activesupport-3.2.11-tests.tgz
/activesupport-3.2.11.gem
/activesupport-3.2.12-tests.tgz
/activesupport-3.2.12.gem
/activesupport-3.2.13-tests.tgz
/activesupport-3.2.13.gem
/activesupport-4.0.0-tests.tgz
/activesupport-4.0.0.gem
/activesupport-4.0.1-tests.tgz
/activesupport-4.0.1.gem
/activesupport-4.0.2-tests.tgz
/activesupport-4.0.2.gem
/activesupport-4.0.3-tests.tgz
/activesupport-4.0.3.gem
/activesupport-4.1.0-tests.tgz
/activesupport-4.1.0.gem
/activesupport-4.1.1-tests.tgz
/activesupport-4.1.1.gem
/activesupport-4.1.4-tests.tgz
/activesupport-4.1.4.gem
/activesupport-4.1.5-tests.tgz
/activesupport-4.1.5.gem
/activesupport-4.2.0-tests.tgz
/activesupport-4.2.0.gem
/activesupport-4.2.1-tests.tgz
/activesupport-4.2.1.gem
/activesupport-4.2.2-tests.tgz
/activesupport-4.2.2.gem
/activesupport-4.2.3-tests.tgz
/activesupport-4.2.3.gem
/activesupport-4.2.4-tests.tgz
/activesupport-4.2.4.gem
/activesupport-4.2.5-tests.tgz
/activesupport-4.2.5.gem
/activesupport-4.2.5.1-tests.tgz
/activesupport-4.2.5.1.gem
/activesupport-4.2.5.2-tests.tgz
/activesupport-4.2.5.2.gem
/activesupport-4.2.6-tests.tgz
/activesupport-4.2.6.gem
/activesupport-5.0.0-tests.tgz
/activesupport-5.0.0.gem
/activesupport-5.0.0.1-tests.tgz
/activesupport-5.0.0.1.gem
/activesupport-5.0.1-tests.tgz
/activesupport-5.0.1.gem
/activesupport-5.0.2-tests.tgz
/activesupport-5.0.2.gem
/activesupport-5.1.1.gem
/activesupport-5.1.1-tests.tgz
/activesupport-5.1.2-tests.tgz
/activesupport-5.1.2.gem
/activesupport-5.1.3-tests.tgz
/activesupport-5.1.3.gem
/activesupport-5.1.4-tests.tgz
/activesupport-5.1.4.gem
/activesupport-*.gem
/activesupport-*-tests.tgz

@ -1,39 +0,0 @@
From 3a077f369199651fa62a3e9b8ab2d8f8ee70a0e9 Mon Sep 17 00:00:00 2001
From: "yuuji.yaginuma" <yuuji.yaginuma@gmail.com>
Date: Tue, 2 Jan 2018 18:15:11 +0900
Subject: [PATCH] Use `Minitest::Result` for retain test result
Runnable.marshal_dump/load was removed in
https://github.com/seattlerb/minitest/commit/00433fc0a4fdd0e6b302aace633384ba1312237
Instead, `Minitest::Result` is contained test result and the that can be
marshalled.
---
activesupport/lib/active_support/testing/isolation.rb | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/activesupport/lib/active_support/testing/isolation.rb b/activesupport/lib/active_support/testing/isolation.rb
index fa9bebb181a4..562f985f1ba2 100644
--- a/activesupport/lib/active_support/testing/isolation.rb
+++ b/activesupport/lib/active_support/testing/isolation.rb
@@ -45,7 +45,8 @@ def run_in_isolation(&blk)
end
}
end
- result = Marshal.dump(dup)
+ test_result = defined?(Minitest::Result) ? Minitest::Result.from(self) : dup
+ result = Marshal.dump(test_result)
end
write.puts [result].pack("m")
@@ -69,8 +70,9 @@ def run_in_isolation(&blk)
if ENV["ISOLATION_TEST"]
yield
+ test_result = defined?(Minitest::Result) ? Minitest::Result.from(self) : dup
File.open(ENV["ISOLATION_OUTPUT"], "w") do |file|
- file.puts [Marshal.dump(dup)].pack("m")
+ file.puts [Marshal.dump(test_result)].pack("m")
end
exit!
else

@ -2,8 +2,8 @@
Name: rubygem-%{gem_name}
Epoch: 1
Version: 5.1.4
Release: 3%{?dist}
Version: 5.1.5
Release: 1%{?dist}
Summary: A support libraries and Ruby core extensions extracted from the Rails framework
Group: Development/Languages
License: MIT
@ -14,10 +14,8 @@ Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem
# Rails rpms, you may check it out like so
# git clone http://github.com/rails/rails.git
# cd rails/activesupport/
# git checkout v5.1.4 && tar czvf activesupport-5.1.4-tests.tgz test/
# git checkout v5.1.5 && tar czvf activesupport-5.1.5-tests.tgz test/
Source1: %{gem_name}-%{version}-tests.tgz
# Fix MiniTest 5.11 compatibility.
Patch0: rubygem-activesupport-5.1.4-Use-Minitest-Result-for-retain-test-result.patch
# ruby package has just soft dependency on rubygem({bigdecimal,json}), while
# ActiveSupport always requires them.
@ -60,7 +58,6 @@ Documentation for %{name}.
%gem_install -n %{SOURCE0}
pushd .%{gem_instdir}
%patch0 -p2
popd
%build
@ -103,6 +100,9 @@ popd
%doc %{gem_instdir}/README.rdoc
%changelog
* Fri Feb 16 2018 Pavel Valena <pvalena@redhat.com> - 1:5.1.5-1
- Update to Active Support 5.1.5.
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:5.1.4-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild

@ -1,2 +1,2 @@
SHA512 (activesupport-5.1.4-tests.tgz) = f89d9397d94e2db521ab46b2a8abce2130b4bcfebb9f143bb1338ef5899cf3d9b7f292c12f3c07c429ee5916ef5eae0145fe25289fa94562c1c27af855154e8b
SHA512 (activesupport-5.1.4.gem) = 0da18df1bbf7648c12753844400ccc562ca8b1281e3f381c6f8e3b3d02d6ab313b549a3d90ca69fbf5a31da12ca3c188d1c6492815ef3b0611bb75c95d71cdd9
SHA512 (activesupport-5.1.5.gem) = 6e20f069f4e2e20a8ea762e02be9f136a32535b871b4c6f2a59600393201f6d01dbd2696a74024811c168e8d6c223e5a4fa0eda3ba30d87a3c2216fba0aedd05
SHA512 (activesupport-5.1.5-tests.tgz) = 11be71318b4e9f1365d18d72fc527c87837782b62adb6498c423edd2a40687ad22b43b05e983528b6a4d1690376d64adecad816ec8bfd298d7352307e63acd89

Loading…
Cancel
Save