threasy 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
---- 
-SHA1: 
-  metadata.gz: b06dfdee1ca788c21cf8cdd036eb0b7b7995bba3
-  data.tar.gz: ae7b941674e8d3db405fd8227ce206a3f0e7f62e
-SHA512: 
-  metadata.gz: d7ce1d2e0829dfca7ae76891df339164fdf379a647d3e601c416dccd7eabb91412cf8bc647bbc97fb4e5c5613a46a83917e15f55aa0ec7a2fc56786b6c38f3ac
-  data.tar.gz: 7ef14d1a0917a5104a0508697ee7d486f07601eef86e6057860336705da471039debc1ddf4b80697566eb5c7d7ec10b8a71316b26cfd4614b6b4ecdea9b5e4e9
+---
+SHA1:
+  metadata.gz: 36bcb6a7e87480c94e15a521e2d74a7de07ed995
+  data.tar.gz: 7f049f5eb6155d16b14278e599544268cf3426cc
+SHA512:
+  metadata.gz: 21fc8a8219c66db4fc212dd6a992dcea86b68f22bb5b3102c5e2c628636dadb23a17b138d759dcc982a6abe46581fd151953250e19425094b7093c83bce915cc
+  data.tar.gz: c38a34ed3220b5ed5c2b804ff714f9fabf8d413959d647bef757f8585cd5bfbd884746deddce9aec1e056003ccd03e5d8871a056f29c9ac3bb8496ca32e11809

data/Gemfile

@@ -2,7 +2,6 @@ source 'https://rubygems.org'
 
 platform :rbx do
   gem "rubysl-mutex_m"
-  gem "rubysl-singleton"
 end
 
 gemspec

data/lib/threasy.rb

@@ -1,5 +1,4 @@
 require "logger"
-require "singleton"
 
 require "threasy/version"
 require "threasy/config"
@@ -8,8 +7,9 @@ require "threasy/schedule"
 
 module Threasy
   def self.config
-    yield Config.instance if block_given?
-    Config.instance
+    @@config ||= Config.new
+    yield @@config if block_given?
+    @@config
   end
 
   def self.logger
@@ -17,7 +17,7 @@ module Threasy
   end
 
   def self.work
-    Work.instance
+    config.work ||= Work.new
   end
 
   def self.enqueue(*args, &block)
@@ -25,7 +25,7 @@ module Threasy
   end
 
   def self.schedules
-    Schedule.instance
+    config.schedule ||= Schedule.new(work)
   end
 
   def self.schedule(*args, &block)

data/lib/threasy/config.rb

@@ -1,8 +1,6 @@
 module Threasy
   class Config
-    include Singleton
-
-    attr_accessor :max_workers
+    attr_accessor :work, :schedule, :max_workers
     attr_writer :logger
 
     def initialize

data/lib/threasy/schedule.rb

@@ -1,8 +1,11 @@
 module Threasy
   class Schedule
-    include Singleton
+    MAX_SLEEP   = 5.0 # 5 seconds
 
-    def initialize
+    include Enumerable
+
+    def initialize(work = nil)
+      @work = work
       @semaphore = Mutex.new
       @schedules = []
       @watcher = Thread.new{ watch }
@@ -11,7 +14,7 @@ module Threasy
     def add(*args, &block)
       options = args.last.is_a?(Hash) ? args.pop : {}
       job = block_given? ? block : args.first
-      add_entry Entry.new(job, options)
+      add_entry Entry.new(self, job, options)
     end
 
     def add_entry(entry)
@@ -20,6 +23,15 @@ module Threasy
         @schedules.sort_by!(&:at)
       end
       tickle_watcher
+      entry
+    end
+
+    def work
+      @work ||= Threasy.work
+    end
+
+    def remove_entry(entry)
+      sync{ @schedules.delete entry }
     end
 
     def tickle_watcher
@@ -27,14 +39,19 @@ module Threasy
     end
 
     def sync
-      @semaphore.synchronize{ yield }
+      @semaphore.synchronize { yield }
     end
 
     def entries
       @schedules
     end
 
+    def each
+      entries.each { |entry| yield entry }
+    end
+
     def clear
+      log.debug "Clearing schedules"
       sync{ @schedules.clear }
     end
 
@@ -48,7 +65,7 @@ module Threasy
         end
         next_job = @schedules.first
         if next_job && next_job.future?
-          seconds = next_job.at - Time.now
+          seconds = [next_job.at - Time.now, MAX_SLEEP].min
           log.debug "Schedule watcher sleeping for #{seconds} seconds"
           sleep seconds
         end
@@ -74,19 +91,26 @@ module Threasy
     end
 
     class Entry
-      attr_accessor :job, :at, :repeat
+      MAX_OVERDUE = 300 # 5 minutes
 
-      def initialize(job, options = {})
+      attr_accessor :schedule, :job, :at, :repeat
+
+      def initialize(schedule, job, options = {})
+        self.schedule = schedule
         self.job = job
-        seconds = options[:in] || options[:every]
-        self.at = options.fetch(:at){ Time.now + seconds }
         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
@@ -95,9 +119,19 @@ module Threasy
         ! due?
       end
 
+      def overdue
+        Time.now - at
+      end
+
       def work!
-        Threasy.enqueue job
-        self.at = Time.now + repeat if repeat?
+        if once? || overdue < MAX_OVERDUE
+          schedule.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.0.1"
+  VERSION = "0.1.0"
 end

data/lib/threasy/work.rb

@@ -1,12 +1,11 @@
 module Threasy
   class Work
-    include Singleton
-
     attr_reader :queue, :pool
 
     def initialize
       @queue = TimeoutQueue.new
       @pool = Set.new
+      @semaphore = Mutex.new
     end
 
     def enqueue(job = nil, &block)
@@ -15,6 +14,10 @@ module Threasy
 
     alias_method :enqueue_block, :enqueue
 
+    def sync(&block)
+      @semaphore.synchronize &block
+    end
+
     def grab
       queue.pop
     end
@@ -24,17 +27,23 @@ module Threasy
     end
 
     def check_workers
-      pool_size = pool.size
-      queue_size = queue.size
-      log "Checking workers. Pool: #{pool_size}, Max: #{max_workers}, Queue: #{queue_size}"
-      if pool_size < max_workers
-        add_worker if pool_size == 0 || queue_size > max_workers
+      sync do
+        pool_size = pool.size
+        queue_size = queue.size
+        log "Checking workers. Pool: #{pool_size}, Max: #{max_workers}, Queue: #{queue_size}"
+        if pool_size < max_workers
+          add_worker(pool_size) if pool_size == 0 || queue_size > max_workers
+        end
       end
     end
 
-    def add_worker
-      log "Adding new worker to pool"
-      Worker.new(pool.size).work(self)
+    def add_worker(size)
+      # sync do
+        log "Adding new worker to pool"
+        worker = Worker.new(self, size)
+        pool.add worker
+      # end
+      worker.work
     end
 
     def log(msg)
@@ -42,23 +51,24 @@ module Threasy
     end
 
     class Worker
-      def initialize(id)
+      def initialize(work, id)
+        @work = work
         @id = id
       end
 
-      def work(work)
+      def work
         Thread.start do
-          work.pool.add Thread.current
-          while job = work.grab
+          while job = @work.grab
             log.debug "Worker ##{@id} has grabbed a job"
             begin
+              job = eval(job) if job.kind_of?(String)
               job.respond_to?(:perform) ? job.perform : job.call
             rescue Exception => e
               log.error %|Worker ##{@id} error: #{e.message}\n#{e.backtrace.join("\n")}|
             end
           end
           log.debug "Worker ##{@id} removing self from pool"
-          work.pool.delete Thread.current
+          @work.sync{ @work.pool.delete self }
         end
       end
 

data/spec/spec_helper.rb

@@ -1 +1,6 @@
+# require 'pry'
+require 'timecop'
+
 require File.join(File.dirname(__FILE__), "..", "lib", "threasy")
+
+# Threasy.config.logger.level = Logger::DEBUG

data/spec/threasy/schedule_spec.rb

@@ -1,45 +1,102 @@
-require "spec_helper"
-
 describe "Threasy::Schedule" do
-
-  before :each do
-    @schedule = Threasy::Schedule.instance
-  end
+  let(:job){ double("job") }
+  let(:work){ double("work") }
+  subject{ Threasy::Schedule.new(work) }
 
   describe "#add" do
     it "should allow a job to be processed after specified delay" do
-      job = double("job")
-      expect(job).to receive(:perform)
-      @schedule.add(job, in: 0.5)
-      sleep 1
+      expect(work).to receive(:enqueue).with(job)
+      subject.add(job, in: 0.1)
+      sleep 0.2
     end
 
     it "should allow a job to be processed at the specified time" do
-      job = double("job")
-      expect(job).to receive(:perform)
-      @schedule.add(job, at: Time.now + 1)
-      sleep 2
+      expect(work).to receive(:enqueue).with(job)
+      subject.add(job, at: Time.now + 0.1)
+      sleep 0.2
     end
 
     it "should allow a job to be repeated at the specified interval" do
-      job = double("job")
-      expect(job).to receive(:perform).at_least(:twice)
-      @schedule.add(job, every: 1)
-      sleep 3
+      expect(work).to receive(:enqueue).with(job).at_least(:twice)
+      subject.add(job, every: 0.1, in: 0.1)
+      sleep 0.3
     end
 
     it "should allow blocks to be processed on schedule" do
-      job = double("job")
-      i = 0
-      @schedule.add(:in => 0.5){ i += 1 }
-      expect(i).to eq(0)
-      sleep 1
-      expect(i).to eq(1)
+      block_job = ->{ 1 + 1 }
+      expect(work).to receive(:enqueue).with(block_job)
+      subject.add(in: 0.1, &block_job)
+      sleep 0.2
+    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
+    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
+    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)
+      sleep 0.3
+      entry.remove
+      sleep 0.5
     end
   end
 
-  after :each do
-    @schedule.clear
+  context "when laptop suspends" do
+    subject{ Threasy::Schedule.new }
+    let(:hour) { 60*60 }
+
+    it "should recover in a few seconds when time suddenly jumps forward" do
+      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) }
+        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/spec/threasy/work_spec.rb

@@ -1,27 +1,38 @@
-require "spec_helper"
+class TestJob
+end
 
 describe "Threasy::Work" do
   before :each do
-    @work = Threasy::Work.instance
+    @work = Threasy::Work.new
   end
 
   describe "#enqueue" do
+    it "should have a method for enqueing" do
+      expect(@work.respond_to?(:enqueue)).to eq(true)
+    end
+
     it "should allow a job object to be enqueued and worked" do
       job = double("job")
       expect(job).to receive(:perform).once
       @work.enqueue job
-      sleep 0.5
+      sleep 0.1
     end
 
     it "should allow a job block to be enqueued and worked" do
       i = 0
       @work.enqueue do
-        sleep 0.5
+        sleep 0.1
         i += 1
       end
       expect(i).to eq(0)
-      sleep 1
+      sleep 0.2
       expect(i).to eq(1)
     end
+
+    it "should allow a string expression to be enqueued and worked" do
+      expect(TestJob).to receive(:perform).once
+      @work.enqueue "TestJob"
+      sleep 0.1
+    end
   end
 end

data/threasy.gemspec

@@ -24,4 +24,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rake"
   s.add_development_dependency "pry"
   s.add_development_dependency "rspec"
+  s.add_development_dependency "timecop"
 end

metadata

@@ -1,63 +1,93 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: threasy
-version: !ruby/object:Gem::Version 
-  version: 0.0.1
+version: !ruby/object:Gem::Version
+  version: 0.1.0
 platform: ruby
-authors: 
+authors:
 - Carl Zulauf
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2014-01-21 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: "1.5"
+date: 2015-08-16 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
   type: :development
-  requirement: *id001
   prerelease: false
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - &id003 
-      - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+- !ruby/object:Gem::Dependency
   name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: *id002
   prerelease: false
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
-    requirements: 
-    - *id003
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: *id004
   prerelease: false
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
-    requirements: 
-    - *id003
+  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
-  requirement: *id005
   prerelease: false
-description: Dead simple in-process background job solution using threads, with support for scheduled jobs.
-email: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: timecop
+  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: Dead simple in-process background job solution using threads, with support
+  for scheduled jobs.
+email:
 - carl@linkleaf.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -72,29 +102,31 @@ files:
 - spec/threasy/work_spec.rb
 - threasy.gemspec
 homepage: http://github.com/carlzulauf/threasy
-licenses: 
+licenses:
 - MIT
 metadata: {}
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - *id003
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - *id003
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Simple threaded background jobs and scheduling.
-test_files: 
+test_files:
 - spec/spec_helper.rb
 - spec/threasy/schedule_spec.rb
 - spec/threasy/work_spec.rb
+has_rdoc: