diff options
author | Thom May <thom@chef.io> | 2016-01-14 14:08:03 +0000 |
---|---|---|
committer | Thom May <thom@chef.io> | 2016-01-14 14:08:03 +0000 |
commit | 51cfbdc4d16739caac4d946fadbe678444aafe34 (patch) | |
tree | 56dfd8f1cd9fd933de27268b32402e955a43ac2b /kitchen-tests | |
parent | 05064423057d4cf46f4713b81b08829cf6d20af6 (diff) | |
download | chef-51cfbdc4d16739caac4d946fadbe678444aafe34.tar.gz |
Use double quotes by default
This is an entirely mechanically generated (chefstyle -a) change, to go
along with chef/chefstyle#5 . We should pick something and use it
consistently, and my opinion is that double quotes are the appropriate
thing.
Diffstat (limited to 'kitchen-tests')
-rw-r--r-- | kitchen-tests/Gemfile | 12 | ||||
-rw-r--r-- | kitchen-tests/cookbooks/audit_test/metadata.rb | 14 | ||||
-rw-r--r-- | kitchen-tests/cookbooks/webapp/attributes/default.rb | 14 | ||||
-rw-r--r-- | kitchen-tests/cookbooks/webapp/metadata.rb | 22 | ||||
-rw-r--r-- | kitchen-tests/cookbooks/webapp/recipes/default.rb | 40 | ||||
-rw-r--r-- | kitchen-tests/test/fixtures/serverspec_helper.rb | 16 | ||||
-rw-r--r-- | kitchen-tests/test/integration/webapp/serverspec/Gemfile | 2 |
7 files changed, 60 insertions, 60 deletions
diff --git a/kitchen-tests/Gemfile b/kitchen-tests/Gemfile index 6ded6a784c..874f052ae8 100644 --- a/kitchen-tests/Gemfile +++ b/kitchen-tests/Gemfile @@ -1,10 +1,10 @@ source "https://rubygems.org" group :end_to_end do - gem 'berkshelf' - gem 'test-kitchen', '~> 1.4' - gem 'kitchen-appbundle-updater', '~> 0.0.1' - gem "kitchen-vagrant", '~> 0.17' - gem 'kitchen-ec2', github: 'test-kitchen/kitchen-ec2' - gem 'vagrant-wrapper' + gem "berkshelf" + gem "test-kitchen", "~> 1.4" + gem "kitchen-appbundle-updater", "~> 0.0.1" + gem "kitchen-vagrant", "~> 0.17" + gem "kitchen-ec2", github: "test-kitchen/kitchen-ec2" + gem "vagrant-wrapper" end diff --git a/kitchen-tests/cookbooks/audit_test/metadata.rb b/kitchen-tests/cookbooks/audit_test/metadata.rb index 4a60104e92..91cf94c0ff 100644 --- a/kitchen-tests/cookbooks/audit_test/metadata.rb +++ b/kitchen-tests/cookbooks/audit_test/metadata.rb @@ -1,8 +1,8 @@ -name 'audit_test' -maintainer 'The Authors' -maintainer_email 'you@example.com' -license 'all_rights' -description 'Installs/Configures audit_test' -long_description 'Installs/Configures audit_test' -version '0.1.0' +name "audit_test" +maintainer "The Authors" +maintainer_email "you@example.com" +license "all_rights" +description "Installs/Configures audit_test" +long_description "Installs/Configures audit_test" +version "0.1.0" diff --git a/kitchen-tests/cookbooks/webapp/attributes/default.rb b/kitchen-tests/cookbooks/webapp/attributes/default.rb index fb33efa49e..2ff7a6c5ff 100644 --- a/kitchen-tests/cookbooks/webapp/attributes/default.rb +++ b/kitchen-tests/cookbooks/webapp/attributes/default.rb @@ -1,14 +1,14 @@ -default['apache']['remote_host_ip'] = '127.0.0.1' +default["apache"]["remote_host_ip"] = "127.0.0.1" -default['webapp']['database'] = 'webapp' -default['webapp']['db_username'] = 'webapp' -default['webapp']['path'] = '/srv/webapp' +default["webapp"]["database"] = "webapp" +default["webapp"]["db_username"] = "webapp" +default["webapp"]["path"] = "/srv/webapp" # XXX: apache2 cookbook 2.0.0 has bugs around changing the mpm and then attempting a graceful restart # which fails and leaves the service down. -case node['platform'] +case node["platform"] when "ubuntu" - if node['platform_version'].to_f >= 14.04 - default[:apache][:mpm] = 'event' + if node["platform_version"].to_f >= 14.04 + default[:apache][:mpm] = "event" end end diff --git a/kitchen-tests/cookbooks/webapp/metadata.rb b/kitchen-tests/cookbooks/webapp/metadata.rb index c26ad23979..f1f07d952b 100644 --- a/kitchen-tests/cookbooks/webapp/metadata.rb +++ b/kitchen-tests/cookbooks/webapp/metadata.rb @@ -1,12 +1,12 @@ -name 'webapp' -maintainer '' -maintainer_email '' -license '' -description 'Installs/Configures webapp' -long_description 'Installs/Configures webapp' -version '0.1.0' +name "webapp" +maintainer "" +maintainer_email "" +license "" +description "Installs/Configures webapp" +long_description "Installs/Configures webapp" +version "0.1.0" -depends 'apache2' -depends 'database', '~> 2.3.1' -depends 'mysql' -depends 'php' +depends "apache2" +depends "database", "~> 2.3.1" +depends "mysql" +depends "php" diff --git a/kitchen-tests/cookbooks/webapp/recipes/default.rb b/kitchen-tests/cookbooks/webapp/recipes/default.rb index e0cbbdd4a8..3dc22ea0fa 100644 --- a/kitchen-tests/cookbooks/webapp/recipes/default.rb +++ b/kitchen-tests/cookbooks/webapp/recipes/default.rb @@ -11,43 +11,43 @@ include_recipe "php" creds = Hash.new %w(mysql webapp).each do |item_name| - creds[item_name] = data_bag_item('passwords', item_name) + creds[item_name] = data_bag_item("passwords", item_name) end web_app "webapp" do - server_name 'localhost' - server_aliases [node['fqdn'], node['hostname'], 'localhost.localdomain'] - docroot node['webapp']['path'] - cookbook 'apache2' + server_name "localhost" + server_aliases [node["fqdn"], node["hostname"], "localhost.localdomain"] + docroot node["webapp"]["path"] + cookbook "apache2" end mysql_service "default" do - server_root_password creds['mysql']['server_root_password'] - server_repl_password creds['mysql']['server_repl_password'] + server_root_password creds["mysql"]["server_root_password"] + server_repl_password creds["mysql"]["server_repl_password"] end -mysql_database node['webapp']['database'] do +mysql_database node["webapp"]["database"] do connection ({ - :host => 'localhost', - :username => 'root', - :password => creds['mysql']['server_root_password'], + :host => "localhost", + :username => "root", + :password => creds["mysql"]["server_root_password"], }) action :create end -mysql_database_user node['webapp']['db_username'] do +mysql_database_user node["webapp"]["db_username"] do connection ({ - :host => 'localhost', - :username => 'root', - :password => creds['mysql']['server_root_password'], + :host => "localhost", + :username => "root", + :password => creds["mysql"]["server_root_password"], }) - password creds['webapp']['db_password'] - database_name node['webapp']['database'] + password creds["webapp"]["db_password"] + database_name node["webapp"]["database"] privileges [:select, :update, :insert, :create, :delete] action :grant end -directory node['webapp']['path'] do +directory node["webapp"]["path"] do owner "root" group "root" mode "0755" @@ -56,9 +56,9 @@ directory node['webapp']['path'] do end template "#{node['webapp']['path']}/index.html" do - source 'index.html.erb' + source "index.html.erb" end template "#{node['webapp']['path']}/index.php" do - source 'index.php.erb' + source "index.php.erb" end diff --git a/kitchen-tests/test/fixtures/serverspec_helper.rb b/kitchen-tests/test/fixtures/serverspec_helper.rb index ad1f866775..feb4c21200 100644 --- a/kitchen-tests/test/fixtures/serverspec_helper.rb +++ b/kitchen-tests/test/fixtures/serverspec_helper.rb @@ -2,24 +2,24 @@ # The commented-out platforms in the osmapping hash can be added once we have added them into # our .kitchen.yml and .kitchen.travis.yml and added the appropriate JSON under test/fixtures/platforms. -require 'serverspec' -require 'json' -require 'ffi_yajl' +require "serverspec" +require "json" +require "ffi_yajl" set :backend, :exec include Specinfra::Helper::Properties -require 'pp' +require "pp" pp os def load_nodestub case os[:family] - when 'ubuntu', 'debian' + when "ubuntu", "debian" platform = os[:family] platform_version = os[:release] - when 'redhat' - platform = 'centos' + when "redhat" + platform = "centos" platform_version = os[:release].to_i end FFI_Yajl::Parser.parse(IO.read("#{ENV['BUSSER_ROOT']}/../kitchen/data/platforms/#{platform}/#{platform_version}.json"), :symbolize_names => true) @@ -27,6 +27,6 @@ end # centos-59 doesn't have /sbin in the default path, # so we must ensure it's on serverspec's path -set :path, '$PATH:/sbin' +set :path, "$PATH:/sbin" set_property load_nodestub diff --git a/kitchen-tests/test/integration/webapp/serverspec/Gemfile b/kitchen-tests/test/integration/webapp/serverspec/Gemfile index 0cb00ce354..eef1450f7a 100644 --- a/kitchen-tests/test/integration/webapp/serverspec/Gemfile +++ b/kitchen-tests/test/integration/webapp/serverspec/Gemfile @@ -1,4 +1,4 @@ # This Gemfile is only needed so that busser will install gems it needs for serverspec_helper.rb to work source "https://rubygems.org" -gem 'ffi-yajl', '~> 1.1' # Go away, JSON gem +gem "ffi-yajl", "~> 1.1" # Go away, JSON gem |