Merge pull request #121 from aerostitch/fixing_provider_name

Fixing the provider name bug introduced in #117
voxpupuli · Feb 20, 2016 · 0fa23f4 · 0fa23f4
2 parents ef99433 + fb7132a
commit 0fa23f4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/manifests/params.pp b/manifests/params.pp
@@ -9,7 +9,7 @@
       $seven_zip_name     = '7zip'
       $seven_zip_provider = 'chocolatey'
       if versioncmp($::puppetversion, '4.3.1') >= 0 {
-        $gem_provider = 'pe_gem'
+        $gem_provider = 'puppet_gem'
       } else {
         $gem_provider = 'gem'
       }
@@ -21,8 +21,10 @@
       $mode  = '0640'
       $seven_zip_name = undef
       $seven_zip_provider = undef
-      if $::puppetversion =~ /Puppet Enterprise/ or versioncmp($::puppetversion, '4.0.0') >= 0 {
+      if $::puppetversion =~ /Puppet Enterprise/ {
         $gem_provider = 'pe_gem'
+      } elsif versioncmp($::puppetversion, '4.0.0') >= 0 {
+        $gem_provider = 'puppet_gem'
       } else {
         $gem_provider = 'gem'
       }

diff --git a/spec/classes/archive_spec.rb b/spec/classes/archive_spec.rb
@@ -20,8 +20,8 @@
   context 'RHEL Puppet 4.0.0 opensource' do
     let(:facts) { { :osfamily => 'RedHat', :puppetversion => '4.0.0' } }
 
-    it { is_expected.to contain_package('faraday').with_provider('pe_gem') }
-    it { is_expected.to contain_package('faraday_middleware').with_provider('pe_gem') }
+    it { is_expected.to contain_package('faraday').with_provider('puppet_gem') }
+    it { is_expected.to contain_package('faraday_middleware').with_provider('puppet_gem') }
     it { is_expected.to_not contain_package('7zip') }
   end
 
@@ -39,8 +39,8 @@
   context 'Windows Puppet 4.3.1 opensource' do
     let(:facts) { { :osfamily => 'Windows', :archive_windir => 'C:/staging', :puppetversion => '4.3.1' } }
 
-    it { is_expected.to contain_package('faraday').with_provider('pe_gem') }
-    it { is_expected.to contain_package('faraday_middleware').with_provider('pe_gem') }
+    it { is_expected.to contain_package('faraday').with_provider('puppet_gem') }
+    it { is_expected.to contain_package('faraday_middleware').with_provider('puppet_gem') }
     it do
       should contain_package('7zip').with(:name     => '7zip',
                                           :provider => 'chocolatey',)