Add rubocop testing and conform to its style recommendations

.travis.yml

@@ -7,13 +7,14 @@ rvm:
 
 env:
   matrix:
-    - PUPPET_GEM_VERSION="~> 4.7.0"
-    - PUPPET_GEM_VERSION="~> 4.8.0"
-    - PUPPET_GEM_VERSION="~> 4"
+    - PUPPET_GEM_VERSION="~> 4.7.0" CHECK=test
+    - PUPPET_GEM_VERSION="~> 4.8.0" CHECK=test
+    - PUPPET_GEM_VERSION="~> 4" CHECK=test
+    - PUPPET_GEM_VERSION="~> 4" CHECK=rubocop
 
 sudo: false
 
-script: 'SPEC_OPTS="--format documentation" bundle exec rake validate lint spec'
+script: 'SPEC_OPTS="--format documentation" bundle exec rake $CHECK'
 
 matrix:
   fast_finish: true

Gemfile

@@ -13,6 +13,7 @@ gem 'rubocop', :require => false
 gem 'puppetlabs_spec_helper', '>= 1.2.0', :require => false
 gem 'facter', '>= 2.0', :require => false
 gem 'hiera', '~> 3.0', :require => false
+gem 'rubocop', :require => false
 gem 'puppet-lint', '~> 2.0', :require => false
 gem 'puppet-lint-absolute_classname-check', :require => false
 gem 'puppet-lint-alias-check', :require => false

Rakefile

@@ -29,3 +29,10 @@ task :validate do
     sh "erb -P -x -T '-' #{template} | ruby -c"
   end
 end
+
+desc 'Run tests for CI'
+task :test do
+  [:lint, :validate, :spec].each do |test|
+    Rake::Task[test].invoke
+  end
+end

spec/classes/init_spec.rb

@@ -114,11 +114,11 @@
             cron_minute = nil
           end
 
-          if [true, 'true'].include?(noop_value)
-            cron_command = '/opt/puppetlabs/bin/puppet agent --onetime --ignorecache --no-daemonize --no-usecacheonfailure --detailed-exitcodes --no-splay --noop'
-          else
-            cron_command = '/opt/puppetlabs/bin/puppet agent --onetime --ignorecache --no-daemonize --no-usecacheonfailure --detailed-exitcodes --no-splay'
-          end
+          cron_command = if [true, 'true'].include?(noop_value)
+                           '/opt/puppetlabs/bin/puppet agent --onetime --ignorecache --no-daemonize --no-usecacheonfailure --detailed-exitcodes --no-splay --noop'
+                         else
+                           '/opt/puppetlabs/bin/puppet agent --onetime --ignorecache --no-daemonize --no-usecacheonfailure --detailed-exitcodes --no-splay'
+                         end
 
           it do
             should contain_cron('puppet_agent_every_thirty').with({
@@ -165,11 +165,11 @@
       context "set to #{value} (as #{value.class})" do
         let(:params) { { :run_at_boot => value } }
 
-        if [true, 'true'].include?(value)
-          foo = 'present'
-        else
-          foo = 'absent'
-        end
+        foo = if [true, 'true'].include?(value)
+                'present'
+              else
+                'absent'
+              end
 
         it { should contain_cron('puppet_agent_once_at_boot').with_ensure(foo) }
       end

spec/classes/server_spec.rb

@@ -188,12 +188,12 @@
       'non-empty array of strings' => {
         :name    => %w(autosign_entries),
         :valid   => [['array with one string'], %w(array with many strings)],
-        :invalid => [%w(), [1,'not_all','string'], true, 'string', { 'ha' => 'sh' }, 3, 2.42],
+        :invalid => [%w(), [1, 'not_all', 'string'], true, 'string', { 'ha' => 'sh' }, 3, 2.42],
         :message => 'Error while evaluating a Resource Statement',
       },
       'memory size regex' => {
         :name    => %w(memory_size),
-        :valid   => ['1g', '1m', '1500m', '3g'],
+        :valid   => %w(1g 1m 1500m 3g),
         :invalid => ['1g1', 'm', '1k', '2t', 'g3', '1.2g'],
         :message => 'must be an integer following by the unit',
       },