sidekiq_snitch 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e93d050d1ec259c9f6999a0233af52290500260a
-  data.tar.gz: 42b4633edb33029ff5d31c8023db288ede8617b6
+  metadata.gz: afe59b184d86c2b9e53b801c2917118b981bf6ce
+  data.tar.gz: 94bfcd206d8153a0cb3fceb59cef5b20ca44d746
 SHA512:
-  metadata.gz: 3bd27cb05071385d4519c849a97c6035a3ef45fe1f8baf0c5613d300a9893a401885c2c6afdbdd6454ffbcd2888f40fa7a72a6fa72aa431911560c2d1ac1eb9d
-  data.tar.gz: d692b4547d069c5d4fa3d6c3ed94731ff89f368400c159d166e509eddc87e26686b94a9d4eed4bc8b510451845318b183ced028e218dd8baae9430d88e58fb65
+  metadata.gz: 8bdb47a7a3434fd27dcf58ba6e1503835c36eb0034e570f33dd20d17438202e49cf08aae1341fed6cdb8cc760ee0d2cd99ab18560c00bddb44c48849fbe14095
+  data.tar.gz: f17618ac621eda69dacd3127913a1537c38902e24f4d50429b7254d3cf2ac07f4a952ea7dee2b2d280db42153f86ea839050456e8be8dfe2c38e1fb0fc493a58

data/Rakefile

@@ -1,32 +1,4 @@
-begin
-  require 'bundler/setup'
-rescue LoadError
-  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
-end
-
-require 'rdoc/task'
-
-RDoc::Task.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'SidekiqSnitch'
-  rdoc.options << '--line-numbers'
-  rdoc.rdoc_files.include('README.rdoc')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
-
-
-
-
-Bundler::GemHelper.install_tasks
-
-require 'rake/testtask'
-
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.libs << 'test'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = false
-end
-
-
-task default: :test
+require "bundler/gem_tasks"
+require "rspec/core/rake_task"
+RSpec::Core::RakeTask.new(:spec)
+task default: :spec

data/app/workers/sidekiq/snitch.rb

@@ -13,7 +13,7 @@ module Sidekiq
         Net::HTTP.get(URI(ENV['SIDEKIQ_SNITCH_URL']))
 
         # groundhog day!
-        Snitch.perform_in(1.hour)
+        Snitch.perform_in(1.hour) unless SidekiqSnitch.scheduled?
       end
     end
   end

data/config/initializers/perform.rb

@@ -1,14 +1,7 @@
-require 'sidekiq/api'
-
-# This initializer inspects the currently scheduled Sidekiq workers,
-# of which the Sidekiq::Snitch must always be one in a properly
-# configured application.
-#
-# When none are found, schedule one to run immediately. The worker
-# will then take care of rescheduling itself.
-set = Sidekiq::ScheduledSet.new
-already_scheduled = set.any? {|job| job.klass == "Sidekiq::Snitch" }
-
-if ! already_scheduled && ! ENV['SIDEKIQ_SNITCH_URL'].blank?
-  Sidekiq::Snitch.perform_async
+# Scheduled a Sidekiq::Snitch worker to monitor Sidekiq using
+# Dead Man's Snitch (www.deadmanssnitch.com).
+Sidekiq.configure_server do |config|
+  config.on(:startup) do
+    Sidekiq::Snitch.perform_async unless SidekiqSnitch.scheduled?
+  end
 end

data/lib/sidekiq_snitch.rb

@@ -1,4 +1,8 @@
 require "sidekiq_snitch/engine"
+require 'sidekiq/api'
 
 module SidekiqSnitch
+  def self.scheduled?
+    Sidekiq::ScheduledSet.new.any? {|job| job.klass == "Sidekiq::Snitch" }
+  end
 end

data/lib/sidekiq_snitch/engine.rb

@@ -1,3 +1,5 @@
+require 'rails/engine'
+
 module SidekiqSnitch
   class Engine < ::Rails::Engine
     isolate_namespace SidekiqSnitch

data/lib/sidekiq_snitch/version.rb

@@ -1,3 +1,3 @@
 module SidekiqSnitch
-  VERSION = "1.2.0"
+  VERSION = "1.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq_snitch
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Joost Baaij
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-20 00:00:00.000000000 Z
+date: 2016-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -38,6 +38,62 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.5.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: rspec
+  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: webmock
+  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'
 description: A Rails engine that monitors your Sidekiq install using Dead Man's Snitch
   (www.deadmanssnitch.com).
 email:
@@ -47,7 +103,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - MIT-LICENSE
-- README.rdoc
 - Rakefile
 - app/workers/sidekiq/snitch.rb
 - config/initializers/perform.rb
@@ -76,8 +131,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Monitor Sidekiq using Dead Mans's Snitch
 test_files: []
+has_rdoc: 

data/README.rdoc

@@ -1,48 +0,0 @@
-= sidekiq_snitch
-
-Rails engine to monitor your Sidekiq queue using Dead Man's Snitch.
-
-= Installation
-
-First, create an account at Dead Man's Snitch http://www.deadmanssnitch.com/
-
-Then, create an hourly snitch. Put its value in ENV['SIDEKIQ_SNITCH_URL'].
-
-In Gemfile:
-
-    gem 'sidekiq_snitch'
-
-and run `bundle`. Deploy et voila!
-
-= FAQ
-
-Question: Why use an external system and not a simple cron job?
-
-Answer: If you use Sidekiq to run tasks in the background, you should monitor it.
-Monitoring any system using the system itself is asking for trouble. Using an external
-tool that starts to yell when something is wrong is the most sensible thing to do.
-
-You can use any old monitoring tool, but we've found that Dead Man's Snitch is
-simple and does one thing really well. It's also very useful for monitoring cron, in
-fact.
-
-Question: What is ENV?
-
-Answer: create an initializer:
-
-    ENV['SIDEKIQ_SNITCH_URL'] = "https://snitch.url.example.com"
-
-Question: Can I turn this off in my development environment?
-
-Answer: Sure! Just make sure there is no value set for ENV['SIDEKIQ_SNITCH_URL'].
-Sidekiq Snitch only runs if it has somewhere to snitch.
-
-= Created by
-
-Space Babies. www.spacebabies.nl
-
-Get in touch: joost@spacebabies.nl
-
-= License
-
-MIT.