Resolve puppet-lint (#81)

Co-authored-by: Raphaël Pinson <[email protected]>

manifests/files.pp

@@ -10,7 +10,7 @@
   # ensure no file not managed by puppet ends up in there.
   file { $lens_dir:
     ensure       => directory,
-    purge        => $::augeas::purge,
+    purge        => $augeas::purge,
     force        => true,
     recurse      => true,
     recurselimit => 1,
@@ -29,7 +29,7 @@
 
   file { "${lens_dir}/tests":
     ensure => directory,
-    purge  => $::augeas::purge,
+    purge  => $augeas::purge,
     force  => true,
     mode   => '0644',
     owner  => $augeas::files_owner,

manifests/init.pp

@@ -12,12 +12,11 @@
   String $files_owner = 'root',
   String $files_group = 'root',
   $version      = present,
-  $ruby_package = $::augeas::params::ruby_pkg,
+  $ruby_package = $augeas::params::ruby_pkg,
   $ruby_version = present,
-  $lens_dir     = $::augeas::params::lens_dir,
+  $lens_dir     = $augeas::params::lens_dir,
   $purge        = true,
 ) inherits augeas::params {
-
   if versioncmp($::puppetversion, '4.0.0') >= 0 {
     contain 'augeas::files'
   } else {
@@ -27,5 +26,4 @@
 
     Package['ruby-augeas', $augeas::params::augeas_pkgs] -> Augeas <| |> # lint:ignore:spaceship_operator_without_tag
   }
-
 }

manifests/lens.pp

@@ -30,7 +30,7 @@
   $test_source  = undef,
   $stock_since  = false,
 ) {
-  include ::augeas
+  include augeas
 
   if $lens_source != undef {
     if $lens_content != undef {
@@ -59,7 +59,6 @@
   }
 
   if (!$stock_since or versioncmp($::augeasversion, $stock_since) < 0) {
-
     assert_type(Pattern[/^\/.*/], $augeas::lens_dir)
 
     $lens_name = "${name}.aug"

manifests/packages.pp

@@ -3,12 +3,12 @@
 # Sets up packages for Augeas
 #
 class augeas::packages {
-  package { $::augeas::params::augeas_pkgs:
-    ensure => $::augeas::version,
+  package { $augeas::params::augeas_pkgs:
+    ensure => $augeas::version,
   }
 
   package { 'ruby-augeas':
-    ensure => $::augeas::ruby_version,
-    name   => $::augeas::ruby_package,
+    ensure => $augeas::ruby_version,
+    name   => $augeas::ruby_package,
   }
 }

manifests/params.pp

@@ -3,7 +3,6 @@
 # Default parameters for the Augeas module
 #
 class augeas::params {
-
   case $::osfamily {
     'RedHat': {
       $ruby_pkg = $::operatingsystem ? {
@@ -23,7 +22,7 @@
         # SLES 11 SP3
         $ruby_pkg = 'ruby1.8-rubygem-ruby-augeas'
       }
-      $augeas_pkgs = ['augeas', 'augeas-lenses', 'libaugeas0' ]
+      $augeas_pkgs = ['augeas', 'augeas-lenses', 'libaugeas0']
     }
 
     'Debian': {
@@ -48,7 +47,7 @@
       $augeas_pkgs = ['augeas']
     }
 
-    default:  { fail("Unsupported OS family: ${::osfamily}") }
+    default:  { fail("Unsupported OS family: ${facts['os']['family']}") }
   }
 
   if versioncmp($::puppetversion, '4.0.0') >= 0 {
@@ -59,5 +58,4 @@
   } else {
     $lens_dir = '/usr/share/augeas/lenses'
   }
-
 }

spec/classes/augeas_spec.rb

@@ -5,6 +5,7 @@
     let(:facts) do
       {
         osfamily: 'MS-DOS',
+        os: { family: 'MS-DOS' },
       }
     end
 
@@ -43,6 +44,7 @@
             case facts[:lsbdistcodename]
             when 'squeeze', 'lucid', 'precise'
               let(:facts) do
+                super().merge(ruby: { version: '1.8.7' })
                 super().merge(rubyversion: '1.8.7')
               end
 
@@ -54,6 +56,7 @@
               }
             else
               let(:facts) do
+                super().merge(ruby: { version: '1.9.3' })
                 super().merge(rubyversion: '1.9.3')
               end
 
@@ -136,6 +139,7 @@
             case facts[:lsbdistcodename]
             when 'squeeze', 'lucid', 'precise'
               let(:facts) do
+                super().merge(ruby: { version: '1.8.7' })
                 super().merge(rubyversion: '1.8.7')
               end
 
@@ -147,6 +151,7 @@
               }
             else
               let(:facts) do
+                super().merge(ruby: { version: '1.9.3' })
                 super().merge(rubyversion: '1.9.3')
               end
 

spec/defines/augeas_lens_spec.rb

@@ -56,6 +56,7 @@
           end
 
           let(:facts) do
+            super().merge(augeas: { version: '1.0.0' })
             super().merge(augeasversion: '1.0.0')
           end
 
@@ -72,6 +73,7 @@
           end
 
           let(:facts) do
+            super().merge(augeas: { version: '1.3.0' })
             super().merge(augeasversion: '1.3.0')
           end