Merge pull request #79 from bstopp/feature/purge-packages

Minor updates

Author: bstopp

.rubocop.yml

@@ -6,6 +6,21 @@ AllCops:
     - 'vendor/**/*'
   TargetRubyVersion: 2.0
 
+Metrics/BlockLength:
+  Exclude:
+    - 'spec/defines/service_spec.rb'
+  ExcludedMethods:
+    - 'describe'
+    - 'context'
+    - 'it'
+    - 'shared_examples'
+    - 'newtype'
+    - 'provide'
+    - 'newproperty'
+    - 'let'
+    - 'shell'
+    - 'CentOS'
+
 Metrics/LineLength:
   Max: 120
 

.rubocop_todo.yml

@@ -23,11 +23,6 @@ Lint/EmptyWhen:
 Metrics/AbcSize:
   Max: 38
 
-# Offense count: 9
-# Configuration parameters: CountComments.
-Metrics/BlockLength:
-  Max: 200
-
 # Offense count: 7
 Metrics/CyclomaticComplexity:
   Max: 9

Gemfile.lock

@@ -8,7 +8,7 @@ GEM
     aws-sdk-v1 (1.66.0)
       json (~> 1.4)
       nokogiri (>= 1.4.4)
-    beaker (3.8.0)
+    beaker (3.9.0)
       aws-sdk-v1 (~> 1.57)
       beaker-facter (~> 0.0)
       beaker-hiera (~> 0.0)
@@ -44,16 +44,16 @@ GEM
       rspec
       serverspec (~> 2)
       specinfra (~> 2)
-    builder (3.2.2)
-    codeclimate-test-reporter (1.0.3)
+    builder (3.2.3)
+    codeclimate-test-reporter (1.0.4)
       simplecov
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     crx_packmgr_api_client (1.2.0)
       json (~> 1.8, >= 1.8.0)
       typhoeus (~> 1.0, >= 1.0.1)
     deep_merge (1.1.1)
-    diff-lcs (1.2.5)
+    diff-lcs (1.3)
     docile (1.1.5)
     docker-api (1.33.1)
       excon (>= 0.38.0)
@@ -63,7 +63,7 @@ GEM
     excon (0.54.0)
     facter (2.4.6)
       CFPropertyList (~> 2.2.6)
-    faraday (0.10.1)
+    faraday (0.11.0)
       multipart-post (>= 1.2, < 3)
     fast_gettext (1.1.0)
     ffi (1.9.17)
@@ -151,7 +151,7 @@ GEM
     fog-profitbricks (3.0.0)
       fog-core (~> 1.42)
       fog-json (~> 1.0)
-    fog-rackspace (0.1.3)
+    fog-rackspace (0.1.4)
       fog-core (>= 1.35)
       fog-json (>= 1.0)
       fog-xml (>= 0.1)
@@ -185,7 +185,7 @@ GEM
     fog-voxel (0.1.0)
       fog-core
       fog-xml
-    fog-vsphere (1.6.0)
+    fog-vsphere (1.7.0)
       fog-core
       rbvmomi (~> 1.9)
     fog-xenserver (0.2.3)
@@ -198,7 +198,7 @@ GEM
     gettext (3.2.2)
       locale (>= 2.0.5)
       text (>= 1.3.0)
-    gettext-setup (0.11)
+    gettext-setup (0.12)
       fast_gettext (~> 1.1.0)
       gettext (>= 3.0.2)
       locale
@@ -228,8 +228,8 @@ GEM
     inflecto (0.0.2)
     inifile (2.0.2)
     ipaddress (0.8.3)
-    json (1.8.5)
-    json_pure (1.8.5)
+    json (1.8.6)
+    json_pure (1.8.6)
     jwt (1.5.6)
     little-plugger (1.1.4)
     locale (2.1.2)
@@ -306,8 +306,8 @@ GEM
       rspec
     rspec-support (3.5.0)
     rsync (1.0.9)
-    rubocop (0.46.0)
-      parser (>= 2.3.1.1, < 3.0)
+    rubocop (0.47.1)
+      parser (>= 2.3.3.1, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.7)
@@ -316,7 +316,7 @@ GEM
     safe_yaml (1.0.4)
     semantic_puppet (0.1.4)
       gettext-setup (>= 0.3)
-    serverspec (2.37.2)
+    serverspec (2.38.0)
       multi_json
       rspec (~> 3.0)
       rspec-its
@@ -333,9 +333,9 @@ GEM
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
     spdx-licenses (1.1.0)
-    specinfra (2.66.3)
+    specinfra (2.66.5)
       net-scp
-      net-ssh (>= 2.7, < 4.0)
+      net-ssh (>= 2.7, < 5.0)
       net-telnet
       sfl
     stringify-hash (0.0.2)
@@ -348,7 +348,7 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.2)
-    unicode-display_width (1.1.2)
+    unicode-display_width (1.1.3)
     webmock (2.3.2)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)

Rakefile

@@ -1,10 +1,11 @@
-require 'rake/clean'
 require 'puppetlabs_spec_helper/rake_tasks'
 require 'puppet-lint/tasks/puppet-lint'
 require 'puppet-syntax/tasks/puppet-syntax'
+require 'rake/clean'
 require 'rubocop/rake_task'
 
 exclude_paths = %w(
+  vendor/**/*.pp
   spec/**/*.pp
   pkg/**/*.pp
 )

spec/defines/service_spec.rb

@@ -40,17 +40,16 @@
   end
 
   %w(CentOS Fedora RedHat).each do |os|
-    describe os do
-      context 'version >= 7' do
+    context os do
+
+      let(:params) do
+        default_params
+      end
 
+      context 'version >= 7' do
         let(:facts) do
           default_facts.merge(operatingsystem: os, operatingsystemmajrelease: '7')
         end
-
-        let(:params) do
-          default_params
-        end
-
         it do
           is_expected.to contain_aem__service__systemd('aem').only_with(
             ensure: 'present',
@@ -67,11 +66,6 @@
         let(:facts) do
           default_facts.merge(operatingsystem: os, operatingsystemmajrelease: '6')
         end
-
-        let(:params) do
-          default_params
-        end
-
         it do
           is_expected.to contain_aem__service__init('aem').only_with(
             ensure: 'present',
@@ -82,7 +76,6 @@
             user: 'aem'
           )
         end
-
       end
     end
   end