Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package vagrant for openSUSE:Factory checked in at 2022-02-28 19:43:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vagrant (Old) and /work/SRC/openSUSE:Factory/.vagrant.new.1958 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vagrant" Mon Feb 28 19:43:11 2022 rev:41 rq:958039 version:2.2.19 Changes: -------- --- /work/SRC/openSUSE:Factory/vagrant/vagrant.changes 2022-02-04 00:46:05.541210747 +0100 +++ /work/SRC/openSUSE:Factory/.vagrant.new.1958/vagrant.changes 2022-02-28 19:43:14.737934035 +0100 @@ -1,0 +2,22 @@ +Mon Feb 28 11:08:13 UTC 2022 - Dan ??erm??k <[email protected]> + +- Bump rspec version to ~> 3.11.0 + + Rebase patches: + * 0001-bin-vagrant-silence-warning-about-installer.patch + * 0002-Use-a-private-temporary-dir.patch + * 0003-plugins-don-t-abuse-require_relative.patch.patch + * 0004-fix-vbox-package-boo-1044087-added-by-robert.muntean.patch + * 0005-do-not-depend-on-wdm.patch + * 0006-do-not-abuse-relative-paths-in-docker-plugin-to-make.patch + * 0007-Don-t-abuse-relative-paths-in-plugins.patch + * 0008-Skip-failing-tests.patch + * 0009-Disable-Subprocess-unit-test.patch + * 0010-Add-support-for-Ruby-3.1.patch + * 0011-Bump-version-of-ed25519-to-1.3.0.patch + + Added patches: + * 0012-Bump-rspec-dependency-to-3.11.0.patch + * 0013-Stop-using-the-last-argument-as-kwargs-in-unit-tests.patch + +------------------------------------------------------------------- New: ---- 0012-Bump-rspec-dependency-to-3.11.0.patch 0013-Stop-using-the-last-argument-as-kwargs-in-unit-tests.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vagrant.spec ++++++ --- /var/tmp/diff_new_pack.dTScUj/_old 2022-02-28 19:43:18.185935326 +0100 +++ /var/tmp/diff_new_pack.dTScUj/_new 2022-02-28 19:43:18.189935329 +0100 @@ -59,6 +59,8 @@ Patch9: 0009-Disable-Subprocess-unit-test.patch Patch10: 0010-Add-support-for-Ruby-3.1.patch Patch11: 0011-Bump-version-of-ed25519-to-1.3.0.patch +Patch12: 0012-Bump-rspec-dependency-to-3.11.0.patch +Patch13: 0013-Stop-using-the-last-argument-as-kwargs-in-unit-tests.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # force only one ruby version @@ -139,8 +141,9 @@ # devel dependencies: # s.add_development_dependency "rake", "~> 13.0" BuildRequires: %{rubygem rake:13 } -# s.add_development_dependency "rspec", "~> 3.10.0" -BuildRequires: %{rubygem rspec:3.10 } +# PATCHED +# s.add_development_dependency "rspec", "~> 3.11.0" +BuildRequires: %{rubygem rspec:3.11 } # s.add_development_dependency "rspec-its", "~> 1.3.0" BuildRequires: %{rubygem rspec-its:1.3 } # s.add_development_dependency "fake_ftp", "~> 0.1.1" ++++++ 0001-bin-vagrant-silence-warning-about-installer.patch ++++++ --- /var/tmp/diff_new_pack.dTScUj/_old 2022-02-28 19:43:18.217935339 +0100 +++ /var/tmp/diff_new_pack.dTScUj/_new 2022-02-28 19:43:18.217935339 +0100 @@ -1,7 +1,7 @@ From 33ec34c4946a10f38747b827ccd0500cc3685af4 Mon Sep 17 00:00:00 2001 From: Antonio Terceiro <[email protected]> Date: Sat, 11 Oct 2014 16:54:58 -0300 -Subject: [PATCH 01/11] bin/vagrant: silence warning about installer +Subject: [PATCH 01/13] bin/vagrant: silence warning about installer Signed-off-by: Johannes Kastl <[email protected]> --- @@ -36,6 +36,6 @@ # # Unset - Disables experimental features -- -2.34.1 +2.35.1 ++++++ 0002-Use-a-private-temporary-dir.patch ++++++ --- /var/tmp/diff_new_pack.dTScUj/_old 2022-02-28 19:43:18.229935343 +0100 +++ /var/tmp/diff_new_pack.dTScUj/_new 2022-02-28 19:43:18.233935345 +0100 @@ -1,7 +1,7 @@ From df5d75cdb6c3f415e53bd494d3db5e4c809d8230 Mon Sep 17 00:00:00 2001 From: Antonio Terceiro <[email protected]> Date: Wed, 22 Oct 2014 09:40:14 -0200 -Subject: [PATCH 02/11] Use a private temporary dir +Subject: [PATCH 02/13] Use a private temporary dir Without this vagrant will clutter $TMPDIR with dozens of even hundreds of temporary files (~4 per vagrant invocation). @@ -94,6 +94,6 @@ + FileUtils.rm_rf(Vagrant::Util::Tempfile.private_tmpdir) +end -- -2.34.1 +2.35.1 ++++++ 0003-plugins-don-t-abuse-require_relative.patch.patch ++++++ --- /var/tmp/diff_new_pack.dTScUj/_old 2022-02-28 19:43:18.241935347 +0100 +++ /var/tmp/diff_new_pack.dTScUj/_new 2022-02-28 19:43:18.245935350 +0100 @@ -1,7 +1,7 @@ From e8835db89852f1221ed9eeff67816a079ed6762b Mon Sep 17 00:00:00 2001 From: Johannes Kastl <[email protected]> Date: Wed, 17 May 2017 09:09:57 +0200 -Subject: [PATCH 03/11] plugins-don-t-abuse-require_relative.patch +Subject: [PATCH 03/13] plugins-don-t-abuse-require_relative.patch Signed-off-by: Johannes Kastl <[email protected]> --- @@ -154,6 +154,6 @@ module VagrantPlugins module GuestSUSE -- -2.34.1 +2.35.1 ++++++ 0004-fix-vbox-package-boo-1044087-added-by-robert.muntean.patch ++++++ --- /var/tmp/diff_new_pack.dTScUj/_old 2022-02-28 19:43:18.257935354 +0100 +++ /var/tmp/diff_new_pack.dTScUj/_new 2022-02-28 19:43:18.257935354 +0100 @@ -1,7 +1,7 @@ From d124f36515e112737baecea699a3aa09615702d7 Mon Sep 17 00:00:00 2001 From: Johannes Kastl <[email protected]> Date: Fri, 16 Nov 2018 21:12:43 +0100 -Subject: [PATCH 04/11] fix vbox package boo#1044087, added by +Subject: [PATCH 04/13] fix vbox package boo#1044087, added by [email protected] on Sun Aug 13 19:07:06 UTC 2017 Signed-off-by: Johannes Kastl <[email protected]> @@ -33,6 +33,6 @@ module VagrantPlugins module ProviderVirtualBox -- -2.34.1 +2.35.1 ++++++ 0005-do-not-depend-on-wdm.patch ++++++ --- /var/tmp/diff_new_pack.dTScUj/_old 2022-02-28 19:43:18.269935358 +0100 +++ /var/tmp/diff_new_pack.dTScUj/_new 2022-02-28 19:43:18.273935360 +0100 @@ -1,7 +1,7 @@ From 4a7f3ff284ac2a3dd1e6261221f787ac4e7075d7 Mon Sep 17 00:00:00 2001 From: Johannes Kastl <[email protected]> Date: Mon, 4 Jun 2018 09:18:23 +0200 -Subject: [PATCH 05/11] do not depend on wdm +Subject: [PATCH 05/13] do not depend on wdm Signed-off-by: Johannes Kastl <[email protected]> --- @@ -21,6 +21,6 @@ s.add_dependency "winrm-elevated", ">= 1.2.1", "< 2.0" s.add_dependency "winrm-fs", ">= 1.3.4", "< 2.0" -- -2.34.1 +2.35.1 ++++++ 0006-do-not-abuse-relative-paths-in-docker-plugin-to-make.patch ++++++ --- /var/tmp/diff_new_pack.dTScUj/_old 2022-02-28 19:43:18.285935364 +0100 +++ /var/tmp/diff_new_pack.dTScUj/_new 2022-02-28 19:43:18.285935364 +0100 @@ -1,7 +1,7 @@ From 99447e851f41f413d1e525ef51e946b003e1a080 Mon Sep 17 00:00:00 2001 From: Johannes Kastl <[email protected]> Date: Fri, 16 Nov 2018 21:14:46 +0100 -Subject: [PATCH 06/11] do not abuse relative paths in docker plugin to make +Subject: [PATCH 06/13] do not abuse relative paths in docker plugin to make docker work, added by [email protected] on Thu Oct 26 19:42:46 UTC 2017 Signed-off-by: Johannes Kastl <[email protected]> @@ -22,6 +22,6 @@ module VagrantPlugins module DockerProvider -- -2.34.1 +2.35.1 ++++++ 0007-Don-t-abuse-relative-paths-in-plugins.patch ++++++ --- /var/tmp/diff_new_pack.dTScUj/_old 2022-02-28 19:43:18.297935369 +0100 +++ /var/tmp/diff_new_pack.dTScUj/_new 2022-02-28 19:43:18.301935370 +0100 @@ -1,7 +1,7 @@ From 3dc208ffbe52efb9c77e8541824b2b33a9252eaf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <[email protected]> Date: Fri, 11 Jan 2019 12:32:28 +0100 -Subject: [PATCH 07/11] Don't abuse relative paths in plugins +Subject: [PATCH 07/13] Don't abuse relative paths in plugins MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -65,6 +65,6 @@ require_relative "../installer" -- -2.34.1 +2.35.1 ++++++ 0008-Skip-failing-tests.patch ++++++ --- /var/tmp/diff_new_pack.dTScUj/_old 2022-02-28 19:43:18.309935373 +0100 +++ /var/tmp/diff_new_pack.dTScUj/_new 2022-02-28 19:43:18.313935375 +0100 @@ -1,7 +1,7 @@ From f6b2e0cebf27725b82b29085451df2308989b1c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <[email protected]> Date: Mon, 1 Apr 2019 17:28:31 +0200 -Subject: [PATCH 08/11] Skip failing tests +Subject: [PATCH 08/13] Skip failing tests --- test/unit/bin/vagrant_test.rb | 4 ++-- @@ -30,6 +30,6 @@ end end -- -2.34.1 +2.35.1 ++++++ 0009-Disable-Subprocess-unit-test.patch ++++++ --- /var/tmp/diff_new_pack.dTScUj/_old 2022-02-28 19:43:18.321935378 +0100 +++ /var/tmp/diff_new_pack.dTScUj/_new 2022-02-28 19:43:18.325935379 +0100 @@ -1,7 +1,7 @@ From cc9cc287131b8a0b4419d2a7c2a0f7f3fd7b5b26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <[email protected]> Date: Wed, 28 Aug 2019 13:39:58 +0200 -Subject: [PATCH 09/11] Disable Subprocess unit test +Subject: [PATCH 09/13] Disable Subprocess unit test This unit test is *very* flaky on OBS' workers and causes random build failures. These are probably caused by worker being under high load and then @@ -33,6 +33,6 @@ thread = Thread.new{ sp.execute } sleep(0.1) -- -2.34.1 +2.35.1 ++++++ 0010-Add-support-for-Ruby-3.1.patch ++++++ --- /var/tmp/diff_new_pack.dTScUj/_old 2022-02-28 19:43:18.333935382 +0100 +++ /var/tmp/diff_new_pack.dTScUj/_new 2022-02-28 19:43:18.337935384 +0100 @@ -1,7 +1,7 @@ From 214e118384d0456db19faa0fa63bff571d0229c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <[email protected]> Date: Mon, 3 Jan 2022 12:08:09 +0100 -Subject: [PATCH 10/11] Add support for Ruby 3.1 +Subject: [PATCH 10/13] Add support for Ruby 3.1 The biggest change comming with Ruby 3.1 is that net/ftp is no longer bundled with Ruby but distributed as a separate gem. @@ -33,6 +33,6 @@ s.add_dependency "net-sftp", "~> 3.0" s.add_dependency "net-scp", "~> 3.0.0" -- -2.34.1 +2.35.1 ++++++ 0011-Bump-version-of-ed25519-to-1.3.0.patch ++++++ --- /var/tmp/diff_new_pack.dTScUj/_old 2022-02-28 19:43:18.345935387 +0100 +++ /var/tmp/diff_new_pack.dTScUj/_new 2022-02-28 19:43:18.349935388 +0100 @@ -1,7 +1,7 @@ From 32b8ea83078edc4a86cbba573142dc95b16ebd40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <[email protected]> Date: Tue, 1 Feb 2022 11:31:44 +0100 -Subject: [PATCH 11/11] Bump version of ed25519 to ~> 1.3.0 +Subject: [PATCH 11/13] Bump version of ed25519 to ~> 1.3.0 (cherry picked from commit 2a974101f42dbc525450e240f02db2a3edc62ac1) --- @@ -22,6 +22,6 @@ s.add_dependency "hashicorp-checkpoint", "~> 0.1.5" s.add_dependency "i18n", "~> 1.8" -- -2.34.1 +2.35.1 ++++++ 0012-Bump-rspec-dependency-to-3.11.0.patch ++++++ >From 28264928d405319ddc28c300cb9b32101eb5fa4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <[email protected]> Date: Mon, 28 Feb 2022 10:51:50 +0100 Subject: [PATCH 12/13] Bump rspec dependency to ~> 3.11.0 (cherry picked from commit 45a225416d2e611ddad34635104b9e22badd17e7) --- vagrant.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vagrant.gemspec b/vagrant.gemspec index ea38685bf..8622c2dbf 100644 --- a/vagrant.gemspec +++ b/vagrant.gemspec @@ -39,7 +39,7 @@ Gem::Specification.new do |s| # Constraint rake to properly handle deprecated method usage # from within rspec s.add_development_dependency "rake", "~> 13.0" - s.add_development_dependency "rspec", "~> 3.10.0" + s.add_development_dependency "rspec", "~> 3.11.0" s.add_development_dependency "rspec-its", "~> 1.3.0" s.add_development_dependency "fake_ftp", "~> 0.1.1" s.add_development_dependency "webrick", "~> 1.7.0" -- 2.35.1 ++++++ 0013-Stop-using-the-last-argument-as-kwargs-in-unit-tests.patch ++++++ >From 729306f83a0cc2926752bc09fb0194e0b2e1d455 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <[email protected]> Date: Mon, 28 Feb 2022 10:46:17 +0100 Subject: [PATCH 13/13] Stop using the last argument as kwargs in unit tests A few unit tests started failing with Ruby 3.0, because they were relying on keyword arguments being converted into hashes automatically. This behavior was deprecated in Ruby 2.7 and results in errors in Ruby 3.0 onward. For further details: https://rubyreferences.github.io/rubychanges/3.0.html#keyword-arguments-are-now-fully-separated-from-positional-arguments (cherry picked from commit 2b1c25d247aba492e582a01cff8ecdd33d4d165b) --- test/unit/plugins/commands/package/command_test.rb | 4 ++-- .../plugins/providers/hyperv/action/read_guest_ip_test.rb | 2 +- test/unit/vagrant/ui_test.rb | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/test/unit/plugins/commands/package/command_test.rb b/test/unit/plugins/commands/package/command_test.rb index 7b289bd1e..d0f81393b 100644 --- a/test/unit/plugins/commands/package/command_test.rb +++ b/test/unit/plugins/commands/package/command_test.rb @@ -64,7 +64,7 @@ describe VagrantPlugins::CommandPackage::Command do it "packages default machine inside specified folder" do expect(package_command).to receive(:package_vm).with( - a_machine_named('default'), :output => "package-output-folder/default" + a_machine_named('default'), { output: "package-output-folder/default" } ) package_command.execute end @@ -96,7 +96,7 @@ describe VagrantPlugins::CommandPackage::Command do let(:argv){ ['--base', 'machine-id'] } it "packages vm defined within virtualbox" do - expect(package_command).to receive(:package_base).with(:base => 'machine-id') + expect(package_command).to receive(:package_base).with({ base: 'machine-id' }) package_command.execute end diff --git a/test/unit/plugins/providers/hyperv/action/read_guest_ip_test.rb b/test/unit/plugins/providers/hyperv/action/read_guest_ip_test.rb index 5642c6271..ecce003a6 100644 --- a/test/unit/plugins/providers/hyperv/action/read_guest_ip_test.rb +++ b/test/unit/plugins/providers/hyperv/action/read_guest_ip_test.rb @@ -31,7 +31,7 @@ describe VagrantPlugins::HyperV::Action::ReadGuestIP do end it "should set the host information into the env" do - expect(env).to receive(:[]=).with(:machine_ssh_info, host: "ADDRESS") + expect(env).to receive(:[]=).with(:machine_ssh_info, { host: "ADDRESS" }) expect(driver).to receive(:read_guest_ip).and_return("ip" => "ADDRESS") subject.call(env) end diff --git a/test/unit/vagrant/ui_test.rb b/test/unit/vagrant/ui_test.rb index e484b8154..120b1dda2 100644 --- a/test/unit/vagrant/ui_test.rb +++ b/test/unit/vagrant/ui_test.rb @@ -379,12 +379,12 @@ describe Vagrant::UI::Prefixed do describe "#machine" do it "sets the target option" do - expect(ui).to receive(:machine).with(:foo, target: prefix) + expect(ui).to receive(:machine).with(:foo, { target: prefix }) subject.machine(:foo) end it "preserves existing options" do - expect(ui).to receive(:machine).with(:foo, :bar, foo: :bar, target: prefix) + expect(ui).to receive(:machine).with(:foo, :bar, { foo: :bar, target: prefix }) subject.machine(:foo, :bar, foo: :bar) end end -- 2.35.1
