Date: Wed, 19 Mar 2025 04:02:20 GMT From: Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 370aff562416 - main - devel/rubygem-sidekiq-scheduler: Allow build with rubygem-sidekiq 8.0.0+ Message-ID: <202503190402.52J42KC8084061@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=370aff562416c824af7d33cdb0d35b83739ee388 commit 370aff562416c824af7d33cdb0d35b83739ee388 Author: Po-Chuan Hsieh <sunpoet@FreeBSD.org> AuthorDate: 2025-03-19 03:43:23 +0000 Commit: Po-Chuan Hsieh <sunpoet@FreeBSD.org> CommitDate: 2025-03-19 03:43:23 +0000 devel/rubygem-sidekiq-scheduler: Allow build with rubygem-sidekiq 8.0.0+ - Bump PORTREVISION for package change Obtained from: https://github.com/sidekiq-scheduler/sidekiq-scheduler/commit/c631bfd873b9bbd3975b626202aa99eb783b1f0d --- devel/rubygem-sidekiq-scheduler/Makefile | 3 +- .../rubygem-sidekiq-scheduler/files/patch-sidekiq8 | 66 ++++++++++++++++++++++ 2 files changed, 68 insertions(+), 1 deletion(-) diff --git a/devel/rubygem-sidekiq-scheduler/Makefile b/devel/rubygem-sidekiq-scheduler/Makefile index 9e391b799914..da90ac1f2f52 100644 --- a/devel/rubygem-sidekiq-scheduler/Makefile +++ b/devel/rubygem-sidekiq-scheduler/Makefile @@ -1,5 +1,6 @@ PORTNAME= sidekiq-scheduler PORTVERSION= 5.0.6 +PORTREVISION= 1 CATEGORIES= devel rubygems MASTER_SITES= RG @@ -12,7 +13,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/MIT-LICENSE RUN_DEPENDS= rubygem-rufus-scheduler>=3.2<4:devel/rubygem-rufus-scheduler \ - rubygem-sidekiq>=6<8:devel/rubygem-sidekiq \ + rubygem-sidekiq>=6<9:devel/rubygem-sidekiq \ rubygem-tilt>=1.4.0<3:devel/rubygem-tilt USES= gem diff --git a/devel/rubygem-sidekiq-scheduler/files/patch-sidekiq8 b/devel/rubygem-sidekiq-scheduler/files/patch-sidekiq8 new file mode 100644 index 000000000000..75465ce92254 --- /dev/null +++ b/devel/rubygem-sidekiq-scheduler/files/patch-sidekiq8 @@ -0,0 +1,66 @@ +Obtained from: https://github.com/sidekiq-scheduler/sidekiq-scheduler/commit/c631bfd873b9bbd3975b626202aa99eb783b1f0d + +--- lib/sidekiq-scheduler/extensions/web.rb.orig 2025-03-15 18:21:05 UTC ++++ lib/sidekiq-scheduler/extensions/web.rb +@@ -2,14 +2,16 @@ if SidekiqScheduler::SidekiqAdapter::SIDEKIQ_GTE_7_3_0 + + if SidekiqScheduler::SidekiqAdapter::SIDEKIQ_GTE_7_3_0 + +- # Locale and asset cache is configured in `.register` +- Sidekiq::Web.register(SidekiqScheduler::Web, +- name: "recurring_jobs", +- tab: ["Recurring Jobs"], +- index: ["recurring-jobs"], +- root_dir: File.expand_path("../../../web", File.dirname(__FILE__)), +- asset_paths: ["stylesheets-scheduler"]) do |app| +- # add middleware or additional settings here ++ # Locale and asset cache is configured in `cfg.register` ++ Sidekiq::Web.configure do |cfg| ++ cfg.register(SidekiqScheduler::Web, ++ name: "recurring_jobs", ++ tab: ["Recurring Jobs"], ++ index: ["recurring-jobs"], ++ root_dir: File.expand_path("../../../web", File.dirname(__FILE__)), ++ asset_paths: ["stylesheets-scheduler"]) do |app| ++ # add middleware or additional settings here ++ end + end + + else +--- lib/sidekiq-scheduler/web.rb.orig 2025-03-15 18:14:11 UTC ++++ lib/sidekiq-scheduler/web.rb +@@ -16,7 +16,7 @@ module SidekiqScheduler + end + + app.post '/recurring-jobs/:name/enqueue' do +- schedule = Sidekiq.get_schedule(params[:name]) ++ schedule = Sidekiq.get_schedule(route_params(:name)) + SidekiqScheduler::Scheduler.instance.enqueue_job(schedule) + redirect "#{root_path}recurring-jobs" + end +@@ -24,12 +24,12 @@ module SidekiqScheduler + app.post '/recurring-jobs/:name/toggle' do + Sidekiq.reload_schedule! + +- SidekiqScheduler::Scheduler.instance.toggle_job_enabled(params[:name]) ++ SidekiqScheduler::Scheduler.instance.toggle_job_enabled(route_params(:name)) + redirect "#{root_path}recurring-jobs" + end + + app.post '/recurring-jobs/toggle-all' do +- SidekiqScheduler::Scheduler.instance.toggle_all_jobs(params[:action] == 'enable') ++ SidekiqScheduler::Scheduler.instance.toggle_all_jobs(url_params(:action) == 'enable') + redirect "#{root_path}recurring-jobs" + end + end +--- sidekiq-scheduler.gemspec.orig 2025-03-15 18:14:11 UTC ++++ sidekiq-scheduler.gemspec +@@ -21,7 +21,7 @@ Gem::Specification.new do |s| + + s.specification_version = 4 + +- s.add_runtime_dependency(%q<sidekiq>.freeze, [">= 6".freeze, "< 8".freeze]) ++ s.add_runtime_dependency(%q<sidekiq>.freeze, [">= 6".freeze, "< 9".freeze]) + s.add_runtime_dependency(%q<rufus-scheduler>.freeze, ["~> 3.2".freeze]) + s.add_runtime_dependency(%q<tilt>.freeze, [">= 1.4.0".freeze, "< 3".freeze]) + s.add_development_dependency(%q<rake>.freeze, ["~> 12.0".freeze])home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202503190402.52J42KC8084061>