From 4338695727d0bf16c9bf90d4170c55232bfc0957 Mon Sep 17 00:00:00 2001 From: Mike Perham Date: Wed, 17 Jun 2020 15:15:20 -0700 Subject: [PATCH] Bump standard, style fixes --- Gemfile.lock | 22 ++++++++++++---------- lib/sidekiq/redis_connection.rb | 2 +- lib/sidekiq/web/router.rb | 2 +- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 0ef31537..a04c669a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -69,7 +69,7 @@ GEM minitest (~> 5.1) tzinfo (~> 1.1) zeitwerk (~> 2.2, >= 2.2.2) - ast (2.4.0) + ast (2.4.1) builder (3.2.4) concurrent-ruby (1.1.6) connection_pool (2.2.3) @@ -82,8 +82,6 @@ GEM hiredis (0.6.3-java) i18n (1.8.2) concurrent-ruby (~> 1.0) - jaro_winkler (1.5.4) - jaro_winkler (1.5.4-java) jdbc-sqlite3 (3.28.0) json (2.3.0) json (2.3.0-java) @@ -104,7 +102,7 @@ GEM nokogiri (1.10.9) mini_portile2 (~> 2.4.0) nokogiri (1.10.9-java) - parallel (1.19.1) + parallel (1.19.2) parser (2.7.1.3) ast (~> 2.4.0) rack (2.2.2) @@ -141,16 +139,20 @@ GEM redis (4.2.0) redis-namespace (1.7.0) redis (>= 3.0.4) + regexp_parser (1.7.1) rexml (3.2.4) - rubocop (0.82.0) - jaro_winkler (~> 1.5.1) + rubocop (0.85.1) parallel (~> 1.10) parser (>= 2.7.0.1) rainbow (>= 2.2.2, < 4.0) + regexp_parser (>= 1.7) rexml + rubocop-ast (>= 0.0.3) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 2.0) - rubocop-performance (1.5.2) + rubocop-ast (0.0.3) + parser (>= 2.7.0.1) + rubocop-performance (1.6.1) rubocop (>= 0.71.0) ruby-progressbar (1.10.1) simplecov (0.17.1) @@ -166,9 +168,9 @@ GEM activesupport (>= 4.0) sprockets (>= 3.0.0) sqlite3 (1.4.2) - standard (0.3.0) - rubocop (~> 0.82.0) - rubocop-performance (~> 1.5.2) + standard (0.4.7) + rubocop (~> 0.85.0) + rubocop-performance (~> 1.6.0) thor (1.0.1) thread_safe (0.3.6) thread_safe (0.3.6-java) diff --git a/lib/sidekiq/redis_connection.rb b/lib/sidekiq/redis_connection.rb index 8a94a57a..89728383 100644 --- a/lib/sidekiq/redis_connection.rb +++ b/lib/sidekiq/redis_connection.rb @@ -127,7 +127,7 @@ module Sidekiq # initialization code at all. # p = ENV["REDIS_PROVIDER"] - if p && p =~ /\:/ + if p && p =~ /:/ raise <<~EOM REDIS_PROVIDER should be set to the name of the variable which contains the Redis URL, not a URL itself. Platforms like Heroku will sell addons that publish a *_URL variable. You need to tell Sidekiq with REDIS_PROVIDER, e.g.: diff --git a/lib/sidekiq/web/router.rb b/lib/sidekiq/web/router.rb index bfe9602f..efd9ff1a 100644 --- a/lib/sidekiq/web/router.rb +++ b/lib/sidekiq/web/router.rb @@ -66,7 +66,7 @@ module Sidekiq class WebRoute attr_accessor :request_method, :pattern, :block, :name - NAMED_SEGMENTS_PATTERN = /\/([^\/]*):([^\.:$\/]+)/ + NAMED_SEGMENTS_PATTERN = /\/([^\/]*):([^.:$\/]+)/ def initialize(request_method, pattern, block) @request_method = request_method