Compare commits

..

No commits in common. "d32163a7cefed2b050b125a1b9d9bbaa84d097b8" and "289c456451486a0ce78cbeae44d855009a3afd2f" have entirely different histories.

7 changed files with 61 additions and 26 deletions

BIN
activeresource-5.0.0.gem Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -0,0 +1,43 @@
From 984181f2b26fe78c94f52d81aed72e25f3d16bf4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
Date: Thu, 1 Jun 2017 13:12:51 +0200
Subject: [PATCH] Always load 'abstract_unit' on the top of test file.
This helps to prevent issues such as:
~~~
+ ruby -Itest -e 'Dir.glob "./test/**/*_test.rb", &method(:require)'
/builddir/build/BUILD/activeresource-5.0.0/usr/share/gems/gems/activeresource-5.0.0/test/threadsafe_attributes_test.rb:1:in `<top (required)>': uninitialized constant ActiveSupport (NameError)
from /usr/share/rubygems/rubygems/core_ext/kernel_require.rb:55:in `require'
from /usr/share/rubygems/rubygems/core_ext/kernel_require.rb:55:in `require'
from -e:1:in `glob'
from -e:1:in `<main>'
~~~
---
test/cases/collection_test.rb | 2 ++
test/threadsafe_attributes_test.rb | 2 ++
2 files changed, 4 insertions(+)
diff --git a/test/cases/collection_test.rb b/test/cases/collection_test.rb
index 025d3ca..9722375 100644
--- a/test/cases/collection_test.rb
+++ b/test/cases/collection_test.rb
@@ -1,3 +1,5 @@
+require 'abstract_unit'
+
class CollectionTest < ActiveSupport::TestCase
def setup
@collection = ActiveResource::Collection.new
diff --git a/test/threadsafe_attributes_test.rb b/test/threadsafe_attributes_test.rb
index 7c3151d..e2459c7 100644
--- a/test/threadsafe_attributes_test.rb
+++ b/test/threadsafe_attributes_test.rb
@@ -1,3 +1,5 @@
+require 'abstract_unit'
+
class ThreadsafeAttributesTest < ActiveSupport::TestCase
class TestClass
--
2.12.2

View File

@ -1,22 +1,22 @@
%global gem_name activeresource %global gem_name activeresource
Name: rubygem-%{gem_name} Name: rubygem-%{gem_name}
Epoch: 1 Epoch: 1
Version: 6.0.0 Version: 5.0.0
Release: 1 Release: 1
Summary: REST modeling framework (part of Rails) Summary: REST modeling framework (part of Rails)
License: MIT License: MIT
URL: http://www.rubyonrails.org URL: http://www.rubyonrails.org
Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem Source0: https://rubygems.org/gems/activeresource-5.0.0.gem
Source1: %{gem_name}-%{version}-tests.tar.gz Source1: https://github.com/rails/activeresource/archive/v5.0.0.tar.gz
Patch0: rubygem-activeresource-5.0.0-Always-load-abstract_unit-on-the-top-of-test-file.patch
BuildRequires: ruby(release) rubygems-devel ruby rubygem(activemodel) >= 5.0 BuildRequires: ruby(release) rubygems-devel ruby rubygem(activemodel) >= 5.0
BuildRequires: rubygem(activesupport) >= 5.0 rubygem(activemodel-serializers-xml) BuildRequires: rubygem(activesupport) >= 5.0 rubygem(activemodel-serializers-xml)
BuildRequires: rubygem(activejob) rubygem(mocha) rubygem(rexml) BuildRequires: rubygem(bundler) rubygem(mocha)
BuildArch: noarch BuildArch: noarch
%description %description
REST on Rails. Wrap your RESTful web app with Ruby classes and work with them REST on Rails. Wrap your RESTful web app with Ruby classes and work with them
like Active Record models. like Active Record models.
%package doc %package doc
Summary: Documentation for %{name} Summary: Documentation for %{name}
Requires: %{name} = %{epoch}:%{version}-%{release} Requires: %{name} = %{epoch}:%{version}-%{release}
@ -25,10 +25,12 @@ BuildArch: noarch
Documentation for %{name}. Documentation for %{name}.
%prep %prep
%setup -q -n %{gem_name}-%{version} -b 1 gem unpack %{SOURCE0}
%setup -q -D -T -n %{gem_name}-%{version}
gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec
%build %build
gem build ../%{gem_name}-%{version}.gemspec gem build %{gem_name}.gemspec
%gem_install %gem_install
%install %install
@ -37,36 +39,26 @@ cp -a .%{gem_dir}/* \
%{buildroot}%{gem_dir}/ %{buildroot}%{gem_dir}/
%check %check
cp %{gem_name}.gemspec .%{gem_instdir}
pushd .%{gem_instdir} pushd .%{gem_instdir}
# Move the tests into place tar xzvf %{SOURCE1}
ln -s %{_builddir}/test test cd %{gem_name}-%{version}
cat %{PATCH0} | patch -p1
# Bundler just complicates everything. echo 'gemspec' > Gemfile
sed -i "/bundler/ s/^/#/" test/abstract_unit.rb sed -i '/rake/ s/^/#/' %{gem_name}.gemspec
ruby -Itest -e 'Dir.glob "./test/**/*_test.rb", &method(:require)'
ruby -Ilib:test -e 'Dir.glob "./test/**/*_test.rb", &method(:require)'
popd popd
%files %files
%dir %{gem_instdir} %dir %{gem_instdir}
%license %{gem_instdir}/MIT-LICENSE
%{gem_libdir} %{gem_libdir}
%exclude %{gem_cache} %exclude %{gem_cache}
%{gem_spec} %{gem_spec}
%files doc %files doc
%doc %{gem_docdir} %doc %{gem_docdir}
%doc %{gem_instdir}/README.md %doc %{gem_instdir}/README.rdoc
%changelog %changelog
* Mon Aug 8 2022 liyanan <liyanan32@h-partners.cn> - 1:6.0.0-1
- update to 6.0.0
* Thu Mar 3 2022 liqiuyu <liqiuyu@kylinos.cn> - 1:5.1.1-1
- update to 5.1.1
* Fri Oct 8 2021 liwu <liwu13@huawei.com> - 5.0.0-2
- Fix CVE-2020-8151
* Wed Aug 12 2020 chengzihan <chengzihan2@huawei.com> - 5.0.0-1 * Wed Aug 12 2020 chengzihan <chengzihan2@huawei.com> - 5.0.0-1
- Package init - Package init

View File

@ -1,4 +1,4 @@
version_control: github version_control: github
src_repo: rails/activeresource src_repo: rails/activeresource
tag_prefix: "^v" tag_prefix: "v"
seperator: "." seperator: "."

BIN
v5.0.0.tar.gz Normal file

Binary file not shown.