Fix rubocop warnings

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 13b8fc9df55785b201df4563cdf9bc794ee89e72..f5b756028f392d8d8f9d4c1a0eabf38f7b16ac63 100644 (file)
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,45 +1,47 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2015-08-18 22:54:59 +0100 using RuboCop version 0.33.0.
+# on 2016-10-20 21:45:03 +0100 using RuboCop version 0.44.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 1
-Lint/HandleExceptions:
-  Exclude:
-    - 'cookbooks/networking/definitions/firewall_rule.rb'
-
 # Offense count: 22
 Metrics/AbcSize:
-  Max: 66
+  Max: 57
+
+# Offense count: 27
+# Configuration parameters: CountComments.
+Metrics/BlockLength:
+  Max: 356
 
 # Offense count: 3
 Metrics/CyclomaticComplexity:
   Max: 8
 
-# Offense count: 338
-# Configuration parameters: AllowURI, URISchemes.
+# Offense count: 475
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives.
+# URISchemes: http, https
 Metrics/LineLength:
   Max: 696
 
-# Offense count: 23
+# Offense count: 24
 # Configuration parameters: CountComments.
 Metrics/MethodLength:
-  Max: 40
+  Max: 24
 
 # Offense count: 1
 Metrics/PerceivedComplexity:
   Max: 9
 
-# Offense count: 14
+# Offense count: 13
 Style/Documentation:
   Exclude:
+    - 'spec/**/*'
+    - 'test/**/*'
     - 'cookbooks/chef/libraries/compare_versions.rb'
     - 'cookbooks/chef/libraries/edit_file.rb'
     - 'cookbooks/chef/libraries/random_password.rb'
-    - 'cookbooks/chef/libraries/remote_directory.rb'
     - 'cookbooks/chef/libraries/subversion.rb'
     - 'cookbooks/hardware/libraries/sensors.rb'
     - 'cookbooks/munin/libraries/expand.rb'
@@ -50,13 +52,12 @@ Style/Documentation:
     - 'cookbooks/tile/files/default/ruby/expire.rb'
     - 'cookbooks/wordpress/libraries/wordpress.rb'
 
-# Offense count: 19
+# Offense count: 14
 # Cop supports --auto-correct.
 # Configuration parameters: MaxLineLength.
 Style/IfUnlessModifier:
   Exclude:
     - 'cookbooks/accounts/recipes/default.rb'
-    - 'cookbooks/apache/providers/conf.rb'
     - 'cookbooks/apache/providers/module.rb'
     - 'cookbooks/chef/libraries/compare_versions.rb'
     - 'cookbooks/exim/recipes/default.rb'
@@ -65,11 +66,9 @@ Style/IfUnlessModifier:
     - 'cookbooks/munin/recipes/default.rb'
     - 'cookbooks/nodejs/recipes/default.rb'
     - 'cookbooks/tile/files/default/ruby/expire.rb'
-    - 'cookbooks/tile/recipes/default.rb'
     - 'cookbooks/tools/recipes/default.rb'
-    - 'cookbooks/web/recipes/cgimap.rb'
 
-# Offense count: 28
+# Offense count: 37
 # Cop supports --auto-correct.
 Style/NumericLiterals:
   MinDigits: 11

diff --git a/cookbooks/accounts/recipes/default.rb b/cookbooks/accounts/recipes/default.rb
index e043d9e3ed6c43fd894b712886be820897c7193e..d6c7806fd62fce386a0e5722a7a8fe590cf6db18 100644 (file)
--- a/cookbooks/accounts/recipes/default.rb
+++ b/cookbooks/accounts/recipes/default.rb
@@ -78,9 +78,7 @@ search(:accounts, "*:*").each do |account|
       end
     end
 
-    if details[:status] == "administrator"
-      administrators.push(name.to_s)
-    end
+    administrators.push(name.to_s) if details[:status] == "administrator"
   else
     user name.to_s do
       action :remove

diff --git a/cookbooks/apache/providers/module.rb b/cookbooks/apache/providers/module.rb
index 252b5e8165f2377757cc40eb71e5a0b4b686a89c..d3f069b7fb77a4550a5ed18a2e51d73331a5f8b9 100644 (file)
--- a/cookbooks/apache/providers/module.rb
+++ b/cookbooks/apache/providers/module.rb
@@ -24,9 +24,7 @@ end
 use_inline_resources
 
 action :install do
-  unless installed?
-    package package_name
-  end
+  package package_name unless installed?
 
   if new_resource.conf # ~FC023
     template available_name("conf") do

diff --git a/cookbooks/chef/libraries/compare_versions.rb b/cookbooks/chef/libraries/compare_versions.rb
index cf6ab1ea23c84a3d0b5764b7d311d32889719efd..45653935f08ca480e3f00cc1ddfe2fd8b2cf27d9 100644 (file)
--- a/cookbooks/chef/libraries/compare_versions.rb
+++ b/cookbooks/chef/libraries/compare_versions.rb
@@ -1,13 +1,9 @@
 class Chef
   class Util
     def self.compare_versions(a, b)
-      if a.is_a?(String)
-        a = a.split(".").map(&:to_i)
-      end
+      a = a.split(".").map(&:to_i) if a.is_a?(String)
 
-      if b.is_a?(String)
-        b = b.split(".").map(&:to_i)
-      end
+      b = b.split(".").map(&:to_i) if b.is_a?(String)
 
       a <=> b
     end

diff --git a/cookbooks/exim/recipes/default.rb b/cookbooks/exim/recipes/default.rb
index 4e7c4638ba86a07e691048b4ce4a99cff0336b5a..2aabb40ff29d3f4d862b10d23356031b1e758098 100644 (file)
--- a/cookbooks/exim/recipes/default.rb
+++ b/cookbooks/exim/recipes/default.rb
@@ -23,9 +23,7 @@ package "exim4"
 package "openssl"
 package "ssl-cert"
 
-if File.exist?("/var/run/clamav/clamd.ctl")
-  package "exim4-daemon-heavy"
-end
+package "exim4-daemon-heavy" if File.exist?("/var/run/clamav/clamd.ctl")
 
 group "ssl-cert" do
   action :modify

diff --git a/cookbooks/hardware/attributes/default.rb b/cookbooks/hardware/attributes/default.rb
index f77967a208604013e7ca5f50858f6a744748a23a..ce7aae86382f9ca162ff6f79381422dad01bbe37 100644 (file)
--- a/cookbooks/hardware/attributes/default.rb
+++ b/cookbooks/hardware/attributes/default.rb
@@ -30,9 +30,7 @@ end
 if node[:kernel] && node[:kernel][:modules]
   raidmods = node[:kernel][:modules].keys & %w(cciss hpsa mptsas mpt2sas mpt3sas megaraid_mm megaraid_sas aacraid)
 
-  unless raidmods.empty?
-    default[:apt][:sources] |= ["hwraid"]
-  end
+  default[:apt][:sources] |= ["hwraid"] unless raidmods.empty?
 end
 
 if node[:kernel][:modules].include?("ipmi_si")

diff --git a/cookbooks/hardware/recipes/default.rb b/cookbooks/hardware/recipes/default.rb
index 7d326d68bb28abf98955d27f9337bd3394c71f53..5d1757b46159b429e8088f1c7bead43070f5b7ef 100644 (file)
--- a/cookbooks/hardware/recipes/default.rb
+++ b/cookbooks/hardware/recipes/default.rb
@@ -31,9 +31,7 @@ end
 
 case node[:cpu][:"0"][:vendor_id]
 when "AuthenticAMD"
-  if node[:lsb][:release].to_f >= 14.04
-    package "amd64-microcode"
-  end
+  package "amd64-microcode" if node[:lsb][:release].to_f >= 14.04
 end
 
 if node[:dmi] && node[:dmi][:system]
@@ -184,9 +182,7 @@ service "haveged" do
   action [:enable, :start]
 end
 
-if node[:kernel][:modules].include?("ipmi_si")
-  package "ipmitool"
-end
+package "ipmitool" if node[:kernel][:modules].include?("ipmi_si")
 
 if node[:lsb][:release].to_f >= 12.10
   package "irqbalance"

diff --git a/cookbooks/imagery/resources/layer.rb b/cookbooks/imagery/resources/layer.rb
index 60712a63585c8869252577c01fd12f933645f8d5..aee757e6e7a5cba8d05a8c654e2c61780a9cce82 100644 (file)
--- a/cookbooks/imagery/resources/layer.rb
+++ b/cookbooks/imagery/resources/layer.rb
@@ -34,9 +34,9 @@ property :background_colour, String
 property :resample, String, :default => "average"
 property :imagemode, String
 property :extension, String, :default => "png"
-property :max_zoom, Fixnum, :default => 18
+property :max_zoom, Integer, :default => 18
 property :url_aliases, [String, Array], :default => []
-property :revision, Fixnum, :default => 0
+property :revision, Integer, :default => 0
 property :overlay, [TrueClass, FalseClass], :default => false
 property :default_layer, [TrueClass, FalseClass], :default => false
 

diff --git a/cookbooks/munin/recipes/default.rb b/cookbooks/munin/recipes/default.rb
index fb98079315f593c6c5a70350ad3e54815067a2be..3b41eb8e9c52d58a29ee89d42da26fd2b6933291 100644 (file)
--- a/cookbooks/munin/recipes/default.rb
+++ b/cookbooks/munin/recipes/default.rb
@@ -291,9 +291,7 @@ Dir.glob("/sys/class/hwmon/hwmon*").each do |hwmon|
   sensors_volt = true unless Dir.glob("#{hwmon}/in*_input").empty?
 end
 
-if sensors_fan || sensors_temp || sensors_volt
-  package "lm-sensors"
-end
+package "lm-sensors" if sensors_fan || sensors_temp || sensors_volt
 
 if sensors_fan
   munin_plugin "sensors_fan" do

diff --git a/cookbooks/nodejs/recipes/default.rb b/cookbooks/nodejs/recipes/default.rb
index 2fa43d63172477f0be25133482331621ab921b05..f6f054fe08b8cc9f8289334f62f3d7d5c8203601 100644 (file)
--- a/cookbooks/nodejs/recipes/default.rb
+++ b/cookbooks/nodejs/recipes/default.rb
@@ -22,6 +22,4 @@ package "npm"
 package "g++"
 package "make"
 
-if node[:lsb][:release].to_f >= 14.04
-  package "nodejs-legacy"
-end
+package "nodejs-legacy" if node[:lsb][:release].to_f >= 14.04

diff --git a/cookbooks/systemd/resources/service.rb b/cookbooks/systemd/resources/service.rb
index df62481a5c5a16607dad51318a3d5b5b99134748..943ce031bbc8ae3f166770d2b499f5eb97d606c1 100644 (file)
--- a/cookbooks/systemd/resources/service.rb
+++ b/cookbooks/systemd/resources/service.rb
@@ -26,7 +26,7 @@ property :wants, [String, Array]
 property :type, String,
          :default => "simple",
          :is => %w(simple forking oneshot dbus notify idle)
-property :limit_nofile, Fixnum
+property :limit_nofile, Integer
 property :environment, Hash, :default => {}
 property :environment_file, [String, Hash]
 property :user, String
@@ -37,7 +37,7 @@ property :exec_start_post, String
 property :exec_stop, String
 property :exec_reload, String
 property :runtime_directory, String
-property :runtime_directory_mode, Fixnum
+property :runtime_directory_mode, Integer
 property :standard_input, String,
          :is => %w(null tty tty-force tty-fail socket)
 property :standard_output, String,
@@ -51,7 +51,7 @@ property :private_devices, [TrueClass, FalseClass]
 property :private_network, [TrueClass, FalseClass]
 property :protect_system, [TrueClass, FalseClass, String]
 property :protect_home, [TrueClass, FalseClass, String]
-property :timeout_sec, Fixnum
+property :timeout_sec, Integer
 property :pid_file, String
 
 action :create do

diff --git a/cookbooks/tile/files/default/ruby/expire.rb b/cookbooks/tile/files/default/ruby/expire.rb
index 8a212aa92f3904dc79d738c617a351aeacaf50b9..3d693ad5b225d3fa9d1a525cd329e97672de0f46 100755 (executable)
--- a/cookbooks/tile/files/default/ruby/expire.rb
+++ b/cookbooks/tile/files/default/ruby/expire.rb
@@ -103,12 +103,8 @@ module Expire
     # added, deleted or modified - the tile will need updating anyway.
     doc.find("//node").each do |node|
       lat = node["lat"].to_f
-      if lat < -85
-        lat = -85
-      end
-      if lat > 85
-        lat = 85
-      end
+      lat = -85 if lat < -85
+      lat = 85 if lat > 85
       point = Proj4::Point.new(Math::PI * node["lon"].to_f / 180,
                                Math::PI * lat / 180)
       nodes[node["id"].to_i] = tile_from_latlon(point, max_zoom)
@@ -186,9 +182,7 @@ module Expire
 
         lon, lat = @cache.sysread(8).unpack("ll")
 
-        if lon != -2147483648 && lat != -2147483648
-          node = Node.new(lon, lat)
-        end
+        node = Node.new(lon, lat) if lon != -2147483648 && lat != -2147483648
       end
 
       node

diff --git a/cookbooks/tools/recipes/default.rb b/cookbooks/tools/recipes/default.rb
index d58523af16d36d824c93218eabdd0d3bb8930855..b751792d22e17f2ae17624eea9596539791720a7 100644 (file)
--- a/cookbooks/tools/recipes/default.rb
+++ b/cookbooks/tools/recipes/default.rb
@@ -35,9 +35,7 @@ package "sysv-rc-conf"
 package "iotop"
 package "lvm2"
 
-if node[:lsb][:release].to_f <= 11.04
-  package "lslk"
-end
+package "lslk" if node[:lsb][:release].to_f <= 11.04
 
 package "rsyslog"