Skip to content
This repository was archived by the owner on Jun 2, 2021. It is now read-only.

Commit a8a51d7

Browse files
committed
Update rubocop to 0.90.0
- Disable Lint/UselessMethodDefinition because adhering to it breaks things. I believe this is mostly because we are overriding constructors to suppress superclass behavior. This is probably not great design, but fixing it is outside the scope of this commit. - Disable Style/CombinableLoops because it requires some significant restructuring. Also there is some async processing in diego/reporters/instances_reporter.rb that might break if the loops are combined. - Disable Style/KeywordParametersOrder to avoid changing existing method interfaces. - Disable Style/SoleNestedConditional because it involves some significant restructuring. This might be a good thing to enable in the future. Authored-by: Greg Cobb <gcobb@pivotal.io>
1 parent 9448bd3 commit a8a51d7

File tree

8 files changed

+28
-7
lines changed

8 files changed

+28
-7
lines changed

.rubocop.yml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -411,3 +411,27 @@ Style/StringConcatenation:
411411

412412
Bundler/OrderedGems:
413413
Enabled: false
414+
415+
Lint/DuplicateRequire:
416+
Enabled: true
417+
418+
Lint/EmptyFile:
419+
Enabled: true
420+
421+
Lint/TrailingCommaInAttributeDeclaration:
422+
Enabled: true
423+
424+
Lint/UselessMethodDefinition:
425+
Enabled: false
426+
427+
Style/CombinableLoops:
428+
Enabled: false
429+
430+
Style/KeywordParametersOrder:
431+
Enabled: false
432+
433+
Style/RedundantSelfAssignment:
434+
Enabled: true
435+
436+
Style/SoleNestedConditional:
437+
Enabled: false

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ group :test do
8888
gem 'rspec-rails', '~> 3.9.1'
8989
gem 'rspec-wait'
9090
gem 'rspec_api_documentation', '>= 6.1.0'
91-
gem 'rubocop', '~> 0.89.0'
91+
gem 'rubocop', '~> 0.90.0'
9292
gem 'timecop'
9393
gem 'webmock', '> 2.3.1'
9494
end

Gemfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,7 @@ GEM
395395
activesupport (>= 3.0.0)
396396
mustache (~> 1.0, >= 0.99.4)
397397
rspec (~> 3.0)
398-
rubocop (0.89.1)
398+
rubocop (0.90.0)
399399
parallel (~> 1.10)
400400
parser (>= 2.7.1.1)
401401
rainbow (>= 2.2.2, < 4.0)
@@ -567,7 +567,7 @@ DEPENDENCIES
567567
rspec-rails (~> 3.9.1)
568568
rspec-wait
569569
rspec_api_documentation (>= 6.1.0)
570-
rubocop (~> 0.89.0)
570+
rubocop (~> 0.90.0)
571571
ruby-debug-ide (>= 0.7.0.beta4)
572572
rubyzip (>= 1.3.0)
573573
scientist (~> 1.1.0)

app/actions/app_delete.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
require 'actions/process_delete'
1212
require 'actions/sidecar_delete'
1313
require 'actions/route_mapping_delete'
14-
require 'actions/sidecar_delete'
1514
require 'actions/staging_cancel'
1615

1716
module VCAP::CloudController

app/models.rb

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@
110110
require 'models/services/service_offering_annotation_model'
111111
require 'models/services/service_binding'
112112
require 'models/services/route_binding'
113+
require 'models/services/route_binding_operation'
113114
require 'models/services/service_dashboard_client'
114115
require 'models/services/service_instance'
115116
require 'models/services/managed_service_instance'
@@ -129,8 +130,6 @@
129130
require 'models/services/service_plan_label_model'
130131
require 'models/services/service_usage_event'
131132
require 'models/services/service_key'
132-
require 'models/services/route_binding'
133-
require 'models/services/route_binding_operation'
134133
require 'models/services/service_credential_binding_view'
135134

136135
require 'models/request_count'

spec/performance/processes_spec.rb

Whitespace-only changes.

spec/unit/actions/annotations_update_spec.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
require 'spec_helper'
2-
require 'spec_helper'
32

43
module VCAP::CloudController
54
RSpec.describe AnnotationsUpdate do

spec/unit/actions/metadata_update_spec.rb

Whitespace-only changes.

0 commit comments

Comments
 (0)