From f30f230da23603e3c7598205219ce01e9820c470 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Fri, 15 Jan 2016 23:05:34 +0000 Subject: [PATCH 1/1] Fix issues reported by new rubocop --- .rubocop.yml | 4 -- cookbooks/chef/libraries/edit_file.rb | 4 +- cookbooks/chef/libraries/random_password.rb | 2 +- cookbooks/chef/libraries/subversion.rb | 14 +++--- cookbooks/hardware/recipes/default.rb | 28 +++++------ .../munin/files/default/plugins/api_calls_ | 2 +- .../munin/files/default/plugins/api_calls_num | 2 +- .../files/default/plugins/api_calls_status | 2 +- .../munin/files/default/plugins/api_waits_ | 2 +- cookbooks/mysql/libraries/mysql.rb | 4 +- cookbooks/mysql/providers/database.rb | 10 ++-- cookbooks/networking/libraries/interfaces.rb | 2 +- cookbooks/networking/libraries/ipaddresses.rb | 2 +- cookbooks/networking/recipes/default.rb | 2 +- cookbooks/nfs/recipes/default.rb | 10 ++-- cookbooks/nfs/recipes/server.rb | 10 ++-- cookbooks/nodejs/providers/package.rb | 20 ++++---- cookbooks/nominatim/recipes/base.rb | 10 ++-- cookbooks/postgresql/libraries/postgresql.rb | 4 +- cookbooks/postgresql/providers/database.rb | 8 ++-- cookbooks/postgresql/providers/table.rb | 10 ++-- cookbooks/tile/files/default/ruby/expire.rb | 6 +-- cookbooks/web/definitions/rails_port.rb | 2 +- cookbooks/wordpress/libraries/wordpress.rb | 48 ++++++++++--------- 24 files changed, 98 insertions(+), 110 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index 2219d6ec6..23c3f82fc 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -18,9 +18,5 @@ Style/FileName: Style/HashSyntax: EnforcedStyle: hash_rockets -Style/SingleSpaceBeforeFirstArg: - Exclude: - - '**/metadata.rb' - Style/StringLiterals: EnforcedStyle: double_quotes diff --git a/cookbooks/chef/libraries/edit_file.rb b/cookbooks/chef/libraries/edit_file.rb index 6260c8a40..bfbec455c 100644 --- a/cookbooks/chef/libraries/edit_file.rb +++ b/cookbooks/chef/libraries/edit_file.rb @@ -1,10 +1,10 @@ class Chef module Mixin module EditFile - def edit_file(file, &block) + def edit_file(file, &_block) Chef::DelayedEvaluator.new do ::File.new(file).collect do |line| - block.call(line) + yield line end.join("") end end diff --git a/cookbooks/chef/libraries/random_password.rb b/cookbooks/chef/libraries/random_password.rb index f8c6674da..71d8bcfed 100644 --- a/cookbooks/chef/libraries/random_password.rb +++ b/cookbooks/chef/libraries/random_password.rb @@ -1,7 +1,7 @@ class Chef class Recipe def random_password(length) - length.times.collect do + Array.new(length) do "!\#$%&()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~"[rand(91)].chr end.join end diff --git a/cookbooks/chef/libraries/subversion.rb b/cookbooks/chef/libraries/subversion.rb index b5ac6f301..dd2c7ec49 100644 --- a/cookbooks/chef/libraries/subversion.rb +++ b/cookbooks/chef/libraries/subversion.rb @@ -17,20 +17,18 @@ class Chef end def current_repository_matches_target_repository? - (!current_repository.nil?) && (@new_resource.repository == current_repository) + !current_repository.nil? && (@new_resource.repository == current_repository) end def repo_attrs return {} unless ::File.exist?(::File.join(@new_resource.destination, ".svn")) @repo_attrs ||= svn_info.lines.each_with_object({}) do |line, attrs| - if line =~ SVN_INFO_PATTERN - property = Regexp.last_match[1] - value = Regexp.last_match[2] - attrs[property] = value - else - fail "Could not parse `svn info` data: #{line}" - end + fail "Could not parse `svn info` data: #{line}" unless line =~ SVN_INFO_PATTERN + + property = Regexp.last_match[1] + value = Regexp.last_match[2] + attrs[property] = value end end diff --git a/cookbooks/hardware/recipes/default.rb b/cookbooks/hardware/recipes/default.rb index 8ba21da8b..8342a9ac3 100644 --- a/cookbooks/hardware/recipes/default.rb +++ b/cookbooks/hardware/recipes/default.rb @@ -297,11 +297,11 @@ end end end -if node[:hardware][:disk] - disks = node[:hardware][:disk][:disks] -else - disks = [] -end +disks = if node[:hardware][:disk] + node[:hardware][:disk][:disks] + else + [] + end disks = disks.map do |disk| next if disk[:state] == "spun_down" @@ -476,15 +476,15 @@ unless Dir.glob("/sys/class/hwmon/hwmon*").empty? cpu = File.basename(coretemp).sub("coretemp.", "").to_i chip = format("coretemp-isa-%04d", cpu) - if File.exist?("#{coretemp}/name") - temps = Dir.glob("#{coretemp}/temp*_input").map do |temp| - File.basename(temp).sub("temp", "").sub("_input", "").to_i - end.sort - else - temps = Dir.glob("#{coretemp}/hwmon/hwmon*/temp*_input").map do |temp| - File.basename(temp).sub("temp", "").sub("_input", "").to_i - end.sort - end + temps = if File.exist?("#{coretemp}/name") + Dir.glob("#{coretemp}/temp*_input").map do |temp| + File.basename(temp).sub("temp", "").sub("_input", "").to_i + end.sort + else + Dir.glob("#{coretemp}/hwmon/hwmon*/temp*_input").map do |temp| + File.basename(temp).sub("temp", "").sub("_input", "").to_i + end.sort + end if temps.first == 1 node.default[:hardware][:sensors][chip][:temps][:temp1][:label] = "CPU #{cpu}" diff --git a/cookbooks/munin/files/default/plugins/api_calls_ b/cookbooks/munin/files/default/plugins/api_calls_ index 158bf9004..17bba1625 100755 --- a/cookbooks/munin/files/default/plugins/api_calls_ +++ b/cookbooks/munin/files/default/plugins/api_calls_ @@ -26,7 +26,7 @@ CALL_TYPES = { :trkpts => "GPX trackpoints calls", :web => "Web site traffic", :other => "Other API calls" -} +}.freeze def categorise_uri(line) uri = line.split(" ")[1] diff --git a/cookbooks/munin/files/default/plugins/api_calls_num b/cookbooks/munin/files/default/plugins/api_calls_num index 443af2c19..e2f74d9ff 100755 --- a/cookbooks/munin/files/default/plugins/api_calls_num +++ b/cookbooks/munin/files/default/plugins/api_calls_num @@ -11,7 +11,7 @@ CALL_TYPES = { :trkpts => "GPX trackpoints calls", :web => "Web site traffic", :other => "Other API calls" -} +}.freeze if ARGV[0] == "config" puts "graph_title Requests processed" diff --git a/cookbooks/munin/files/default/plugins/api_calls_status b/cookbooks/munin/files/default/plugins/api_calls_status index 6d0e619ed..1f18a453b 100755 --- a/cookbooks/munin/files/default/plugins/api_calls_status +++ b/cookbooks/munin/files/default/plugins/api_calls_status @@ -23,7 +23,7 @@ HTTP_STATUSES = { "502" => "Bad Gateway", "503" => "Service Unavailable", "509" => "Bandwidth Limit Exceeded" -} +}.freeze if ARGV[0] == "config" puts "graph_title HTTP response codes" diff --git a/cookbooks/munin/files/default/plugins/api_waits_ b/cookbooks/munin/files/default/plugins/api_waits_ index d072b89d5..49216861a 100755 --- a/cookbooks/munin/files/default/plugins/api_waits_ +++ b/cookbooks/munin/files/default/plugins/api_waits_ @@ -26,7 +26,7 @@ CALL_TYPES = { :trkpts => "GPX trackpoints calls", :web => "Web site traffic", :other => "Other API calls" -} +}.freeze def categorise_uri(line) uri = line.split(" ")[1] diff --git a/cookbooks/mysql/libraries/mysql.rb b/cookbooks/mysql/libraries/mysql.rb index 91eb6f9d1..61d600f1d 100644 --- a/cookbooks/mysql/libraries/mysql.rb +++ b/cookbooks/mysql/libraries/mysql.rb @@ -11,14 +11,14 @@ class Chef :show_db, :super, :create_tmp_table, :lock_tables, :execute, :repl_slave, :repl_client, :create_view, :show_view, :create_routine, :alter_routine, :create_user, :event, :trigger, :create_tablespace - ] + ].freeze DATABASE_PRIVILEGES = [ :select, :insert, :update, :delete, :create, :drop, :grant, :references, :index, :alter, :create_tmp_table, :lock_tables, :create_view, :show_view, :create_routine, :alter_routine, :execute, :event, :trigger - ] + ].freeze def execute(options) # Create argument array diff --git a/cookbooks/mysql/providers/database.rb b/cookbooks/mysql/providers/database.rb index 6e488ce47..345ef7e1e 100644 --- a/cookbooks/mysql/providers/database.rb +++ b/cookbooks/mysql/providers/database.rb @@ -65,12 +65,10 @@ action :create do @mysql.execute(:command => "GRANT #{@mysql.privilege_name(privilege)} ON `#{new_resource.database}`.* TO #{user}") end end - else - if current_privileges.include?(privilege) - converge_by("revoke #{privilege} for #{user} on #{new_resource}") do - Chef::Log.info("Revoking #{privilege} for #{user} on #{new_resource}") - @mysql.execute(:command => "REVOKE #{@mysql.privilege_name(privilege)} ON `#{new_resource.database}`.* FROM #{user}") - end + elsif current_privileges.include?(privilege) + converge_by("revoke #{privilege} for #{user} on #{new_resource}") do + Chef::Log.info("Revoking #{privilege} for #{user} on #{new_resource}") + @mysql.execute(:command => "REVOKE #{@mysql.privilege_name(privilege)} ON `#{new_resource.database}`.* FROM #{user}") end end end diff --git a/cookbooks/networking/libraries/interfaces.rb b/cookbooks/networking/libraries/interfaces.rb index 029cb4f32..c2f170b9c 100644 --- a/cookbooks/networking/libraries/interfaces.rb +++ b/cookbooks/networking/libraries/interfaces.rb @@ -13,7 +13,7 @@ class Chef if block.nil? interfaces << interface else - block.call(interface) + yield interface end end diff --git a/cookbooks/networking/libraries/ipaddresses.rb b/cookbooks/networking/libraries/ipaddresses.rb index 5eb54265e..51ef152b5 100644 --- a/cookbooks/networking/libraries/ipaddresses.rb +++ b/cookbooks/networking/libraries/ipaddresses.rb @@ -7,7 +7,7 @@ class Chef if block.nil? addresses << interface[:address] else - block.call(interface[:address]) + yield interface[:address] end end diff --git a/cookbooks/networking/recipes/default.rb b/cookbooks/networking/recipes/default.rb index 477a15b24..ab139e9ff 100644 --- a/cookbooks/networking/recipes/default.rb +++ b/cookbooks/networking/recipes/default.rb @@ -35,7 +35,7 @@ node[:networking][:interfaces].each do |name, interface| prefix = node[:networking][:interfaces][name][:prefix] - node.set[:networking][:interfaces][name][:netmask] = (~IPAddr.new(interface[:address]).mask(0)).mask(prefix) + node.set[:networking][:interfaces][name][:netmask] = ~IPAddr.new(interface[:address]).mask(0).mask(prefix) node.set[:networking][:interfaces][name][:network] = IPAddr.new(interface[:address]).mask(prefix) end diff --git a/cookbooks/nfs/recipes/default.rb b/cookbooks/nfs/recipes/default.rb index 8d44e2bd6..f4c6016bb 100644 --- a/cookbooks/nfs/recipes/default.rb +++ b/cookbooks/nfs/recipes/default.rb @@ -20,11 +20,11 @@ package "nfs-common" node[:nfs].each do |mountpoint, details| - if details[:readonly] - mount_options = "ro,bg,soft,udp,rsize=8192,wsize=8192,nfsvers=3" - else - mount_options = "rw,bg,udp,rsize=8192,wsize=8192,nfsvers=3" - end + mount_options = if details[:readonly] + "ro,bg,soft,udp,rsize=8192,wsize=8192,nfsvers=3" + else + "rw,bg,udp,rsize=8192,wsize=8192,nfsvers=3" + end directory mountpoint do owner "root" diff --git a/cookbooks/nfs/recipes/server.rb b/cookbooks/nfs/recipes/server.rb index f75e44e88..33e5a315e 100644 --- a/cookbooks/nfs/recipes/server.rb +++ b/cookbooks/nfs/recipes/server.rb @@ -41,11 +41,11 @@ search(:node, "*:*") do |client| client.ipaddresses do |address| exports[mount[:path]] ||= {} - if mount[:readonly] - exports[mount[:path]][address] = "ro" - else - exports[mount[:path]][address] = "rw" - end + exports[mount[:path]][address] = if mount[:readonly] + "ro" + else + "rw" + end end end end diff --git a/cookbooks/nodejs/providers/package.rb b/cookbooks/nodejs/providers/package.rb index 3a3304063..4c852732f 100644 --- a/cookbooks/nodejs/providers/package.rb +++ b/cookbooks/nodejs/providers/package.rb @@ -34,21 +34,19 @@ def load_current_resource end action :install do - if new_resource.version - package_name = "#{new_resource.package_name}@#{new_resource.version}" - else - package_name = new_resource.package_name - end + package_name = if new_resource.version + "#{new_resource.package_name}@#{new_resource.version}" + else + new_resource.package_name + end if !@packages.include?(new_resource.package_name) shell_out!("npm install --global #{package_name}") new_resource.updated_by_last_action(true) - else - if new_resource.version && - new_resource.version != @current_resource.version - shell_out!("npm install --global #{package_name}") - new_resource.updated_by_last_action(true) - end + elsif new_resource.version && + new_resource.version != @current_resource.version + shell_out!("npm install --global #{package_name}") + new_resource.updated_by_last_action(true) end end diff --git a/cookbooks/nominatim/recipes/base.rb b/cookbooks/nominatim/recipes/base.rb index c8e996655..8721ef014 100644 --- a/cookbooks/nominatim/recipes/base.rb +++ b/cookbooks/nominatim/recipes/base.rb @@ -158,11 +158,11 @@ file "#{source_directory}/settings/ip_blocks.map" do mode 0664 end -if node[:nominatim][:enabled] - cron_action = :create -else - cron_action = :delete -end +cron_action = if node[:nominatim][:enabled] + :create + else + :delete + end template "/etc/cron.d/nominatim" do action cron_action diff --git a/cookbooks/postgresql/libraries/postgresql.rb b/cookbooks/postgresql/libraries/postgresql.rb index 6960ec989..266a7b833 100644 --- a/cookbooks/postgresql/libraries/postgresql.rb +++ b/cookbooks/postgresql/libraries/postgresql.rb @@ -6,7 +6,7 @@ class Chef TABLE_PRIVILEGES = [ :select, :insert, :update, :delete, :truncate, :references, :trigger - ] + ].freeze def initialize(cluster) @cluster = cluster @@ -118,7 +118,7 @@ class Chef permissions[user] = { "a" => :insert, "r" => :select, "w" => :update, "d" => :delete, "D" => :truncate, "x" => :references, "t" => :trigger - }.values_at(*(privileges.chars)).compact + }.values_at(*privileges.chars).compact end end end diff --git a/cookbooks/postgresql/providers/database.rb b/cookbooks/postgresql/providers/database.rb index 31704314b..a3a7cbc07 100644 --- a/cookbooks/postgresql/providers/database.rb +++ b/cookbooks/postgresql/providers/database.rb @@ -36,11 +36,9 @@ action :create do if !@pg.databases.include?(new_resource.database) @pg.execute(:command => "CREATE DATABASE \"#{new_resource.database}\" OWNER \"#{new_resource.owner}\" TEMPLATE template0 ENCODING '#{new_resource.encoding}' LC_COLLATE '#{new_resource.collation}' LC_CTYPE '#{new_resource.ctype}'") new_resource.updated_by_last_action(true) - else - if new_resource.owner != @current_resource.owner - @pg.execute(:command => "ALTER DATABASE \"#{new_resource.database}\" OWNER TO \"#{new_resource.owner}\"") - new_resource.updated_by_last_action(true) - end + elsif new_resource.owner != @current_resource.owner + @pg.execute(:command => "ALTER DATABASE \"#{new_resource.database}\" OWNER TO \"#{new_resource.owner}\"") + new_resource.updated_by_last_action(true) end end diff --git a/cookbooks/postgresql/providers/table.rb b/cookbooks/postgresql/providers/table.rb index f162347dd..b1dc67571 100644 --- a/cookbooks/postgresql/providers/table.rb +++ b/cookbooks/postgresql/providers/table.rb @@ -67,12 +67,10 @@ action :create do @pg.execute(:command => "GRANT #{privilege.to_s.upcase} ON #{@name} TO \"#{user}\"", :database => new_resource.database) end end - else - if current_privileges.include?(privilege) - converge_by("revoke #{privilege} for #{user} on #{new_resource}") do - Chef::Log.info("Revoking #{privilege} for #{user} on #{new_resource}") - @pg.execute(:command => "REVOKE #{privilege.to_s.upcase} ON #{@name} FROM \"#{user}\"", :database => new_resource.database) - end + elsif current_privileges.include?(privilege) + converge_by("revoke #{privilege} for #{user} on #{new_resource}") do + Chef::Log.info("Revoking #{privilege} for #{user} on #{new_resource}") + @pg.execute(:command => "REVOKE #{privilege.to_s.upcase} ON #{@name} FROM \"#{user}\"", :database => new_resource.database) end end end diff --git a/cookbooks/tile/files/default/ruby/expire.rb b/cookbooks/tile/files/default/ruby/expire.rb index d695a0bc5..8a212aa92 100755 --- a/cookbooks/tile/files/default/ruby/expire.rb +++ b/cookbooks/tile/files/default/ruby/expire.rb @@ -18,9 +18,9 @@ module Expire # the size of the meta tile blocks METATILE = 8 # the directory root for meta tiles - HASH_ROOT = "/tiles/default/" + HASH_ROOT = "/tiles/default/".freeze # node cache file - NODE_CACHE_FILE = "/store/database/nodes" + NODE_CACHE_FILE = "/store/database/nodes".freeze # turns a spherical mercator coord into a tile coord def self.tile_from_merc(point, zoom) @@ -143,7 +143,7 @@ module Expire set = Set.new nodes.values # expire tiles and shrink to the set of parents - (max_zoom).downto(min_zoom) do |_| + 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/web/definitions/rails_port.rb b/cookbooks/web/definitions/rails_port.rb index f3d89d057..79a9cc836 100644 --- a/cookbooks/web/definitions/rails_port.rb +++ b/cookbooks/web/definitions/rails_port.rb @@ -145,7 +145,7 @@ define :rails_port, :action => [:create, :enable] do end if params[:memcache_servers] - line.gsub!(/^( *)#memcache_servers:.*$/, "\\1memcache_servers: [ \"#{params[:memcache_servers].join("\", \"")}\" ]") + line.gsub!(/^( *)#memcache_servers:.*$/, "\\1memcache_servers: [ \"#{params[:memcache_servers].join('", "')}\" ]") end if params[:potlatch2_key] diff --git a/cookbooks/wordpress/libraries/wordpress.rb b/cookbooks/wordpress/libraries/wordpress.rb index f4f17e220..a381ecfff 100644 --- a/cookbooks/wordpress/libraries/wordpress.rb +++ b/cookbooks/wordpress/libraries/wordpress.rb @@ -7,37 +7,39 @@ class Chef @api_responses = {} @svn_responses = {} - def self.current_version - core_version_check["offers"].first["current"] - end + class << self + def current_version + core_version_check["offers"].first["current"] + end - def self.current_plugin_version(name) - if svn_cat("http://plugins.svn.wordpress.org/#{name}/trunk/readme.txt") =~ /Stable tag:\s*([^\s\r]*)[\s\r]*/ - Regexp.last_match[1] - else - "trunk" + def current_plugin_version(name) + if svn_cat("http://plugins.svn.wordpress.org/#{name}/trunk/readme.txt") =~ /Stable tag:\s*([^\s\r]*)[\s\r]*/ + Regexp.last_match[1] + else + "trunk" + end end - end - private + private - def self.core_version_check - api_get("http://api.wordpress.org/core/version-check/1.6") - end + def core_version_check + api_get("http://api.wordpress.org/core/version-check/1.6") + end - def self.api_get(url) - @api_responses[url] ||= ::PHP.unserialize(::HTTPClient.new.get_content(url)) - end + def api_get(url) + @api_responses[url] ||= ::PHP.unserialize(::HTTPClient.new.get_content(url)) + end - def self.svn_cat(url) - unless @svn_responses[url] - status, stdout, stderr = output_of_command("svn cat #{url}", {}) - handle_command_failures(status, "STDOUT: #{stdout}\nSTDERR: #{stderr}", :output_on_failure => true) + def svn_cat(url) + unless @svn_responses[url] + status, stdout, stderr = output_of_command("svn cat #{url}", {}) + handle_command_failures(status, "STDOUT: #{stdout}\nSTDERR: #{stderr}", :output_on_failure => true) - @svn_responses[url] = stdout.force_encoding("UTF-8") - end + @svn_responses[url] = stdout.force_encoding("UTF-8") + end - @svn_responses[url] + @svn_responses[url] + end end end end -- 2.43.2