say_when 0.3.0 → 0.4.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: ff56cfaa645736fcace3c95f0d9f20a35b7785aa2be6cd544caee8ecb3d0b537
+  data.tar.gz: e04c3cbf9dfff48405d88a574aab8ebd1bf85bb747f6223efa3df184f9e485bb
+SHA512:
+  metadata.gz: 16b737f008959d234f85f9d8100bb5503500c6b0d8acdb5c78f9306e7c7ac7166571d9021a69daba2406e29e112cba8e0b0b27bd222edb7dfae6b2ceb62f8264
+  data.tar.gz: 020d6842616be2b4984f6f7202279d09660646b112a7d0b24cffad38a6be711a1ee257f12eb4fc64aaa861816e2ba75673f773b4bca54c1af131b91029198ebe

data/Gemfile

@@ -2,3 +2,11 @@ source "http://rubygems.org"
 
 # Specify your gem's dependencies in say_when.gemspec
 gemspec
+
+gem "rspec", "=1.3.2", git: 'https://github.com/makandra/rspec.git', branch: '1-3-lts'
+
+git 'https://github.com/makandra/rails.git', :branch => '2-3-lts' do
+  gem 'rails', '~>2.3.18'
+  gem 'activesupport',    :require => false
+  gem 'railslts-version', :require => false
+end

data/Rakefile

@@ -1 +1,9 @@
-require "bundler/gem_tasks"
+require "bundler/gem_tasks"
+require 'spec/rake/spectask'
+
+desc "Run all tests"
+Spec::Rake::SpecTask.new('test') do |t|
+  t.spec_files = FileList['spec/**/*_spec.rb']
+end
+
+task :default => :test

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

@@ -1,5 +1,5 @@
 class CreateSayWhenTables < ActiveRecord::Migration
-  
+
   def self.up
 
     create_table :say_when_jobs, :force => true do |t|
@@ -35,11 +35,13 @@ class CreateSayWhenTables < ActiveRecord::Migration
       t.datetime :start_at
       t.datetime :end_at
     end
-    
+
     add_index :say_when_jobs, :status
     add_index :say_when_jobs, :next_fire_at
+    add_index :say_when_jobs, [:next_fire_at, :status]
+    add_index :say_when_jobs, [:last_fire_at, :status]
   end
-  
+
   def self.down
     drop_table :say_when_job_executions
     drop_table :say_when_jobs

data/lib/say_when/scheduler.rb

@@ -8,7 +8,7 @@ module SayWhen
     @@scheduler = nil
     @@lock = nil
 
-    attr_accessor :storage_strategy, :processor_class, :tick_length, :reset_acquired_length
+    attr_accessor :storage_strategy, :processor_class, :tick_length, :reset_acquired_length, :reset_next_at
 
     attr_accessor :running
 
@@ -63,61 +63,13 @@ module SayWhen
       trap("TERM", "EXIT")
 
       begin
-
         self.running = true
 
         logger.info "SayWhen::Scheduler running"
-        job = nil
-        reset_next_at = Time.now
         while running
-          begin
-            time_now = Time.now
-
-            if reset_acquired_length > 0 && reset_next_at <= time_now
-              reset_next_at = time_now + reset_acquired_length
-              logger.debug "SayWhen:: reset acquired at #{time_now}, try again at #{reset_next_at}"
-              job_class.reset_acquired(reset_acquired_length)
-            end
-
-            begin
-              logger.debug "SayWhen:: Looking for job that should be ready to fire before #{time_now}"
-              job = job_class.acquire_next(time_now)
-            rescue StandardError => ex
-              job_error("Failure to acquire job", job, ex)
-              job = nil
-            end
-
-            if job.nil?
-              logger.debug "SayWhen:: no jobs to acquire, sleep"
-              sleep(tick_length)
-              next
-            end
-
-            begin
-              logger.debug "SayWhen:: got a job: #{job.inspect}"
-              # delegate processing the trigger to the processor
-              self.processor.process(job)
-              logger.debug "SayWhen:: job processed"
-
-              # if successful, update next fire at, put back to waiting / ended
-              job.fired(time_now)
-              logger.debug "SayWhen:: job fired complete"
-            rescue StandardError=>ex
-              job_error("Failure to process", job, ex)
-            end
-
-          rescue Interrupt => ex
-            job_error("Interrupt!", job, ex)
-            raise ex
-          rescue StandardError => ex
-            job_error("Error!", job, ex)
-            sleep(tick_length)
-          rescue Exception => ex
-            job_error("Exception!", job, ex)
-            raise ex
-          end
+          process_jobs
         end
-      rescue Exception=>ex
+      rescue Exception => ex
         logger.error "SayWhen::Scheduler stopping, error: #{ex.class.name}: #{ex.message}"
         exit
       end
@@ -125,6 +77,55 @@ module SayWhen
       logger.info "SayWhen::Scheduler stopped"
     end
 
+    def process_jobs
+      job = nil
+      time_now = Time.now
+      self.reset_next_at ||= Time.now
+
+      if reset_acquired_length > 0 && reset_next_at <= time_now
+        self.reset_next_at = time_now + reset_acquired_length
+        logger.debug "SayWhen:: reset acquired at #{time_now}, try again at #{reset_next_at}"
+        job_class.reset_acquired(reset_acquired_length)
+      end
+
+      begin
+        logger.debug "SayWhen:: Looking for job that should be ready to fire before #{time_now}"
+        job = job_class.acquire_next(time_now)
+      rescue StandardError => ex
+        job_error("Failure to acquire job", job, ex)
+        job = nil
+      end
+
+      if job.nil?
+        logger.debug "SayWhen:: no jobs to acquire, sleep"
+        sleep(tick_length)
+        return
+      end
+
+      begin
+        logger.debug "SayWhen:: got a job: #{job.inspect}"
+        # delegate processing the trigger to the processor
+        self.processor.process(job)
+        logger.debug "SayWhen:: job processed"
+
+        # if successful, update next fire at, put back to waiting / ended
+        job.fired(time_now)
+        logger.debug "SayWhen:: job fired complete"
+      rescue StandardError => ex
+        job_error("Failure to process", job, ex)
+      end
+
+    rescue Interrupt => ex
+      job_error("Interrupt!", job, ex)
+      raise ex
+    rescue StandardError => ex
+      job_error("Error!", job, ex)
+      sleep(tick_length)
+    rescue Exception => ex
+      job_error("Exception!", job, ex)
+      raise ex
+    end
+
     def job_error(msg, job, ex)
       job_msg = job && " job:'#{job.inspect}'"
       logger.error "SayWhen::Scheduler #{msg}#{job_msg}: #{ex.message}\n\t#{ex.backtrace.join("\t\n")}"
@@ -154,6 +155,5 @@ module SayWhen
     def logger
       SayWhen::logger
     end
-
   end
 end

data/lib/say_when/version.rb

@@ -1,3 +1,3 @@
 module SayWhen
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

data/say_when.gemspec

@@ -18,8 +18,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "activemessaging", '~> 0.9.0'
   s.add_development_dependency "activesupport", '~> 2.3.14'
   s.add_development_dependency "activerecord", '~> 2.3.14'
-  s.add_development_dependency 'rspec', "~> 1.3"
+  s.add_development_dependency 'rspec', '~> 1.3'
+  s.add_development_dependency 'rake', '~> 10.5.0'
   s.add_development_dependency 'sqlite3'
-  s.add_development_dependency 'rake', '~> 0.8.7'
-
 end

data/spec/active_record_spec_helper.rb

@@ -1,8 +1,6 @@
 require 'active_record'
 require 'sqlite3'
 
-ActiveRecord::Base.logger = Logger.new(STDOUT)
-
 ActiveRecord::Base.establish_connection(
   :adapter => "sqlite3",
   :database  => (File.dirname(__FILE__) + "/db/test.db")

data/spec/db/schema.rb

@@ -28,9 +28,11 @@ ActiveRecord::Schema.define(:version => 0) do
     t.datetime :start_at
     t.datetime :end_at
   end
-  
+
   add_index :say_when_jobs, :status
   add_index :say_when_jobs, :next_fire_at
+  add_index :say_when_jobs, [:next_fire_at, :status]
+  add_index :say_when_jobs, [:last_fire_at, :status]
 
 
-end
+end

data/spec/say_when/cron_expression_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require_relative '../spec_helper'
 
 describe SayWhen::CronExpression do
 

data/spec/say_when/processor/active_messaging_spec.rb

@@ -1,7 +1,6 @@
-
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/../../../lib/say_when/processor/active_messaging'
-require File.dirname(__FILE__) + '/../../../lib/say_when/storage/active_record/job'
+require_relative '../../spec_helper'
+require_relative '../../../lib/say_when/processor/active_messaging'
+require_relative '../../../lib/say_when/storage/active_record/job'
 
 def destination(destination_name)
   d = ActiveMessaging::Gateway.find_destination(destination_name).value

data/spec/say_when/scheduler_spec.rb

@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../spec_helper'
-require File.dirname(__FILE__) + '/../active_record_spec_helper'
+require_relative '../spec_helper'
+require_relative '../active_record_spec_helper'
 
 describe SayWhen::Scheduler do
 
@@ -58,15 +58,15 @@ describe SayWhen::Scheduler do
     it "should start the scheduler running and stop it" do
       @scheduler.running.should be_false
 
-      puts 'starting'
+      # puts 'starting'
       scheduler_thread = Thread.start{@scheduler.start}
-      puts 'started'
+      # puts 'started'
       sleep(0.1)
       @scheduler.running.should == true
 
-      puts 'stop'
+      # puts 'stop'
       @scheduler.stop
-      puts 'wait for it'
+      # puts 'wait for it'
       @scheduler.running.should == false
     end
 

data/spec/say_when/storage/active_record/job_spec.rb

@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/../../../active_record_spec_helper'
-require File.dirname(__FILE__) + '/../../../../lib/say_when/storage/active_record/job'
+require_relative '../../../spec_helper'
+require_relative '../../../active_record_spec_helper'
+require_relative '../../../../lib/say_when/storage/active_record/job'
 
 describe SayWhen::Storage::ActiveRecord::Job do
 
@@ -66,14 +66,15 @@ describe SayWhen::Storage::ActiveRecord::Job do
     j2_opts = {
       :trigger_strategy => :cron,
       :trigger_options  => {:expression => '0 0 10 ? * * *', :time_zone  => 'Pacific Time (US & Canada)'},
-      :data             => {:foo=>'bar', :result=>2},
+      :data             => {:foo=>'can find the next job - j2', :result=>2},
       :job_class        => 'SayWhen::Test::TestTask',
       :job_method       => 'execute'
     }
 
     j1 = SayWhen::Storage::ActiveRecord::Job.create(@valid_attributes)
     j2 = SayWhen::Storage::ActiveRecord::Job.create(j2_opts)
-    next_job = SayWhen::Storage::ActiveRecord::Job.acquire_next(1.day.since)
+    acquire = 1.day.since
+    next_job = SayWhen::Storage::ActiveRecord::Job.acquire_next(acquire)
     next_job.should == j2
   end
 
@@ -94,5 +95,4 @@ describe SayWhen::Storage::ActiveRecord::Job do
     j.last_fire_at.should == now
     j.status.should == SayWhen::BaseJob::STATE_WAITING
   end
-
 end

data/spec/say_when/storage/memory/job_spec.rb

@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/../../../../lib/say_when/storage/memory/job'
+require_relative '../../../spec_helper'
+require_relative '../../../../lib/say_when/storage/memory/job'
 
 describe SayWhen::Store::Memory::Job do
 

data/spec/say_when/storage/memory/trigger_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require_relative '../../../spec_helper'
 # require File.dirname(__FILE__) + '/../../../../lib/say_when/store/memory/trigger'
 
 # describe SayWhen::Store::Memory::Trigger do

data/spec/say_when/triggers/once_strategy_spec.rb

@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/../../../lib/say_when/triggers/once_strategy'
+require_relative '../../spec_helper'
+require_relative '../../../lib/say_when/triggers/once_strategy'
 
 describe SayWhen::Triggers::OnceStrategy do
 

data/spec/spec_helper.rb

@@ -3,6 +3,7 @@ ENV['RAILS_ENV']='test'
 require "rubygems"
 require 'bundler/setup'
 require 'active_support'
+require 'active_record'
 
 require 'spec'
 require 'spec/autorun'
@@ -10,8 +11,14 @@ require 'spec/autorun'
 $: << (File.dirname(__FILE__) + "/../lib")
 require "say_when"
 
+logger = Logger.new(STDOUT)
+logger.level = Logger::ERROR
+SayWhen.logger = logger
+::ActiveRecord::Base.logger = logger
+
 Dir[File.expand_path(File.join(File.dirname(__FILE__),'support','**','*.rb'))].each {|f| require f}
 
+
 Spec::Runner.configure do |config|
   config.mock_with :rspec
 end

metadata

@@ -1,127 +1,108 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: say_when
-version: !ruby/object:Gem::Version 
-  hash: 19
-  prerelease: 
-  segments: 
-  - 0
-  - 3
-  - 0
-  version: 0.3.0
+version: !ruby/object:Gem::Version
+  version: 0.4.0
 platform: ruby
-authors: 
+authors:
 - Andrew Kuklewicz
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2016-05-17 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  prerelease: false
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 59
-        segments: 
-        - 0
-        - 9
-        - 0
-        version: 0.9.0
-  requirement: *id001
+date: 2022-04-12 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activemessaging
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.0
   type: :development
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 2
-        - 3
-        - 14
-        version: 2.3.14
-  requirement: *id002
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.0
+- !ruby/object:Gem::Dependency
   name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.3.14
   type: :development
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 2
-        - 3
-        - 14
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
         version: 2.3.14
-  requirement: *id003
+- !ruby/object:Gem::Dependency
   name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.3.14
   type: :development
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 1
-        - 3
-        version: "1.3"
-  requirement: *id004
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.3.14
+- !ruby/object:Gem::Dependency
   name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
   type: :development
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id005
-  name: sqlite3
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 10.5.0
   type: :development
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 49
-        segments: 
-        - 0
-        - 8
-        - 7
-        version: 0.8.7
-  requirement: *id006
-  name: rake
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 10.5.0
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  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: 
-email: 
+email:
 - andrew@prx.org
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- .gitignore
-- .travis.yml
+files:
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - Rakefile
 - generators/say_when_migration/say_when_migration_generator.rb
@@ -163,38 +144,27 @@ files:
 - spec/support/models.rb
 homepage: http://labs.prx.org
 licenses: []
-
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
-rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 3.1.4
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Scheduling system for programmatically defined and stored jobs.
-test_files: 
+test_files:
 - spec/active_record_spec_helper.rb
 - spec/db/schema.rb
 - spec/say_when/cron_expression_spec.rb