Upgrade/Update rubocop

Now that almost all of the rubocop blueprints have been completed, make
one final pass through all of the cookbooks ensuring they're all in
sync with each other.

- Upgrade rubocop to 0.18.1
- Fix violations caused by 0.18.1 upgrade
- Add Includes for non-existent folders to Includes so they
  automatically cover future additions

Change-Id: Ib3220a0ab8281bc0eafaf9898c233d90490cfde6
Implements: blueprint lint-and-unit-testing-for-havana

.rubocop.yml

@@ -1,25 +1,21 @@
 AllCops:
   Includes:
-    - Gemfile
     - metadata.rb
+    - Gemfile
     - attributes/**
-    - spec/**
+    - libraries/**
+    - providers/**
     - recipes/**
+    - resources/**
+    - spec/**
 
-  Excludes:
-    - files/**
-    - templates/**
-
-# UTF-8 headers not generally in these files
 Encoding:
   Exclude:
     - metadata.rb
     - Gemfile
 
-# ignore long lines
 LineLength:
   Enabled: false
 
-# ignore word arrays
 WordArray:
   MinSize: 3

Gemfile

@@ -6,4 +6,4 @@ gem 'berkshelf', '~> 2.0.10'
 gem 'chefspec', '~> 3.1.4'
 gem 'foodcritic', '~> 3.0.3'
 gem 'strainer'
-gem 'rubocop', '>= 0.16.0'
+gem 'rubocop', '~> 0.18.1'

Gemfile.lock

@@ -136,7 +136,7 @@ GEM
       mixlib-shellout
       systemu (~> 2.5.2)
       yajl-ruby
-    parser (2.1.2)
+    parser (2.1.4)
       ast (~> 1.1)
       slop (~> 3.4, >= 3.4.5)
     polyglot (0.3.3)
@@ -148,7 +148,7 @@ GEM
     puma (1.6.3)
       rack (~> 1.2)
     rack (1.5.2)
-    rainbow (1.99.1)
+    rainbow (2.0.0)
     rake (10.1.1)
     rbzip2 (0.2.0)
     rest-client (1.6.7)
@@ -182,10 +182,11 @@ GEM
     rspec-expectations (2.14.4)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.14.4)
-    rubocop (0.16.0)
-      parser (~> 2.1)
+    rubocop (0.18.1)
+      json (>= 1.7.7, < 2)
+      parser (~> 2.1.3)
       powerpack (~> 0.0.6)
-      rainbow (>= 1.1.4)
+      rainbow (>= 1.99.1, < 3.0)
     rubyntlm (0.1.1)
     savon (0.9.5)
       akami (~> 1.0)
@@ -232,5 +233,5 @@ DEPENDENCIES
   chefspec (~> 3.1.4)
   foodcritic (~> 3.0.3)
   json (<= 1.7.7)
-  rubocop (>= 0.16.0)
+  rubocop (~> 0.18.1)
   strainer

spec/spec_helper.rb

@@ -33,15 +33,15 @@ MOCK_NODE_NETWORK_DATA =
             'fe80::a00:27ff:feca:ab08' => { 'scope' => 'Link', 'prefixlen' => '64', 'family' => 'inet6' },
             '10.0.0.2' => { 'netmask' => '255.255.255.0', 'broadcast' => '10.0.0.255', 'family' => 'inet' },
             '08:00:27:CA:AB:08' => { 'family' => 'lladdr' }
-          },
+          }
         },
         'lo' => {
           'addresses' => {
             '::1' => { 'scope' => 'Node', 'prefixlen' => '128', 'family' => 'inet6' },
             '127.0.0.1' => { 'netmask' => '255.0.0.0', 'family' => 'inet' }
-          },
-        },
-      },
+          }
+        }
+      }
     }
   }