perform_every 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e9c1509e5c84a94b1a0029dd2a71e5f62a81deb63f1673ac7532a2a43bfdbe4
-  data.tar.gz: 3c7f5acd581c44792a5dcb2577eaf2ec32d42dd36a2abbab333f8f20186ef79c
+  metadata.gz: 28665fe63baa450a89f68d9f6c800c32c0961bb5d3aa248ea39ed0e0363596ae
+  data.tar.gz: 3b570be0905adab69c73d8424a55f4a65bdd6be1cdd9ab918c8e4585157cc7d7
 SHA512:
-  metadata.gz: 98636a9c1083dc8cd8ae302c1cb4c3ebd1f0b1e09cb3bd1cd0d6892d5f721f89d1e4d2ab579c74d39a6e19dc7bba9763fb8c225b2e675e1fcd3300738dd7645c
-  data.tar.gz: da526fc6fbb9a6029f317072953fe15df393c8238605ae5cff5b89ef1d393ed4ca8a721abf8ac883e99790c203e552e29fd7f21f6d367c00e3835e40fb681366
+  metadata.gz: 1540d9335238bfdf3c18330b15263c309e85a504fb025f9e53b9cdeead34c315ca637ff313e2523baf05e7dfc31f19fd28efae8db7aa1f1ff7c0785771e86c31
+  data.tar.gz: b427ada8c301c57ed33ba71ebc369f859467d7ebb0a8fa6e465f9d45bb486ad1f0e9a87d1b784a858bec1004cd39d2934a0d3107b277409c6caee38788ae9ebb

data/Rakefile

@@ -1,26 +1,26 @@
 begin
-  require 'bundler/setup'
+  require "bundler/setup"
 rescue LoadError
-  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
+  puts "You must `gem install bundler` and `bundle install` to run rake tasks"
 end
 
-require 'rdoc/task'
+require "rdoc/task"
 
 RDoc::Task.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'PerformEvery'
-  rdoc.options << '--line-numbers'
-  rdoc.rdoc_files.include('README.md')
-  rdoc.rdoc_files.include('lib/**/*.rb')
+  rdoc.rdoc_dir = "rdoc"
+  rdoc.title = "PerformEvery"
+  rdoc.options << "--line-numbers"
+  rdoc.rdoc_files.include("README.md")
+  rdoc.rdoc_files.include("lib/**/*.rb")
 end
 
-require 'bundler/gem_tasks'
+require "bundler/gem_tasks"
 
-require 'rake/testtask'
+require "rake/testtask"
 
 Rake::TestTask.new(:test) do |t|
-  t.libs << 'test'
-  t.pattern = 'test/**/*_test.rb'
+  t.libs << "test"
+  t.pattern = "test/**/*_test.rb"
   t.verbose = false
 end
 

data/lib/generators/perform_every/active_record_generator.rb

@@ -1,4 +1,3 @@
-
 module PerformEvery
   class ActiveRecordGenerator < Rails::Generators::Base
     include Rails::Generators::Migration
@@ -8,24 +7,12 @@ module PerformEvery
       migration_template "migration.rb", "db/migrate/create_perform_every.rb"
     end
 
-    #def generate_model
-      #invoke "active_record:model", ["PerformEvery"], migration: false unless model_exists? && behavior == :invoke
-    #end
-
-    private 
+    private
 
     # see https://stackoverflow.com/questions/11079617/next-migration-number-notimplementederror-notimplementederror-using-wysihat
     def self.next_migration_number(dirname)
       next_migration_number = current_migration_number(dirname) + 1
       ActiveRecord::Migration.next_migration_number(next_migration_number)
     end
-
-    #def model_exists?
-      #File.exist?(File.join(destination_root, model_path))
-    #end
-
-    #def model_path
-      #@model_path ||= File.join("app", "models", "perform_every.rb")
-    #end
   end
 end

data/lib/generators/perform_every/templates/migration.rb

@@ -1,4 +1,4 @@
-class CreatePerformEvery < ActiveRecord::Migration[4.2]
+class CreatePerformEvery < ActiveRecord::Migration[6.0]
   def change
     create_table :perform_every do |t|
       t.string :job_name

data/lib/perform_every.rb

@@ -4,7 +4,7 @@ require "perform_every/reflection"
 require "perform_every/scheduler"
 require "perform_every/railtie"
 
-require 'fugit'
+require "fugit"
 
 ActiveSupport.on_load(:active_job) do
   require "perform_every/activejob"

data/lib/perform_every/activejob.rb

@@ -7,7 +7,7 @@ module PerformEvery
     # and https://github.com/rails/rails/blob/master/activerecord/lib/active_record/associations.rb
 
     class_methods do
-      def perform_every(interval, opts={})
+      def perform_every(interval, opts = {})
         j = Job.new
         j.job_name = self.name
         j.typ = "interval"
@@ -17,14 +17,14 @@ module PerformEvery
         if j.value.blank?
           raise "#{self.name}#perform_every needs interval"
         end
-        
+
         # TODO raise if perform method has parameters
         # Object.const_get(self.name).instance_method(:perform).parameters.flatten.count
 
         PerformEvery::Reflection.insert(j)
       end
 
-      def perform_at(timestamp, opts={})
+      def perform_at(timestamp, opts = {})
         j = Job.new
         j.job_name = self.name
         j.typ = "timestamp"
@@ -43,4 +43,3 @@ module PerformEvery
     end
   end
 end
-

data/lib/perform_every/job.rb

@@ -1,4 +1,4 @@
-require 'action_view'
+require "action_view"
 
 module PerformEvery
   class Job < ActiveRecord::Base
@@ -15,7 +15,7 @@ module PerformEvery
     end
 
     def from_reflection_store(attr)
-      s = PerformEvery::Reflection.find(self) 
+      s = PerformEvery::Reflection.find(self)
       return nil if s.nil?
       s.send(attr.to_sym)
     end
@@ -122,7 +122,7 @@ module PerformEvery
     def add_history(t = Time.now.utc)
       self.history ||= []
       self.history << t.to_s
-      self.history.shift(self.history.count - MAX_HISTORY) if self.history.count > MAX_HISTORY 
+      self.history.shift(self.history.count - MAX_HISTORY) if self.history.count > MAX_HISTORY
     end
 
     def perform_next_at
@@ -138,7 +138,7 @@ module PerformEvery
     def parse_interval_value
       raise "must be interval" if self.value.blank?
       interval = ::Fugit::Nat.parse("every " + self.value, multi: :fail)
-      raise "must be interval" if interval.blank? || !interval.is_a?(::Fugit::Cron) 
+      raise "must be interval" if interval.blank? || !interval.is_a?(::Fugit::Cron)
       return interval
     end
 
@@ -149,8 +149,8 @@ module PerformEvery
       return timestamp
     end
 
-    def == j
-      self.job_name == j.job_name && self.typ == j.typ && self.value == j.value  
+    def ==(j)
+      self.job_name == j.job_name && self.typ == j.typ && self.value == j.value
     end
 
     def perform_once?
@@ -165,6 +165,5 @@ module PerformEvery
       self.deprecated = true
       self.save!
     end
-
   end
 end

data/lib/perform_every/reflection.rb

@@ -1,5 +1,4 @@
 module PerformEvery
-
   module Reflection
     mattr_reader :store, default: []
 
@@ -13,8 +12,7 @@ module PerformEvery
     def self.find(job)
       i = @@store.index(job)
       return nil if i.nil?
-      @@store[i] 
+      @@store[i]
     end
   end
-
 end

data/lib/perform_every/scheduler.rb

@@ -1,17 +1,16 @@
-require 'with_advisory_lock'
+require "with_advisory_lock"
 
 module PerformEvery
   class Scheduler
-
     def run_forever
       Zeitwerk::Loader.eager_load_all # make sure all jobs are loaded
 
       # trap SIGINT and SIGTERM signals for clean shutdown
       kill = false
-      Signal.trap("INT") {|s| kill = true }
-      Signal.trap("TERM") {|s| kill = true }
+      Signal.trap("INT") { |s| kill = true }
+      Signal.trap("TERM") { |s| kill = true }
 
-      # try to continuously acquire advisory lock so that only one worker 
+      # try to continuously acquire advisory lock so that only one worker
       # at a time will schedule jobs. wait 5 seconds for lock, then try again after 30 seconds.
       loop do
         Rails.logger.info "Leader election: waiting to become master ..."
@@ -26,7 +25,7 @@ module PerformEvery
 
           at_exit do
             Rails.logger.info "#{metrics}" unless metrics.blank?
-            Rails.logger.info "Bye" 
+            Rails.logger.info "Bye"
           end
 
           # start endless loop
@@ -37,9 +36,8 @@ module PerformEvery
             jobs = Job.where(:deprecated => false)
             jobs.each do |job|
 
-
               # check if job is still present in local job files
-              if Reflection.store.include?(job) 
+              if Reflection.store.include?(job)
                 op = job.perform!
                 metrics[op] ||= 0
                 metrics[op] += 1
@@ -72,7 +70,6 @@ module PerformEvery
           return if kill
           sleep 2
         end
-
       end # /loop around with_advisory_lock
     end
 
@@ -81,11 +78,14 @@ module PerformEvery
     # insert new jobs to database
     def self.persist_jobs
       return 0 if Reflection.store.blank?
-      Job.insert_all(Reflection.store.map{|j| { 
-        job_name: j.job_name, 
-        typ: j.typ, 
-        value: j.value, 
-        perform_at: j.perform_next_at} })
+      Job.insert_all(Reflection.store.map { |j|
+        {
+          job_name: j.job_name,
+          typ: j.typ,
+          value: j.value,
+          perform_at: j.perform_next_at,
+        }
+      })
       Reflection.store.count
     end
 
@@ -96,6 +96,5 @@ module PerformEvery
     def self.reset_jobs
       Job.connection.truncate(Job.table_name)
     end
-
   end
 end

data/lib/perform_every/version.rb

@@ -1,3 +1,3 @@
 module PerformEvery
-  VERSION = '0.1.0'
+  VERSION = "0.1.1"
 end

data/lib/tasks/perform_every_tasks.rake

@@ -1,8 +1,7 @@
 namespace :perform_every do
-
   desc "Run scheduler"
   task run: :environment do
-    s = PerformEvery::Scheduler.new 
+    s = PerformEvery::Scheduler.new
     s.run_forever
   end
 
@@ -15,5 +14,4 @@ namespace :perform_every do
   task reset: :environment do
     PerformEvery::Scheduler.reset_jobs
   end
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: perform_every
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Matthias Kadenbach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-07 00:00:00.000000000 Z
+date: 2020-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails