Fix for changed RuboCop and FoodCritic rule(s)

djoos-cookbooks · Jul 19, 2017 · d9a3cee · d9a3cee
1 parent eb54711
commit d9a3cee
Show file tree

Hide file tree

Showing 31 changed files with 26 additions and 44 deletions.
diff --git a/Rakefile b/Rakefile
@@ -247,23 +247,23 @@ namespace :publish do
 end
 
 desc 'Run lint checks'
-task :lint => %w(style)
+task :lint => %w[style]
 
 desc 'Run unit tests'
-task :unit => %w(spec)
+task :unit => %w[spec]
 
 desc 'Run Travis CI tests'
-task :travis => %w(lint unit)
+task :travis => %w[lint unit]
 
 desc 'Run all integration tests'
-task :integration => %w(integration:vagrant)
+task :integration => %w[integration:vagrant]
 
 desc 'Publish'
-task :publish => %w(publish:scm publish:chef:supermarket publish:chef:server)
+task :publish => %w[publish:scm publish:chef:supermarket publish:chef:server]
 
 desc 'Release'
 task :release do
   ReleaseCommands.release(environment)
 end
 
-task :default => %w(lint unit integration)
+task :default => %w[lint unit integration]
diff --git a/metadata.rb b/metadata.rb
@@ -7,7 +7,7 @@
 version '2.29.0'
 chef_version '>= 0.10.0' if respond_to?(:chef_version)
 
-%w(debian ubuntu redhat centos fedora scientific amazon windows smartos oracle).each do |os|
+%w[debian ubuntu redhat centos fedora scientific amazon windows smartos oracle].each do |os|
   supports os
 end
 

diff --git a/providers/agent_php.rb b/providers/agent_php.rb
@@ -168,7 +168,7 @@ def startup_mode_config
     # ensure that the daemon isn't currently running
     # only stop the daemon if it has not been run by the agent (with a newrelic.cfg)
     service 'newrelic-daemon' do
-      action [:disable, :stop] # stops the service if it's running and disables it from starting at system boot time
+      action %i[disable stop] # stops the service if it's running and disables it from starting at system boot time
       only_if { ::File.exist?('/etc/newrelic/newrelic.cfg') }
     end
     # ensure that the file /etc/newrelic/newrelic.cfg does not exist if it does, move it aside (or remove it)
@@ -198,7 +198,7 @@ def startup_mode_config
       notifies new_resource.service_action, "service[#{new_resource.service_name}]", :delayed if new_resource.service_name
     end
     service 'newrelic-daemon' do
-      action [:enable, :start] # starts the service if it's not running and enables it to start at system boot time
+      action %i[enable start] # starts the service if it's not running and enables it to start at system boot time
     end
   else
     raise "#{new_resource.startup_mode} is not a valid newrelic-daemon startup mode."

diff --git a/providers/deployment.rb b/providers/deployment.rb
@@ -5,7 +5,7 @@
 # Copyright (c) 2016, David Joos
 #
 
-use_inline_resources if defined?(use_inline_resources)
+use_inline_resources
 
 def whyrun_supported?
   true
@@ -67,8 +67,6 @@ def whyrun_supported?
       command command_curl
       action :run
     end
-
-    new_resource.updated_by_last_action(true)
   end
 end
 

diff --git a/providers/yml.rb b/providers/yml.rb
@@ -7,7 +7,7 @@
 
 require 'uri'
 
-use_inline_resources if defined?(use_inline_resources)
+use_inline_resources
 
 def whyrun_supported?
   true
@@ -40,6 +40,4 @@ def whyrun_supported?
     sensitive true
     action :create
   end
-
-  new_resource.updated_by_last_action(t.updated_by_last_action?)
 end
diff --git a/resources/agent_infrastructure.rb b/resources/agent_infrastructure.rb
@@ -17,6 +17,6 @@
 attribute :proxy, :kind_of => String, :default => nil
 attribute :template_cookbook, :kind_of => String, :default => 'newrelic'
 attribute :template_source, :kind_of => String, :default => 'agent/infrastructure/newrelic.yml.erb'
-attribute :service_actions, :kind_of => Array, :default => %w(enable start)
+attribute :service_actions, :kind_of => Array, :default => %w[enable start]
 attribute :windows_version, :kind_of => String, :default => '1.0.703'
 attribute :windows_checksum, :kind_of => String, :default => '3c9f98325dc484ee8735f01b913803eaef54f06641348b3dd9f3c0b3cd803ace'
diff --git a/resources/deployment.rb b/resources/deployment.rb
@@ -9,7 +9,7 @@
 default_action :notify
 
 attribute :url, :kind_of => String, :default => 'https://api.newrelic.com/deployments.xml'
-attribute :key_type, :kind_of => String, :equal_to => %w(license_key api_key), :default => 'api_key'
+attribute :key_type, :kind_of => String, :equal_to => %w[license_key api_key], :default => 'api_key'
 attribute :key, :name_attribute => true, :kind_of => String
 
 # @todo take out deprecated api_key logic
@@ -24,7 +24,5 @@
 
 def initialize(*args)
   super
-  @action = :notify
-
   @run_context.include_recipe 'curl'
 end
diff --git a/resources/server_monitor.rb b/resources/server_monitor.rb
@@ -26,7 +26,7 @@
 
 attribute :config_file_user, :kind_of => String, :default => 'root'
 attribute :service_notify_action, :kind_of => String, :default => 'restart'
-attribute :service_actions, :kind_of => Array, :default => %w(enable start)
+attribute :service_actions, :kind_of => Array, :default => %w[enable start]
 attribute :windows_version, :kind_of => String, :default => '2.0.0.198'
 attribute :windows64_checksum, :kind_of => String, :default => '5a8f3f5e8f15997463430401756d377c321c8899c2790ca85e5587a5b643651e'
 attribute :windows32_checksum, :kind_of => String, :default => 'ac2b65eecaad461fdd2e4386e3e4c9f96ea940b35bdf7a8c532c21dbd1c99ff0'

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -26,7 +26,7 @@ def stub_node_resources(node)
 
 RSpec.configure do |config|
   config.mock_with :rspec do |c|
-    c.syntax = [:should, :expect]
+    c.syntax = %i[should expect]
   end
   config.log_level = :error
   config.formatter = :documentation

diff --git a/spec/unit/agent_java_spec.rb b/spec/unit/agent_java_spec.rb
@@ -46,7 +46,7 @@
       ChefSpec::Runner.new(:log_level => LOG_LEVEL, :platform => 'centos', :version => '6.6', :step_into => ['newrelic_agent_java']) do |node|
         stub_node_resources(node)
         node.override['newrelic']['java_agent']['class_transformer_config'] = {
-          'classloader_blacklist' => %w(class1 class2),
+          'classloader_blacklist' => %w[class1 class2],
           'instrumentation_classes' => {
             'wildfly-8' => { 'enabled' => false },
             'wildfly-8-CAT' => { 'enabled' => false },

diff --git a/test/fixtures/cookbooks/newrelic_lwrp_test/metadata.rb b/test/fixtures/cookbooks/newrelic_lwrp_test/metadata.rb
@@ -1,4 +1,3 @@
-# Encoding: utf-8
 name 'newrelic_lwrp_test'
 maintainer 'David Joos'
 maintainer_email '[email protected]'

diff --git a/test/fixtures/cookbooks/newrelic_lwrp_test/recipes/agent_dotnet.rb b/test/fixtures/cookbooks/newrelic_lwrp_test/recipes/agent_dotnet.rb
@@ -1,4 +1,3 @@
-# Encoding: utf-8
 #
 # Cookbook Name:: newrelic_lwrp_test
 # Recipe:: agent_dotnet

diff --git a/test/fixtures/cookbooks/newrelic_lwrp_test/recipes/agent_infrastructure.rb b/test/fixtures/cookbooks/newrelic_lwrp_test/recipes/agent_infrastructure.rb
@@ -1,4 +1,3 @@
-# Encoding: utf-8
 #
 # Cookbook Name:: newrelic_lwrp_test
 # Recipe:: agent_infrastructure

diff --git a/test/fixtures/cookbooks/newrelic_lwrp_test/recipes/agent_java.rb b/test/fixtures/cookbooks/newrelic_lwrp_test/recipes/agent_java.rb
@@ -1,4 +1,3 @@
-# Encoding: utf-8
 #
 # Cookbook Name:: newrelic_lwrp_test
 # Recipe:: agent_java

diff --git a/test/fixtures/cookbooks/newrelic_lwrp_test/recipes/agent_nodejs.rb b/test/fixtures/cookbooks/newrelic_lwrp_test/recipes/agent_nodejs.rb
@@ -1,4 +1,3 @@
-# Encoding: utf-8
 #
 # Cookbook Name:: newrelic_lwrp_test
 # Recipe:: agent_nodejs

diff --git a/test/fixtures/cookbooks/newrelic_lwrp_test/recipes/agent_nodejs_recipe.rb b/test/fixtures/cookbooks/newrelic_lwrp_test/recipes/agent_nodejs_recipe.rb
@@ -1,4 +1,3 @@
-# Encoding: utf-8
 #
 # Cookbook Name:: newrelic_lwrp_test
 # Recipe:: agent_nodejs_recipe

diff --git a/test/fixtures/cookbooks/newrelic_lwrp_test/recipes/agent_php.rb b/test/fixtures/cookbooks/newrelic_lwrp_test/recipes/agent_php.rb
@@ -1,4 +1,3 @@
-# Encoding: utf-8
 #
 # Cookbook Name:: newrelic_lwrp_test
 # Recipe:: agent_php

diff --git a/test/fixtures/cookbooks/newrelic_lwrp_test/recipes/agent_python.rb b/test/fixtures/cookbooks/newrelic_lwrp_test/recipes/agent_python.rb
@@ -1,4 +1,3 @@
-# Encoding: utf-8
 #
 # Cookbook Name:: newrelic_lwrp_test
 # Recipe:: agent_python

diff --git a/test/fixtures/cookbooks/newrelic_lwrp_test/recipes/agent_python_recipe.rb b/test/fixtures/cookbooks/newrelic_lwrp_test/recipes/agent_python_recipe.rb
@@ -1,4 +1,3 @@
-# Encoding: utf-8
 #
 # Cookbook Name:: newrelic_lwrp_test
 # Recipe:: agent_python_recipe

diff --git a/test/fixtures/cookbooks/newrelic_lwrp_test/recipes/agent_ruby.rb b/test/fixtures/cookbooks/newrelic_lwrp_test/recipes/agent_ruby.rb
@@ -1,4 +1,3 @@
-# Encoding: utf-8
 #
 # Cookbook Name:: newrelic_lwrp_test
 # Recipe:: agent_java

diff --git a/test/fixtures/cookbooks/newrelic_lwrp_test/recipes/lwrp_yml.rb b/test/fixtures/cookbooks/newrelic_lwrp_test/recipes/lwrp_yml.rb
@@ -1,4 +1,3 @@
-# Encoding: utf-8
 #
 # Cookbook Name:: newrelic_lwrp_test
 # Recipe:: lwrp_yml

diff --git a/test/fixtures/cookbooks/newrelic_lwrp_test/recipes/server_monitor.rb b/test/fixtures/cookbooks/newrelic_lwrp_test/recipes/server_monitor.rb
@@ -1,4 +1,3 @@
-# Encoding: utf-8
 #
 # Cookbook Name:: newrelic_lwrp_test
 # Recipe:: server_monitor

diff --git a/test/integration/default/serverspec/default_spec.rb b/test/integration/default/serverspec/default_spec.rb
@@ -6,7 +6,7 @@
     it { is_expected.to be_enabled }
   end
 
-  describe file('/etc/apt/sources.list.d/newrelic.list'), :if => %w(debian ubuntu).include?(os[:family]) do
+  describe file('/etc/apt/sources.list.d/newrelic.list'), :if => %w[debian ubuntu].include?(os[:family]) do
     it { is_expected.to be_file }
   end
 

diff --git a/test/integration/infrastructure-agent/serverspec/default_spec.rb b/test/integration/infrastructure-agent/serverspec/default_spec.rb
@@ -4,7 +4,7 @@
   it { is_expected.to exist }
   it { is_expected.to be_enabled }
 end
-describe file('/etc/apt/sources.list.d/newrelic-infra.list'), :if => %w(debian ubuntu).include?(os[:family]) do
+describe file('/etc/apt/sources.list.d/newrelic-infra.list'), :if => %w[debian ubuntu].include?(os[:family]) do
   it { is_expected.to be_file }
 end
 describe package 'newrelic-infra' do

diff --git a/test/integration/nodejs-agent-recipe/serverspec/default_spec.rb b/test/integration/nodejs-agent-recipe/serverspec/default_spec.rb
@@ -5,7 +5,7 @@
   it { is_expected.to exist }
   it { is_expected.to be_enabled }
 end
-describe file('/etc/apt/sources.list.d/newrelic.list'), :if => %w(debian ubuntu).include?(os[:family]) do
+describe file('/etc/apt/sources.list.d/newrelic.list'), :if => %w[debian ubuntu].include?(os[:family]) do
   it { is_expected.to be_file }
 end
 

diff --git a/test/integration/nodejs-agent/serverspec/default_spec.rb b/test/integration/nodejs-agent/serverspec/default_spec.rb
@@ -4,7 +4,7 @@
   it { is_expected.to exist }
   it { is_expected.to be_enabled }
 end
-describe file('/etc/apt/sources.list.d/newrelic.list'), :if => %w(debian ubuntu).include?(os[:family]) do
+describe file('/etc/apt/sources.list.d/newrelic.list'), :if => %w[debian ubuntu].include?(os[:family]) do
   it { is_expected.to be_file }
 end
 

diff --git a/test/integration/php-agent-php5enmod/serverspec/default_spec.rb b/test/integration/php-agent-php5enmod/serverspec/default_spec.rb
@@ -1,10 +1,10 @@
 require 'spec_helper'
 
-describe file('/etc/php5/conf.d/newrelic.ini'), :if => %w(12.04).include?(os[:release]) do
+describe file('/etc/php5/conf.d/newrelic.ini'), :if => %w[12.04].include?(os[:release]) do
   it { is_expected.to be_file }
 end
 
-describe file('/etc/php5/mods-available/newrelic.ini'), :if => %w(14.04).include?(os[:release]) do
+describe file('/etc/php5/mods-available/newrelic.ini'), :if => %w[14.04].include?(os[:release]) do
   it { is_expected.to be_file }
 end
 

diff --git a/test/integration/php-agent/serverspec/default_spec.rb b/test/integration/php-agent/serverspec/default_spec.rb
@@ -4,7 +4,7 @@
   it { is_expected.to exist }
   it { is_expected.to be_enabled }
 end
-describe file('/etc/apt/sources.list.d/newrelic.list'), :if => %w(debian ubuntu).include?(os[:family]) do
+describe file('/etc/apt/sources.list.d/newrelic.list'), :if => %w[debian ubuntu].include?(os[:family]) do
   it { is_expected.to be_file }
 end
 describe package 'newrelic-daemon' do

diff --git a/test/integration/python-agent-recipe/serverspec/default_spec.rb b/test/integration/python-agent-recipe/serverspec/default_spec.rb
@@ -5,7 +5,7 @@
   it { is_expected.to be_enabled }
 end
 
-describe file('/etc/apt/sources.list.d/newrelic.list'), :if => %w(debian ubuntu).include?(os[:family]) do
+describe file('/etc/apt/sources.list.d/newrelic.list'), :if => %w[debian ubuntu].include?(os[:family]) do
   it { is_expected.to be_file }
 end
 

diff --git a/test/integration/python-agent/serverspec/default_spec.rb b/test/integration/python-agent/serverspec/default_spec.rb
@@ -4,7 +4,7 @@
   it { is_expected.to exist }
   it { is_expected.to be_enabled }
 end
-describe file('/etc/apt/sources.list.d/newrelic.list'), :if => %w(debian ubuntu).include?(os[:family]) do
+describe file('/etc/apt/sources.list.d/newrelic.list'), :if => %w[debian ubuntu].include?(os[:family]) do
   it { is_expected.to be_file }
 end
 

diff --git a/test/integration/server-monitor/serverspec/default_spec.rb b/test/integration/server-monitor/serverspec/default_spec.rb
@@ -4,7 +4,7 @@
   it { is_expected.to exist }
   it { is_expected.to be_enabled }
 end
-describe file('/etc/apt/sources.list.d/newrelic.list'), :if => %w(debian ubuntu).include?(os[:family]) do
+describe file('/etc/apt/sources.list.d/newrelic.list'), :if => %w[debian ubuntu].include?(os[:family]) do
   it { is_expected.to be_file }
 end
 describe package 'newrelic-sysmond' do