sidekiq-scheduler-notification 0.1.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ef1c2d1a43626cddfcde1433cc2d94dad8fc9579
-  data.tar.gz: 20b4914852b731b67a705256dbb3c0109e582677
+SHA256:
+  metadata.gz: f76f433968aaa90efef0b3fe962831b4f2fd3da3bad196c253e880b349c2b76c
+  data.tar.gz: cb868e41b8ef1171867b25f16996d57e5f696d97cd99096d3626de10b235d642
 SHA512:
-  metadata.gz: b1f37c76794848447e54d689ec7fdeeb3529988b045933fa1e6cefb738b258ce2c8ae7c5dd233b2babdb6486c3e3f5123ae21a56ee7e7df677820ebcb01bbf42
-  data.tar.gz: 6297d9090c53b13af9214f0711fbfb43cc26b11e7b13fcb2c35413b3f26624536ed115f44d1269e3b2b3297097b6f6d3e8c8a5dd81e9ca251ca89879769da81a
+  metadata.gz: 565f5bdda7638644bfa1b6e576aa7b2d38a4c399e912b65c0d668b2bd385cf881a717e10185388c4f8faa2c14923dd2380dc8fb259a9d10e6b7158c28f009dbe
+  data.tar.gz: 6e9c8d2273fe45014af06989e503461fc2d0d8ea098331224de4f83edbc256100abead2e59324d0d1b06daae20cdff124fd0ad90658a0dce3496cddf3fd5ae8b

data/.github/workflows/test.yml

@@ -0,0 +1,33 @@
+name: test
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+permissions:
+  contents: read
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: ['2.6', '2.7', '3.0', '3.1', head]
+
+    services:
+      redis:
+        image: redis
+        ports:
+          - 6379:6379
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+    - name: Run tests
+      run: bundle exec rake

data/Gemfile

@@ -1,3 +1,6 @@
 source 'https://rubygems.org'
 
 gemspec
+
+gem "rake"
+gem "minitest"

data/README.md

@@ -23,10 +23,10 @@ Or install it yourself as:
 Added following configuration to initializer like `config/initializer/sidekiq.rb`
 
 ```rb
-Sidekiq::Scheduler.notify_webhook = "https://hooks.slack.com/services/xxx/yyyzzz"
+SidekiqScheduler::Scheduler.notify_webhook = "https://hooks.slack.com/services/xxx/yyyzzz"
 ```
 
-and append `notification` variable like this
+and append `notification` variable into `schedule.yml` used by sidekiq-scheduler. like this
 
 ```yaml
 NotificationJob:
@@ -34,7 +34,13 @@ NotificationJob:
   notification: true
 ```
 
-You can get notification from sidekiq to slack channnel.
+Finally, You need to load `schedule.yml` at first before loading to this gem. You can add to read schedule.yml to sidekiq startup hook.
+
+```rb
+Sidekiq.options[:lifecycle_events][:startup].unshift -> {
+  Sidekiq.schedule = YAML.load_file(File.expand_path("../../../config/scheduler.yml",__FILE__))
+}
+```
 
 ## Development
 

data/lib/sidekiq/middleware/server/slack_notification.rb

@@ -5,9 +5,10 @@ module Sidekiq
     module Server
       class SlackNotification
         def call(_worker, job, _queue)
-          if Sidekiq::Scheduler.notify_classes.include? job['wrapped']
-            notifier ||= Slack::Notifier.new(Sidekiq::Scheduler.notify_webhook)
-            notifier.username = 'Sidekiq Notification'
+          if SidekiqScheduler::Scheduler.notify_classes.include? job['wrapped']
+            notifier ||= Slack::Notifier.new(SidekiqScheduler::Scheduler.notify_webhook) do
+              defaults username: 'Sidekiq Notification'
+            end
             begin
               notifier.ping "Start : #{job['wrapped']}"
               yield

data/lib/sidekiq/scheduler/notification/version.rb

@@ -1,7 +1,7 @@
-module Sidekiq
+module SidekiqScheduler
   class Scheduler
     module Notification
-      VERSION = "0.1.0"
+      VERSION = "1.0.0"
     end
   end
 end

data/lib/sidekiq/scheduler/notification.rb

@@ -2,7 +2,7 @@ require 'sidekiq-scheduler'
 require 'sidekiq/middleware/server/slack_notification'
 require 'sidekiq/scheduler/notification/version'
 
-module Sidekiq
+module SidekiqScheduler
   class Scheduler
     class << self
       attr_accessor :notify_classes, :notify_webhook
@@ -11,23 +11,15 @@ module Sidekiq
 end
 
 module SidekiqSchedulerNotification
-  module ClassMethods
-    def load_schedule!
-      super
-      if enabled && Sidekiq.schedule
-        Sidekiq::Scheduler.notify_classes = Sidekiq.schedule.select{|_,v| v["notification"] }.map{|k,_| k}
-      end
-    end
-  end
-
-  def self.prepended(base)
-    class << base
-      prepend ClassMethods
+  def load_schedule!
+    super
+    if Sidekiq.schedule
+      SidekiqScheduler::Scheduler.notify_classes = Sidekiq.schedule.select{|_,v| v["notification"] }.map{|k,_| k}
     end
   end
 end
 
-Sidekiq::Scheduler.prepend SidekiqSchedulerNotification
+SidekiqScheduler::Scheduler.prepend SidekiqSchedulerNotification
 
 Sidekiq.configure_server do |config|
   config.server_middleware do |chain|

data/sidekiq-scheduler-notification.gemspec

@@ -5,7 +5,7 @@ require 'sidekiq/scheduler/notification/version'
 
 Gem::Specification.new do |spec|
   spec.name          = "sidekiq-scheduler-notification"
-  spec.version       = Sidekiq::Scheduler::Notification::VERSION
+  spec.version       = SidekiqScheduler::Scheduler::Notification::VERSION
   spec.authors       = ["SHIBATA Hiroshi"]
   spec.email         = ["hsbt@ruby-lang.org"]
 
@@ -19,10 +19,6 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'sidekiq-scheduler'
-  spec.add_dependency 'slack-notifier'
-
-  spec.add_development_dependency "bundler"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "minitest"
+  spec.add_dependency 'sidekiq-scheduler', '>= 3'
+  spec.add_dependency 'slack-notifier', '>= 2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-scheduler-notification
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 1.0.0
 platform: ruby
 authors:
 - SHIBATA Hiroshi
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2016-07-23 00:00:00.000000000 Z
+date: 2022-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq-scheduler
@@ -16,70 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: slack-notifier
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
 description: Slack notification middleware for sidekiq-scheduler
 email:
 - hsbt@ruby-lang.org
@@ -87,8 +45,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/test.yml"
 - ".gitignore"
-- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -103,7 +61,7 @@ homepage: https://github.com/hsbt/sidekiq-scheduler-notification
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -118,9 +76,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
-signing_key: 
+rubygems_version: 3.4.0.dev
+signing_key:
 specification_version: 4
 summary: Slack notification middleware for sidekiq-scheduler
 test_files: []

data/.travis.yml

@@ -1,6 +0,0 @@
-sudo: false
-language: ruby
-rvm:
-  - 2.3.1
-  - ruby-head
-before_install: gem install bundler -v 1.12.5