summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher H. Laco <chris.laco@rackspace.com>2014-02-04 15:27:56 -0500
committerChristopher H. Laco <chris.laco@rackspace.com>2014-02-04 15:27:56 -0500
commitef8c535cc832febbd47ce903c72e676aa532902b (patch)
tree91f472c1ad24f3266d192c39301dd2fb23db79c2
parent3cc1b69377b902edda92ab6c120c5e5d0722ab5e (diff)
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: I9224b785f50103d348e3b16ea24e5dc8cab84c62 Implements: blueprint lint-and-unit-testing-for-havana
Notes
Notes (review): Verified+2: Jenkins Code-Review+2: Matt Ray <matthewhray@gmail.com> Approved+1: Andy McCrae <andy.mccrae@googlemail.com> Code-Review+2: Andy McCrae <andy.mccrae@googlemail.com> Code-Review+1: Mark Vanderwiel <vanderwl@us.ibm.com> Code-Review+1: Richard Theis <rtheis@us.ibm.com> Submitted-by: Jenkins Submitted-at: Thu, 06 Feb 2014 10:46:14 +0000 Reviewed-on: https://review.openstack.org/71090 Project: stackforge/cookbook-openstack-block-storage Branch: refs/heads/master
-rw-r--r--.rubocop.yml10
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock13
-rw-r--r--recipes/api.rb2
-rw-r--r--recipes/cinder-common.rb2
-rw-r--r--recipes/volume.rb2
6 files changed, 19 insertions, 12 deletions
diff --git a/.rubocop.yml b/.rubocop.yml
index 888678a..8dc6194 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -3,13 +3,19 @@ AllCops:
3 - metadata.rb 3 - metadata.rb
4 - Gemfile 4 - Gemfile
5 - attributes/** 5 - attributes/**
6 - libraries/**
7 - providers/**
6 - recipes/** 8 - recipes/**
9 - resources/**
7 - spec/** 10 - spec/**
8 11
9# ignore long lines 12Encoding:
13 Exclude:
14 - metadata.rb
15 - Gemfile
16
10LineLength: 17LineLength:
11 Enabled: false 18 Enabled: false
12 19
13# Allow small arrays before forcing %w or %W
14WordArray: 20WordArray:
15 MinSize: 3 21 MinSize: 3
diff --git a/Gemfile b/Gemfile
index 27706b4..86dcd42 100644
--- a/Gemfile
+++ b/Gemfile
@@ -7,4 +7,4 @@ gem 'berkshelf', '~> 2.0.10'
7gem 'chefspec', '~> 3.1.4' 7gem 'chefspec', '~> 3.1.4'
8gem 'foodcritic', '~> 3.0.3' 8gem 'foodcritic', '~> 3.0.3'
9gem 'strainer' 9gem 'strainer'
10gem 'rubocop', '>= 0.16.0' 10gem 'rubocop', '~> 0.18.1'
diff --git a/Gemfile.lock b/Gemfile.lock
index 47c4e86..b6f6331 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -135,7 +135,7 @@ GEM
135 mixlib-shellout 135 mixlib-shellout
136 systemu (~> 2.5.2) 136 systemu (~> 2.5.2)
137 yajl-ruby 137 yajl-ruby
138 parser (2.1.2) 138 parser (2.1.4)
139 ast (~> 1.1) 139 ast (~> 1.1)
140 slop (~> 3.4, >= 3.4.5) 140 slop (~> 3.4, >= 3.4.5)
141 polyglot (0.3.3) 141 polyglot (0.3.3)
@@ -147,7 +147,7 @@ GEM
147 puma (1.6.3) 147 puma (1.6.3)
148 rack (~> 1.2) 148 rack (~> 1.2)
149 rack (1.5.2) 149 rack (1.5.2)
150 rainbow (1.99.1) 150 rainbow (2.0.0)
151 rake (10.1.1) 151 rake (10.1.1)
152 rbzip2 (0.2.0) 152 rbzip2 (0.2.0)
153 rest-client (1.6.7) 153 rest-client (1.6.7)
@@ -181,10 +181,11 @@ GEM
181 rspec-expectations (2.14.4) 181 rspec-expectations (2.14.4)
182 diff-lcs (>= 1.1.3, < 2.0) 182 diff-lcs (>= 1.1.3, < 2.0)
183 rspec-mocks (2.14.4) 183 rspec-mocks (2.14.4)
184 rubocop (0.16.0) 184 rubocop (0.18.1)
185 parser (~> 2.1) 185 json (>= 1.7.7, < 2)
186 parser (~> 2.1.3)
186 powerpack (~> 0.0.6) 187 powerpack (~> 0.0.6)
187 rainbow (>= 1.1.4) 188 rainbow (>= 1.99.1, < 3.0)
188 rubyntlm (0.1.1) 189 rubyntlm (0.1.1)
189 savon (0.9.5) 190 savon (0.9.5)
190 akami (~> 1.0) 191 akami (~> 1.0)
@@ -230,5 +231,5 @@ DEPENDENCIES
230 chefspec (~> 3.1.4) 231 chefspec (~> 3.1.4)
231 foodcritic (~> 3.0.3) 232 foodcritic (~> 3.0.3)
232 json (<= 1.7.7) 233 json (<= 1.7.7)
233 rubocop (>= 0.16.0) 234 rubocop (~> 0.18.1)
234 strainer 235 strainer
diff --git a/recipes/api.rb b/recipes/api.rb
index a9a4db8..459b42b 100644
--- a/recipes/api.rb
+++ b/recipes/api.rb
@@ -21,7 +21,7 @@
21# limitations under the License. 21# limitations under the License.
22# 22#
23 23
24class ::Chef::Recipe 24class ::Chef::Recipe # rubocop:disable Documentation
25 include ::Openstack 25 include ::Openstack
26end 26end
27 27
diff --git a/recipes/cinder-common.rb b/recipes/cinder-common.rb
index a846491..285bc77 100644
--- a/recipes/cinder-common.rb
+++ b/recipes/cinder-common.rb
@@ -13,7 +13,7 @@
13# limitations under the License. 13# limitations under the License.
14# 14#
15 15
16class ::Chef::Recipe 16class ::Chef::Recipe # rubocop:disable Documentation
17 include ::Openstack 17 include ::Openstack
18end 18end
19 19
diff --git a/recipes/volume.rb b/recipes/volume.rb
index 1733e9b..efe4051 100644
--- a/recipes/volume.rb
+++ b/recipes/volume.rb
@@ -22,7 +22,7 @@
22# limitations under the License. 22# limitations under the License.
23# 23#
24 24
25class ::Chef::Recipe 25class ::Chef::Recipe # rubocop:disable Documentation
26 include ::Openstack 26 include ::Openstack
27end 27end
28 28