Use facts hash and add some spacing styles

treydock · treydock · commit 0c331a39c3df · 2020-12-14T10:20:49.000-05:00
diff --git a/manifests/install.pp b/manifests/install.pp
@@ -284,7 +284,7 @@
         $pip_package  = 'pip'
         $pip_provider = 'pip'
       } else {
-        $pip_package = fact('os.release.major') ? {
+        $pip_package = $facts['os']['release']['major'] ? {
           '20.04' => 'python3-pip',
           default => 'python-pip',
         }
diff --git a/manifests/params.pp b/manifests/params.pp
@@ -46,7 +46,7 @@
     default  => 'gunicorn',
   }
 
-  $version = fact('os.release.major') ? {
+  $version = $facts['os']['release']['major'] ? {
     '20.04' => '3',
     default => 'system',
   }
diff --git a/manifests/pyvenv.pp b/manifests/pyvenv.pp
@@ -47,6 +47,7 @@
     if ( $facts['os']['family'] == 'Debian') {
       $python3_venv_package = "python${normalized_python_version}-venv"
       ensure_packages($python3_venv_package)
+
       Package[$python3_venv_package] -> File[$venv_dir]
     }
 
diff --git a/spec/defines/pip_spec.rb b/spec/defines/pip_spec.rb
@@ -10,7 +10,8 @@
         kernel: 'Linux',
         lsbdistcodename: 'squeeze',
         os: {
-          family: 'Debian'
+          family: 'Debian',
+          release: { major: '6' },
         },
         osfamily: 'Debian',
         operatingsystem: 'Debian',

Original file line number	Diff line number	Diff line change
`@@ -284,7 +284,7 @@`
`284`	`284`	`$pip_package = 'pip'`
`285`	`285`	`$pip_provider = 'pip'`
`286`	`286`	`} else {`
`287`		`- $pip_package = fact('os.release.major') ? {`
	`287`	`+ $pip_package = $facts['os']['release']['major'] ? {`
`288`	`288`	`'20.04' => 'python3-pip',`
`289`	`289`	`default => 'python-pip',`
`290`	`290`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@`
`46`	`46`	`default => 'gunicorn',`
`47`	`47`	`}`
`48`	`48`
`49`		`- $version = fact('os.release.major') ? {`
	`49`	`+ $version = $facts['os']['release']['major'] ? {`
`50`	`50`	`'20.04' => '3',`
`51`	`51`	`default => 'system',`
`52`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,7 @@`
`47`	`47`	`if ( $facts['os']['family'] == 'Debian') {`
`48`	`48`	`$python3_venv_package = "python${normalized_python_version}-venv"`
`49`	`49`	`ensure_packages($python3_venv_package)`
	`50`	`+`
`50`	`51`	`Package[$python3_venv_package] -> File[$venv_dir]`
`51`	`52`	`}`
`52`	`53`