Rubocop: Upgrade to 0.13 by disabling some (but not all) new cops

.rubocop.yml

@@ -20,7 +20,13 @@ SpaceAroundBraces:
 BlockNesting:
   Enabled: false # change to 4
 
-AvoidPerlBackrefs:
+PerlBackrefs:
+  Enabled: false # remove me
+
+AlignHash:
+  Enabled: false # remove me
+
+AlignArray:
   Enabled: false # remove me
 
 # end TODO
@@ -34,6 +40,7 @@ AllCops:
     # TODO: remove these other paths as we fix them
     - spec/**
     - test/**
+    - config/navigation.rb
 
 MethodLength:
   Description: 'Avoid methods longer than 30 lines of code.'

app/controllers/api/v1/proxies_controller.rb

@@ -26,12 +26,11 @@ def rules
       case route.name
       when "api_proxy_consumer_deletionrecord_delete_path"
         if !User.consumer?
-          consumer_gone, consumer_live = false
+          consumer_gone = false
           begin
             Resources::Candlepin::Consumer.get params[:id] # check with candlepin if system is Gone, raises RestClient::Gone
                                                            # a 200 means the system exists. the deletion record wont exist, but its
                                                            # not a permissions error
-            consumer_live = true
           rescue RestClient::Gone
             # the correct response is a 410, since the system has been deleted
             consumer_gone = true

app/controllers/api/v2/distributors_controller.rb

@@ -14,4 +14,4 @@ class Api::V2::DistributorsController < Api::V1::DistributorsController
 
   include Api::V2::Rendering
 
-end
+end

app/controllers/api/v2/role_ldap_groups_controller.rb

@@ -28,4 +28,3 @@ def create
   end
 
 end
-

app/controllers/application_controller.rb

@@ -718,4 +718,3 @@ def default_notify_options
   end
 
 end
-

app/controllers/sync_management_controller.rb

@@ -10,7 +10,7 @@
 # have received a copy of GPLv2 along with this software; if not, see
 # http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
 
-# rubocop:disable AvoidClassVars
+# rubocop:disable ClassVars
 class SyncManagementController < ApplicationController
   include TranslationHelper
   include ActionView::Helpers::DateHelper

app/helpers/application_helper.rb

@@ -382,4 +382,3 @@ def repo_selector(repositories, url, field = :repository_id, record = nil)
     end
   end
 end
-

app/helpers/errata_helper.rb

@@ -15,7 +15,7 @@ def errata_title(errata)
     # Provide the errata title in the format of Advisory: Title. (E.g. "RHSA_2011:1230 : Package X security update").
     # Remove from the title the severity, if included.
     title = errata.errata_id  # the id contains the advisory
-    title += " : " + errata.title.sub(/Critical: |Important: |Moderate: |Low: /, "")
+    title + (" : " + errata.title.sub(/Critical: |Important: |Moderate: |Low: /, ""))
   end
 
   def errata_human_type(type)

app/helpers/gpg_keys_helper.rb

@@ -16,4 +16,4 @@ def gpg_content_limit
     GpgKey::MAX_CONTENT_LENGTH
   end
 
-end
+end

app/helpers/menu.rb

@@ -105,4 +105,4 @@ def prune_menu(menu_items)
     end
   end
 
-end
+end

app/helpers/packages_helper.rb

@@ -72,7 +72,7 @@ def previewed_changelog(lines)
       more_lines = number_with_delimiter(lines.length - 10)
       link_to((_("Show %s more line(s)") % more_lines), "", class: "show-more-changelog")
     end
-    html += content_tag "div", :class => "more-changelog" do
+    html + content_tag("div", :class => "more-changelog") do
       format_changelog_changes(lines[10..-1].join("\n"))
     end
   end

app/helpers/products_helper.rb

@@ -67,4 +67,3 @@ def get_products(options)
     @product_hash
   end
 end
-

app/helpers/promotions_helper.rb

@@ -35,4 +35,3 @@ def show_new_button?(manage_promotion, manage_deletion)
   end
 
 end
-

app/helpers/providers_helper.rb

@@ -98,4 +98,3 @@ def label_from_url(provider, url)
   end
 
 end
-

app/helpers/repositories_helper.rb

@@ -27,4 +27,3 @@ def gpg_keys
     GpgKey.readable(current_organization)
   end
 end
-

app/lib/api/v2/rendering.rb

@@ -67,4 +67,3 @@ def try_specific_collection_template(action, common_action, options = {})
     end
   end
 end
-

app/lib/authorization_rules.rb

@@ -89,4 +89,3 @@ def param_rules
   end
 
 end
-

app/lib/http_resource.rb

@@ -97,7 +97,7 @@ def get(a_path, headers = {})
       result
     rescue RestClient::Exception => e
       raise_rest_client_exception e, a_path, "GET"
-    rescue Errno::ECONNREFUSED => e
+    rescue Errno::ECONNREFUSED
       service = a_path.split("/").second
       raise Errors::ConnectionRefusedException, _("A backend service [ %s ] is unreachable") % service.capitalize
     end
@@ -111,7 +111,7 @@ def post(a_path, payload = {}, headers = {})
       result
     rescue RestClient::Exception => e
       raise_rest_client_exception e, a_path, "POST"
-    rescue Errno::ECONNREFUSED => e
+    rescue Errno::ECONNREFUSED
       service = a_path.split("/").second
       raise Errors::ConnectionRefusedException, _("A backend service [ %s ] is unreachable") % service.capitalize
     end
@@ -125,7 +125,7 @@ def put(a_path, payload = {}, headers = {})
       result
     rescue RestClient::Exception => e
       raise_rest_client_exception e, a_path, "PUT"
-    rescue Errno::ECONNREFUSED => e
+    rescue Errno::ECONNREFUSED
       service = a_path.split("/").second
       raise Errors::ConnectionRefusedException, _("A backend service [ %s ] is unreachable") % service.capitalize
     end
@@ -139,7 +139,7 @@ def delete(a_path = nil, headers = {})
       result
     rescue RestClient::Exception => e
       raise_rest_client_exception e, a_path, "DELETE"
-    rescue Errno::ECONNREFUSED => e
+    rescue Errno::ECONNREFUSED
       service = a_path.split("/").second
       raise Errors::ConnectionRefusedException, _("A backend service [ %s ] is unreachable") % service.capitalize
     end

app/lib/navigation/dashboard_menu.rb

@@ -21,4 +21,4 @@ def menu_dashboard
     end
 
   end
-end
+end

app/lib/navigation/notifications_menu.rb

@@ -25,4 +25,4 @@ def menu_notifications
     end
 
   end
-end
+end

app/lib/notifications.rb

@@ -12,4 +12,4 @@
 
 # see {Notify} and what is defined inside the namespace
 module Notifications
-end
+end

app/lib/notifications/notifier.rb

@@ -186,4 +186,3 @@ def process_options(options)
     return options
   end
 end
-

app/lib/resources/candlepin.rb

@@ -647,7 +647,7 @@ def remove_content(product_id, content_id)
         def create_unlimited_subscription(owner_key, product_id)
           start_date ||= Date.today
           # End it 100 years from now
-          end_date ||= start_date + 10950
+          end_date ||= start_date + 10_950
 
           subscription = {
             'startDate' => start_date,

app/lib/validators/erratum_rule_params_validator.rb

@@ -48,4 +48,4 @@ def validate_each(record, attribute, value)
       end
     end
   end
-end
+end

app/lib/validators/katello_label_format_validator.rb

@@ -29,4 +29,4 @@ def self.validate_length(record, attribute, value, max_length = 128, min_length
       end
     end
   end
-end
+end

app/lib/validators/katello_url_format_validator.rb

@@ -20,4 +20,4 @@ def validate_each(record, attribute, value)
     end
 
   end
-end
+end

app/lib/validators/library_presence_validator.rb

@@ -16,4 +16,4 @@ def validate_each(record, attribute, value)
       record.errors[attribute] << N_("must contain '%s'") % "Library" if value.select {|e| e.library}.empty?
     end
   end
-end
+end

app/lib/validators/lock_validator.rb

@@ -20,4 +20,4 @@ def validate(record)
       end
     end
   end
-end
+end

app/lib/validators/no_trailing_space_validator.rb

@@ -22,4 +22,4 @@ def self.validate_trailing_space(record, attribute, value)
       end
     end
   end
-end
+end

app/lib/validators/non_library_environment_validator.rb

@@ -17,4 +17,4 @@ def validate_each(record, attribute, value)
       record.errors[attribute] << N_("Cannot register a system to the '%s' environment") % "Library" if !record.environment.nil? && record.environment.library?
     end
   end
-end
+end

app/lib/validators/not_in_library_validator.rb

@@ -16,4 +16,4 @@ def validate(record)
       record.errors[:environment] << _("The '%s' environment cannot contain a changeset!") % "Library" if record.environment.library?
     end
   end
-end
+end

app/lib/validators/package_group_rule_params_validator.rb

@@ -29,4 +29,4 @@ def validate_each(record, attribute, value)
       end
     end
   end
-end
+end

app/lib/validators/path_descendents_validator.rb

@@ -31,4 +31,4 @@ def is_duplicate?(record)
       false
     end
   end
-end
+end

app/lib/validators/permission_validator.rb

@@ -38,4 +38,4 @@ def validate(record)
       end
     end
   end
-end
+end

app/lib/validators/prior_validator.rb

@@ -27,4 +27,4 @@ def validate(record)
       record.errors[:prior] << _("environment required") unless !record.prior.nil? || record.library?
     end
   end
-end
+end

app/lib/validators/repo_disablement_validator.rb

@@ -18,4 +18,4 @@ def validate(record)
       end
     end
   end
-end
+end

app/lib/validators/rule_params_validator.rb

@@ -29,4 +29,4 @@ def validate_each(record, attribute, value)
       end
     end
   end
-end
+end

app/lib/validators/rule_version_validator.rb

@@ -25,4 +25,4 @@ def validate_each(record, attribute, value)
       end
     end
   end
-end
+end

app/lib/validators/self_reference_environment_validator.rb

@@ -16,4 +16,4 @@ def validate(record)
       record.errors[:base] << _("Environment cannot be in its own promotion path") if record.priors.select(:id).include? record.id
     end
   end
-end
+end

app/lib/validators/serialized_params_validator.rb

@@ -22,4 +22,4 @@ def validate_each(record, attribute, value)
       end
     end
   end
-end
+end

app/models/authorization/content_view_definition.rb

@@ -98,4 +98,4 @@ def items(org, verbs)
 
   end # end ClassMethods
 
-end
+end

app/models/authorization/system.rb

@@ -64,19 +64,16 @@ def any_systems_deletable?(systems)
 
   included do
     def readable?
-      sg_readable = false
       sg_readable = !::SystemGroup.systems_readable(self.organization).where(:id => self.system_group_ids).empty?
       environment.systems_readable? || sg_readable
     end
 
     def editable?
-      sg_editable = false
       sg_editable = !::SystemGroup.systems_editable(self.organization).where(:id => self.system_group_ids).empty?
       environment.systems_editable? || sg_editable
     end
 
     def deletable?
-      sg_deletable = false
       sg_deletable = !::SystemGroup.systems_deletable(self.organization).where(:id => self.system_group_ids).empty?
       environment.systems_deletable? || sg_deletable
     end

app/models/candlepin/content.rb

@@ -48,4 +48,3 @@ def load_attributes(params)
     params.each_pair {|k, v| instance_variable_set("@#{k}", v) unless v.nil? }
   end
 end
-

app/models/candlepin/product_content.rb

@@ -145,4 +145,3 @@ def refresh_repositories
   end
 
 end
-

app/models/changeset.rb

@@ -212,4 +212,3 @@ def update_progress!(percent)
   end
 
 end
-

app/models/cp_consumer_user.rb

@@ -18,4 +18,4 @@ def cp_oauth_header
     { 'cp-consumer' => self.uuid }
   end
 
-end
+end

app/models/filter.rb

@@ -65,7 +65,7 @@ def clone_for_archive
 
   def repos(env)
     repos = self.products.map { |prod| prod.repos(env) }.flatten.reject(&:puppet?)
-    repos += repositories
+    repos + repositories
   end
 
   def puppet_repository

app/models/glue/candlepin/consumer.rb

@@ -148,7 +148,7 @@ def refresh_subscriptions
     def del_candlepin_consumer
       Rails.logger.debug "Deleting consumer in candlepin: #{name}"
       Resources::Candlepin::Consumer.destroy(self.uuid)
-    rescue RestClient::Gone => e
+    rescue RestClient::Gone
       #ignore already deleted system
       true
     rescue => e