Attachment 9820 Details for Bug 22114 – [PATCH] Upgrade the vagrant mgarepo

[patch] [PATCH] Upgrade the vagrant mgarepo

vagrant.patch (text/plain), 15.05 KB, created by Shlomi Fish on 2017-12-04 17:27:08 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Shlomi Fish

Created: 2017-12-04 17:27:08 CET

Size: 15.05 KB

patch

obsolete

>Index: SOURCES/sha1.lst
>===================================================================
>--- SOURCES/sha1.lst	(revision 1180724)
>+++ SOURCES/sha1.lst	(working copy)
>@@ -1,2 +1,2 @@
>-4653cb0efa8e205384197404f4040022b678aa56  vagrant-1.9.8.tar.gz
>+05091017bda0bf1114498a625792961d803292c6  vagrant-2.0.1.tar.gz
> 9177d72804f719ca5108d677246e937cfa9a9ab1  vagrant-spec-e623a5694912c539ac2657e38a372d5e8c93441d.tar.gz
>Index: SOURCES/vagrant-1.8.1-disable-winrm-tests.patch
>===================================================================
>--- SOURCES/vagrant-1.8.1-disable-winrm-tests.patch	(revision 1180724)
>+++ SOURCES/vagrant-1.8.1-disable-winrm-tests.patch	(working copy)
>@@ -1,9 +1,24 @@
>-diff --git a/test/unit/plugins/provisioners/ansible/provisioner_test.rb b/test/unit/plugins/provisioners/ansible/provisioner_test.rb
>-index 31354a7..f2dfd0f 100644
>---- a/test/unit/plugins/provisioners/ansible/provisioner_test.rb
>-+++ b/test/unit/plugins/provisioners/ansible/provisioner_test.rb
>-@@ -497,55 +497,6 @@ VF
>+--- vagrant-2.0.1/test/unit/plugins/provisioners/ansible/provisioner_test.rb.WINRM	2017-12-02 23:08:25.279988444 +0200
>++++ vagrant-2.0.1/test/unit/plugins/provisioners/ansible/provisioner_test.rb	2017-12-02 23:09:19.446428504 +0200
>+@@ -650,89 +650,40 @@
>+       it_should_set_arguments_and_environment_variables
>+     end
>+ 
>+     context "with force_remote_user option disabled" do
>+       before do
>+         config.force_remote_user = false
>        end
>+ 
>+       it_should_create_and_use_generated_inventory false # i.e. without setting ansible_ssh_user in inventory
>+ 
>+       it_should_set_arguments_and_environment_variables 6
>+ 
>+       it "uses a --user argument to set a default remote user" do
>+         expect(Vagrant::Util::Subprocess).to receive(:execute).with('ansible-playbook', any_args) { |*args|
>+           expect(args).not_to include("--extra-vars=ansible_ssh_user='#{machine.ssh_info[:username]}'")
>+           expect(args).to include("--user=#{machine.ssh_info[:username]}")
>+         }.and_return(default_execute_result)
>+       end
>      end
>  
> -    context "with winrm communicator" do
>@@ -30,8 +45,7 @@
> -      it_should_set_arguments_and_environment_variables
> -
> -      it "generates an inventory with winrm connection settings" do
>--
>--        expect(Vagrant::Util::Subprocess).to receive(:execute).with(any_args) { |*args|
>+-        expect(Vagrant::Util::Subprocess).to receive(:execute).with('ansible-playbook', any_args) { |*args|
> -          expect(config.inventory_path).to be_nil
> -          expect(File.exists?(generated_inventory_file)).to be(true)
> -          inventory_content = File.read(generated_inventory_file)
>@@ -46,7 +60,7 @@
> -        end
> -
> -        it "doesn't set the ansible remote user in inventory and use '--user' argument with the vagrant ssh username" do
>--          expect(Vagrant::Util::Subprocess).to receive(:execute).with(any_args) { |*args|
>+-          expect(Vagrant::Util::Subprocess).to receive(:execute).with('ansible-playbook', any_args) { |*args|
> -            inventory_content = File.read(generated_inventory_file)
> -
> -            expect(inventory_content).to include("machine1 ansible_connection=winrm ansible_ssh_host=127.0.0.1 ansible_ssh_port=55986 ansible_ssh_pass='winword'\n")
>@@ -55,9 +69,24 @@
> -        end
> -      end
> -    end
>- 
>+-
>      describe "with inventory_path option" do
>        before do
>--- 
>-2.5.0
>-
>+         config.inventory_path = existing_file
>+       end
>+ 
>+       it_should_set_arguments_and_environment_variables 6
>+ 
>+       it "does not generate the inventory and uses given inventory path instead" do
>+         expect(Vagrant::Util::Subprocess).to receive(:execute).with('ansible-playbook', any_args) { |*args|
>+           expect(args).to include("--inventory-file=#{existing_file}")
>+           expect(args).not_to include("--inventory-file=#{generated_inventory_file}")
>+           expect(File.exists?(generated_inventory_file)).to be(false)
>+         }.and_return(default_execute_result)
>+       end
>+ 
>+       it "uses an --extra-vars argument to force ansible_ssh_user parameter" do
>+         expect(Vagrant::Util::Subprocess).to receive(:execute).with('ansible-playbook', any_args) { |*args|
>+           expect(args).not_to include("--user=#{machine.ssh_info[:username]}")
>+           expect(args).to include("--extra-vars=ansible_ssh_user='#{machine.ssh_info[:username]}'")
>+         }.and_return(default_execute_result)
>Index: SOURCES/vagrant-1.9.1-Fix-Ruby-2.4-compatibility.patch
>===================================================================
>--- SOURCES/vagrant-1.9.1-Fix-Ruby-2.4-compatibility.patch	(revision 1180724)
>+++ SOURCES/vagrant-1.9.1-Fix-Ruby-2.4-compatibility.patch	(nonexistent)
>@@ -1,171 +0,0 @@
>-From 3cdd1d09f9617e6005fc643000b5486ffbe22577 Mon Sep 17 00:00:00 2001
>-From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
>-Date: Tue, 14 Feb 2017 10:13:29 +0100
>-Subject: [PATCH 1/2] Use Integer instead of Fixnum for Ruby 2.4+
>- compatibility.
>-
>----
>- lib/vagrant/cli.rb                                  | 2 +-
>- lib/vagrant/plugin/v2/communicator.rb               | 2 +-
>- lib/vagrant/registry.rb                             | 2 +-
>- plugins/provisioners/shell/config.rb                | 4 ++--
>- plugins/pushes/local-exec/config.rb                 | 4 ++--
>- test/unit/plugins/provisioners/shell/config_test.rb | 6 +++---
>- test/unit/plugins/pushes/local-exec/config_test.rb  | 4 ++--
>- 7 files changed, 12 insertions(+), 12 deletions(-)
>-
>-diff --git a/lib/vagrant/cli.rb b/lib/vagrant/cli.rb
>-index a6e9655f0..cca8c0184 100644
>---- a/lib/vagrant/cli.rb
>-+++ b/lib/vagrant/cli.rb
>-@@ -45,7 +45,7 @@ module Vagrant
>-         result = 1
>-       end
>- 
>--      result = 0 if !result.is_a?(Fixnum)
>-+      result = 0 if !result.is_a?(Integer)
>-       return result
>-     end
>- 
>-diff --git a/lib/vagrant/plugin/v2/communicator.rb b/lib/vagrant/plugin/v2/communicator.rb
>-index 511fb6002..41385f486 100644
>---- a/lib/vagrant/plugin/v2/communicator.rb
>-+++ b/lib/vagrant/plugin/v2/communicator.rb
>-@@ -50,7 +50,7 @@ module Vagrant
>-         # until then. It will wait up to the given duration or raise an
>-         # exception if something goes wrong.
>-         #
>--        # @param [Fixnum] duration Timeout in seconds.
>-+        # @param [Integer] duration Timeout in seconds.
>-         # @return [Boolean] Will return true on successful connection
>-         #   or false on timeout.
>-         def wait_for_ready(duration)
>-diff --git a/lib/vagrant/registry.rb b/lib/vagrant/registry.rb
>-index d84a745a5..c0c4e1bad 100644
>---- a/lib/vagrant/registry.rb
>-+++ b/lib/vagrant/registry.rb
>-@@ -52,7 +52,7 @@ module Vagrant
>- 
>-     # Return the number of elements in this registry.
>-     #
>--    # @return [Fixnum]
>-+    # @return [Integer]
>-     def length
>-       @items.keys.length
>-     end
>-diff --git a/plugins/provisioners/shell/config.rb b/plugins/provisioners/shell/config.rb
>-index 049eb15d0..05da320e3 100644
>---- a/plugins/provisioners/shell/config.rb
>-+++ b/plugins/provisioners/shell/config.rb
>-@@ -106,10 +106,10 @@ module VagrantPlugins
>-       def args_valid?
>-         return true if !args
>-         return true if args.is_a?(String)
>--        return true if args.is_a?(Fixnum)
>-+        return true if args.is_a?(Integer)
>-         if args.is_a?(Array)
>-           args.each do |a|
>--            return false if !a.kind_of?(String) && !a.kind_of?(Fixnum)
>-+            return false if !a.kind_of?(String) && !a.kind_of?(Integer)
>-           end
>- 
>-           return true
>-diff --git a/plugins/pushes/local-exec/config.rb b/plugins/pushes/local-exec/config.rb
>-index d62dfa8fa..9ed466088 100644
>---- a/plugins/pushes/local-exec/config.rb
>-+++ b/plugins/pushes/local-exec/config.rb
>-@@ -63,10 +63,10 @@ module VagrantPlugins
>-       def args_valid?
>-         return true if !args
>-         return true if args.is_a?(String)
>--        return true if args.is_a?(Fixnum)
>-+        return true if args.is_a?(Integer)
>-         if args.is_a?(Array)
>-           args.each do |a|
>--            return false if !a.kind_of?(String) && !a.kind_of?(Fixnum)
>-+            return false if !a.kind_of?(String) && !a.kind_of?(Integer)
>-           end
>- 
>-           return true
>-diff --git a/test/unit/plugins/provisioners/shell/config_test.rb b/test/unit/plugins/provisioners/shell/config_test.rb
>-index c4d260b90..905a28b03 100644
>---- a/test/unit/plugins/provisioners/shell/config_test.rb
>-+++ b/test/unit/plugins/provisioners/shell/config_test.rb
>-@@ -30,7 +30,7 @@ describe "VagrantPlugins::Shell::Config" do
>-       expect(result["shell provisioner"]).to eq([])
>-     end
>- 
>--    it "passes with fixnum args" do
>-+    it "passes with integer args" do
>-       subject.path = file_that_exists
>-       subject.args = 1
>-       subject.finalize!
>-@@ -112,7 +112,7 @@ describe "VagrantPlugins::Shell::Config" do
>-   end
>- 
>-   describe 'finalize!' do
>--    it 'changes fixnum args into strings' do
>-+    it 'changes integer args into strings' do
>-       subject.path = file_that_exists
>-       subject.args = 1
>-       subject.finalize!
>-@@ -120,7 +120,7 @@ describe "VagrantPlugins::Shell::Config" do
>-       expect(subject.args).to eq '1'
>-     end
>- 
>--    it 'changes fixnum args in arrays into strings' do
>-+    it 'changes integer args in arrays into strings' do
>-       subject.path = file_that_exists
>-       subject.args = ["string", 1, 2]
>-       subject.finalize!
>-diff --git a/test/unit/plugins/pushes/local-exec/config_test.rb b/test/unit/plugins/pushes/local-exec/config_test.rb
>-index 1bde10d98..9442b6420 100644
>---- a/test/unit/plugins/pushes/local-exec/config_test.rb
>-+++ b/test/unit/plugins/pushes/local-exec/config_test.rb
>-@@ -70,7 +70,7 @@ describe VagrantPlugins::LocalExecPush::Config do
>-           expect(errors).to be_empty
>-         end
>- 
>--        it "passes with fixnum args" do
>-+        it "passes with integer args" do
>-           subject.args = 1
>-           expect(errors).to be_empty
>-         end
>-@@ -118,7 +118,7 @@ describe VagrantPlugins::LocalExecPush::Config do
>-           expect(errors).to be_empty
>-         end
>- 
>--        it "passes with fixnum args" do
>-+        it "passes with integer args" do
>-           subject.args = 1
>-           expect(errors).to be_empty
>-         end
>--- 
>-2.11.1
>-
>-
>-From 6d269293e37db86325bec0a17502d68838d28214 Mon Sep 17 00:00:00 2001
>-From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
>-Date: Tue, 14 Feb 2017 10:33:58 +0100
>-Subject: [PATCH 2/2] Do not use deprecated API.
>-
>----
>- lib/vagrant/util/keypair.rb | 2 +-
>- 1 file changed, 1 insertion(+), 1 deletion(-)
>-
>-diff --git a/lib/vagrant/util/keypair.rb b/lib/vagrant/util/keypair.rb
>-index 342d3264f..5e3d10ea6 100644
>---- a/lib/vagrant/util/keypair.rb
>-+++ b/lib/vagrant/util/keypair.rb
>-@@ -26,7 +26,7 @@ module Vagrant
>-         private_key = rsa_key.to_pem
>- 
>-         if password
>--          cipher      = OpenSSL::Cipher::Cipher.new('des3')
>-+          cipher      = OpenSSL::Cipher.new('des3')
>-           private_key = rsa_key.to_pem(cipher, password)
>-         end
>- 
>--- 
>-2.11.1
>-
>Index: SOURCES/vagrant-1.9.8-fix-dependencies.patch
>===================================================================
>--- SOURCES/vagrant-1.9.8-fix-dependencies.patch	(revision 1180724)
>+++ SOURCES/vagrant-1.9.8-fix-dependencies.patch	(working copy)
>@@ -1,29 +1,29 @@
>-From 7486aa2ce950f55a4be9049d514c412d7e45ddef Mon Sep 17 00:00:00 2001
>-From: Pavel Valena <pvalena@redhat.com>
>-Date: Thu, 20 Jul 2017 15:01:06 +0200
>-Subject: [PATCH] Fix dependencies for Vagrant 1.9.7.
>-
>----
>- vagrant.gemspec |   23 +++++++++++++----------
>- 1 file changed, 13 insertions(+), 10 deletions(-)
>-
>-diff --git a/vagrant.gemspec b/vagrant.gemspec
>-index c92ca17..aeee52f 100644
>---- a/vagrant.gemspec
>-+++ b/vagrant.gemspec
>-@@ -12,31 +12,34 @@ Gem::Specification.new do |s|
>+--- vagrant-2.0.1/vagrant.gemspec.F	2017-11-03 00:07:17.000000000 +0200
>++++ vagrant-2.0.1/vagrant.gemspec	2017-12-02 23:13:19.639939314 +0200
>+@@ -1,59 +1,62 @@
>+ $:.unshift File.expand_path("../lib", __FILE__)
>+ require "vagrant/version"
>+ 
>+ Gem::Specification.new do |s|
>+   s.name          = "vagrant"
>+   s.version       = Vagrant::VERSION
>+   s.platform      = Gem::Platform::RUBY
>+   s.authors       = ["Mitchell Hashimoto", "John Bender"]
>+   s.email         = ["mitchell.hashimoto@gmail.com", "john.m.bender@gmail.com"]
>+   s.homepage      = "https://www.vagrantup.com"
>+   s.license       = 'MIT'
>    s.summary       = "Build and distribute virtualized development environments."
>    s.description   = "Vagrant is a tool for building and distributing virtualized development environments."
>  
>--  s.required_ruby_version     = "~> 2.2", "< 2.4"
>-+  s.required_ruby_version     = "~> 2.2"
>+   s.required_ruby_version     = "~> 2.2", "< 2.5"
>    s.required_rubygems_version = ">= 1.3.6"
>    s.rubyforge_project         = "vagrant"
>  
> -  s.add_dependency "childprocess", "~> 0.6.0"
>-+  s.add_dependency "childprocess", "~> 0.5.0"
>++  s.add_dependency "childprocess", "~> 0.7.0"
>    s.add_dependency "erubis", "~> 2.7.0"
>-   s.add_dependency "i18n", ">= 0.6.0", "<= 0.8.0"
>+-  s.add_dependency "i18n", ">= 0.6.0", "<= 0.8.0"
>++  s.add_dependency "i18n", ">= 0.6.0", "<= 0.9.0"
>    s.add_dependency "listen", "~> 3.1.5"
>    s.add_dependency "hashicorp-checkpoint", "~> 0.1.1"
>    s.add_dependency "log4r", "~> 1.1.9", "< 1.1.11"
>@@ -56,6 +56,20 @@
>  
>    # Constraint rake to properly handle deprecated method usage
>    # from within rspec
>--- 
>-2.7.5
>-
>+   s.add_development_dependency "rake", "~> 12.0.0"
>+   s.add_development_dependency "rspec", "~> 3.5.0"
>+   s.add_development_dependency "rspec-its", "~> 1.2.0"
>+   s.add_development_dependency "webmock", "~> 2.3.1"
>+   s.add_development_dependency "fake_ftp", "~> 0.1.1"
>+ 
>+   # The following block of code determines the files that should be included
>+   # in the gem. It does this by reading all the files in the directory where
>+   # this gemspec is, and parsing out the ignored files from the gitignore.
>+   # Note that the entire gitignore(5) syntax is not supported, specifically
>+   # the "!" syntax, but it should mostly work correctly.
>+   root_path      = File.dirname(__FILE__)
>+   all_files      = Dir.chdir(root_path) { Dir.glob("**/{*,.*}") }
>+   all_files.reject! { |file| [".", ".."].include?(File.basename(file)) }
>+   all_files.reject! { |file| file.start_with?("website/") }
>+   gitignore_path = File.join(root_path, ".gitignore")
>+   gitignore      = File.readlines(gitignore_path)
>Index: SPECS/vagrant.spec
>===================================================================
>--- SPECS/vagrant.spec	(revision 1180724)
>+++ SPECS/vagrant.spec	(working copy)
>@@ -5,7 +5,7 @@
> 
> %define with_tests 0
> Name: vagrant
>-Version: 1.9.8
>+Version: 2.0.1
> Release: %mkrel 1
> Summary: Build and distribute virtualized development environments
> Group: Development/Other
>@@ -31,10 +31,6 @@
> # Disable ansible winrm tests 
> Patch1: vagrant-1.8.1-disable-winrm-tests.patch
> 
>-# Use Integer instead of Fixnum for Ruby 2.4+ compatibility.
>-# https://github.com/mitchellh/vagrant/pull/8284
>-Patch2: vagrant-1.9.1-Fix-Ruby-2.4-compatibility.patch
>-
> Requires: ruby(release)
> Requires: ruby(rubygems) >= 1.3.6
> # Explicitly specify MRI, since Vagrant does not work with JRuby ATM.
>@@ -107,7 +103,6 @@
> 
> %patch0 -p1
> %patch1 -p1
>-%patch2 -p1
> 
> %build
> gem build %{name}.gemspec

Index: SOURCES/sha1.lst
===================================================================
--- SOURCES/sha1.lst	(revision 1180724)
+++ SOURCES/sha1.lst	(working copy)
@@ -1,2 +1,2 @@
-4653cb0efa8e205384197404f4040022b678aa56  vagrant-1.9.8.tar.gz
+05091017bda0bf1114498a625792961d803292c6  vagrant-2.0.1.tar.gz
 9177d72804f719ca5108d677246e937cfa9a9ab1  vagrant-spec-e623a5694912c539ac2657e38a372d5e8c93441d.tar.gz
Index: SOURCES/vagrant-1.8.1-disable-winrm-tests.patch
===================================================================
--- SOURCES/vagrant-1.8.1-disable-winrm-tests.patch	(revision 1180724)
+++ SOURCES/vagrant-1.8.1-disable-winrm-tests.patch	(working copy)
@@ -1,9 +1,24 @@
-diff --git a/test/unit/plugins/provisioners/ansible/provisioner_test.rb b/test/unit/plugins/provisioners/ansible/provisioner_test.rb
-index 31354a7..f2dfd0f 100644
---- a/test/unit/plugins/provisioners/ansible/provisioner_test.rb
-+++ b/test/unit/plugins/provisioners/ansible/provisioner_test.rb
-@@ -497,55 +497,6 @@ VF
+--- vagrant-2.0.1/test/unit/plugins/provisioners/ansible/provisioner_test.rb.WINRM	2017-12-02 23:08:25.279988444 +0200
++++ vagrant-2.0.1/test/unit/plugins/provisioners/ansible/provisioner_test.rb	2017-12-02 23:09:19.446428504 +0200
+@@ -650,89 +650,40 @@
+       it_should_set_arguments_and_environment_variables
+     end
+ 
+     context "with force_remote_user option disabled" do
+       before do
+         config.force_remote_user = false
        end
+ 
+       it_should_create_and_use_generated_inventory false # i.e. without setting ansible_ssh_user in inventory
+ 
+       it_should_set_arguments_and_environment_variables 6
+ 
+       it "uses a --user argument to set a default remote user" do
+         expect(Vagrant::Util::Subprocess).to receive(:execute).with('ansible-playbook', any_args) { |*args|
+           expect(args).not_to include("--extra-vars=ansible_ssh_user='#{machine.ssh_info[:username]}'")
+           expect(args).to include("--user=#{machine.ssh_info[:username]}")
+         }.and_return(default_execute_result)
+       end
      end
  
 -    context "with winrm communicator" do
@@ -30,8 +45,7 @@
 -      it_should_set_arguments_and_environment_variables
 -
 -      it "generates an inventory with winrm connection settings" do
--
--        expect(Vagrant::Util::Subprocess).to receive(:execute).with(any_args) { |*args|
+-        expect(Vagrant::Util::Subprocess).to receive(:execute).with('ansible-playbook', any_args) { |*args|
 -          expect(config.inventory_path).to be_nil
 -          expect(File.exists?(generated_inventory_file)).to be(true)
 -          inventory_content = File.read(generated_inventory_file)
@@ -46,7 +60,7 @@
 -        end
 -
 -        it "doesn't set the ansible remote user in inventory and use '--user' argument with the vagrant ssh username" do
--          expect(Vagrant::Util::Subprocess).to receive(:execute).with(any_args) { |*args|
+-          expect(Vagrant::Util::Subprocess).to receive(:execute).with('ansible-playbook', any_args) { |*args|
 -            inventory_content = File.read(generated_inventory_file)
 -
 -            expect(inventory_content).to include("machine1 ansible_connection=winrm ansible_ssh_host=127.0.0.1 ansible_ssh_port=55986 ansible_ssh_pass='winword'\n")
@@ -55,9 +69,24 @@
 -        end
 -      end
 -    end
- 
+-
      describe "with inventory_path option" do
        before do
--- 
-2.5.0
-
+         config.inventory_path = existing_file
+       end
+ 
+       it_should_set_arguments_and_environment_variables 6
+ 
+       it "does not generate the inventory and uses given inventory path instead" do
+         expect(Vagrant::Util::Subprocess).to receive(:execute).with('ansible-playbook', any_args) { |*args|
+           expect(args).to include("--inventory-file=#{existing_file}")
+           expect(args).not_to include("--inventory-file=#{generated_inventory_file}")
+           expect(File.exists?(generated_inventory_file)).to be(false)
+         }.and_return(default_execute_result)
+       end
+ 
+       it "uses an --extra-vars argument to force ansible_ssh_user parameter" do
+         expect(Vagrant::Util::Subprocess).to receive(:execute).with('ansible-playbook', any_args) { |*args|
+           expect(args).not_to include("--user=#{machine.ssh_info[:username]}")
+           expect(args).to include("--extra-vars=ansible_ssh_user='#{machine.ssh_info[:username]}'")
+         }.and_return(default_execute_result)
Index: SOURCES/vagrant-1.9.1-Fix-Ruby-2.4-compatibility.patch
===================================================================
--- SOURCES/vagrant-1.9.1-Fix-Ruby-2.4-compatibility.patch	(revision 1180724)
+++ SOURCES/vagrant-1.9.1-Fix-Ruby-2.4-compatibility.patch	(nonexistent)
@@ -1,171 +0,0 @@
-From 3cdd1d09f9617e6005fc643000b5486ffbe22577 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
-Date: Tue, 14 Feb 2017 10:13:29 +0100
-Subject: [PATCH 1/2] Use Integer instead of Fixnum for Ruby 2.4+
- compatibility.
-
----
- lib/vagrant/cli.rb                                  | 2 +-
- lib/vagrant/plugin/v2/communicator.rb               | 2 +-
- lib/vagrant/registry.rb                             | 2 +-
- plugins/provisioners/shell/config.rb                | 4 ++--
- plugins/pushes/local-exec/config.rb                 | 4 ++--
- test/unit/plugins/provisioners/shell/config_test.rb | 6 +++---
- test/unit/plugins/pushes/local-exec/config_test.rb  | 4 ++--
- 7 files changed, 12 insertions(+), 12 deletions(-)
-
-diff --git a/lib/vagrant/cli.rb b/lib/vagrant/cli.rb
-index a6e9655f0..cca8c0184 100644
---- a/lib/vagrant/cli.rb
-+++ b/lib/vagrant/cli.rb
-@@ -45,7 +45,7 @@ module Vagrant
-         result = 1
-       end
- 
--      result = 0 if !result.is_a?(Fixnum)
-+      result = 0 if !result.is_a?(Integer)
-       return result
-     end
- 
-diff --git a/lib/vagrant/plugin/v2/communicator.rb b/lib/vagrant/plugin/v2/communicator.rb
-index 511fb6002..41385f486 100644
---- a/lib/vagrant/plugin/v2/communicator.rb
-+++ b/lib/vagrant/plugin/v2/communicator.rb
-@@ -50,7 +50,7 @@ module Vagrant
-         # until then. It will wait up to the given duration or raise an
-         # exception if something goes wrong.
-         #
--        # @param [Fixnum] duration Timeout in seconds.
-+        # @param [Integer] duration Timeout in seconds.
-         # @return [Boolean] Will return true on successful connection
-         #   or false on timeout.
-         def wait_for_ready(duration)
-diff --git a/lib/vagrant/registry.rb b/lib/vagrant/registry.rb
-index d84a745a5..c0c4e1bad 100644
---- a/lib/vagrant/registry.rb
-+++ b/lib/vagrant/registry.rb
-@@ -52,7 +52,7 @@ module Vagrant
- 
-     # Return the number of elements in this registry.
-     #
--    # @return [Fixnum]
-+    # @return [Integer]
-     def length
-       @items.keys.length
-     end
-diff --git a/plugins/provisioners/shell/config.rb b/plugins/provisioners/shell/config.rb
-index 049eb15d0..05da320e3 100644
---- a/plugins/provisioners/shell/config.rb
-+++ b/plugins/provisioners/shell/config.rb
-@@ -106,10 +106,10 @@ module VagrantPlugins
-       def args_valid?
-         return true if !args
-         return true if args.is_a?(String)
--        return true if args.is_a?(Fixnum)
-+        return true if args.is_a?(Integer)
-         if args.is_a?(Array)
-           args.each do |a|
--            return false if !a.kind_of?(String) && !a.kind_of?(Fixnum)
-+            return false if !a.kind_of?(String) && !a.kind_of?(Integer)
-           end
- 
-           return true
-diff --git a/plugins/pushes/local-exec/config.rb b/plugins/pushes/local-exec/config.rb
-index d62dfa8fa..9ed466088 100644
---- a/plugins/pushes/local-exec/config.rb
-+++ b/plugins/pushes/local-exec/config.rb
-@@ -63,10 +63,10 @@ module VagrantPlugins
-       def args_valid?
-         return true if !args
-         return true if args.is_a?(String)
--        return true if args.is_a?(Fixnum)
-+        return true if args.is_a?(Integer)
-         if args.is_a?(Array)
-           args.each do |a|
--            return false if !a.kind_of?(String) && !a.kind_of?(Fixnum)
-+            return false if !a.kind_of?(String) && !a.kind_of?(Integer)
-           end
- 
-           return true
-diff --git a/test/unit/plugins/provisioners/shell/config_test.rb b/test/unit/plugins/provisioners/shell/config_test.rb
-index c4d260b90..905a28b03 100644
---- a/test/unit/plugins/provisioners/shell/config_test.rb
-+++ b/test/unit/plugins/provisioners/shell/config_test.rb
-@@ -30,7 +30,7 @@ describe "VagrantPlugins::Shell::Config" do
-       expect(result["shell provisioner"]).to eq([])
-     end
- 
--    it "passes with fixnum args" do
-+    it "passes with integer args" do
-       subject.path = file_that_exists
-       subject.args = 1
-       subject.finalize!
-@@ -112,7 +112,7 @@ describe "VagrantPlugins::Shell::Config" do
-   end
- 
-   describe 'finalize!' do
--    it 'changes fixnum args into strings' do
-+    it 'changes integer args into strings' do
-       subject.path = file_that_exists
-       subject.args = 1
-       subject.finalize!
-@@ -120,7 +120,7 @@ describe "VagrantPlugins::Shell::Config" do
-       expect(subject.args).to eq '1'
-     end
- 
--    it 'changes fixnum args in arrays into strings' do
-+    it 'changes integer args in arrays into strings' do
-       subject.path = file_that_exists
-       subject.args = ["string", 1, 2]
-       subject.finalize!
-diff --git a/test/unit/plugins/pushes/local-exec/config_test.rb b/test/unit/plugins/pushes/local-exec/config_test.rb
-index 1bde10d98..9442b6420 100644
---- a/test/unit/plugins/pushes/local-exec/config_test.rb
-+++ b/test/unit/plugins/pushes/local-exec/config_test.rb
-@@ -70,7 +70,7 @@ describe VagrantPlugins::LocalExecPush::Config do
-           expect(errors).to be_empty
-         end
- 
--        it "passes with fixnum args" do
-+        it "passes with integer args" do
-           subject.args = 1
-           expect(errors).to be_empty
-         end
-@@ -118,7 +118,7 @@ describe VagrantPlugins::LocalExecPush::Config do
-           expect(errors).to be_empty
-         end
- 
--        it "passes with fixnum args" do
-+        it "passes with integer args" do
-           subject.args = 1
-           expect(errors).to be_empty
-         end
--- 
-2.11.1
-
-
-From 6d269293e37db86325bec0a17502d68838d28214 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
-Date: Tue, 14 Feb 2017 10:33:58 +0100
-Subject: [PATCH 2/2] Do not use deprecated API.
-
----
- lib/vagrant/util/keypair.rb | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/vagrant/util/keypair.rb b/lib/vagrant/util/keypair.rb
-index 342d3264f..5e3d10ea6 100644
---- a/lib/vagrant/util/keypair.rb
-+++ b/lib/vagrant/util/keypair.rb
-@@ -26,7 +26,7 @@ module Vagrant
-         private_key = rsa_key.to_pem
- 
-         if password
--          cipher      = OpenSSL::Cipher::Cipher.new('des3')
-+          cipher      = OpenSSL::Cipher.new('des3')
-           private_key = rsa_key.to_pem(cipher, password)
-         end
- 
--- 
-2.11.1
-
Index: SOURCES/vagrant-1.9.8-fix-dependencies.patch
===================================================================
--- SOURCES/vagrant-1.9.8-fix-dependencies.patch	(revision 1180724)
+++ SOURCES/vagrant-1.9.8-fix-dependencies.patch	(working copy)
@@ -1,29 +1,29 @@
-From 7486aa2ce950f55a4be9049d514c412d7e45ddef Mon Sep 17 00:00:00 2001
-From: Pavel Valena <pvalena@redhat.com>
-Date: Thu, 20 Jul 2017 15:01:06 +0200
-Subject: [PATCH] Fix dependencies for Vagrant 1.9.7.
-
----
- vagrant.gemspec |   23 +++++++++++++----------
- 1 file changed, 13 insertions(+), 10 deletions(-)
-
-diff --git a/vagrant.gemspec b/vagrant.gemspec
-index c92ca17..aeee52f 100644
---- a/vagrant.gemspec
-+++ b/vagrant.gemspec
-@@ -12,31 +12,34 @@ Gem::Specification.new do |s|
+--- vagrant-2.0.1/vagrant.gemspec.F	2017-11-03 00:07:17.000000000 +0200
++++ vagrant-2.0.1/vagrant.gemspec	2017-12-02 23:13:19.639939314 +0200
+@@ -1,59 +1,62 @@
+ $:.unshift File.expand_path("../lib", __FILE__)
+ require "vagrant/version"
+ 
+ Gem::Specification.new do |s|
+   s.name          = "vagrant"
+   s.version       = Vagrant::VERSION
+   s.platform      = Gem::Platform::RUBY
+   s.authors       = ["Mitchell Hashimoto", "John Bender"]
+   s.email         = ["mitchell.hashimoto@gmail.com", "john.m.bender@gmail.com"]
+   s.homepage      = "https://www.vagrantup.com"
+   s.license       = 'MIT'
    s.summary       = "Build and distribute virtualized development environments."
    s.description   = "Vagrant is a tool for building and distributing virtualized development environments."
  
--  s.required_ruby_version     = "~> 2.2", "< 2.4"
-+  s.required_ruby_version     = "~> 2.2"
+   s.required_ruby_version     = "~> 2.2", "< 2.5"
    s.required_rubygems_version = ">= 1.3.6"
    s.rubyforge_project         = "vagrant"
  
 -  s.add_dependency "childprocess", "~> 0.6.0"
-+  s.add_dependency "childprocess", "~> 0.5.0"
++  s.add_dependency "childprocess", "~> 0.7.0"
    s.add_dependency "erubis", "~> 2.7.0"
-   s.add_dependency "i18n", ">= 0.6.0", "<= 0.8.0"
+-  s.add_dependency "i18n", ">= 0.6.0", "<= 0.8.0"
++  s.add_dependency "i18n", ">= 0.6.0", "<= 0.9.0"
    s.add_dependency "listen", "~> 3.1.5"
    s.add_dependency "hashicorp-checkpoint", "~> 0.1.1"
    s.add_dependency "log4r", "~> 1.1.9", "< 1.1.11"
@@ -56,6 +56,20 @@
  
    # Constraint rake to properly handle deprecated method usage
    # from within rspec
--- 
-2.7.5
-
+   s.add_development_dependency "rake", "~> 12.0.0"
+   s.add_development_dependency "rspec", "~> 3.5.0"
+   s.add_development_dependency "rspec-its", "~> 1.2.0"
+   s.add_development_dependency "webmock", "~> 2.3.1"
+   s.add_development_dependency "fake_ftp", "~> 0.1.1"
+ 
+   # The following block of code determines the files that should be included
+   # in the gem. It does this by reading all the files in the directory where
+   # this gemspec is, and parsing out the ignored files from the gitignore.
+   # Note that the entire gitignore(5) syntax is not supported, specifically
+   # the "!" syntax, but it should mostly work correctly.
+   root_path      = File.dirname(__FILE__)
+   all_files      = Dir.chdir(root_path) { Dir.glob("**/{*,.*}") }
+   all_files.reject! { |file| [".", ".."].include?(File.basename(file)) }
+   all_files.reject! { |file| file.start_with?("website/") }
+   gitignore_path = File.join(root_path, ".gitignore")
+   gitignore      = File.readlines(gitignore_path)
Index: SPECS/vagrant.spec
===================================================================
--- SPECS/vagrant.spec	(revision 1180724)
+++ SPECS/vagrant.spec	(working copy)
@@ -5,7 +5,7 @@
 
 %define with_tests 0
 Name: vagrant
-Version: 1.9.8
+Version: 2.0.1
 Release: %mkrel 1
 Summary: Build and distribute virtualized development environments
 Group: Development/Other
@@ -31,10 +31,6 @@
 # Disable ansible winrm tests 
 Patch1: vagrant-1.8.1-disable-winrm-tests.patch
 
-# Use Integer instead of Fixnum for Ruby 2.4+ compatibility.
-# https://github.com/mitchellh/vagrant/pull/8284
-Patch2: vagrant-1.9.1-Fix-Ruby-2.4-compatibility.patch
-
 Requires: ruby(release)
 Requires: ruby(rubygems) >= 1.3.6
 # Explicitly specify MRI, since Vagrant does not work with JRuby ATM.
@@ -107,7 +103,6 @@
 
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %build
 gem build %{name}.gemspec

Actions: View | Diff

Attachments on bug 22114: 9820