Merge pull request #11 from jlambert121/lint

Lint

.fixtures.yml

@@ -1,6 +1,7 @@
 fixtures:
-  repositories:
-    stdlib: https://github.com/puppetlabs/puppetlabs-stdlib.git
+  forge_modules:
+    stdlib:
+      repo: "puppetlabs/stdlib"
+      ref: "3.2.0"
   symlinks:
     lynis: "#{source_dir}"
-

.sync.yml

@@ -2,6 +2,6 @@
   .travis.yml:
     hc_secure: "hFn1IPniahB7mdgd0l8rRjeCfkkAWnSNJA5PkKaWKtv/e+JWkFp6mIsdPV+XipLL+h8f6GfNvvwHQtWHTWVQHbEszVxL4nGzIeBI391nyHFZR9vU3ePy2rkm3dlm90NM59XVYMaGBJBoIyAmLOoFZZhx0OgIWKQ73HFpkZOdyv8="
   spec/acceptance/nodesets/ubuntu-server-1204-x64.yml:
-    delete: true
+    unmanaged: true
   spec/acceptance/nodesets/ubuntu-server-1404-x64.yml:
-    delete: true
+    unmanaged: true

Gemfile

@@ -1,13 +1,24 @@
 source ENV['GEM_SOURCE'] || "https://rubygems.org"
 
 group :unit_tests do
-  gem 'rake',                    :require => false
-  gem 'rspec-puppet',            :require => false, :git => 'https://github.com/rodjek/rspec-puppet.git', :tag => 'v2.0.0'
-  gem 'puppetlabs_spec_helper',  :require => false
-  gem 'puppet-lint', '1.0.1',    :require => false
-  gem 'puppet-syntax',           :require => false
-  gem 'metadata-json-lint',      :require => false
-  gem 'json',                    :require => false
+  gem 'rake',                                              :require => false
+  gem 'rspec', '~> 3.1.0',                                 :require => false
+  gem 'rspec-puppet',                                      :require => false
+  gem 'puppetlabs_spec_helper',                            :require => false
+  gem 'puppet-lint', '1.0.1',                              :require => false
+  gem 'puppet-syntax',                                     :require => false
+  gem 'metadata-json-lint',                                :require => false
+  gem 'json',                                              :require => false
+  gem 'puppet-lint-absolute_classname-check',              :require => false
+  gem 'puppet-lint-appends-check',                         :require => false
+  gem 'puppet-lint-empty_string-check',                    :require => false
+  gem 'puppet-lint-file_ensure-check',                     :require => false
+  gem 'puppet-lint-leading_zero-check',                    :require => false
+  gem 'puppet-lint-spaceship_operator_without_tag-check',  :require => false
+  gem 'puppet-lint-trailing_comma-check',                  :require => false
+  gem 'puppet-lint-undef_in_function-check',               :require => false
+  gem 'puppet-lint-unquoted_string-check',                 :require => false
+  gem 'puppet-lint-version_comparison-check',              :require => false
 end
 group :development do
   gem 'simplecov',   :require => false

manifests/init.pp

@@ -30,6 +30,6 @@
   $version = 'latest',
 ) {
 
-  class { 'lynis::install': }
+  class { '::lynis::install': }
 
 }

manifests/install.pp

@@ -15,14 +15,14 @@
 class lynis::install {
 
   package { 'lynis':
-    ensure  => $::lynis::version
+    ensure  => $::lynis::version,
   }
 
   file { '/usr/local/bin/lynis_parse.rb':
     ensure => 'file',
     owner  => 'root',
     group  => 'root',
     mode   => '0555',
-    source => "puppet:///modules/${module_name}/lynis_parse.rb"
+    source => "puppet:///modules/${module_name}/lynis_parse.rb",
   }
 }

manifests/profile.pp

@@ -62,16 +62,18 @@
     source => $source,
   }
 
+  $_command = "/usr/bin/lynis --cronjob --profile /etc/lynis/${profile_name}.prf > /dev/null"
+
   if $logstashify {
-    $ls = ' && /usr/local/bin/lynis_parse.rb'
+    $command = "${_command} && /usr/local/bin/lynis_parse.rb"
   } else {
-    $ls = ''
+    $command = $_command
   }
 
   if $enable_cron {
     cron { $profile_name:
       ensure  => 'present',
-      command => "/usr/bin/lynis --cronjob --profile /etc/lynis/${profile_name}.prf > /dev/null${ls}",
+      command => $command,
       hour    => $hour,
       minute  => $minute,
     }