From b20599b6503be65674c3e420be6cca91b507ac0a Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Mon, 2 Feb 2015 22:25:07 +0000 Subject: [PATCH] Fix some issues identified by rubocop --- cookbooks/accounts/recipes/default.rb | 3 +-- cookbooks/apache/providers/conf.rb | 2 +- cookbooks/apache/providers/module.rb | 6 +++--- cookbooks/apache/providers/site.rb | 2 +- cookbooks/chef/libraries/edit_file.rb | 2 +- cookbooks/civicrm/recipes/default.rb | 1 - cookbooks/dev/recipes/default.rb | 4 ++-- cookbooks/exim/recipes/default.rb | 6 +++--- cookbooks/hardware/attributes/default.rb | 2 +- cookbooks/hardware/recipes/default.rb | 2 +- cookbooks/incron/recipes/default.rb | 2 +- cookbooks/mediawiki/definitions/mediawiki_extension.rb | 1 - cookbooks/mediawiki/definitions/mediawiki_site.rb | 4 ++-- cookbooks/munin/providers/plugin.rb | 6 +++--- cookbooks/munin/recipes/default.rb | 8 ++++---- cookbooks/mysql/providers/database.rb | 2 +- cookbooks/networking/libraries/interfaces.rb | 2 +- cookbooks/nfs/recipes/default.rb | 2 +- cookbooks/nominatim/recipes/default.rb | 2 +- cookbooks/openvpn/recipes/default.rb | 2 +- cookbooks/osqa/recipes/default.rb | 1 - cookbooks/otrs/recipes/default.rb | 1 - cookbooks/postgresql/providers/table.rb | 2 +- cookbooks/sysctl/recipes/default.rb | 2 +- cookbooks/sysfs/recipes/default.rb | 2 +- cookbooks/tile/files/default/ruby/expire.rb | 4 ++-- cookbooks/tile/recipes/default.rb | 4 ++-- cookbooks/trac/recipes/default.rb | 2 +- cookbooks/web/recipes/rails.rb | 2 +- 29 files changed, 38 insertions(+), 43 deletions(-) diff --git a/cookbooks/accounts/recipes/default.rb b/cookbooks/accounts/recipes/default.rb index 50e3d375a..9627d1d08 100644 --- a/cookbooks/accounts/recipes/default.rb +++ b/cookbooks/accounts/recipes/default.rb @@ -30,9 +30,8 @@ search(:accounts, "*:*").each do |account| if details[:status] group_members = details[:members] || account["members"] || [] - user_home = details[:home] || account["home"] || "#{node[:accounts][:home]}/#{name.to_s}" + user_home = details[:home] || account["home"] || "#{node[:accounts][:home]}/#{name}" manage_home = details[:manage_home] || account["manage_home"] || node[:accounts][:manage_home] - groups = details[:groups] || account["groups"] || [] group_members = group_members.collect { |m| m.to_s }.sort diff --git a/cookbooks/apache/providers/conf.rb b/cookbooks/apache/providers/conf.rb index d249079d9..806a7076a 100644 --- a/cookbooks/apache/providers/conf.rb +++ b/cookbooks/apache/providers/conf.rb @@ -108,5 +108,5 @@ def enabled_name end def enabled? - ::File.exists?(enabled_name) + ::File.exist?(enabled_name) end diff --git a/cookbooks/apache/providers/module.rb b/cookbooks/apache/providers/module.rb index 17008371e..166aa4a47 100644 --- a/cookbooks/apache/providers/module.rb +++ b/cookbooks/apache/providers/module.rb @@ -60,7 +60,7 @@ action :enable do owner "root" group "root" notifies :reload, "service[apache2]" - only_if { ::File.exists?(available_name("conf")) } + only_if { ::File.exist?(available_name("conf")) } end new_resource.updated_by_last_action(true) @@ -106,9 +106,9 @@ def enabled_name(extension) end def installed? - ::File.exists?(available_name("load")) + ::File.exist?(available_name("load")) end def enabled? - ::File.exists?(enabled_name("load")) + ::File.exist?(enabled_name("load")) end diff --git a/cookbooks/apache/providers/site.rb b/cookbooks/apache/providers/site.rb index 86fecbfcf..9c3303251 100644 --- a/cookbooks/apache/providers/site.rb +++ b/cookbooks/apache/providers/site.rb @@ -94,5 +94,5 @@ def enabled_name end def enabled? - ::File.exists?(enabled_name) + ::File.exist?(enabled_name) end diff --git a/cookbooks/chef/libraries/edit_file.rb b/cookbooks/chef/libraries/edit_file.rb index ea200c845..a3c892d71 100644 --- a/cookbooks/chef/libraries/edit_file.rb +++ b/cookbooks/chef/libraries/edit_file.rb @@ -3,7 +3,7 @@ class Chef def edit_file(file, &block) Chef::DelayedEvaluator.new do ::File.new(file).collect do |line| - line = block.call(line) + block.call(line) end.join("") end end diff --git a/cookbooks/civicrm/recipes/default.rb b/cookbooks/civicrm/recipes/default.rb index 382cb53b4..6c2d5ecbe 100644 --- a/cookbooks/civicrm/recipes/default.rb +++ b/cookbooks/civicrm/recipes/default.rb @@ -27,7 +27,6 @@ package "wkhtmltopdf" passwords = data_bag_item("civicrm", "passwords") database_password = passwords["database"] -admin_password = passwords["admin"] site_key = passwords["key"] mysql_user "civicrm@localhost" do diff --git a/cookbooks/dev/recipes/default.rb b/cookbooks/dev/recipes/default.rb index d660718e6..1290e11f9 100644 --- a/cookbooks/dev/recipes/default.rb +++ b/cookbooks/dev/recipes/default.rb @@ -106,7 +106,7 @@ search(:accounts, "*:*").each do |account| port = 7000 + account["uid"].to_i if ["user","administrator"].include?(details[:status]) - user_home = details[:home] || account["home"] || "#{node[:accounts][:home]}/#{name.to_s}" + user_home = details[:home] || account["home"] || "#{node[:accounts][:home]}/#{name}" if File.directory?("#{user_home}/public_html") template "/etc/php5/fpm/pool.d/#{name}.conf" do @@ -220,7 +220,7 @@ if node[:postgresql][:clusters][:"9.1/main"] template "apache.apis.erb" end - node[:postgresql][:clusters].each do |name,details| + node[:postgresql][:clusters].each_key do |name| postgresql_munin name do cluster name database "ALL" diff --git a/cookbooks/exim/recipes/default.rb b/cookbooks/exim/recipes/default.rb index af0070bd9..b53da4e03 100644 --- a/cookbooks/exim/recipes/default.rb +++ b/cookbooks/exim/recipes/default.rb @@ -38,8 +38,8 @@ template "/tmp/exim.ssl.cnf" do owner "root" group "root" mode 0644 - not_if do - File.exists?("/etc/ssl/certs/exim.pem") and File.exists?("/etc/ssl/private/exim.key") + not_if do + File.exist?("/etc/ssl/certs/exim.pem") and File.exist?("/etc/ssl/private/exim.key") end end @@ -48,7 +48,7 @@ execute "/etc/ssl/certs/exim.pem" do user "root" group "ssl-cert" not_if do - File.exists?("/etc/ssl/certs/exim.pem") and File.exists?("/etc/ssl/private/exim.key") + File.exist?("/etc/ssl/certs/exim.pem") and File.exist?("/etc/ssl/private/exim.key") end end diff --git a/cookbooks/hardware/attributes/default.rb b/cookbooks/hardware/attributes/default.rb index 46b5893a8..2a4e8e272 100644 --- a/cookbooks/hardware/attributes/default.rb +++ b/cookbooks/hardware/attributes/default.rb @@ -33,7 +33,7 @@ if node[:kernel][:modules].include?("ipmi_si") default[:hardware][:modules] |= [ "ipmi_devintf" ] end -if File.exists?("/proc/xen") +if File.exist?("/proc/xen") default[:hardware][:watchdog] = "xen_wdt" elsif node[:kernel][:modules].include?("i6300esb") default[:hardware][:watchdog] = "none" diff --git a/cookbooks/hardware/recipes/default.rb b/cookbooks/hardware/recipes/default.rb index a508fff6b..441dbd1e3 100644 --- a/cookbooks/hardware/recipes/default.rb +++ b/cookbooks/hardware/recipes/default.rb @@ -253,7 +253,7 @@ end end end -if File.exists?("/etc/mdadm/mdadm.conf") +if File.exist?("/etc/mdadm/mdadm.conf") mdadm_conf = edit_file "/etc/mdadm/mdadm.conf" do |line| line.gsub!(/^MAILADDR .*$/, "MAILADDR admins@openstreetmap.org") diff --git a/cookbooks/incron/recipes/default.rb b/cookbooks/incron/recipes/default.rb index d4a176179..29ba1e807 100644 --- a/cookbooks/incron/recipes/default.rb +++ b/cookbooks/incron/recipes/default.rb @@ -26,7 +26,7 @@ end incrontabs = {} -node[:incron].each do |name,details| +node[:incron].each_value do |details| user = details[:user] path = details[:path] mask = details[:events].join(",") diff --git a/cookbooks/mediawiki/definitions/mediawiki_extension.rb b/cookbooks/mediawiki/definitions/mediawiki_extension.rb index 37c93e41d..134bc4497 100644 --- a/cookbooks/mediawiki/definitions/mediawiki_extension.rb +++ b/cookbooks/mediawiki/definitions/mediawiki_extension.rb @@ -20,7 +20,6 @@ define :mediawiki_extension, :action => [ :enable ], :variables => {} do name = params[:name] site = params[:site] - site_directory = node[:mediawiki][:sites][site][:site_directory] mediawiki_directory = node[:mediawiki][:sites][site][:directory] extension_directory = "#{mediawiki_directory}/extensions/#{name}" source = params[:source] diff --git a/cookbooks/mediawiki/definitions/mediawiki_site.rb b/cookbooks/mediawiki/definitions/mediawiki_site.rb index f8f03c18e..8b7467010 100644 --- a/cookbooks/mediawiki/definitions/mediawiki_site.rb +++ b/cookbooks/mediawiki/definitions/mediawiki_site.rb @@ -93,7 +93,7 @@ define :mediawiki_site, :action => [ :create, :enable ] do user node[:mediawiki][:user] group node[:mediawiki][:group] not_if do - File.exists?("#{mediawiki[:directory]}/LocalSettings-install.php") + File.exist?("#{mediawiki[:directory]}/LocalSettings-install.php") end notifies :create, 'ruby_block[rename-installer-localsettings]', :immediately end @@ -135,7 +135,7 @@ define :mediawiki_site, :action => [ :create, :enable ] do # end not_if do - File.exists?("#{mediawiki[:directory]}/LocalSettings-install.php") + File.exist?("#{mediawiki[:directory]}/LocalSettings-install.php") end notifies :run, resources(:execute => "#{mediawiki[:directory]}/maintenance/install.php"), :immediately action :create diff --git a/cookbooks/munin/providers/plugin.rb b/cookbooks/munin/providers/plugin.rb index 4361514fb..c058524b9 100644 --- a/cookbooks/munin/providers/plugin.rb +++ b/cookbooks/munin/providers/plugin.rb @@ -73,11 +73,11 @@ end def target_path case - when ::File.exists?(target) + when ::File.exist?(target) target - when ::File.exists?("/usr/local/share/munin/plugins/#{target}") + when ::File.exist?("/usr/local/share/munin/plugins/#{target}") "/usr/local/share/munin/plugins/#{target}" - when ::File.exists?("/usr/share/munin/plugins/#{target}") + when ::File.exist?("/usr/share/munin/plugins/#{target}") "/usr/share/munin/plugins/#{target}" else nil diff --git a/cookbooks/munin/recipes/default.rb b/cookbooks/munin/recipes/default.rb index ac6c4d843..e48c7806d 100644 --- a/cookbooks/munin/recipes/default.rb +++ b/cookbooks/munin/recipes/default.rb @@ -90,7 +90,7 @@ end # apcpdu_ munin_plugin "cpu" -if File.exists?("/sys/devices/system/cpu/cpu0/cpufreq/stats/time_in_state") +if File.exist?("/sys/devices/system/cpu/cpu0/cpufreq/stats/time_in_state") munin_plugin "cpuspeed" else munin_plugin "cpuspeed" do @@ -127,7 +127,7 @@ else end end -disks = node[:block_device].select do |name,attributes| +disks = node[:block_device].select do |_,attributes| [ "ATA", "FUJITSU", "SEAGATE", "DELL", "COMPAQ", "IBM-ESXS" ].include?(attributes[:vendor]) end @@ -142,7 +142,7 @@ else end end -if File.exists?("/sbin/hpasmcli") +if File.exist?("/sbin/hpasmcli") munin_plugin "hpasmcli2_temp" do target "hpasmcli2_" end @@ -277,7 +277,7 @@ sensors_temp = false sensors_volt = false Dir.glob("/sys/class/hwmon/hwmon*").each do |hwmon| - hwmon = "#{hwmon}/device" unless File.exists?("#{hwmon}/name") + hwmon = "#{hwmon}/device" unless File.exist?("#{hwmon}/name") sensors_fan = true unless Dir.glob("#{hwmon}/fan*_input").empty? sensors_temp = true unless Dir.glob("#{hwmon}/temp*_input").empty? diff --git a/cookbooks/mysql/providers/database.rb b/cookbooks/mysql/providers/database.rb index 29b38f70e..556e40454 100644 --- a/cookbooks/mysql/providers/database.rb +++ b/cookbooks/mysql/providers/database.rb @@ -40,7 +40,7 @@ action :create do [@mysql.canonicalise_user(user), privileges] end] - @current_resource.permissions.each do |user,privileges| + @current_resource.permissions.each_key do |user| unless new_permissions[user] converge_by("revoke all for #{user} on #{new_resource}") do Chef::Log.info("Revoking all for #{user} on #{new_resource}") diff --git a/cookbooks/networking/libraries/interfaces.rb b/cookbooks/networking/libraries/interfaces.rb index cc9c11a23..67b2bd237 100644 --- a/cookbooks/networking/libraries/interfaces.rb +++ b/cookbooks/networking/libraries/interfaces.rb @@ -6,7 +6,7 @@ class Chef networking = construct_attributes[:networking] || {} networking_interfaces = networking[:interfaces] || [] - networking_interfaces.each do |name,interface| + networking_interfaces.each_value do |interface| if options[:role].nil? or interface[:role].to_s == options[:role].to_s if options[:family].nil? or interface[:family].to_s == options[:family].to_s if block.nil? diff --git a/cookbooks/nfs/recipes/default.rb b/cookbooks/nfs/recipes/default.rb index 0b4c9ffe4..1719a967c 100644 --- a/cookbooks/nfs/recipes/default.rb +++ b/cookbooks/nfs/recipes/default.rb @@ -31,7 +31,7 @@ node[:nfs].each do |mountpoint,details| group "root" mode 0755 recursive true - not_if { File.exists?(mountpoint) } + not_if { File.exist?(mountpoint) } end mount mountpoint do diff --git a/cookbooks/nominatim/recipes/default.rb b/cookbooks/nominatim/recipes/default.rb index bb5ff5c94..682352a6d 100644 --- a/cookbooks/nominatim/recipes/default.rb +++ b/cookbooks/nominatim/recipes/default.rb @@ -137,7 +137,7 @@ package "libboost-thread-dev" execute "php-pear-db" do command "pear install DB" - not_if { File.exists?("/usr/share/php/DB") } + not_if { File.exist?("/usr/share/php/DB") } end execute "compile_nominatim" do diff --git a/cookbooks/openvpn/recipes/default.rb b/cookbooks/openvpn/recipes/default.rb index fbf6af9b6..a1a52f13e 100644 --- a/cookbooks/openvpn/recipes/default.rb +++ b/cookbooks/openvpn/recipes/default.rb @@ -46,7 +46,7 @@ node[:openvpn][:tunnels].each do |name,details| creates "/etc/openvpn/#{name}.key" end - if File.exists?("/etc/openvpn/#{name}.key") + if File.exist?("/etc/openvpn/#{name}.key") node.set[:openvpn][:keys][name] = IO.read("/etc/openvpn/#{name}.key") end elsif peer and peer[:openvpn] diff --git a/cookbooks/osqa/recipes/default.rb b/cookbooks/osqa/recipes/default.rb index de65ad99b..e283f3795 100644 --- a/cookbooks/osqa/recipes/default.rb +++ b/cookbooks/osqa/recipes/default.rb @@ -40,7 +40,6 @@ apache_module "wsgi" node[:osqa][:sites].each do |site| name = site[:name] directory = site[:directory] || "/srv/#{name}" - osqa_revision = site[:revision] || node[:osqa][:revision] site_user = site[:user] || node[:osqa][:user] site_user = Etc.getpwuid(site_user).name if site_user.is_a?(Integer) site_group = site[:group] || node[:osqa][:group] || Etc.getpwnam(site_user).gid diff --git a/cookbooks/otrs/recipes/default.rb b/cookbooks/otrs/recipes/default.rb index 5f74ae9f6..a3ebf21f4 100644 --- a/cookbooks/otrs/recipes/default.rb +++ b/cookbooks/otrs/recipes/default.rb @@ -41,7 +41,6 @@ apache_module "headers" version = node[:otrs][:version] user = node[:otrs][:user] -group = node[:otrs][:group] database_cluster = node[:otrs][:database_cluster] database_name = node[:otrs][:database_name] database_user = node[:otrs][:database_user] diff --git a/cookbooks/postgresql/providers/table.rb b/cookbooks/postgresql/providers/table.rb index 4a2b43f5d..bcd39a959 100644 --- a/cookbooks/postgresql/providers/table.rb +++ b/cookbooks/postgresql/providers/table.rb @@ -42,7 +42,7 @@ action :create do end end - @current_resource.permissions.each do |user,privileges| + @current_resource.permissions.each_key do |user| unless new_resource.permissions[user] converge_by("revoke all for #{user} on #{new_resource}") do Chef::Log.info("Revoking all for #{user} on #{new_resource}") diff --git a/cookbooks/sysctl/recipes/default.rb b/cookbooks/sysctl/recipes/default.rb index d2797a289..920402a6e 100644 --- a/cookbooks/sysctl/recipes/default.rb +++ b/cookbooks/sysctl/recipes/default.rb @@ -47,7 +47,7 @@ node[:sysctl].each_value do |group| file sysctl_file do content "#{value}\n" atomic_update false - only_if { File.exists?(sysctl_file) } + only_if { File.exist?(sysctl_file) } end end end diff --git a/cookbooks/sysfs/recipes/default.rb b/cookbooks/sysfs/recipes/default.rb index f0290d4e7..a3de9b40d 100644 --- a/cookbooks/sysfs/recipes/default.rb +++ b/cookbooks/sysfs/recipes/default.rb @@ -39,7 +39,7 @@ node[:sysfs].each_value do |group| file sysfs_file do content "#{value}\n" atomic_update false - only_if { File.exists?(sysfs_file) } + only_if { File.exist?(sysfs_file) } end end end diff --git a/cookbooks/tile/files/default/ruby/expire.rb b/cookbooks/tile/files/default/ruby/expire.rb index 8fb0033cd..4e5cba2db 100755 --- a/cookbooks/tile/files/default/ruby/expire.rb +++ b/cookbooks/tile/files/default/ruby/expire.rb @@ -93,7 +93,7 @@ module Expire end end - def Expire.do_expire(change_file, min_zoom, max_zoom, &block) + def Expire.do_expire(change_file, min_zoom, max_zoom, &_) # read in the osm change file doc = XML::Document.file(change_file) @@ -142,7 +142,7 @@ module Expire set = Set.new nodes.values # expire tiles and shrink to the set of parents - (max_zoom).downto(min_zoom) do |z| + (max_zoom).downto(min_zoom) do |_| # allow the block to work on the set, returning the set at the next # zoom level set = yield set diff --git a/cookbooks/tile/recipes/default.rb b/cookbooks/tile/recipes/default.rb index 6cb1b9acb..bf5431d06 100644 --- a/cookbooks/tile/recipes/default.rb +++ b/cookbooks/tile/recipes/default.rb @@ -145,7 +145,7 @@ directory "/srv/tile.openstreetmap.org/data" do mode 0755 end -node[:tile][:data].each do |name,data| +node[:tile][:data].each_value do |data| url = data[:url] file = "/srv/tile.openstreetmap.org/data/#{File.basename(url)}" directory = "/srv/tile.openstreetmap.org/data/#{data[:directory]}" @@ -513,7 +513,7 @@ template "/usr/local/bin/cleanup-tiles" do mode 0755 end -tile_directories = node[:tile][:styles].collect do |name,style| +tile_directories = node[:tile][:styles].collect do |_,style| style[:tile_directories].collect { |directory| directory[:name] } end.flatten.sort.uniq diff --git a/cookbooks/trac/recipes/default.rb b/cookbooks/trac/recipes/default.rb index 42cff0649..d61feab0e 100644 --- a/cookbooks/trac/recipes/default.rb +++ b/cookbooks/trac/recipes/default.rb @@ -60,7 +60,7 @@ execute "trac-deploy-#{site_name}" do command "trac-admin /var/lib/trac deploy #{site_directory}" user "root" group "root" - not_if { File.exists?(site_directory) } + not_if { File.exist?(site_directory) } end cookbook_file "/usr/local/bin/trac-authenticate" do diff --git a/cookbooks/web/recipes/rails.rb b/cookbooks/web/recipes/rails.rb index 1a8ef4122..dd4260900 100644 --- a/cookbooks/web/recipes/rails.rb +++ b/cookbooks/web/recipes/rails.rb @@ -37,7 +37,7 @@ end rails_directory = "#{node[:web][:base_directory]}/rails" -piwik_configuration = data_bag_item("web", "piwik").to_hash.reject do |k,v| +piwik_configuration = data_bag_item("web", "piwik").to_hash.reject do |k,_| ["chef_type", "data_bag", "id"].include?(k) end -- 2.39.5