Further changes based on PR feedback(1)

voxpupuli · Dec 3, 2017 · ec19dea · ec19dea
1 parent 9bcd158
commit ec19dea
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 23 deletions.
diff --git a/manifests/params.pp b/manifests/params.pp
@@ -32,7 +32,7 @@
         $npm_path                  = '/usr/bin/npm'
         $repo_class                = '::nodejs::repo::nodesource'
       }
-      elsif $facts['os']['release']['full'] =~ /^14.04$|^16.04$/ {
+      elsif $facts['os']['release']['full'] =~ /^1[46]\.04$/ {
         $legacy_debian_symlinks    = false
         $manage_package_repo       = true
         $nodejs_debug_package_name = 'nodejs-dbg'

diff --git a/manifests/repo/nodesource.pp b/manifests/repo/nodesource.pp
@@ -11,14 +11,9 @@
 
   case $facts['os']['family'] {
     'RedHat': {
-      if $facts['os']['release']['full'] =~ /^6\.(\d+)/ {
-        $dist_version = '6'
-        $name_string  = 'Enterprise Linux 6'
-      }
-
-      elsif $facts['os']['release']['full'] =~ /^7\.(\d+)/ {
-        $dist_version = '7'
-        $name_string  = 'Enterprise Linux 7'
+      if $facts['os']['release']['major'] =~ /^[67]$/ {
+        $dist_version = $facts['os']['release']['major']
+        $name_string  = "Enterprise Linux ${dist_version}"
       }
 
       # Fedora
@@ -54,11 +49,6 @@
       contain '::nodejs::repo::nodesource::yum'
 
     }
-    'Linux': {
-        if ($ensure == 'present') {
-          fail("Unsupported managed NodeSource repository for operatingsystem: ${facts['os']['name']}.")
-        }
-    }
     'Debian': {
       class { '::nodejs::repo::nodesource::apt': }
       contain '::nodejs::repo::nodesource::apt'

diff --git a/spec/classes/nodejs_spec.rb b/spec/classes/nodejs_spec.rb
@@ -9,6 +9,12 @@
         facts
       end
 
+      is_supported_debian_version = if facts[:os]['family'] == 'Debian' && %w[8 9].include?(facts[:os]['release']['major'])
+                                      true
+                                    else
+                                      false
+                                    end
+
       it 'the file resource root_npmrc should be in the catalog' do
         is_expected.to contain_file('root_npmrc').with(
           'ensure' => 'file',
@@ -208,8 +214,7 @@
           }
         end
 
-        if facts[:os]['family'] == 'Debian' &&
-           %w[8 9].include?(facts[:os]['release']['major'])
+        if is_supported_debian_version
 
           it 'the nodejs development package resource should not be present' do
             is_expected.not_to contain_package('nodejs-dev')
@@ -228,8 +233,7 @@
           }
         end
 
-        if facts[:os]['family'] == 'Debian' &&
-           %w[8 9].include?(facts[:os]['release']['major'])
+        if is_supported_debian_version
 
           it 'the nodejs development package resource should not be present' do
             is_expected.not_to contain_package('nodejs-dev')
@@ -274,8 +278,7 @@
           }
         end
 
-        if facts[:os]['family'] == 'Debian' &&
-           %w[8 9].include?(facts[:os]['release']['major'])
+        if is_supported_debian_version
 
           it 'the npm package resource should not be present' do
             is_expected.not_to contain_package('npm')
@@ -294,8 +297,7 @@
           }
         end
 
-        if facts[:os]['family'] == 'Debian' &&
-           %w[8 9].include?(facts[:os]['release']['major'])
+        if is_supported_debian_version
 
           it 'the npm package resource should not be present' do
             is_expected.not_to contain_package('npm')
@@ -1113,7 +1115,9 @@
           'family' => 'RedHat',
           'name' => 'Amazon',
           'release' => {
-            'full'  => '2015.03'
+            'full'  => '2015.03',
+            'major' => '2015',
+            'minor' => '03'
           }
         }
       }