From 2b0617fb649bb322419fdcd3cf32a3d00387065d Mon Sep 17 00:00:00 2001
From: Vidroha Debroy <vd374g@att.com>
Date: Fri, 25 Jan 2019 13:59:15 -0600
Subject: [PATCH 1/9] Adding pip_install_cmd as a default parameter to get_pip.
 Unit Tests.

---
 .../provisioners/ansible/cap/guest/pip/pip.rb |  4 +-
 .../ansible/cap/guest/pip/pip_test.rb         | 41 +++++++++++++++++++
 2 files changed, 43 insertions(+), 2 deletions(-)
 create mode 100644 test/unit/plugins/provisioners/ansible/cap/guest/pip/pip_test.rb

diff --git a/plugins/provisioners/ansible/cap/guest/pip/pip.rb b/plugins/provisioners/ansible/cap/guest/pip/pip.rb
index 370aabd32..98a9ba0b8 100644
--- a/plugins/provisioners/ansible/cap/guest/pip/pip.rb
+++ b/plugins/provisioners/ansible/cap/guest/pip/pip.rb
@@ -18,9 +18,9 @@ module VagrantPlugins
             machine.communicate.sudo "pip install #{args_array.join(' ')}"
           end
 
-          def self.get_pip(machine)
+          def self.get_pip(machine, pip_install_cmd="curl https://bootstrap.pypa.io/get-pip.py | sudo python")
             machine.ui.detail I18n.t("vagrant.provisioners.ansible.installing_pip")
-            machine.communicate.execute "curl https://bootstrap.pypa.io/get-pip.py | sudo python"
+            machine.communicate.execute pip_install_cmd
           end
 
         end
diff --git a/test/unit/plugins/provisioners/ansible/cap/guest/pip/pip_test.rb b/test/unit/plugins/provisioners/ansible/cap/guest/pip/pip_test.rb
new file mode 100644
index 000000000..79ecf7c1b
--- /dev/null
+++ b/test/unit/plugins/provisioners/ansible/cap/guest/pip/pip_test.rb
@@ -0,0 +1,41 @@
+require_relative "../../../../../../base"
+
+require Vagrant.source_root.join("plugins/provisioners/ansible/cap/guest/pip/pip")
+
+describe VagrantPlugins::Ansible::Cap::Guest::Pip do
+  include_context "unit"
+
+  subject { VagrantPlugins::Ansible::Cap::Guest::Pip }
+
+  let(:iso_env) do
+    # We have to create a Vagrantfile so there is a root path
+    env = isolated_environment
+    env.vagrantfile("")
+    env.create_vagrant_env
+  end
+
+  let(:machine) { iso_env.machine(iso_env.machine_names[0], :dummy) }
+  let(:communicator) { double("comm") }
+
+  before do
+    allow(machine).to receive(:communicate).and_return(communicator)
+    allow(communicator).to receive(:execute).and_return(true)
+  end
+
+  describe "#get_pip" do
+    describe 'when no pip_install_command argument is provided' do
+        it "installs pip using the default command" do
+            expect(communicator).to receive(:execute).with("curl https://bootstrap.pypa.io/get-pip.py | sudo python")
+            subject.get_pip(machine)
+        end
+    end
+
+    describe 'when pip_install_command argument is provided' do
+        it "runs the supplied argument instead of default" do
+            pip_install_command = "foo"
+            expect(communicator).to receive(:execute).with(pip_install_command)
+            subject.get_pip(machine,pip_install_command)
+        end
+    end    
+  end
+end
\ No newline at end of file

From 84df0981358ce4cb9c69e357f346819a13547d84 Mon Sep 17 00:00:00 2001
From: Vidroha Debroy <vd374g@att.com>
Date: Fri, 25 Jan 2019 14:55:39 -0600
Subject: [PATCH 2/9] Handling empty strings passed as pip_install_command.

---
 plugins/provisioners/ansible/cap/guest/pip/pip.rb  | 14 +++++++++++++-
 .../provisioners/ansible/cap/guest/pip/pip_test.rb |  6 ++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/plugins/provisioners/ansible/cap/guest/pip/pip.rb b/plugins/provisioners/ansible/cap/guest/pip/pip.rb
index 98a9ba0b8..307261a7f 100644
--- a/plugins/provisioners/ansible/cap/guest/pip/pip.rb
+++ b/plugins/provisioners/ansible/cap/guest/pip/pip.rb
@@ -5,6 +5,8 @@ module VagrantPlugins
       module Guest
         module Pip
 
+          DEFAULT_PIP_INSTALL_CMD = "curl https://bootstrap.pypa.io/get-pip.py | sudo python"
+
           def self.pip_install(machine, package = "", version = "", pip_args = "", upgrade = true)
             upgrade_arg = "--upgrade" if upgrade
             version_arg = ""
@@ -18,7 +20,17 @@ module VagrantPlugins
             machine.communicate.sudo "pip install #{args_array.join(' ')}"
           end
 
-          def self.get_pip(machine, pip_install_cmd="curl https://bootstrap.pypa.io/get-pip.py | sudo python")
+          def self.get_pip(machine, pip_install_cmd=DEFAULT_PIP_INSTALL_CMD)
+
+            # The objective here is to get pip either by default
+            # or by the argument passed in. The objective is not 
+            # to circumvent the pip setup by passing in nothing.
+            # Thus, we stick with the default on an empty string.
+
+            if pip_install_cmd.empty?
+              pip_install_cmd=DEFAULT_PIP_INSTALL_CMD
+            end
+
             machine.ui.detail I18n.t("vagrant.provisioners.ansible.installing_pip")
             machine.communicate.execute pip_install_cmd
           end
diff --git a/test/unit/plugins/provisioners/ansible/cap/guest/pip/pip_test.rb b/test/unit/plugins/provisioners/ansible/cap/guest/pip/pip_test.rb
index 79ecf7c1b..24f510186 100644
--- a/test/unit/plugins/provisioners/ansible/cap/guest/pip/pip_test.rb
+++ b/test/unit/plugins/provisioners/ansible/cap/guest/pip/pip_test.rb
@@ -36,6 +36,12 @@ describe VagrantPlugins::Ansible::Cap::Guest::Pip do
             expect(communicator).to receive(:execute).with(pip_install_command)
             subject.get_pip(machine,pip_install_command)
         end
+
+        it "installs pip using the default command if the argument is empty" do
+            pip_install_command = ""
+            expect(communicator).to receive(:execute).with("curl https://bootstrap.pypa.io/get-pip.py | sudo python")
+            subject.get_pip(machine,pip_install_command)
+        end        
     end    
   end
 end
\ No newline at end of file

From 614523a5fc2aab8c0f09c4374c8e8f64d97abf9d Mon Sep 17 00:00:00 2001
From: Vidroha Debroy <vd374g@att.com>
Date: Fri, 25 Jan 2019 15:09:31 -0600
Subject: [PATCH 3/9] Exposing pip_install_cmd to callers as optional.

---
 .../ansible/cap/guest/debian/ansible_install.rb        | 10 +++++-----
 .../ansible/cap/guest/fedora/ansible_install.rb        | 10 +++++-----
 .../ansible/cap/guest/redhat/ansible_install.rb        | 10 +++++-----
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/plugins/provisioners/ansible/cap/guest/debian/ansible_install.rb b/plugins/provisioners/ansible/cap/guest/debian/ansible_install.rb
index fc8feeaad..0c77506ab 100644
--- a/plugins/provisioners/ansible/cap/guest/debian/ansible_install.rb
+++ b/plugins/provisioners/ansible/cap/guest/debian/ansible_install.rb
@@ -8,13 +8,13 @@ module VagrantPlugins
           module AnsibleInstall
 
 
-            def self.ansible_install(machine, install_mode, ansible_version, pip_args)
+            def self.ansible_install(machine, install_mode, ansible_version, pip_args, pip_install_cmd="")
               case install_mode
               when :pip
-                pip_setup machine
+                pip_setup machine, pip_install_cmd
                 Pip::pip_install machine, "ansible", ansible_version, pip_args, true
               when :pip_args_only
-                pip_setup machine
+                pip_setup machine, pip_install_cmd
                 Pip::pip_install machine, "", "", pip_args, false
               else
                 ansible_apt_install machine
@@ -36,10 +36,10 @@ INLINE_CRIPT
               machine.communicate.sudo "apt-get install -y -qq ansible"
             end
 
-            def self.pip_setup(machine)
+            def self.pip_setup(machine, pip_install_cmd="")
               machine.communicate.sudo "apt-get update -y -qq"
               machine.communicate.sudo "apt-get install -y -qq build-essential curl git libssl-dev libffi-dev python-dev"
-              Pip::get_pip machine
+              Pip::get_pip machine, pip_install_cmd
             end
 
           end
diff --git a/plugins/provisioners/ansible/cap/guest/fedora/ansible_install.rb b/plugins/provisioners/ansible/cap/guest/fedora/ansible_install.rb
index fe651f372..560a4dcc0 100644
--- a/plugins/provisioners/ansible/cap/guest/fedora/ansible_install.rb
+++ b/plugins/provisioners/ansible/cap/guest/fedora/ansible_install.rb
@@ -8,13 +8,13 @@ module VagrantPlugins
         module Fedora
           module AnsibleInstall
 
-            def self.ansible_install(machine, install_mode, ansible_version, pip_args)
+            def self.ansible_install(machine, install_mode, ansible_version, pip_args, pip_install_cmd="")
               case install_mode
               when :pip
-                pip_setup machine
+                pip_setup machine, pip_install_cmd
                 Pip::pip_install machine, "ansible", ansible_version, pip_args, true
               when :pip_args_only
-                pip_setup machine
+                pip_setup machine, pip_install_cmd
                 Pip::pip_install machine, "", "", pip_args, false
               else
                 rpm_package_manager = Facts::rpm_package_manager(machine)
@@ -25,11 +25,11 @@ module VagrantPlugins
 
             private
 
-            def self.pip_setup(machine)
+            def self.pip_setup(machine, pip_install_cmd="")
               rpm_package_manager = Facts::rpm_package_manager(machine)
 
               machine.communicate.sudo "#{rpm_package_manager} install -y curl gcc gmp-devel libffi-devel openssl-devel python-crypto python-devel python-dnf python-setuptools redhat-rpm-config"
-              Pip::get_pip machine
+              Pip::get_pip machine, pip_install_cmd
             end
 
           end
diff --git a/plugins/provisioners/ansible/cap/guest/redhat/ansible_install.rb b/plugins/provisioners/ansible/cap/guest/redhat/ansible_install.rb
index 3119cab90..05e858ddd 100644
--- a/plugins/provisioners/ansible/cap/guest/redhat/ansible_install.rb
+++ b/plugins/provisioners/ansible/cap/guest/redhat/ansible_install.rb
@@ -8,13 +8,13 @@ module VagrantPlugins
         module RedHat
           module AnsibleInstall
 
-            def self.ansible_install(machine, install_mode, ansible_version, pip_args)
+            def self.ansible_install(machine, install_mode, ansible_version, pip_args, pip_install_cmd="")
               case install_mode
               when :pip
-                pip_setup machine
+                pip_setup machine, pip_install_cmd
                 Pip::pip_install machine, "ansible", ansible_version, pip_args, true
               when :pip_args_only
-                pip_setup machine
+                pip_setup machine, pip_install_cmd
                 Pip::pip_install machine, "", "", pip_args, false
               else
                 ansible_rpm_install machine
@@ -33,11 +33,11 @@ module VagrantPlugins
               machine.communicate.sudo "#{rpm_package_manager} -y --enablerepo=epel install ansible"
             end
 
-            def self.pip_setup(machine)
+            def self.pip_setup(machine, pip_install_cmd="")
               rpm_package_manager = Facts::rpm_package_manager(machine)
 
               machine.communicate.sudo("#{rpm_package_manager} -y install curl gcc libffi-devel openssl-devel python-crypto python-devel python-setuptools")
-              Pip::get_pip machine
+              Pip::get_pip machine, pip_install_cmd
             end
 
           end

From 8418d260374597545669f6fe9d68dd867cb90483 Mon Sep 17 00:00:00 2001
From: Vidroha Debroy <vd374g@att.com>
Date: Fri, 25 Jan 2019 15:22:04 -0600
Subject: [PATCH 4/9] Ubuntu code updated because it calls Debian code.

---
 .../provisioners/ansible/cap/guest/ubuntu/ansible_install.rb  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/provisioners/ansible/cap/guest/ubuntu/ansible_install.rb b/plugins/provisioners/ansible/cap/guest/ubuntu/ansible_install.rb
index d319ac071..b08176997 100644
--- a/plugins/provisioners/ansible/cap/guest/ubuntu/ansible_install.rb
+++ b/plugins/provisioners/ansible/cap/guest/ubuntu/ansible_install.rb
@@ -7,9 +7,9 @@ module VagrantPlugins
         module Ubuntu
           module AnsibleInstall
 
-            def self.ansible_install(machine, install_mode, ansible_version, pip_args)
+            def self.ansible_install(machine, install_mode, ansible_version, pip_args, pip_install_cmd="")
               if install_mode != :default
-                Debian::AnsibleInstall::ansible_install machine, install_mode, ansible_version, pip_args
+                Debian::AnsibleInstall::ansible_install machine, install_mode, ansible_version, pip_args, pip_install_cmd
               else
                 ansible_apt_install machine
               end

From d2c11e81ae9c3a67961ac8c32bb944a4bb2999a1 Mon Sep 17 00:00:00 2001
From: Vidroha Debroy <vd374g@att.com>
Date: Fri, 25 Jan 2019 16:51:58 -0600
Subject: [PATCH 5/9] Config has pip_install_cmd for Provisioner to pick it up.
 Tests updated.

---
 plugins/provisioners/ansible/config/guest.rb               | 3 +++
 plugins/provisioners/ansible/provisioner/guest.rb          | 7 +++++--
 .../unit/plugins/provisioners/ansible/config/guest_test.rb | 1 +
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/plugins/provisioners/ansible/config/guest.rb b/plugins/provisioners/ansible/config/guest.rb
index a869779ae..13d801ff8 100644
--- a/plugins/provisioners/ansible/config/guest.rb
+++ b/plugins/provisioners/ansible/config/guest.rb
@@ -11,6 +11,7 @@ module VagrantPlugins
         attr_accessor :install
         attr_accessor :install_mode
         attr_accessor :pip_args
+        attr_accessor :pip_install_cmd
 
         def initialize
           super
@@ -18,6 +19,7 @@ module VagrantPlugins
           @install           = UNSET_VALUE
           @install_mode      = UNSET_VALUE
           @pip_args          = UNSET_VALUE
+          @pip_install_cmd   = UNSET_VALUE          
           @provisioning_path = UNSET_VALUE
           @tmp_path          = UNSET_VALUE
         end
@@ -28,6 +30,7 @@ module VagrantPlugins
           @install           = true                   if @install           == UNSET_VALUE
           @install_mode      = :default               if @install_mode      == UNSET_VALUE
           @pip_args          = ""                     if @pip_args          == UNSET_VALUE
+          @pip_install_cmd   = ""                     if @pip_args          == UNSET_VALUE          
           @provisioning_path = "/vagrant"             if provisioning_path  == UNSET_VALUE
           @tmp_path          = "/tmp/vagrant-ansible" if tmp_path           == UNSET_VALUE
         end
diff --git a/plugins/provisioners/ansible/provisioner/guest.rb b/plugins/provisioners/ansible/provisioner/guest.rb
index ca4953b72..de101e051 100644
--- a/plugins/provisioners/ansible/provisioner/guest.rb
+++ b/plugins/provisioners/ansible/provisioner/guest.rb
@@ -32,7 +32,10 @@ module VagrantPlugins
         #
         # Current limitations:
         #   - The installation of a specific Ansible version is only supported by
-        #     the "pip" install_mode.
+        #     the "pip" install_mode. Note that "pip" installation also takes place
+        #     via a default command. If pip needs to be installed differently then 
+        #     the command can be overwritten by supplying "pip_install_cmd" in the
+        #     config settings.
         #   - There is no absolute guarantee that the automated installation will replace
         #     a previous Ansible installation (although it works fine in many cases)
         #
@@ -51,7 +54,7 @@ module VagrantPlugins
              (config.version.to_s.to_sym == :latest ||
               !@machine.guest.capability(:ansible_installed, config.version))
             @machine.ui.detail I18n.t("vagrant.provisioners.ansible.installing")
-            @machine.guest.capability(:ansible_install, config.install_mode, config.version, config.pip_args)
+            @machine.guest.capability(:ansible_install, config.install_mode, config.version, config.pip_args, config.pip_install_cmd)
           end
 
           # This step will also fetch the Ansible version data into related instance variables
diff --git a/test/unit/plugins/provisioners/ansible/config/guest_test.rb b/test/unit/plugins/provisioners/ansible/config/guest_test.rb
index 19010ba94..d3abc431c 100644
--- a/test/unit/plugins/provisioners/ansible/config/guest_test.rb
+++ b/test/unit/plugins/provisioners/ansible/config/guest_test.rb
@@ -32,6 +32,7 @@ describe VagrantPlugins::Ansible::Config::Guest do
                             inventory_path
                             limit
                             pip_args
+                            pip_install_cmd
                             playbook
                             playbook_command
                             provisioning_path

From 281203edf18668003e53281bb2a68789e58b7e87 Mon Sep 17 00:00:00 2001
From: Vidroha Debroy <vd374g@att.com>
Date: Mon, 28 Jan 2019 13:35:50 -0600
Subject: [PATCH 6/9] Handling the cases for UNSET_VALUE, i.e., config is not
 finalized.

---
 plugins/provisioners/ansible/cap/guest/pip/pip.rb          | 5 +++--
 .../plugins/provisioners/ansible/cap/guest/pip/pip_test.rb | 7 ++++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/plugins/provisioners/ansible/cap/guest/pip/pip.rb b/plugins/provisioners/ansible/cap/guest/pip/pip.rb
index 307261a7f..df22cf181 100644
--- a/plugins/provisioners/ansible/cap/guest/pip/pip.rb
+++ b/plugins/provisioners/ansible/cap/guest/pip/pip.rb
@@ -25,9 +25,10 @@ module VagrantPlugins
             # The objective here is to get pip either by default
             # or by the argument passed in. The objective is not 
             # to circumvent the pip setup by passing in nothing.
-            # Thus, we stick with the default on an empty string.
+            # Thus, we stick with the default on an empty string
+            # or if it is an UNSET_VALUE.
 
-            if pip_install_cmd.empty?
+            if pip_install_cmd == Vagrant.plugin("2", :config)::UNSET_VALUE || pip_install_cmd.empty?
               pip_install_cmd=DEFAULT_PIP_INSTALL_CMD
             end
 
diff --git a/test/unit/plugins/provisioners/ansible/cap/guest/pip/pip_test.rb b/test/unit/plugins/provisioners/ansible/cap/guest/pip/pip_test.rb
index 24f510186..da4b25460 100644
--- a/test/unit/plugins/provisioners/ansible/cap/guest/pip/pip_test.rb
+++ b/test/unit/plugins/provisioners/ansible/cap/guest/pip/pip_test.rb
@@ -41,7 +41,12 @@ describe VagrantPlugins::Ansible::Cap::Guest::Pip do
             pip_install_command = ""
             expect(communicator).to receive(:execute).with("curl https://bootstrap.pypa.io/get-pip.py | sudo python")
             subject.get_pip(machine,pip_install_command)
-        end        
+        end 
+        
+        it "installs pip using the default command if the argument is UNSET_VALUE" do
+            expect(communicator).to receive(:execute).with("curl https://bootstrap.pypa.io/get-pip.py | sudo python")
+            subject.get_pip(machine, Vagrant.plugin("2", :config)::UNSET_VALUE)
+        end         
     end    
   end
 end
\ No newline at end of file

From 9b618eb0cf62cc9a5b4ffa87c25dd99c1bca6bfe Mon Sep 17 00:00:00 2001
From: Vidroha Debroy <vd374g@att.com>
Date: Mon, 28 Jan 2019 13:59:00 -0600
Subject: [PATCH 7/9] Updated documentation. Fixes hashicorp/vagrant#9584.

---
 .../docs/provisioning/ansible_local.html.md   | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/website/source/docs/provisioning/ansible_local.html.md b/website/source/docs/provisioning/ansible_local.html.md
index 14df9d53f..635451192 100644
--- a/website/source/docs/provisioning/ansible_local.html.md
+++ b/website/source/docs/provisioning/ansible_local.html.md
@@ -93,6 +93,31 @@ This section lists the _specific_ options for the Ansible Local provisioner. In
         sudo pip install --upgrade ansible==2.2.1.0
         ```
 
+    As-is `pip` is installed if needed via a default command which looks like
+
+        ```shell
+        curl https://bootstrap.pypa.io/get-pip.py | sudo python
+        ```
+
+    This can be problematic in certain scenarios, for example, when behind a proxy. It is possible to override this default command by providing an explicit command to run as part of the config using `pip_install_cmd`. For example:
+        
+        ```ruby
+        config.vm.provision "ansible_local" do |ansible|
+          ansible.playbook = "playbook.yml"
+          ansible.install_mode = "pip"
+          ansible.pip_install_cmd = "https_proxy=http://your.proxy.server:port curl -s https://bootstrap.pypa.io/get-pip.py | sudo https_proxy=http://your.proxy.server:port python"
+          ansible.version = "2.2.1.0"
+        end
+        ```
+        
+    In this case case `pip` will be installed via the command:
+
+        ```shell
+        https_proxy=http://your.proxy.server:port curl -s https://bootstrap.pypa.io/get-pip.py | sudo https_proxy=http://your.proxy.server:port python
+        ```
+
+    If `pip_install_cmd` is not provided in the config, then `pip` is installed via the default command.
+
   - `:pip_args_only`: This mode is very similar to the `:pip` mode, with the difference that in this case no pip arguments will be automatically set by Vagrant.
 
         Example:

From 7c0ffe369ab3f9a5875c10938e031adca929689e Mon Sep 17 00:00:00 2001
From: Vidroha Debroy <vdebroy.github@gmail.com>
Date: Fri, 15 Feb 2019 12:14:37 -0600
Subject: [PATCH 8/9] Updated based on recommended changes per review.

---
 .../provisioners/ansible/cap/guest/pip/pip.rb |  8 ++---
 .../ansible/cap/guest/pip/pip_test.rb         | 36 +++++++++----------
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/plugins/provisioners/ansible/cap/guest/pip/pip.rb b/plugins/provisioners/ansible/cap/guest/pip/pip.rb
index df22cf181..462131c02 100644
--- a/plugins/provisioners/ansible/cap/guest/pip/pip.rb
+++ b/plugins/provisioners/ansible/cap/guest/pip/pip.rb
@@ -5,7 +5,7 @@ module VagrantPlugins
       module Guest
         module Pip
 
-          DEFAULT_PIP_INSTALL_CMD = "curl https://bootstrap.pypa.io/get-pip.py | sudo python"
+          DEFAULT_PIP_INSTALL_CMD = "curl https://bootstrap.pypa.io/get-pip.py | sudo python".freeze
 
           def self.pip_install(machine, package = "", version = "", pip_args = "", upgrade = true)
             upgrade_arg = "--upgrade" if upgrade
@@ -25,10 +25,10 @@ module VagrantPlugins
             # The objective here is to get pip either by default
             # or by the argument passed in. The objective is not 
             # to circumvent the pip setup by passing in nothing.
-            # Thus, we stick with the default on an empty string
-            # or if it is an UNSET_VALUE.
+            # Thus, we stick with the default on an empty string.
+            # Typecast added in the check for safety.
 
-            if pip_install_cmd == Vagrant.plugin("2", :config)::UNSET_VALUE || pip_install_cmd.empty?
+            if pip_install_cmd == pip_install_cmd.to_s.empty?
               pip_install_cmd=DEFAULT_PIP_INSTALL_CMD
             end
 
diff --git a/test/unit/plugins/provisioners/ansible/cap/guest/pip/pip_test.rb b/test/unit/plugins/provisioners/ansible/cap/guest/pip/pip_test.rb
index da4b25460..a4403b7df 100644
--- a/test/unit/plugins/provisioners/ansible/cap/guest/pip/pip_test.rb
+++ b/test/unit/plugins/provisioners/ansible/cap/guest/pip/pip_test.rb
@@ -24,29 +24,29 @@ describe VagrantPlugins::Ansible::Cap::Guest::Pip do
 
   describe "#get_pip" do
     describe 'when no pip_install_command argument is provided' do
-        it "installs pip using the default command" do
-            expect(communicator).to receive(:execute).with("curl https://bootstrap.pypa.io/get-pip.py | sudo python")
-            subject.get_pip(machine)
-        end
+      it "installs pip using the default command" do
+        expect(communicator).to receive(:execute).with("curl https://bootstrap.pypa.io/get-pip.py | sudo python")
+        subject.get_pip(machine)
+      end
     end
 
     describe 'when pip_install_command argument is provided' do
-        it "runs the supplied argument instead of default" do
-            pip_install_command = "foo"
-            expect(communicator).to receive(:execute).with(pip_install_command)
-            subject.get_pip(machine,pip_install_command)
-        end
+      it "runs the supplied argument instead of default" do
+        pip_install_command = "foo"
+        expect(communicator).to receive(:execute).with(pip_install_command)
+        subject.get_pip(machine,pip_install_command)
+      end
 
-        it "installs pip using the default command if the argument is empty" do
-            pip_install_command = ""
-            expect(communicator).to receive(:execute).with("curl https://bootstrap.pypa.io/get-pip.py | sudo python")
-            subject.get_pip(machine,pip_install_command)
-        end 
+      it "installs pip using the default command if the argument is empty" do
+        pip_install_command = ""
+        expect(communicator).to receive(:execute).with("curl https://bootstrap.pypa.io/get-pip.py | sudo python")
+        subject.get_pip(machine,pip_install_command)
+      end 
         
-        it "installs pip using the default command if the argument is UNSET_VALUE" do
-            expect(communicator).to receive(:execute).with("curl https://bootstrap.pypa.io/get-pip.py | sudo python")
-            subject.get_pip(machine, Vagrant.plugin("2", :config)::UNSET_VALUE)
-        end         
+      it "installs pip using the default command if the argument is nil" do
+        expect(communicator).to receive(:execute).with("curl https://bootstrap.pypa.io/get-pip.py | sudo python")
+        subject.get_pip(machine, nil)
+      end         
     end    
   end
 end
\ No newline at end of file

From aacb453a79e421a770ce0615f73458184f9f364d Mon Sep 17 00:00:00 2001
From: Vidroha Debroy <vdebroy.github@gmail.com>
Date: Fri, 15 Feb 2019 14:53:56 -0600
Subject: [PATCH 9/9] Fixing bug I introduced. Thanks @chrisroberts!

---
 plugins/provisioners/ansible/cap/guest/pip/pip.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/provisioners/ansible/cap/guest/pip/pip.rb b/plugins/provisioners/ansible/cap/guest/pip/pip.rb
index 462131c02..88cb5b630 100644
--- a/plugins/provisioners/ansible/cap/guest/pip/pip.rb
+++ b/plugins/provisioners/ansible/cap/guest/pip/pip.rb
@@ -28,7 +28,7 @@ module VagrantPlugins
             # Thus, we stick with the default on an empty string.
             # Typecast added in the check for safety.
 
-            if pip_install_cmd == pip_install_cmd.to_s.empty?
+            if pip_install_cmd.to_s.empty?
               pip_install_cmd=DEFAULT_PIP_INSTALL_CMD
             end