Update rubocop to 0.89.0

- Fairly big jump because of various bugs with rubocop between 0.83 and
0.89
- Disable Style/RedundantRegexpCharacterClass and
Style/RedundantRegexpEscape to avoid messing with existing regular
expressions
- Disable Lint/BinaryOperatorWithIdenticalOperands because it errors
- Disable Lint/EmptyConditionalBody because there are places where it is
useful to document possible cases with empty conditional bodies
- Disable Lint/MissingSuper. This might be nice to enable in the future,
but it involves too many changes for this commit.
- Disable Style/CaseLikeIf because I don't care about this style.
- Disable Style/OptionalBooleanParameter. This might be nice to change
in the future, but it involves changing to many method interfaces for
this commit.
- Disable Style/RedundantAssignment because "redundant" naming of return
values is useful for documentation
- Disable Style/StringConcatenation because it involves too many changes
for this commit. The auto correct also messes up nested quotes.
- Disable Bundler/OrderedGems because it clobbers gem upgrade history
for marginal gain.

Authored-by: Greg Cobb <gcobb@pivotal.io>

Author: Gerg

.rubocop.yml

@@ -325,3 +325,89 @@ Layout/EmptyLinesAroundAttributeAccessor:
 Style/SlicingWithRange:
   Enabled: true
 
+Lint/DeprecatedOpenSSLConstant:
+  Enabled: true
+
+Lint/MixedRegexpCaptureTypes:
+  Enabled: true
+
+Style/RedundantRegexpCharacterClass:
+  Enabled: false
+
+Style/RedundantRegexpEscape:
+  Enabled: false
+
+Lint/BinaryOperatorWithIdenticalOperands:
+  Enabled: false
+
+Lint/DuplicateElsifCondition:
+  Enabled: true
+
+Lint/DuplicateRescueException:
+  Enabled: true
+
+Lint/EmptyConditionalBody:
+  Enabled: false
+
+Lint/FloatComparison:
+  Enabled: true
+
+Lint/MissingSuper:
+  Enabled: false
+
+Lint/OutOfRangeRegexpRef:
+  Enabled: true
+
+Lint/SelfAssignment:
+  Enabled: true
+
+Lint/TopLevelReturnWithArgument:
+  Enabled: true
+
+Lint/UnreachableLoop:
+  Enabled: true
+
+Style/AccessorGrouping:
+  Enabled: true
+
+Style/ArrayCoercion:
+  Enabled: true
+
+Style/BisectedAttrAccessor:
+  Enabled: true
+
+Style/CaseLikeIf:
+  Enabled: false
+
+Style/ExplicitBlockArgument:
+  Enabled: true
+
+Style/GlobalStdStream:
+  Enabled: true
+
+Style/HashAsLastArrayItem:
+  Enabled: true
+
+Style/HashLikeCase:
+  Enabled: true
+
+Style/OptionalBooleanParameter:
+  Enabled: false
+
+Style/RedundantAssignment:
+  Enabled: false
+
+Style/RedundantFetchBlock:
+  Enabled: true
+
+Style/RedundantFileExtensionInRequire:
+  Enabled: true
+
+Style/SingleArgumentDig:
+  Enabled: true
+
+Style/StringConcatenation:
+  Enabled: false
+
+Bundler/OrderedGems:
+  Enabled: false

Gemfile

@@ -88,7 +88,7 @@ group :test do
   gem 'rspec-rails', '~> 3.9.1'
   gem 'rspec-wait'
   gem 'rspec_api_documentation', '>= 6.1.0'
-  gem 'rubocop', '~> 0.83.0'
+  gem 'rubocop', '~> 0.89.0'
   gem 'timecop'
   gem 'webmock', '> 2.3.1'
 end

Gemfile.lock

@@ -343,6 +343,7 @@ GEM
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     recursive-open-struct (1.1.2)
+    regexp_parser (1.8.2)
     representable (3.0.4)
       declarative (< 0.1.0)
       declarative-option (< 0.2.0)
@@ -394,13 +395,17 @@ GEM
       activesupport (>= 3.0.0)
       mustache (~> 1.0, >= 0.99.4)
       rspec (~> 3.0)
-    rubocop (0.83.0)
+    rubocop (0.89.1)
       parallel (~> 1.10)
-      parser (>= 2.7.0.1)
+      parser (>= 2.7.1.1)
       rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.7)
       rexml
+      rubocop-ast (>= 0.3.0, < 1.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
+    rubocop-ast (0.8.0)
+      parser (>= 2.7.1.5)
     ruby-debug-ide (0.7.2)
       rake (>= 0.8.1)
     ruby-mysql (2.9.14)
@@ -562,7 +567,7 @@ DEPENDENCIES
   rspec-rails (~> 3.9.1)
   rspec-wait
   rspec_api_documentation (>= 6.1.0)
-  rubocop (~> 0.83.0)
+  rubocop (~> 0.89.0)
   ruby-debug-ide (>= 0.7.0.beta4)
   rubyzip (>= 1.3.0)
   scientist (~> 1.1.0)

app/actions/organization_quotas_create.rb

@@ -3,6 +3,7 @@ class OrganizationQuotasCreate
     class Error < ::StandardError
     end
 
+    # rubocop:todo Metrics/CyclomaticComplexity
     def create(message)
       org_quota = nil
 
@@ -36,6 +37,7 @@ def create(message)
     rescue Sequel::ValidationFailed => e
       validation_error!(e, message)
     end
+    # rubocop:enable Metrics/CyclomaticComplexity
 
     private
 

app/actions/route_create.rb

@@ -113,6 +113,7 @@ def validation_error_routing_api!(error)
       end
     end
 
+    # rubocop:todo Metrics/CyclomaticComplexity
     def validation_error_host!(error, host, domain)
       if error.errors.on(:host)&.include?(:domain_conflict)
         error!("Route conflicts with domain '#{host}.#{domain.name}'.")
@@ -154,7 +155,9 @@ def validation_error_host!(error, host, domain)
         error!('Paths are not supported for TCP routes.')
       end
     end
+    # rubocop:enable Metrics/CyclomaticComplexity
 
+    # rubocop:todo Metrics/CyclomaticComplexity
     def validation_error_path!(error, host, path, domain)
       if error.errors.on(:path)&.include?(:path_not_supported_for_internal_domain)
         error!('Paths are not supported for internal domains.')
@@ -187,6 +190,7 @@ def validation_error_path!(error, host, path, domain)
         end
       end
     end
+    # rubocop:enable Metrics/CyclomaticComplexity
 
     def validation_error_port!(error, host, port, domain)
       if error.errors.on(:port)&.include?(:port_required)

app/actions/space_diff_manifest.rb

@@ -3,6 +3,7 @@
 
 module VCAP::CloudController
   class SpaceDiffManifest
+    # rubocop:todo Metrics/CyclomaticComplexity
     def self.filter_manifest_app_hash(manifest_app_hash)
       if manifest_app_hash.key? 'sidecars'
         manifest_app_hash['sidecars'] = manifest_app_hash['sidecars'].map do |hash|
@@ -56,7 +57,9 @@ def self.filter_manifest_app_hash(manifest_app_hash)
 
       manifest_app_hash
     end
+    # rubocop:enable Metrics/CyclomaticComplexity
 
+    # rubocop:todo Metrics/CyclomaticComplexity
     def self.generate_diff(app_manifests, space)
       json_diff = []
       recognized_top_level_keys = NamedAppManifestMessage.allowed_keys.map(&:to_s)
@@ -105,6 +108,7 @@ def self.generate_diff(app_manifests, space)
           end
         end
       end
+      # rubocop:enable Metrics/CyclomaticComplexity
 
       json_diff
     end

app/actions/v2/app_update.rb

@@ -100,7 +100,7 @@ def update_lifecycle(app, process, request_attrs)
       end
 
       def docker_data_changed(process, request_attrs)
-        requested_docker_image = request_attrs.dig('docker_image') || ''
+        requested_docker_image = request_attrs['docker_image'] || ''
         requested_docker_username = request_attrs.dig('docker_credentials', 'username')
         requested_docker_password = request_attrs.dig('docker_credentials', 'password')
 

app/controllers/base/model_controller.rb

@@ -331,9 +331,7 @@ def find_guid(guid, find_model=model)
     class << self
       include VCAP::CloudController
 
-      attr_accessor :attributes
-      attr_accessor :to_many_relationships
-      attr_accessor :to_one_relationships
+      attr_accessor :attributes, :to_many_relationships, :to_one_relationships
 
       # path_guid
       #

app/controllers/v3/spaces_controller.rb

@@ -5,15 +5,15 @@
 require 'messages/space_update_message'
 require 'messages/space_update_isolation_segment_message'
 require 'messages/spaces_list_message'
-require 'messages/space_security_groups_list_message.rb'
+require 'messages/space_security_groups_list_message'
 require 'messages/space_show_message'
 require 'actions/space_update_isolation_segment'
 require 'actions/space_create'
 require 'actions/space_update'
 require 'actions/space_delete_unmapped_routes'
 require 'fetchers/space_list_fetcher'
 require 'fetchers/space_fetcher'
-require 'fetchers/security_group_list_fetcher.rb'
+require 'fetchers/security_group_list_fetcher'
 require 'jobs/v3/space_delete_unmapped_routes_job'
 
 class SpacesV3Controller < ApplicationController

app/decorators/field_service_instance_offering_decorator.rb

@@ -12,6 +12,7 @@ def initialize(fields)
       @fields = fields[:'service_plan.service_offering'].to_set.intersection(self.class.allowed)
     end
 
+    # rubocop:todo Metrics/CyclomaticComplexity
     def decorate(hash, service_instances)
       managed_service_instances = service_instances.select(&:managed_instance?)
       return hash if managed_service_instances.empty?
@@ -42,6 +43,7 @@ def decorate(hash, service_instances)
 
       hash
     end
+    # rubocop:enable Metrics/CyclomaticComplexity
 
     private