diff --git a/.rubocop.yml b/.rubocop.yml index afc22bc..8dc6194 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -3,12 +3,11 @@ AllCops: - metadata.rb - Gemfile - attributes/** - - recipes/** - - spec/** - Excludes: - libraries/** - providers/** + - recipes/** - resources/** + - spec/** Encoding: Exclude: diff --git a/Gemfile b/Gemfile index 76065e1..0f77822 100644 --- a/Gemfile +++ b/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' diff --git a/Gemfile.lock b/Gemfile.lock index 9c331c2..4edf372 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -135,7 +135,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) @@ -147,7 +147,7 @@ GEM puma (1.6.3) rack (~> 1.2) rack (1.5.2) - rainbow (1.99.1) + rainbow (2.0.0) rake (10.1.0) rbzip2 (0.2.0) rest-client (1.6.7) @@ -181,10 +181,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) @@ -230,5 +231,5 @@ DEPENDENCIES chefspec (~> 3.1.4) foodcritic (~> 3.0.3) json (<= 1.7.7) - rubocop (>= 0.16.0) + rubocop (~> 0.18.1) strainer diff --git a/recipes/common.rb b/recipes/common.rb index 4c211e5..9332697 100644 --- a/recipes/common.rb +++ b/recipes/common.rb @@ -20,7 +20,7 @@ # limitations under the License. # -class ::Chef::Recipe +class ::Chef::Recipe # rubocop:disable Documentation include ::Openstack end