More fixes and tests

Author: Thai Pham

manifests/install.pp

@@ -10,7 +10,7 @@
   $python = $python_version ? {
     'system' => 'python',
     'pypy'   => 'pypy',
-    /\A(python)?([0-9](\.?[0-9])+)/ => "python${1}",
+    /\A(python)?([0-9](\.?[0-9])+)/ => "python${2}",
     default  => "python${python::version}",
   }
 
@@ -74,19 +74,29 @@
         }
       }
 
-      # Install pip without pip, see https://pip.pypa.io/en/stable/installing/.
-      include 'python::pip::bootstrap'
+      # Respect the $pip_ensure setting
+      unless $pip_ensure == 'absent' {
+        # Install pip without pip, see https://pip.pypa.io/en/stable/installing/.
+        include 'python::pip::bootstrap'
 
-      Exec['bootstrap pip'] -> File['pip-python'] -> Package <| provider == pip |>
+        Exec['bootstrap pip'] -> File['pip-python'] -> Package <| provider == pip |>
 
-      Package <| title == 'pip' |> {
-        name     => 'pip',
-        provider => 'pip',
-      }
-      Package <| title == 'virtualenv' |> {
-        name     => 'virtualenv',
-        provider => 'pip',
-        require  => Package[$pythondev],
+        Package <| title == 'pip' |> {
+          name     => 'pip',
+          provider => 'pip',
+        }
+        if $pythondev {
+          Package <| title == 'virtualenv' |> {
+            name     => 'virtualenv',
+            provider => 'pip',
+            require  => Package['python-dev'],
+          }
+        } else {
+          Package <| title == 'virtualenv' |> {
+            name     => 'virtualenv',
+            provider => 'pip',
+          }
+        }
       }
     }
     'scl': {

manifests/pip.pp

@@ -244,7 +244,7 @@
         # Unfortunately this is the smartest way of getting the latest available package version with pip as of now
         # Note: we DO need to repeat ourselves with "from version" in both grep and sed as on some systems pip returns
         # more than one line with paretheses.
-        $latest_version = join(["${pip_env} install ${proxy_flag} ${pkgname}==notreallyaversion 2>&1",
+        $latest_version = join(["${pip_install} ${pypi_index} ${proxy_flag} ${install_args} ${install_editable} ${pkgname}==notreallyaversion 2>&1",
                                 ' | grep -oP "\(from versions: .*\)" | sed -E "s/\(from versions: (.*?, )*(.*)\)/\2/g"',
                                 ' | tr -d "[:space:]"'])
 

spec/classes/python_spec.rb

@@ -61,7 +61,7 @@
 
           describe 'with python::provider' do
             context 'pip' do
-              let(:params) { { provider: 'pip' } }
+              let(:params) { { pip: 'present', provider: 'pip' } }
 
               it {
                 is_expected.to contain_package('virtualenv').with(
@@ -384,7 +384,7 @@
 
           describe 'with python::provider' do
             context 'pip' do
-              let(:params) { { provider: 'pip' } }
+              let(:params) { { pip: 'present', provider: 'pip' } }
 
               it {
                 is_expected.to contain_package('virtualenv').with(