summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Ray <matthewhray@gmail.com>2013-12-24 09:40:34 -0600
committerMatt Ray <matthewhray@gmail.com>2013-12-24 09:40:34 -0600
commit0ef57f04739c24ace2b0f3cd2a61276577ba92bd (patch)
treea8e1a960eaa783368774067996934a302270fc24
parentcaff601e2c48ba3e6dd17ef504a5dcb44ebd1916 (diff)
Rubocop support for metadata.rb and Gemfile
Replace double-quotes with single-quotes for now, expect this to act as a gate in the future. Change-Id: I10ff8b23517cb334905b162ce14059dbf23d7bc8
Notes
Notes (review): Verified+2: Jenkins Code-Review+1: John Dewey <john@dewey.ws> Code-Review+2: Justin Shepherd <jshepher@rackspace.com> Approved+1: craigtracey <craigtracey@gmail.com> Submitted-by: Jenkins Submitted-at: Thu, 02 Jan 2014 20:44:28 +0000 Reviewed-on: https://review.openstack.org/63941 Project: stackforge/cookbook-openstack-block-storage Branch: refs/heads/master
-rw-r--r--.rubocop.yml7
-rw-r--r--Gemfile16
-rw-r--r--Strainerfile2
-rw-r--r--metadata.rb34
4 files changed, 34 insertions, 25 deletions
diff --git a/.rubocop.yml b/.rubocop.yml
new file mode 100644
index 0000000..7a296ac
--- /dev/null
+++ b/.rubocop.yml
@@ -0,0 +1,7 @@
1# UTF-8 headers not generally in these files
2Encoding:
3 Enabled: false
4
5# ignore long lines
6LineLength:
7 Enabled: false
diff --git a/Gemfile b/Gemfile
index 840af0a..fa26df3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,9 +1,9 @@
1source "https://rubygems.org" 1source 'https://rubygems.org'
2 2
3gem "chef", "~> 11.4.4" 3gem 'chef', '~> 11.4.4'
4gem "json", "<= 1.7.7" # chef 11 dependency 4gem 'json', '<= 1.7.7' # chef 11 dependency
5gem "berkshelf", "~> 2.0.10" 5gem 'berkshelf', '~> 2.0.10'
6gem "chefspec", "~> 3.0.2" 6gem 'chefspec', '~> 3.0.2'
7gem "foodcritic", "~> 3.0.3" 7gem 'foodcritic', '~> 3.0.3'
8gem "strainer" 8gem 'strainer'
9gem "rubocop" 9gem 'rubocop'
diff --git a/Strainerfile b/Strainerfile
index cede8bf..77a72ec 100644
--- a/Strainerfile
+++ b/Strainerfile
@@ -1,5 +1,7 @@
1# Strainerfile 1# Strainerfile
2rubocop: bundle exec rubocop $SANDBOX/$COOKBOOK/attributes/ 2rubocop: bundle exec rubocop $SANDBOX/$COOKBOOK/attributes/
3rubocop: bundle exec rubocop $SANDBOX/$COOKBOOK/metadata.rb
4rubocop: bundle exec rubocop $SANDBOX/$COOKBOOK/Gemfile
3# rubocop: bundle exec rubocop $SANDBOX/$COOKBOOK 5# rubocop: bundle exec rubocop $SANDBOX/$COOKBOOK
4# may want to add rubocop check for Berksfile and Gemfile 6# may want to add rubocop check for Berksfile and Gemfile
5knife test: bundle exec knife cookbook test $COOKBOOK 7knife test: bundle exec knife cookbook test $COOKBOOK
diff --git a/metadata.rb b/metadata.rb
index ddfaa46..68470b8 100644
--- a/metadata.rb
+++ b/metadata.rb
@@ -1,24 +1,24 @@
1name "openstack-block-storage" 1name 'openstack-block-storage'
2maintainer "AT&T Services, Inc." 2maintainer 'AT&T Services, Inc.'
3maintainer_email "cookbooks@lists.tfoundry.com" 3maintainer_email 'cookbooks@lists.tfoundry.com'
4license "Apache 2.0" 4license 'Apache 2.0'
5description "The OpenStack Advanced Volume Management service Cinder." 5description 'The OpenStack Advanced Volume Management service Cinder.'
6long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) 6long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
7version "8.0.0" 7version '8.0.0'
8 8
9recipe "openstack-block-storage::common", "Defines the common pieces of repeated code from the other recipes" 9recipe 'openstack-block-storage::common', 'Defines the common pieces of repeated code from the other recipes'
10recipe "openstack-block-storage::api", "Installs the cinder-api, sets up the cinder database, and cinder service/user/endpoints in keystone" 10recipe 'openstack-block-storage::api', 'Installs the cinder-api, sets up the cinder database, and cinder service/user/endpoints in keystone'
11recipe "openstack-block-storage::keystone_registration", "Registers cinder service/user/endpoints in keystone" 11recipe 'openstack-block-storage::keystone_registration', 'Registers cinder service/user/endpoints in keystone'
12recipe "openstack-block-storage::scheduler", "Installs the cinder-scheduler service" 12recipe 'openstack-block-storage::scheduler', 'Installs the cinder-scheduler service'
13recipe "openstack-block-storage::volume", "Installs the cinder-volume service and sets up the iscsi helper" 13recipe 'openstack-block-storage::volume', 'Installs the cinder-volume service and sets up the iscsi helper'
14 14
15%w{ ubuntu fedora redhat centos suse }.each do |os| 15%w{ ubuntu fedora redhat centos suse }.each do |os|
16 supports os 16 supports os
17end 17end
18 18
19depends "apt" 19depends 'apt'
20depends "openstack-common", "~> 8.0" 20depends 'openstack-common', '~> 8.0'
21depends "openstack-identity", "~> 8.0" 21depends 'openstack-identity', '~> 8.0'
22depends "openstack-image", "~> 8.0" 22depends 'openstack-image', '~> 8.0'
23depends "selinux" 23depends 'selinux'
24depends "python" 24depends 'python'