pip.rb in vagrant-unbundled-2.2.5.0

- old
+ new

@@ -3,10 +3,12 @@
   module Ansible
     module Cap
       module Guest
         module Pip
 
+          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
             version_arg = ""
 
             if !version.to_s.empty? && version.to_s.to_sym != :latest
@@ -16,12 +18,23 @@
             args_array = [pip_args, upgrade_arg, "#{package}#{version_arg}"]
 
             machine.communicate.sudo "pip install #{args_array.join(' ')}"
           end
 
-          def self.get_pip(machine)
+          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.
+            # Typecast added in the check for safety.
+
+            if pip_install_cmd.to_s.empty?
+              pip_install_cmd=DEFAULT_PIP_INSTALL_CMD
+            end
+
             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
       end
     end