diff options
Diffstat (limited to 'dev-ruby/stomp')
-rw-r--r-- | dev-ruby/stomp/Manifest | 3 | ||||
-rw-r--r-- | dev-ruby/stomp/files/stomp-1.4.10-rspec-3.12.patch | 149 | ||||
-rw-r--r-- | dev-ruby/stomp/stomp-1.4.10-r1.ebuild (renamed from dev-ruby/stomp/stomp-1.4.10.ebuild) | 11 |
3 files changed, 158 insertions, 5 deletions
diff --git a/dev-ruby/stomp/Manifest b/dev-ruby/stomp/Manifest index 1747ec6f1d76..97ead70f8c4d 100644 --- a/dev-ruby/stomp/Manifest +++ b/dev-ruby/stomp/Manifest @@ -1,3 +1,4 @@ +AUX stomp-1.4.10-rspec-3.12.patch 7913 BLAKE2B ae256807a2b66ff03e50f58451cb447114a366bc0ace5546235c6940be015ee265c17f0df3b289f199afd991b5069b12a1d5549faa9facc1262a94c5fd0f3552 SHA512 98fbd983c16ef226bc6ff913efdbc295de307b5f6b413aae753d2c928d8b2e334b7d11b91762ae743b507e77c9236a5c29351996681b59d2c3d4ee18ffc8a7ef DIST stomp-1.4.10.gem 99840 BLAKE2B 5dc2b18d7551629dccb599a77934bffcf92d83158b6797a1645f5fd8af6c4738e1d8d97d5a6c6bb6655c19f98accd4ecdee0677096f9a5e89bdf0295532a1087 SHA512 bff1a533e5455cf4540bab3b5d16c63f1e0783b0257b5e0bf2fd26512586670ce5db66f97e098805c7b5fc02913478553409b90a4014bdc883465bc7b474eb7e -EBUILD stomp-1.4.10.ebuild 620 BLAKE2B c8721efc9c6996b1b4ad67d38d5b538446fefbf2667e4273921f8af4d38156abbf5343297207dbff680711a0204594c8e5d7fb88d71d1d9b0c6744d7c7c07c3d SHA512 d2601668dd0b166bee76da80f8f9cf9c1946af4386c69e8d5cb51d03650392437e4764980af78c2205af4e9b31a34358555667965fcc4f233b2a14627663251c +EBUILD stomp-1.4.10-r1.ebuild 670 BLAKE2B abc4b2935e98ccec085ee5a08e98d3ba9753f3b6fb4d20b6a3853ad2da1063a6a01e5f86ff7a97071ca2720c1b402e8e57e974db6c3ca67afc7b18b878fc8220 SHA512 8eb4066603dd28a7d539a78afb606ecbc1e9bbd7fbec2a7acb350504a89d0686a945378a148d1bb64959806f067b99bf33ac040edc0a3d4f49b6f525a58c235f MISC metadata.xml 341 BLAKE2B 6574cce9057c215a7742c460afbbf28911e86e8355049b1e677f7ee867008fdd9a1c6895de69b52fdbeddcf7a034322bfa74bef2ecd9aa2a60aa0b15091fa94c SHA512 5c55a763563879d691d30c1a6830e6a3e85246c145aaf9daf4a48791edcb36dc1c76f8692829934015c59287bd9390978fb7af6fb8975536d39fe50dd2e9340e diff --git a/dev-ruby/stomp/files/stomp-1.4.10-rspec-3.12.patch b/dev-ruby/stomp/files/stomp-1.4.10-rspec-3.12.patch new file mode 100644 index 000000000000..f7f1ca39016b --- /dev/null +++ b/dev-ruby/stomp/files/stomp-1.4.10-rspec-3.12.patch @@ -0,0 +1,149 @@ +https://github.com/stompgem/stomp/pull/175 + +From 299923281d02e544ca386a9883e87c395135d3af Mon Sep 17 00:00:00 2001 +From: Steve Traylen <steve.traylen@cern.ch> +Date: Thu, 30 Mar 2023 13:36:52 +0200 +Subject: [PATCH] Fix tests failing with rspec 3.12 + +Patch from + +* https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1027092 +* https://salsa.debian.org/ruby-team/ruby-stomp/-/commit/5be6383a7a34a1d1891708d6aa8688cb4a6f89a5 + +resolves rspec failure: + +``` +$ rspec --fail-fast spec/client_spec.rb +RSpec version: 3.8.0 +Traceback (most recent call last): + 9: from /home/straylen/pkgs/rubygem-stomp/stomp-1.4.9/lib/client/utils.rb:194:in `block in start_listeners' + 8: from /home/straylen/pkgs/rubygem-stomp/stomp-1.4.9/lib/client/utils.rb:194:in `loop' + 7: from /home/straylen/pkgs/rubygem-stomp/stomp-1.4.9/lib/client/utils.rb:195:in `block (2 levels) in start_listeners' + 6: from /usr/share/gems/gems/rspec-mocks-3.8.1/lib/rspec/mocks/test_double.rb:102:in `method_missing' + 5: from /usr/share/gems/gems/rspec-mocks-3.8.1/lib/rspec/mocks/proxy.rb:202:in `raise_unexpected_message_error' + 4: from /usr/share/gems/gems/rspec-mocks-3.8.1/lib/rspec/mocks/error_generator.rb:50:in `raise_unexpected_message_error' + 3: from /usr/share/gems/gems/rspec-mocks-3.8.1/lib/rspec/mocks/error_generator.rb:311:in `__raise' + 2: from /usr/share/gems/gems/rspec-mocks-3.8.1/lib/rspec/mocks/error_generator.rb:327:in `notify' + 1: from /usr/share/gems/gems/rspec-support-3.8.2/lib/rspec/support.rb:106:in `notify_failure' +/usr/share/gems/gems/rspec-support-3.8.2/lib/rspec/support.rb:97:in `block in <module:Support>': #<Double "connection"> received unexpected message :receive with (no args) (RSpec::Mocks::MockExpectationError) +.#<Thread:0x000055a54150bd60@/home/straylen/pkgs/rubygem-stomp/stomp-1.4.9/lib/client/utils.rb:193 run> terminated with exception (report_on_exception is true): +Traceback (most recent call last): + 6: from /home/straylen/pkgs/rubygem-stomp/stomp-1.4.9/lib/client/utils.rb:194:in `block in start_listeners' + 5: from /home/straylen/pkgs/rubygem-stomp/stomp-1.4.9/lib/client/utils.rb:194:in `loop' +``` + +Fixes: #164 +--- a/spec/client_spec.rb ++++ b/spec/client_spec.rb +@@ -136,13 +136,13 @@ + end + + it "should properly parse the URL provided" do +- expect(Stomp::Connection).to receive(:new).with(:hosts => [{:login => 'testlogin', ++ expect(Stomp::Connection).to receive(:new).with({:hosts => [{:login => 'testlogin', + :passcode => 'testpassword', + :host => 'localhost', + :port => 12345}], + :logger => null_logger, + :reliable => false, +- :client_main => @cli_thread) ++ :client_main => @cli_thread}) + Stomp::Client.new('testlogin', 'testpassword', 'localhost', '12345', false) + end + +@@ -157,13 +157,13 @@ + end + + it "should properly parse the URL provided" do +- expect(Stomp::Connection).to receive(:new).with(:hosts => [{:login => '', ++ expect(Stomp::Connection).to receive(:new).with({:hosts => [{:login => '', + :passcode => '', + :host => 'foobar', + :port => 12345}], + :logger => null_logger, + :reliable => false, +- :client_main => @cli_thread) ++ :client_main => @cli_thread}) + Stomp::Client.new('stomp://foobar:12345') + end + +@@ -179,13 +179,13 @@ + end + + it "should properly parse the URL provided" do +- expect(Stomp::Connection).to receive(:new).with(:hosts => [{:login => '', ++ expect(Stomp::Connection).to receive(:new).with({:hosts => [{:login => '', + :passcode => '', + :host => 'foo-bar', + :port => 12345}], + :logger => null_logger, + :reliable => false, +- :client_main => @cli_thread) ++ :client_main => @cli_thread}) + Stomp::Client.new('stomp://foo-bar:12345') + end + +@@ -201,13 +201,13 @@ + end + + it "should properly parse the URL provided" do +- expect(Stomp::Connection).to receive(:new).with(:hosts => [{:login => 'test-login', ++ expect(Stomp::Connection).to receive(:new).with({:hosts => [{:login => 'test-login', + :passcode => 'testpasscode', + :host => 'foobar', + :port => 12345}], + :logger => null_logger, + :reliable => false, +- :client_main => @cli_thread) ++ :client_main => @cli_thread}) + Stomp::Client.new('stomp://test-login:testpasscode@foobar:12345') + end + +@@ -223,13 +223,13 @@ + end + + it "should properly parse the URL provided" do +- expect(Stomp::Connection).to receive(:new).with(:hosts => [{:login => 'test-login', ++ expect(Stomp::Connection).to receive(:new).with({:hosts => [{:login => 'test-login', + :passcode => 'testpasscode', + :host => 'foo-bar', + :port => 12345}], + :logger => null_logger, + :reliable => false, +- :client_main => @cli_thread) ++ :client_main => @cli_thread}) + Stomp::Client.new('stomp://test-login:testpasscode@foo-bar:12345') + end + +@@ -248,13 +248,13 @@ + end + + it "should properly parse the URL provided" do +- expect(Stomp::Connection).to receive(:new).with(:hosts => [{:login => '', ++ expect(Stomp::Connection).to receive(:new).with({:hosts => [{:login => '', + :passcode => '', + :host => 'host.foobar.com', + :port => 12345}], + :logger => null_logger, + :reliable => false, +- :client_main => @cli_thread) ++ :client_main => @cli_thread}) + Stomp::Client.new('stomp://host.foobar.com:12345') + end + +@@ -270,13 +270,13 @@ + end + + it "should properly parse the URL provided" do +- expect(Stomp::Connection).to receive(:new).with(:hosts => [{:login => 'testlogin', ++ expect(Stomp::Connection).to receive(:new).with({:hosts => [{:login => 'testlogin', + :passcode => 'testpasscode', + :host => 'host.foobar.com', + :port => 12345}], + :logger => null_logger, + :reliable => false, +- :client_main => @cli_thread) ++ :client_main => @cli_thread}) + Stomp::Client.new('stomp://testlogin:testpasscode@host.foobar.com:12345') + end + diff --git a/dev-ruby/stomp/stomp-1.4.10.ebuild b/dev-ruby/stomp/stomp-1.4.10-r1.ebuild index e57bb3a1bdeb..2344aac53557 100644 --- a/dev-ruby/stomp/stomp-1.4.10.ebuild +++ b/dev-ruby/stomp/stomp-1.4.10-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -USE_RUBY="ruby25 ruby26 ruby27 ruby30" +USE_RUBY="ruby27 ruby30 ruby31 ruby32" RUBY_FAKEGEM_DOCDIR="doc" RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md" @@ -18,7 +18,10 @@ HOMEPAGE="https://github.com/stompgem/stomp" LICENSE="Apache-2.0" SLOT="0" KEYWORDS="amd64 x86" -IUSE="" + +PATCHES=( + "${FILESDIR}"/${PN}-1.4.10-rspec-3.12.patch +) all_ruby_prepare() { # Skip specs that hang the test run indefinitely, most likely |