Skip to content

Commit 63f6e68

Browse files
committed
standard formatting
1 parent 96816c3 commit 63f6e68

File tree

4 files changed

+18
-18
lines changed

4 files changed

+18
-18
lines changed

Gemfile.lock

+11-11
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,8 @@ GEM
106106
nokogiri (1.11.2)
107107
mini_portile2 (~> 2.5.0)
108108
racc (~> 1.4)
109-
parallel (1.20.1)
110-
parser (3.0.1.1)
109+
parallel (1.21.0)
110+
parser (3.1.0.0)
111111
ast (~> 2.4.1)
112112
racc (1.5.2)
113113
rack (2.2.3)
@@ -142,20 +142,20 @@ GEM
142142
rainbow (3.0.0)
143143
rake (13.0.3)
144144
redis (4.2.5)
145-
regexp_parser (2.1.1)
145+
regexp_parser (2.2.0)
146146
rexml (3.2.5)
147-
rubocop (1.14.0)
147+
rubocop (1.24.1)
148148
parallel (~> 1.10)
149149
parser (>= 3.0.0.0)
150150
rainbow (>= 2.2.2, < 4.0)
151151
regexp_parser (>= 1.8, < 3.0)
152152
rexml
153-
rubocop-ast (>= 1.5.0, < 2.0)
153+
rubocop-ast (>= 1.15.1, < 2.0)
154154
ruby-progressbar (~> 1.7)
155155
unicode-display_width (>= 1.4.0, < 3.0)
156-
rubocop-ast (1.5.0)
156+
rubocop-ast (1.15.1)
157157
parser (>= 3.0.1.1)
158-
rubocop-performance (1.11.2)
158+
rubocop-performance (1.13.1)
159159
rubocop (>= 1.7.0, < 2.0)
160160
rubocop-ast (>= 0.4.0)
161161
ruby-progressbar (1.11.0)
@@ -171,14 +171,14 @@ GEM
171171
activesupport (>= 4.0)
172172
sprockets (>= 3.0.0)
173173
sqlite3 (1.4.2)
174-
standard (1.1.1)
175-
rubocop (= 1.14.0)
176-
rubocop-performance (= 1.11.2)
174+
standard (1.6.0)
175+
rubocop (= 1.24.1)
176+
rubocop-performance (= 1.13.1)
177177
thor (1.1.0)
178178
toxiproxy (1.0.3)
179179
tzinfo (2.0.4)
180180
concurrent-ruby (~> 1.0)
181-
unicode-display_width (2.0.0)
181+
unicode-display_width (2.1.0)
182182
websocket-driver (0.7.3)
183183
websocket-extensions (>= 0.1.0)
184184
websocket-extensions (0.1.5)

lib/sidekiq/api.rb

+4-4
Original file line numberDiff line numberDiff line change
@@ -819,10 +819,10 @@ def each
819819

820820
hash = Sidekiq.load_json(info)
821821
yield Process.new(hash.merge("busy" => busy.to_i,
822-
"beat" => at_s.to_f,
823-
"quiet" => quiet,
824-
"rss" => rss.to_i,
825-
"rtt_us" => rtt.to_i))
822+
"beat" => at_s.to_f,
823+
"quiet" => quiet,
824+
"rss" => rss.to_i,
825+
"rtt_us" => rtt.to_i))
826826
end
827827
end
828828

lib/sidekiq/job_util.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ def normalize_item(item)
3434
# merge in the default sidekiq_options for the item's class and/or wrapped element
3535
# this allows ActiveJobs to control sidekiq_options too.
3636
defaults = normalized_hash(item["class"])
37-
defaults = defaults.merge(item["wrapped"].get_sidekiq_options) if item["wrapped"].respond_to?("get_sidekiq_options")
37+
defaults = defaults.merge(item["wrapped"].get_sidekiq_options) if item["wrapped"].respond_to?(:get_sidekiq_options)
3838
item = defaults.merge(item)
3939

4040
raise(ArgumentError, "Job must include a valid queue name") if item["queue"].nil? || item["queue"] == ""
@@ -49,7 +49,7 @@ def normalize_item(item)
4949

5050
def normalized_hash(item_class)
5151
if item_class.is_a?(Class)
52-
raise(ArgumentError, "Message must include a Sidekiq::Worker class, not class name: #{item_class.ancestors.inspect}") unless item_class.respond_to?("get_sidekiq_options")
52+
raise(ArgumentError, "Message must include a Sidekiq::Worker class, not class name: #{item_class.ancestors.inspect}") unless item_class.respond_to?(:get_sidekiq_options)
5353
item_class.get_sidekiq_options
5454
else
5555
Sidekiq.default_worker_options

lib/sidekiq/web/application.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@ def call(env)
299299
return [404, {"Content-Type" => "text/plain", "X-Cascade" => "pass"}, ["Not Found"]] unless action
300300

301301
app = @klass
302-
resp = catch(:halt) do # rubocop:disable Standard/SemanticBlocks
302+
resp = catch(:halt) do
303303
self.class.run_befores(app, action)
304304
action.instance_exec env, &action.block
305305
ensure

0 commit comments

Comments
 (0)