threasy 0.1.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 36bcb6a7e87480c94e15a521e2d74a7de07ed995
-  data.tar.gz: 7f049f5eb6155d16b14278e599544268cf3426cc
+  metadata.gz: 1e72cd2a275c0cc94bcac05463b285062788c4bd
+  data.tar.gz: 37d0d9082bca7164f370fca2f1e8c7ec057db9f8
 SHA512:
-  metadata.gz: 21fc8a8219c66db4fc212dd6a992dcea86b68f22bb5b3102c5e2c628636dadb23a17b138d759dcc982a6abe46581fd151953250e19425094b7093c83bce915cc
-  data.tar.gz: c38a34ed3220b5ed5c2b804ff714f9fabf8d413959d647bef757f8585cd5bfbd884746deddce9aec1e056003ccd03e5d8871a056f29c9ac3bb8496ca32e11809
+  metadata.gz: 4f4f468799a33bea2755f2bf99ff971940197296c3ace39a4a55737c8d2f06c5250f1a27c8d1e1d33ea5ba72eba143f0f1901a4d7fdc844ff0ab4c3b582c1064
+  data.tar.gz: 46f254797c31d50e690c36d6c388b79053997e5e0e0f59af72f1c59938965c4369a975c4b33f552e14e6c70407a2e595dcaa97ec64d6cec3c23e25d57fe01c0c

data/lib/threasy.rb

@@ -4,6 +4,7 @@ require "threasy/version"
 require "threasy/config"
 require "threasy/work"
 require "threasy/schedule"
+require "threasy/schedule/entry"
 
 module Threasy
   def self.config

data/lib/threasy/config.rb

@@ -1,14 +1,16 @@
 module Threasy
   class Config
-    attr_accessor :work, :schedule, :max_workers
+    attr_accessor :work, :schedule, :max_workers, :max_sleep, :max_overdue
     attr_writer :logger
 
     def initialize
-      self.max_workers = 5
+      self.max_workers  = 4
+      self.max_sleep    = 60.0
+      self.max_overdue  = 300.0
     end
 
     def logger
-      @logger ||= Logger.new(STDOUT).tap{|l| l.level = Logger::INFO }
+      @logger ||= Logger.new(STDOUT).tap { |l| l.level = Logger::INFO }
     end
   end
 end

data/lib/threasy/schedule.rb

@@ -1,9 +1,9 @@
 module Threasy
   class Schedule
-    MAX_SLEEP   = 5.0 # 5 seconds
-
     include Enumerable
 
+    attr_reader :schedules, :watcher
+
     def initialize(work = nil)
       @work = work
       @semaphore = Mutex.new
@@ -14,13 +14,13 @@ module Threasy
     def add(*args, &block)
       options = args.last.is_a?(Hash) ? args.pop : {}
       job = block_given? ? block : args.first
-      add_entry Entry.new(self, job, options)
+      add_entry Entry.new(job, {schedule: self}.merge(options))
     end
 
     def add_entry(entry)
       sync do
-        @schedules << entry
-        @schedules.sort_by!(&:at)
+        schedules << entry
+        schedules.sort_by!(&:at)
       end
       tickle_watcher
       entry
@@ -31,33 +31,29 @@ module Threasy
     end
 
     def remove_entry(entry)
-      sync{ @schedules.delete entry }
+      sync { schedules.delete entry }
     end
 
     def tickle_watcher
-      @watcher.wakeup if @watcher.stop?
+      watcher.wakeup if watcher.stop?
     end
 
     def sync
       @semaphore.synchronize { yield }
     end
 
-    def entries
-      @schedules
-    end
-
     def each
-      entries.each { |entry| yield entry }
+      schedules.each { |entry| yield entry }
     end
 
     def clear
       log.debug "Clearing schedules"
-      sync{ @schedules.clear }
+      sync { schedules.clear }
     end
 
     def watch
       loop do
-        Thread.stop if @schedules.empty?
+        Thread.stop if schedules.empty?
         entries_due.each do |entry|
           log.debug "Adding scheduled job to work queue"
           entry.work!
@@ -65,7 +61,7 @@ module Threasy
         end
         next_job = @schedules.first
         if next_job && next_job.future?
-          seconds = [next_job.at - Time.now, MAX_SLEEP].min
+          seconds = [next_job.at - Time.now, max_sleep].min
           log.debug "Schedule watcher sleeping for #{seconds} seconds"
           sleep seconds
         end
@@ -75,64 +71,23 @@ module Threasy
     def entries_due
       [].tap do |entries|
         sync do
-          while @schedules.first && @schedules.first.due?
-            entries << @schedules.shift
+          while schedules.first && schedules.first.due?
+            entries << schedules.shift
           end
         end
       end
     end
 
     def count
-      @schedules.count
+      schedules.count
     end
 
     def log
       Threasy.logger
     end
 
-    class Entry
-      MAX_OVERDUE = 300 # 5 minutes
-
-      attr_accessor :schedule, :job, :at, :repeat
-
-      def initialize(schedule, job, options = {})
-        self.schedule = schedule
-        self.job = job
-        self.repeat = options[:every]
-        seconds = options.fetch(:in){ repeat || 60 }
-        self.at = options.fetch(:at){ Time.now + seconds }
-      end
-
-      def repeat?
-        !! repeat
-      end
-
-      def once?
-        ! repeat?
-      end
-
-      def due?
-        Time.now > at
-      end
-
-      def future?
-        ! due?
-      end
-
-      def overdue
-        Time.now - at
-      end
-
-      def work!
-        if once? || overdue < MAX_OVERDUE
-          schedule.work.enqueue job
-        end
-        self.at = at + repeat if repeat?
-      end
-
-      def remove
-        schedule.remove_entry self
-      end
+    def max_sleep
+      Threasy.config.max_sleep
     end
   end
 end

data/lib/threasy/schedule/entry.rb

@@ -0,0 +1,49 @@
+module Threasy
+  class Schedule::Entry
+    attr_accessor :schedule, :work, :job, :at, :repeat
+
+    def initialize(job, options = {})
+      self.schedule = options.fetch(:schedule) { Threasy.schedules }
+      self.work     = options.fetch(:work) { schedule.work }
+      self.job      = job
+      self.repeat   = options[:every]
+      seconds       = options.fetch(:in) { repeat || 60 }
+      self.at       = options.fetch(:at) { Time.now + seconds }
+    end
+
+    def repeat?
+      !! repeat
+    end
+
+    def once?
+      ! repeat?
+    end
+
+    def due?
+      Time.now > at
+    end
+
+    def future?
+      ! due?
+    end
+
+    def overdue
+      Time.now - at
+    end
+
+    def max_overdue
+      Threasy.config.max_overdue
+    end
+
+    def work!
+      if once? || overdue < max_overdue
+        work.enqueue job
+      end
+      self.at = at + repeat if repeat?
+    end
+
+    def remove
+      schedule.remove_entry self
+    end
+  end
+end

data/lib/threasy/version.rb

@@ -1,3 +1,3 @@
 module Threasy
-  VERSION = "0.1.0"
+  VERSION = "0.2.2"
 end

data/spec/threasy/schedule/entry_spec.rb

@@ -0,0 +1,22 @@
+describe Threasy::Schedule::Entry do
+  let(:work) { double("work") }
+  let(:job)  { double("work") }
+  let(:hour) { 60 * 60 }
+
+  subject { Threasy::Schedule::Entry }
+
+  describe "#work!" do
+    it "should execute a one-time job long after its due" do
+      expect(work).to receive(:enqueue).with(job)
+      entry = subject.new(job, work: work, in: hour/2)
+      Timecop.travel(Time.now + hour) { entry.work! }
+    end
+
+    it "should not execute a repeating job long after its due" do
+      expect(work).not_to receive(:enqueue).with(job)
+      entry = subject.new(job, work: work, in: hour/2, every: hour)
+      Timecop.travel(Time.now + hour) { entry.work! }
+    end
+  end
+
+end

data/spec/threasy/schedule_spec.rb

@@ -7,48 +7,52 @@ describe "Threasy::Schedule" do
     it "should allow a job to be processed after specified delay" do
       expect(work).to receive(:enqueue).with(job)
       subject.add(job, in: 0.1)
-      sleep 0.2
+      sleep 0.3
     end
 
     it "should allow a job to be processed at the specified time" do
       expect(work).to receive(:enqueue).with(job)
       subject.add(job, at: Time.now + 0.1)
-      sleep 0.2
+      sleep 0.3
     end
 
     it "should allow a job to be repeated at the specified interval" do
       expect(work).to receive(:enqueue).with(job).at_least(:twice)
       subject.add(job, every: 0.1, in: 0.1)
-      sleep 0.3
+      sleep 0.5
     end
 
     it "should allow blocks to be processed on schedule" do
       block_job = ->{ 1 + 1 }
       expect(work).to receive(:enqueue).with(block_job)
       subject.add(in: 0.1, &block_job)
-      sleep 0.2
+      sleep 0.3
     end
 
     it "should allow string expressions to be processed on schedule" do
       expect(work).to receive(:enqueue).with("TestScheduledJob")
       subject.add("TestScheduledJob", in: 0.1)
-      sleep 0.2
+      sleep 0.3
     end
 
     it "should default first run to now + every_interval" do
       expect(work).to receive(:enqueue).with(job).at_least(:twice)
       subject.add(job, every: 0.1)
-      sleep 0.3
+      sleep 0.5
     end
   end
 
   describe "#remove" do
     it "should be possible to remove a job from the schedule" do
-      expect(work).to receive(:enqueue).with(job).at_least(:once).at_most(:twice)
-      entry = subject.add(job, every: 0.2)
+      expect(work).to receive(:enqueue).with(job).at_least(:once)
+
+      entry = subject.add(job, every: 0.1)
       sleep 0.3
+
       entry.remove
-      sleep 0.5
+
+      expect(work).not_to receive(:enqueue)
+      sleep 0.3
     end
   end
 
@@ -57,46 +61,18 @@ describe "Threasy::Schedule" do
     let(:hour) { 60*60 }
 
     it "should recover in a few seconds when time suddenly jumps forward" do
+      Threasy.config.max_sleep = 0.1
       job_ran = false
       job = -> { job_ran = true }
       subject.add(in: hour + 1, &job)
 
       Timecop.travel(Time.now + hour) do
         Timeout.timeout(6) do
-          loop { job_ran ? break : sleep(0.2) }
-        end
-      end
-    end
-
-    it "should execute a one-time schedule long after it's due" do
-      job_ran = false
-      job = -> { job_ran = true }
-      subject.add(in: hour/2, &job)
-
-      Timecop.travel(Time.now + hour) do
-        Timeout.timeout(6) do
-          loop { job_ran ? break : sleep(0.2) }
+          loop { job_ran ? break : sleep(0.1) }
         end
       end
     end
 
-    # This really tests Schedule::Entry and should be moved to its own spec
-    it "should skip a repeating schedule that is long past due" do
-      job1_ran = false
-      job1 = -> { job1_ran = true }
-
-      job2_ran = false
-      job2 = -> { job2_ran = true }
-
-      subject.add(every: hour, in: hour/2, &job1)
-      subject.add(in: hour/2, &job2)
-
-      Timecop.travel(Time.now + hour) { sleep 6 }
-
-      expect(job1_ran).to eq(false)
-      expect(job2_ran).to eq(true)
-    end
-
   end
 
 end

data/threasy.gemspec

@@ -21,8 +21,8 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_development_dependency "bundler", "~> 1.5"
-  s.add_development_dependency "rake"
-  s.add_development_dependency "pry"
-  s.add_development_dependency "rspec"
-  s.add_development_dependency "timecop"
+  s.add_development_dependency "rake",    "~> 10.0"
+  s.add_development_dependency "pry",     "~> 0.10"
+  s.add_development_dependency "rspec",   "~> 3.3"
+  s.add_development_dependency "timecop", "~> 0.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: threasy
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.2
 platform: ruby
 authors:
 - Carl Zulauf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-16 00:00:00.000000000 Z
+date: 2015-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -28,58 +28,58 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.8'
 description: Dead simple in-process background job solution using threads, with support
   for scheduled jobs.
 email:
@@ -95,9 +95,11 @@ files:
 - lib/threasy.rb
 - lib/threasy/config.rb
 - lib/threasy/schedule.rb
+- lib/threasy/schedule/entry.rb
 - lib/threasy/version.rb
 - lib/threasy/work.rb
 - spec/spec_helper.rb
+- spec/threasy/schedule/entry_spec.rb
 - spec/threasy/schedule_spec.rb
 - spec/threasy/work_spec.rb
 - threasy.gemspec
@@ -127,6 +129,7 @@ specification_version: 4
 summary: Simple threaded background jobs and scheduling.
 test_files:
 - spec/spec_helper.rb
+- spec/threasy/schedule/entry_spec.rb
 - spec/threasy/schedule_spec.rb
 - spec/threasy/work_spec.rb
 has_rdoc: