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 - Move Excludes for non-existent folders to Includes so they automatically cover future additions Change-Id: Id66903d1ca0f5fc0fa3323cca2ec6880730db3fe Implements: blueprint lint-and-unit-testing-for-havana
This commit is contained in:
parent
d7242b7668
commit
2f3fda1dc9
@ -3,12 +3,11 @@ AllCops:
|
||||
- metadata.rb
|
||||
- Gemfile
|
||||
- attributes/**
|
||||
- recipes/**
|
||||
- spec/**
|
||||
- libraries/**
|
||||
Excludes:
|
||||
- providers/**
|
||||
- recipes/**
|
||||
- resources/**
|
||||
- spec/**
|
||||
|
||||
Encoding:
|
||||
Exclude:
|
||||
|
2
Gemfile
2
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'
|
||||
|
13
Gemfile.lock
13
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
|
||||
|
@ -19,7 +19,7 @@
|
||||
# limitations under the License.
|
||||
#
|
||||
|
||||
module ::Openstack
|
||||
module ::Openstack # rubocop:disable Documentation
|
||||
# Library routine that uses the database cookbook to create the
|
||||
# service's database and grant read/write access to the
|
||||
# given user and password.
|
||||
|
@ -19,7 +19,7 @@
|
||||
# limitations under the License.
|
||||
#
|
||||
|
||||
module ::Openstack
|
||||
module ::Openstack # rubocop:disable Documentation
|
||||
# return the IPv4 (default) address of the given interface.
|
||||
#
|
||||
# @param [String] interface The interface to query.
|
||||
|
@ -18,7 +18,7 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
module ::Openstack
|
||||
module ::Openstack # rubocop:disable Documentation
|
||||
# The current state of (at least some) OpenStack CLI tools do not provide a
|
||||
# mechanism for outputting data in formats other than PrettyTable output.
|
||||
# Therefore this function is intended to parse PrettyTable output into a
|
||||
|
@ -19,7 +19,7 @@
|
||||
# limitations under the License.
|
||||
#
|
||||
|
||||
module ::Openstack
|
||||
module ::Openstack # rubocop:disable Documentation
|
||||
# Library routine that returns an encrypted data bag value
|
||||
# for a supplied string. The key used in decrypting the
|
||||
# encrypted value should be located at
|
||||
|
@ -18,7 +18,7 @@
|
||||
# limitations under the License.
|
||||
#
|
||||
|
||||
module ::Openstack
|
||||
module ::Openstack # rubocop:disable Documentation
|
||||
# Search the nodes environment for the given role or recipe.
|
||||
#
|
||||
# @param [String] The role or recipe to be found.
|
||||
|
@ -18,7 +18,7 @@
|
||||
# limitations under the License.
|
||||
#
|
||||
|
||||
class ::Chef::Recipe
|
||||
class ::Chef::Recipe # rubocop:disable Documentation
|
||||
include ::Openstack
|
||||
end
|
||||
|
||||
|
@ -106,7 +106,7 @@ describe ::Openstack do
|
||||
it 'returns rabbit servers' do
|
||||
nodes = [
|
||||
{ 'openstack' => { 'mq' => { 'listen' => '1.1.1.1', 'port' => '5672' } } },
|
||||
{ 'openstack' => { 'mq' => { 'listen' => '2.2.2.2', 'port' => '5672' } } },
|
||||
{ 'openstack' => { 'mq' => { 'listen' => '2.2.2.2', 'port' => '5672' } } }
|
||||
]
|
||||
@subject.stub(:node).and_return @chef_run.node
|
||||
@subject.stub(:search_for)
|
||||
|
Loading…
Reference in New Issue
Block a user