Update rubocop to 0.91.1

- Disable Lint/ConstantDefinitionInBlock because it doesn't auto correct
and requires some significant restructuring since it flags class
definitions. This might be a good thing to enable in the future.

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

Author: Gerg

.rubocop.yml

@@ -435,3 +435,16 @@ Style/RedundantSelfAssignment:
 
 Style/SoleNestedConditional:
   Enabled: false
+
+Layout/BeginEndAlignment:
+  Enabled: true
+
+Lint/ConstantDefinitionInBlock:
+  Enabled: false
+
+Lint/IdentityComparison:
+  Enabled: true
+
+Lint/UselessTimes:
+  Enabled: true
+

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.90.0'
+  gem 'rubocop', '~> 0.91.1'
   gem 'timecop'
   gem 'webmock', '> 2.3.1'
 end

Gemfile.lock

@@ -395,13 +395,13 @@ GEM
       activesupport (>= 3.0.0)
       mustache (~> 1.0, >= 0.99.4)
       rspec (~> 3.0)
-    rubocop (0.90.0)
+    rubocop (0.91.1)
       parallel (~> 1.10)
       parser (>= 2.7.1.1)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.7)
       rexml
-      rubocop-ast (>= 0.3.0, < 1.0)
+      rubocop-ast (>= 0.4.0, < 1.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
     rubocop-ast (0.8.0)
@@ -567,7 +567,7 @@ DEPENDENCIES
   rspec-rails (~> 3.9.1)
   rspec-wait
   rspec_api_documentation (>= 6.1.0)
-  rubocop (~> 0.90.0)
+  rubocop (~> 0.91.1)
   ruby-debug-ide (>= 0.7.0.beta4)
   rubyzip (>= 1.3.0)
   scientist (~> 1.1.0)

lib/cloud_controller/config.rb

@@ -153,18 +153,18 @@ def kubernetes_workloads_namespace
 
     def kubernetes_ca_cert
       @kubernetes_ca_cert ||= begin
-                                ensure_k8s_api_configured!
-                                file = get(:kubernetes, :ca_file)
-                                File.read(file)
-                              end
+        ensure_k8s_api_configured!
+        file = get(:kubernetes, :ca_file)
+        File.read(file)
+      end
     end
 
     def kubernetes_service_account_token
       @kubernetes_service_account_token ||= begin
-                                              ensure_k8s_api_configured!
-                                              file = get(:kubernetes, :service_account, :token_file)
-                                              File.read(file)
-                                            end
+        ensure_k8s_api_configured!
+        file = get(:kubernetes, :service_account, :token_file)
+        File.read(file)
+      end
     end
 
     def package_image_registry_configured?

spec/api/documentation/shared_domain_api_spec.rb

@@ -5,7 +5,7 @@
   let(:admin_auth_header) { admin_headers['HTTP_AUTHORIZATION'] }
   let(:guid) { VCAP::CloudController::SharedDomain.first.guid }
   let!(:domains) { 3.times { VCAP::CloudController::SharedDomain.make } }
-  let!(:tcp_domains) { 1.times { VCAP::CloudController::SharedDomain.make router_group_guid: 'my-random-guid' } }
+  let!(:tcp_domains) { VCAP::CloudController::SharedDomain.make router_group_guid: 'my-random-guid' }
 
   authenticated_request
 

spec/request/service_route_bindings_spec.rb

@@ -122,7 +122,7 @@
         instance = VCAP::CloudController::UserProvidedServiceInstance.make(:routing)
         other_instance = VCAP::CloudController::UserProvidedServiceInstance.make(:routing)
 
-        1.times { VCAP::CloudController::RouteBinding.make(service_instance: instance) }
+        VCAP::CloudController::RouteBinding.make(service_instance: instance)
         2.times { VCAP::CloudController::RouteBinding.make(service_instance: other_instance) }
 
         get '/v3/service_route_bindings?include=service_instance', nil, admin_headers
@@ -137,10 +137,8 @@
         route = VCAP::CloudController::Route.make
         other_route = VCAP::CloudController::Route.make
 
-        1.times do
-          si = VCAP::CloudController::ManagedServiceInstance.make(:routing, space: route.space)
-          VCAP::CloudController::RouteBinding.make(route: route, service_instance: si)
-        end
+        si = VCAP::CloudController::ManagedServiceInstance.make(:routing, space: route.space)
+        VCAP::CloudController::RouteBinding.make(route: route, service_instance: si)
 
         2.times do
           si = VCAP::CloudController::ManagedServiceInstance.make(:routing, space: other_route.space)

spec/unit/lib/cloud_controller/encryptor_spec.rb

@@ -155,8 +155,8 @@ module VCAP::CloudController
 
               result = begin
                 Encryptor.decrypt(encrypted_string, salt, iterations: encryption_iterations)
-                       rescue OpenSSL::Cipher::CipherError => e
-                         e.message
+              rescue OpenSSL::Cipher::CipherError => e
+                e.message
               end
 
               expect(result).not_to eq(unencrypted_string)
@@ -169,8 +169,8 @@ module VCAP::CloudController
 
               result = begin
                 Encryptor.decrypt(encrypted_string, salt, label: 'death', iterations: encryption_iterations)
-                       rescue OpenSSL::Cipher::CipherError => e
-                         e.message
+              rescue OpenSSL::Cipher::CipherError => e
+                e.message
               end
 
               expect(result).not_to eq(unencrypted_string)