From 6e421e50e7a828d8a929faf294c7cb65f565277c Mon Sep 17 00:00:00 2001 From: Ivars Belovs Date: Mon, 24 Jul 2023 14:00:17 +0300 Subject: [PATCH 1/3] Update resque to 2.5.0 --- Gemfile | 2 +- Gemfile.lock | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/Gemfile b/Gemfile index c8388af..12ea3dd 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' -gem 'resque', '~>1.19' +gem 'resque', '~>2.5' group :test do gem 'mocha', '~>0.9' diff --git a/Gemfile.lock b/Gemfile.lock index 8539ae2..cb62032 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -51,19 +51,16 @@ GEM connection_pool redis-namespace (1.11.0) redis (>= 4) - resque (1.27.4) + resque (2.5.0) mono_logger (~> 1.0) multi_json (~> 1.0) - redis-namespace (~> 1.3) + redis-namespace (~> 1.6) sinatra (>= 0.9.2) - vegas (~> 0.1.2) sinatra (1.4.8) rack (~> 1.5) rack-protection (~> 1.4) tilt (>= 1.3, < 3) tilt (2.2.0) - vegas (0.1.11) - rack (>= 1.0.0) PLATFORMS ruby @@ -72,7 +69,7 @@ DEPENDENCIES jeweler minitest (~> 5.5) mocha (~> 0.9) - resque (~> 1.19) + resque (~> 2.5) BUNDLED WITH 2.3.20 From 2de4e43dbc5c5c47f450e2e3642d73a282fbeef5 Mon Sep 17 00:00:00 2001 From: Ivars Belovs Date: Mon, 24 Jul 2023 16:05:28 +0300 Subject: [PATCH 2/3] Update gems --- Gemfile.lock | 95 +++++++++++++++++++------------ lib/resque/plugins/status/hash.rb | 12 +++- 2 files changed, 68 insertions(+), 39 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index cb62032..46e44e0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,50 +1,65 @@ GEM remote: https://rubygems.org/ specs: - addressable (2.3.5) - builder (3.2.2) + addressable (2.4.0) + builder (3.2.4) connection_pool (2.4.1) - faraday (0.7.6) - addressable (~> 2.2) - multipart-post (~> 1.1) - rack (~> 1.1) - git (1.2.6) - github_api (0.4.10) - faraday (~> 0.7.6) - hashie (~> 1.2.0) - multi_json (~> 1.0) - oauth2 (~> 0.5.2) - hashie (1.2.0) - highline (1.6.20) - jeweler (2.0.0) + descendants_tracker (0.0.4) + thread_safe (~> 0.3, >= 0.3.1) + faraday (0.9.2) + multipart-post (>= 1.2, < 3) + git (1.11.0) + rchardet (~> 1.8) + github_api (0.16.0) + addressable (~> 2.4.0) + descendants_tracker (~> 0.0.4) + faraday (~> 0.8, < 0.10) + hashie (>= 3.4) + mime-types (>= 1.16, < 3.0) + oauth2 (~> 1.0) + hashie (5.0.0) + highline (2.1.0) + jeweler (2.3.9) builder - bundler (>= 1.0) + bundler git (>= 1.2.5) - github_api + github_api (~> 0.16.0) highline (>= 1.6.15) nokogiri (>= 1.5.10) + psych rake rdoc - json (1.8.6) - metaclass (0.0.2) - mini_portile (0.5.2) - minitest (5.5.1) + semver2 + jwt (2.7.1) + metaclass (0.0.4) + mime-types (2.99.3) + minitest (5.18.1) mocha (0.14.0) metaclass (~> 0.0.1) mono_logger (1.1.2) multi_json (1.15.0) - multipart-post (1.2.0) - nokogiri (1.6.1) - mini_portile (~> 0.5.0) - oauth2 (0.5.2) - faraday (~> 0.7) - multi_json (~> 1.0) - rack (1.6.13) - rack-protection (1.5.5) + multi_xml (0.6.0) + multipart-post (2.3.0) + mustermann (3.0.0) + ruby2_keywords (~> 0.0.1) + nokogiri (1.15.3-x86_64-darwin) + racc (~> 1.4) + oauth2 (1.4.8) + faraday (>= 0.8, < 3.0) + jwt (>= 1.0, < 3.0) + multi_json (~> 1.3) + multi_xml (~> 0.5) + rack (>= 1.2, < 3) + psych (5.1.0) + stringio + racc (1.7.1) + rack (2.2.7) + rack-protection (3.0.6) rack - rake (10.1.1) - rdoc (4.1.1) - json (~> 1.4) + rake (13.0.6) + rchardet (1.8.0) + rdoc (6.5.0) + psych (>= 4.0.0) redis (5.0.6) redis-client (>= 0.9.0) redis-client (0.14.1) @@ -56,14 +71,20 @@ GEM multi_json (~> 1.0) redis-namespace (~> 1.6) sinatra (>= 0.9.2) - sinatra (1.4.8) - rack (~> 1.5) - rack-protection (~> 1.4) - tilt (>= 1.3, < 3) + ruby2_keywords (0.0.5) + semver2 (3.4.2) + sinatra (3.0.6) + mustermann (~> 3.0) + rack (~> 2.2, >= 2.2.4) + rack-protection (= 3.0.6) + tilt (~> 2.0) + stringio (3.0.7) + thread_safe (0.3.6) tilt (2.2.0) PLATFORMS - ruby + x86_64-darwin-19 + x86_64-darwin-22 DEPENDENCIES jeweler diff --git a/lib/resque/plugins/status/hash.rb b/lib/resque/plugins/status/hash.rb index c0a3015..05ada7a 100644 --- a/lib/resque/plugins/status/hash.rb +++ b/lib/resque/plugins/status/hash.rb @@ -196,8 +196,16 @@ def #{name}? # Proxy deprecated methods directly back to Resque itself. class << self - [:redis, :encode, :decode].each do |method| - define_method(method) { |*args| Resque.send(method, *args) } + def encode(val) + Resque.encode(val) + end + + def decode(val) + Resque.decode(val) + end + + def redis + Resque.redis end end From 912f2051372ec8351ec6f3bdd9f831f3f0059482 Mon Sep 17 00:00:00 2001 From: Ivars Belovs Date: Mon, 24 Jul 2023 16:26:35 +0300 Subject: [PATCH 3/3] Update gemspec --- resque-status.gemspec | 37 ++++++++++++++++--------------------- 1 file changed, 16 insertions(+), 21 deletions(-) diff --git a/resque-status.gemspec b/resque-status.gemspec index c2e272d..a723fa7 100644 --- a/resque-status.gemspec +++ b/resque-status.gemspec @@ -5,15 +5,15 @@ # stub: resque-status 0.5.0 ruby lib Gem::Specification.new do |s| - s.name = "resque-status" + s.name = "resque-status".freeze s.version = "0.6.0" - s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= - s.require_paths = ["lib"] - s.authors = ["Aaron Quint"] - s.date = "2015-03-18" - s.description = "resque-status is an extension to the resque queue system that provides simple trackable jobs. It provides a Resque::Plugins::Status::Hash class which can set/get the statuses of jobs and a Resque::Plugins::Status class that when included provides easily trackable/killable jobs." - s.email = "aaron@quirkey.com" + s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version= + s.require_paths = ["lib".freeze] + s.authors = ["Aaron Quint".freeze] + s.date = "2023-07-24" + s.description = "resque-status is an extension to the resque queue system that provides simple trackable jobs. It provides a Resque::Plugins::Status::Hash class which can set/get the statuses of jobs and a Resque::Plugins::Status class that when included provides easily trackable/killable jobs.".freeze + s.email = "aaron@quirkey.com".freeze s.extra_rdoc_files = [ "LICENSE", "README.rdoc" @@ -42,24 +42,19 @@ Gem::Specification.new do |s| "test/test_resque_plugins_status.rb", "test/test_resque_plugins_status_hash.rb" ] - s.homepage = "http://github.com/quirkey/resque-status" - s.rubyforge_project = "quirkey" - s.rubygems_version = "2.2.2" - s.summary = "resque-status is an extension to the resque queue system that provides simple trackable jobs." + s.homepage = "http://github.com/quirkey/resque-status".freeze + s.rubygems_version = "3.3.26".freeze + s.summary = "resque-status is an extension to the resque queue system that provides simple trackable jobs.".freeze if s.respond_to? :specification_version then s.specification_version = 4 + end - if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then - s.add_runtime_dependency(%q, [">= 1.19", "< 3"]) - s.add_development_dependency(%q, [">= 0"]) - else - s.add_dependency(%q, [">= 1.19", "< 3"]) - s.add_dependency(%q, [">= 0"]) - end + if s.respond_to? :add_runtime_dependency then + s.add_runtime_dependency(%q.freeze, ["~> 2.5"]) + s.add_development_dependency(%q.freeze, [">= 0"]) else - s.add_dependency(%q, [">= 1.19", "< 3"]) - s.add_dependency(%q, [">= 0"]) + s.add_dependency(%q.freeze, ["~> 2.5"]) + s.add_dependency(%q.freeze, [">= 0"]) end end -