update to 1.4.0

This commit is contained in:
lyn1001 2023-11-13 18:02:38 +08:00
parent b50047dcc6
commit 10d730ea9e
5 changed files with 56 additions and 28 deletions

View File

@ -1,15 +1,16 @@
%global gem_name typhoeus %global gem_name typhoeus
Name: rubygem-%{gem_name} Name: rubygem-%{gem_name}
Version: 1.0.2 Version: 1.4.0
Release: 2 Release: 1
Summary: Parallel HTTP library on top of libcurl multi Summary: Parallel HTTP library on top of libcurl multi
License: MIT License: MIT
URL: https://github.com/typhoeus/typhoeus URL: https://github.com/typhoeus/typhoeus
Source0: https://rubygems.org/gems/typhoeus-%{version}.gem Source0: https://rubygems.org/gems/typhoeus-%{version}.gem
#https://github.com/typhoeus/typhoeus/pull/668 #https://github.com/typhoeus/typhoeus/pull/668
Patch0: typhoeus-1.0.2-Fix-Ruby-3.0-compatibility.patch Patch0: typhoeus-1.4.0-Fix-Ruby-3-0-compatibility.patch
BuildRequires: ruby(release) rubygems-devel ruby rubygem(ethon) >= 0.7.0 rubygem(faraday) BuildRequires: ruby(release) rubygems-devel ruby rubygem(ethon) >= 0.7.0 rubygem(faraday)
BuildRequires: rubygem(rack) rubygem(rspec) rubygem(sinatra) rubygem(webrick) BuildRequires: rubygem(rack) rubygem(rspec) rubygem(sinatra) rubygem(webrick)
BuildRequires: rubygem(redis) rubygem(dalli)
BuildArch: noarch BuildArch: noarch
%description %description
Like a modern code version of the mythical beast with 100 serpent heads, Like a modern code version of the mythical beast with 100 serpent heads,
@ -71,6 +72,12 @@ popd
%doc %{gem_docdir} %doc %{gem_docdir}
%changelog %changelog
* Mon Nov 13 2023 liyanan <liyanan61@h-partners.com> - 1.4.0-1
- Update to 1.4.0
- Faraday adapter exceptions namespace compatibility with Faraday v1
- Add global config option `Typhoeus::Config.proxy`
- Add cache adapters for Dails,Rails, and Redis
* Thu Feb 24 2022 liyanan <liyanan32@huawei.com> - 1.0.2-2 * Thu Feb 24 2022 liyanan <liyanan32@huawei.com> - 1.0.2-2
- Fix Ruby 3.0 compatibility - Fix Ruby 3.0 compatibility

View File

@ -1,25 +0,0 @@
diff -Nur a/usr/share/gems/gems/typhoeus-1.0.2/Gemfile b/usr/share/gems/gems/typhoeus-1.0.2/Gemfile
--- a/usr/share/gems/gems/typhoeus-1.0.2/Gemfile 2022-02-22 17:24:27.241061703 +0800
+++ b/usr/share/gems/gems/typhoeus-1.0.2/Gemfile 2022-02-22 17:24:04.860685270 +0800
@@ -11,6 +11,9 @@
gem "rspec", "~> 3.0"
gem "sinatra", "~> 1.3"
+
+ gem "webrick"
+
gem "json"
gem "faraday", ">= 0.9"
diff -Nur a/usr/share/gems/gems/typhoeus-1.0.2/spec/support/localhost_server.rb b/usr/share/gems/gems/typhoeus-1.0.2/spec/support/localhost_server.rb
--- a/usr/share/gems/gems/typhoeus-1.0.2/spec/support/localhost_server.rb 2022-02-22 17:24:27.269062174 +0800
+++ b/usr/share/gems/gems/typhoeus-1.0.2/spec/support/localhost_server.rb 2022-02-22 17:22:37.167210286 +0800
@@ -43,7 +43,7 @@
# Use WEBrick since it's part of the ruby standard library and is available on all ruby interpreters.
options = { :Port => port }
options.merge!(:AccessLog => [], :Logger => WEBrick::BasicLog.new(StringIO.new)) unless ENV['VERBOSE_SERVER']
- Rack::Handler::WEBrick.run(Identify.new(@rack_app), options)
+ Rack::Handler::WEBrick.run(Identify.new(@rack_app), **options)
end
def booted?

Binary file not shown.

View File

@ -0,0 +1,46 @@
From 905a52b12fd6e9ccab8b83f3def97c7d3a26ca2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
Date: Thu, 14 Jan 2021 17:54:33 +0100
Subject: [PATCH 1/2] Add WEBrick dependency
Because WEBrick was removed from Ruby 3.0.
---
Gemfile | 2 ++
1 file changed, 2 insertions(+)
diff --git a/usr/share/gems/gems/typhoeus-1.0.2/Gemfile b/usr/share/gems/gems/typhoeus-1.0.2/Gemfile
index dd662d70..d11359b0 100644
--- a/usr/share/gems/gems/typhoeus-1.4.0/Gemfile 2022-02-22 17:24:27.241061703 +0800
+++ b/usr/share/gems/gems/typhoeus-1.4.0/Gemfile 2022-02-22 17:24:04.860685270 +0800
@@ -14,6 +14,8 @@ group :development, :test do
gem "sinatra", "~> 1.3"
+ gem "webrick"
+
if Gem.ruby_version >= Gem::Version.new("1.9.0")
gem "faraday", ">= 0.9"
gem "dalli", "~> 2.0"
From 6515d6a23990b7a63acc90e97f5d76129a2b8987 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
Date: Thu, 14 Jan 2021 18:06:55 +0100
Subject: [PATCH 2/2] Fix Ruby 3.0 compatibility.
---
spec/support/localhost_server.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/usr/share/gems/gems/typhoeus-1.4.0/spec/support/localhost_server.rb b/usr/share/gems/gems/typhoeus-1.4.0/spec/support/localhost_server.rb
index c5a7508b..da096005 100644
--- a/usr/share/gems/gems/typhoeus-1.4.0/spec/support/localhost_server.rb 2022-02-22 17:24:27.269062174 +0800
+++ b/usr/share/gems/gems/typhoeus-1.4.0/spec/support/localhost_server.rb 2022-02-22 17:22:37.167210286 +0800
@@ -43,7 +43,7 @@ def boot
# Use WEBrick since it's part of the ruby standard library and is available on all ruby interpreters.
options = { :Port => port }
options.merge!(:AccessLog => [], :Logger => WEBrick::BasicLog.new(StringIO.new)) unless ENV['VERBOSE_SERVER']
- Rack::Handler::WEBrick.run(Identify.new(@rack_app), options)
+ Rack::Handler::WEBrick.run(Identify.new(@rack_app), **options)
end
def booted?

BIN
typhoeus-1.4.0.gem Normal file

Binary file not shown.