Skip to content

Commit 8222b23

Browse files
committed
Upgrade to rubocop 1.48.0 to support ruby 3.2
Remove rubocop-shopify gem Update .rubocop.yml Rubocop: auto-correct basic things Suppress warnings that are time-consuming to fix Add minor tweaks Suppress rubocop warnings for redeploy_state and deploy_state Minor rubocop tweaks Update file_system_test.rb Update stack.rb Update command.rb Update dev.rake
1 parent d6c6fa8 commit 8222b23

File tree

309 files changed

+1888
-1539
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

309 files changed

+1888
-1539
lines changed

.rubocop.yml

Lines changed: 35 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@ AllCops:
1313
- lib/shipit-engine.rb
1414
- template.rb
1515

16-
inherit_gem:
17-
rubocop-shopify: rubocop.yml
18-
1916
Layout/LineLength:
2017
Exclude:
2118
- config/routes.rb
@@ -66,6 +63,41 @@ Style/SymbolArray:
6663
Naming/InclusiveLanguage:
6764
Enabled: false
6865

66+
Style/Documentation:
67+
Enabled: false
68+
69+
Metrics/ClassLength:
70+
Enabled: false
71+
72+
Metrics/BlockLength:
73+
Enabled: false
74+
75+
Metrics/ModuleLength:
76+
Enabled: false
77+
78+
Metrics/MethodLength:
79+
Enabled: false
80+
81+
Naming/MemoizedInstanceVariableName:
82+
Enabled: false
83+
84+
Lint/ConstantDefinitionInBlock:
85+
Enabled: false
86+
87+
Metrics/AbcSize:
88+
Enabled: false
89+
90+
Metrics/CyclomaticComplexity:
91+
Enabled: false
92+
93+
Metrics/PerceivedComplexity:
94+
Enabled: false
95+
96+
Style/NumericPredicate:
97+
Enabled: false
98+
99+
Style/ModuleFunction:
100+
Enabled: false
69101

70102
# Crashing cops. We need to update rubocop at some point but better do it in its own PR.
71103
Layout/BlockAlignment:

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# Unreleased
22

33
* Pass `Shipit::Stack` to `DeploySpec::FileSystem.new` and make it accessible through an accessor. (#1356)
4+
* Upgrade Rubocop to 1.48.0
45

56
# 0.39.0
67

Gemfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ end
1313
group :development, :test do
1414
gem 'faker'
1515
gem 'webmock'
16-
gem 'rubocop', '1.18.3'
17-
gem 'rubocop-shopify', require: false
16+
gem 'rubocop', '~> 1.48.0'
1817
end
1918

2019
group :test do

Gemfile.lock

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ GEM
109109
addressable (2.8.0)
110110
public_suffix (>= 2.0.2, < 5.0)
111111
ansi_stream (0.0.6)
112-
ast (2.4.2)
112+
ast (2.4.3)
113113
autoprefixer-rails (6.4.1.1)
114114
execjs
115115
axiom-types (0.1.1)
@@ -195,6 +195,7 @@ GEM
195195
rails-dom-testing (>= 1, < 3)
196196
railties (>= 4.2.0)
197197
thor (>= 0.14, < 2.0)
198+
json (2.10.2)
198199
jwt (2.7.1)
199200
lodash-rails (4.17.21)
200201
railties (>= 3.1)
@@ -252,11 +253,12 @@ GEM
252253
omniauth (>= 1.9, < 3)
253254
paquito (0.10.0)
254255
msgpack (>= 1.5.2)
255-
parallel (1.26.3)
256-
parser (3.3.4.2)
256+
parallel (1.27.0)
257+
parser (3.3.8.0)
257258
ast (~> 2.4.1)
258259
racc
259260
pg (1.3.3)
261+
prism (1.4.0)
260262
pry (0.14.1)
261263
coderay (~> 1.1)
262264
method_source (~> 1.0)
@@ -318,26 +320,26 @@ GEM
318320
redis (4.8.1)
319321
redis-objects (1.7.0)
320322
redis
321-
regexp_parser (2.9.2)
323+
regexp_parser (2.10.0)
322324
reline (0.5.8)
323325
io-console (~> 0.5)
324326
responders (3.1.0)
325327
actionpack (>= 5.2)
326328
railties (>= 5.2)
327329
rexml (3.3.9)
328-
rubocop (1.18.3)
330+
rubocop (1.48.1)
331+
json (~> 2.3)
329332
parallel (~> 1.10)
330-
parser (>= 3.0.0.0)
333+
parser (>= 3.2.0.0)
331334
rainbow (>= 2.2.2, < 4.0)
332335
regexp_parser (>= 1.8, < 3.0)
333-
rexml
334-
rubocop-ast (>= 1.7.0, < 2.0)
336+
rexml (>= 3.2.5, < 4.0)
337+
rubocop-ast (>= 1.26.0, < 2.0)
335338
ruby-progressbar (~> 1.7)
336-
unicode-display_width (>= 1.4.0, < 3.0)
337-
rubocop-ast (1.32.1)
338-
parser (>= 3.3.1.0)
339-
rubocop-shopify (2.2.0)
340-
rubocop (~> 1.18)
339+
unicode-display_width (>= 2.4.0, < 3.0)
340+
rubocop-ast (1.44.1)
341+
parser (>= 3.3.7.2)
342+
prism (~> 1.4)
341343
ruby-progressbar (1.13.0)
342344
ruby2_keywords (0.0.5)
343345
safe_yaml (1.0.5)
@@ -390,7 +392,7 @@ GEM
390392
timeout (0.4.1)
391393
tzinfo (2.0.6)
392394
concurrent-ruby (~> 1.0)
393-
unicode-display_width (2.5.0)
395+
unicode-display_width (2.6.0)
394396
useragent (0.16.10)
395397
validate_url (1.0.15)
396398
activemodel (>= 3.0.0)
@@ -423,8 +425,7 @@ DEPENDENCIES
423425
mysql2
424426
pg
425427
pry
426-
rubocop (= 1.18.3)
427-
rubocop-shopify
428+
rubocop (~> 1.48.0)
428429
shipit-engine!
429430
simplecov
430431
spy

Rakefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# frozen_string_literal: true
2+
23
# Add your own tasks in files placed in lib/tasks ending in .rake,
34
# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
45

@@ -8,7 +9,7 @@ begin
89
rescue LoadError
910
end
1011

11-
APP_RAKEFILE = File.expand_path('../test/dummy/Rakefile', __FILE__)
12+
APP_RAKEFILE = File.expand_path('test/dummy/Rakefile', __dir__)
1213
load('rails/tasks/engine.rake')
1314

1415
Bundler::GemHelper.install_tasks

app/controllers/concerns/shipit/active_model_serializers_patch.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# frozen_string_literal: true
2+
23
module Shipit
34
module ActiveModelSerializersPatch
45
private

app/controllers/concerns/shipit/api/cacheable.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# frozen_string_literal: true
2+
23
module Shipit
34
module Api
45
module Cacheable

app/controllers/concerns/shipit/api/paginable.rb

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# frozen_string_literal: true
2+
23
module Shipit
34
module Api
45
module Paginable
@@ -23,8 +24,8 @@ def render_resources(resource, *)
2324
resource,
2425
self,
2526
order: default_order,
26-
max_page_size: max_page_size,
27-
default_page_size: default_page_size,
27+
max_page_size:,
28+
default_page_size:
2829
)
2930
headers[LINK] = render_links(paginator.links)
3031
super(paginator.to_a)

app/controllers/concerns/shipit/api/rendering.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# frozen_string_literal: true
2+
23
module Shipit
34
module Api
45
module Rendering

app/controllers/concerns/shipit/authentication.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# frozen_string_literal: true
2+
23
module Shipit
34
module Authentication
45
extend ActiveSupport::Concern

0 commit comments

Comments
 (0)