zhong 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4eafb64d51589613dfcfeca62326319eb839962f
-  data.tar.gz: 66b4fd921dd9ed1795ffa407afbcc5f33b867607
+  metadata.gz: 8f1dac5a4ab2bbf39455eb3ae3aa85b8db281f71
+  data.tar.gz: bad4a27f7f28e8d9e09bd89e722c8d14de24135f
 SHA512:
-  metadata.gz: 267619b1f313f958d2e2e7071bb3fbdcb22efcd9018e64d1cdcf5f07d86d055e5e4e4e87f8b1144550956ded9370c10584212fec1c6c7890bd6ace880af2348b
-  data.tar.gz: e4a9329e22811d4cda8f01882ed7e8755388b30723eb0a424f5b01ff05d526f512be60fae222d77b359326e16f60208cc8452b0ce837b9ad2ea492e9d17bf8a6
+  metadata.gz: 09b25ced5faf77601dcc4056f32441cdf9183a542e4fcdc87ce689806e38e1fc1189613ff9ca11f776c8967e1c4fba9bab83049022860c21ab4893255c64fa4b
+  data.tar.gz: 50d880d5819a8d103d99740a1cacd3a828277015d0def4d486fa777d20f082daa7c1e9d6a56f89469de22f3d9c26245b056165fad4f2339b7fcc45647471a4fd

data/.codeclimate.yml

@@ -16,8 +16,8 @@ ratings:
   paths:
   - "**.js"
   - "**.jsx"
-  - "**.module"
   - "**.rb"
 exclude_paths:
+- "**/*helper*"
 - test/
 - "**/*{.,-}min.js"

data/.rubocop.yml

@@ -74,7 +74,7 @@ Style/SpaceInsideBrackets:
 Style/AndOr:
   Enabled: false
 
-Style/TrailingComma:
+Style/TrailingCommaInLiteral:
   Enabled: true
 
 Style/SpaceBeforeComma:
@@ -98,7 +98,7 @@ Style/SpaceAfterColon:
 Style/SpaceAfterComma:
   Enabled: true
 
-Style/SpaceAfterControlKeyword:
+Style/SpaceAroundKeyword:
   Enabled: true
 
 Style/SpaceAfterNot:
@@ -163,7 +163,7 @@ Style/StringLiterals:
   EnforcedStyle: double_quotes
 
 Metrics/CyclomaticComplexity:
-  Max: 8
+  Max: 10
 
 Metrics/LineLength:
   Max: 128
@@ -214,3 +214,6 @@ Metrics/ParameterLists:
 
 Metrics/PerceivedComplexity:
   Enabled: false
+
+Style/Documentation:
+  Enabled: false

data/.travis.yml

@@ -1,5 +1,5 @@
 language: ruby
 rvm:
-  - 2.2.0
+  - 2.3.0
 services:
   - redis-server

data/CHANGELOG.md

@@ -1,7 +1,17 @@
+## 0.1.6
+
+- Add Zhong.any_running? for monitoring that any Zhong node has checked in rencently
+- More code cleanup/refactoring.
+
 ## 0.1.5
 
 - Improve the API.
 - Add scheduler test.
+- Add Zhong::Web to see job status, and enable/disable jobs. Activate it with:
+    Rails.application.routes.draw do
+      # ...
+      require "zhong/web"
+      mount Zhong::Web => "/zhong" # or wherever
 
 ## 0.1.4
 

data/Gemfile

@@ -1,4 +1,4 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 # Specify your gem's dependencies in zhong.gemspec
 gemspec

data/README.md

@@ -45,20 +45,21 @@ Zhong.schedule do
     true
   end
 
+  on(:before_run) do |job, time|
+    puts "running #{job}"
+    true # can conditionally run a specific job
+  end
+
+  on(:after_run) do |job, time, ran|
+    puts "#{job} ran?: #{ran}"
+  end
+
   error_handler do |e, job|
-    puts "damn, #{job} messed up: #{e}"
+    puts "dang, #{job} messed up: #{e}"
   end
 end
 ```
 
-## TODO
- - better logging
- - error handling
- - tests
- - examples
- - callbacks
- - generic handler
-
 ## History
 
 View the [changelog](https://github.com/nickelser/zhong/blob/master/CHANGELOG.md).

data/Rakefile

@@ -1,8 +1,9 @@
 require "bundler/gem_tasks"
 require "rake/testtask"
 
-task default: :test
-Rake::TestTask.new do |t|
+Rake::TestTask.new(:test) do |t|
   t.libs << "test"
-  t.pattern = "test/**/*_test.rb"
+  t.pattern = "test/**/test_*.rb"
 end
+
+task default: :test

data/lib/zhong/at.rb

@@ -24,7 +24,7 @@ module Zhong
         parse_at(at, grace)
       end
     rescue ArgumentError
-      fail FailedToParse, at
+      raise FailedToParse, at
     end
 
     def self.deserialize(at)
@@ -37,7 +37,7 @@ module Zhong
       @wday = wday
       @grace = grace
 
-      fail ArgumentError unless valid?
+      raise ArgumentError unless valid?
     end
 
     def next_at(time = Time.now)
@@ -46,11 +46,11 @@ module Zhong
       grace_cutoff = time.change(sec: 0) - @grace
 
       if at_time < grace_cutoff
-        if @wday.nil?
-          at_time += @hour.nil? ? 1.hour : 1.day
-        else
-          at_time += 1.week
-        end
+        at_time + if @wday.nil?
+                    @hour.nil? ? 1.hour : 1.day
+                  else
+                    1.week
+                  end
       else
         at_time
       end
@@ -58,10 +58,7 @@ module Zhong
 
     def to_s
       str = "#{formatted_time(@hour)}:#{formatted_time(@minute)}"
-
-      if @wday
-        str += " on #{WDAYS.invert[@wday].capitalize}"
-      end
+      str += " on #{WDAYS.invert[@wday].capitalize}" if @wday
 
       str
     end
@@ -74,57 +71,59 @@ module Zhong
       MessagePack.pack(as_json)
     end
 
-    protected
-
-    def formatted_time(t)
-      if t.nil?
-        "**"
+    def self.parse_serialized(at)
+      if at.is_a?(Array)
+        MultiAt.new(at.map { |a| parse_serialized(a) })
       else
-        t.to_s.rjust(2, "0")
+        new(minute: at["m"], hour: at["h"], wday: at["w"], grace: at["g"])
       end
     end
-
-    def ==(o)
-      o.class == self.class && o.state == state
-    end
-
-    def state
-      [@minute, @hour, @wday]
-    end
-
-    private
+    private_class_method :parse_serialized
 
     def self.parse_at(at, grace)
       case at
       when /\A([[:alpha:]]+)\s+(.*)\z/
         wday = WDAYS[$1.downcase]
 
-        if wday
-          parsed_time = parse_at($2, grace)
-          parsed_time.wday = wday
-          parsed_time
-        else
-          fail FailedToParse, at
-        end
+        raise FailedToParse, at unless wday
+
+        parsed_time = parse_at($2, grace)
+        parsed_time.wday = wday
+        parsed_time
       when /\A(\d{1,2}):(\d\d)\z/
         new(minute: $2.to_i, hour: $1.to_i, grace: grace)
       when /\A\*{1,2}:(\d\d)\z/
         new(minute: $1.to_i, grace: grace)
       when /\A(\d{1,2}):\*{1,2}\z/
         new(hour: $1.to_i, grace: grace)
+      when /\A\*{1,2}:\*{1,2}\z/
+        new(grace: grace)
       else
-        fail FailedToParse, at
+        raise FailedToParse, at
       end
     end
+    private_class_method :parse_at
 
-    def self.parse_serialized(at)
-      if at.is_a?(Array)
-        MultiAt.new(at.map { |a| parse_serialized(a) })
+    protected
+
+    def formatted_time(t)
+      if t.nil?
+        "**"
       else
-        new(minute: at["m"], hour: at["h"], wday: at["w"], grace: at["g"])
+        t.to_s.rjust(2, "0")
       end
     end
 
+    def ==(other)
+      other.class == self.class && other.state == state
+    end
+
+    def state
+      [@minute, @hour, @wday]
+    end
+
+    private
+
     def at_time_hour_minute_adjusted(time)
       if @minute && @hour
         time.change(hour: @hour, min: @minute)
@@ -155,8 +154,8 @@ module Zhong
       @ats = ats
     end
 
-    def ==(o)
-      o.class == self.class && @ats == o.ats
+    def ==(other)
+      other.class == self.class && @ats == other.ats
     end
 
     def next_at(time = Time.now)

data/lib/zhong/every.rb

@@ -15,20 +15,17 @@ module Zhong
     def initialize(period)
       @period = period
 
-      fail "`every` must be >= 1 second" unless valid?
+      raise "`every` must be >= 1 second" unless valid?
     end
 
     def to_s
       EVERY_KEYWORDS.to_a.reverse.each do |friendly, period|
-        if @period % period == 0
-          rem = @period / period
-
-          if rem == 1
-            return "#{rem} #{friendly}"
-          else
-            return "#{rem} #{friendly}s"
-          end
-        end
+        next unless @period % period == 0
+
+        rem = @period / period
+
+        return "#{rem} #{friendly}" if rem == 1
+        return "#{rem} #{friendly}s"
       end
 
       "#{@period.to_i} second#{@period.to_i == 1 ? '' : 's'}"
@@ -49,11 +46,11 @@ module Zhong
       when String, Symbol
         key = every.downcase.to_sym
 
-        fail FailedToParse, every unless EVERY_KEYWORDS.key?(key)
+        raise FailedToParse, every unless EVERY_KEYWORDS.key?(key)
 
         new(EVERY_KEYWORDS[key])
       else
-        fail FailedToParse, every
+        raise FailedToParse, every
       end
     end
   end

data/lib/zhong/job.rb

@@ -11,7 +11,7 @@ module Zhong
       @at = config[:at] ? At.parse(config[:at], grace: config.fetch(:grace, 15.minutes)) : nil
       @every = config[:every] ? Every.parse(config[:every]) : nil
 
-      fail "must specific either `at` or `every` for job: #{self}" unless @at || @every
+      raise "must specific either `at` or `every` for job: #{self}" unless @at || @every
 
       @block = block
 
@@ -39,6 +39,7 @@ module Zhong
 
       locked = false
       errored = false
+      ran = false
 
       begin
         redis_lock.lock do
@@ -61,6 +62,7 @@ module Zhong
           if @block
             begin
               @block.call
+              ran = true
             rescue => boom
               logger.error "#{self} failed: #{boom}"
               error_handler.call(boom, self) if error_handler
@@ -77,6 +79,8 @@ module Zhong
       @running = false
 
       logger.info "unable to acquire exclusive run lock: #{self}" if !locked && !errored
+
+      ran
     end
 
     def running?
@@ -97,7 +101,7 @@ module Zhong
     end
 
     def disabled?
-      !!@redis.get(disabled_key)
+      !@redis.get(disabled_key).nil?
     end
 
     def to_s

data/lib/zhong/scheduler.rb

@@ -19,10 +19,19 @@ module Zhong
       @tz = @config[:tz]
       @category = nil
       @error_handler = nil
+      @running = false
+    end
+
+    def clear
+      raise "unable to clear while running; run Zhong.stop first" if @running
+
+      @jobs = {}
+      @callbacks = {}
+      @category = nil
     end
 
     def category(name)
-      fail "cannot nest categories: #{name} would be nested in #{@category} (#{caller.first})" if @category
+      raise "cannot nest categories: #{name} would be nested in #{@category} (#{caller.first})" if @category
 
       @category = name.to_s
 
@@ -32,7 +41,7 @@ module Zhong
     end
 
     def every(period, name, opts = {}, &block)
-      fail "must specify a period for #{name} (#{caller.first})" unless period
+      raise "must specify a period for #{name} (#{caller.first})" unless period
 
       job = Job.new(name, opts.merge(@config).merge(every: period, category: @category), &block)
 
@@ -50,7 +59,7 @@ module Zhong
     end
 
     def on(event, &block)
-      fail "unknown callback #{event}" unless [:before_tick, :after_tick, :before_run, :after_run].include?(event.to_sym)
+      raise "unknown callback #{event}" unless [:before_tick, :after_tick, :before_run, :after_run].include?(event.to_sym)
       (@callbacks[event.to_sym] ||= []) << block
     end
 
@@ -61,7 +70,11 @@ module Zhong
 
       trap_signals
 
+      raise "already running" if @running
+
       loop do
+        @running = true
+
         if fire_callbacks(:before_tick)
           now = redis_time
 
@@ -83,14 +96,26 @@ module Zhong
         break if @stop
       end
 
+      @running = false
+
       Thread.new { @logger.info "stopped" }.join
     end
 
     def stop
-      Thread.new { @logger.error "stopping" } # thread necessary due to trap context
+      Thread.new { @logger.error "stopping" } if @running # thread necessary due to trap context
       @stop = true
     end
 
+    def find_by_name(job_name)
+      @jobs[Digest::SHA256.hexdigest(job_name)]
+    end
+
+    def redis_time
+      s, ms = @redis.time # returns [seconds since epoch, microseconds]
+      now = Time.at(s + ms / (10**6))
+      @tz ? now.in_time_zone(@tz) : now
+    end
+
     private
 
     TRAPPED_SIGNALS = %w(QUIT INT TERM).freeze
@@ -107,9 +132,9 @@ module Zhong
     def run_job(job, time = redis_time)
       return unless fire_callbacks(:before_run, job, time)
 
-      job.run(time, error_handler)
+      ran = job.run(time, error_handler)
 
-      fire_callbacks(:after_run, job, time)
+      fire_callbacks(:after_run, job, time, ran)
     end
 
     def heartbeat(time)
@@ -130,11 +155,5 @@ module Zhong
       GC.start
       sleep(1.0 - Time.now.subsec + 0.0001)
     end
-
-    def redis_time
-      s, ms = @redis.time # returns [seconds since epoch, microseconds]
-      now = Time.at(s + ms / (10**6))
-      @tz ? now.in_time_zone(@tz) : now
-    end
   end
 end

data/lib/zhong/util.rb

@@ -0,0 +1,13 @@
+module Zhong
+  module Util
+    def safe_mget(keys)
+      if keys.empty?
+        {}
+      else
+        Zhong.redis.mapped_mget(*keys)
+      end
+    end
+
+    module_function :safe_mget
+  end
+end

data/lib/zhong/version.rb

@@ -1,3 +1,3 @@
 module Zhong
-  VERSION = "0.1.5"
+  VERSION = "0.1.6".freeze
 end

data/lib/zhong/web.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-require "tilt/erubis"
 require "erb"
 require "sinatra/base"
 
@@ -29,21 +28,21 @@ module Zhong
 
     helpers WebHelpers
 
-    get '/' do
+    get "/" do
       index
 
       erb :index
     end
 
-    post '/' do
-      if params['disable']
-        if job = Zhong.jobs[params['disable']]
-          job.disable
-        end
-      elsif params['enable']
-        if job = Zhong.jobs[params['enable']]
-          job.enable
-        end
+    post "/" do
+      if params["disable"]
+        job = Zhong.jobs[params["disable"]]
+
+        job.disable if job
+      elsif params["enable"]
+        job = Zhong.jobs[params["enable"]]
+
+        job.enable if job
       end
 
       index
@@ -55,30 +54,18 @@ module Zhong
       @jobs = Zhong.jobs.values
       @last_runs = zhong_mget(@jobs, "last_ran")
       @disabled = zhong_mget(@jobs, "disabled")
-      @hosts = safe_mget(Zhong.redis.scan_each(match: "zhong:heartbeat:*").to_a).map do |k, v|
-        host, pid = k.split("zhong:heartbeat:", 2)[1].split("#", 2)
-        {host: host, pid: pid, last_seen: Time.at(v.to_i)}
-      end
+      @hosts = Zhong.all_heartbeats
     end
 
     def zhong_mget(jobs, key)
       keys = jobs.map(&:to_s)
-      ret = safe_mget(keys.map { |j| "zhong:#{key}:#{j}" })
+      ret = Zhong::Util.safe_mget(keys.map { |j| "zhong:#{key}:#{j}" })
       Hash[keys.map { |j| [j, ret["zhong:#{key}:#{j}"]] }]
     end
-
-    def safe_mget(keys)
-      if keys.length > 0
-        Zhong.redis.mapped_mget(*keys)
-      else
-        {}
-      end
-    end
   end
 end
 
-if defined?(::ActionDispatch::Request::Session) &&
-    !::ActionDispatch::Request::Session.respond_to?(:each)
+if defined?(::ActionDispatch::Request::Session) && !::ActionDispatch::Request::Session.respond_to?(:each)
   # mperham/sidekiq#2460
   # Rack apps can't reuse the Rails session store without
   # this monkeypatch

data/lib/zhong/web_helpers.rb

@@ -7,7 +7,7 @@ module Zhong
     # capture method from sinatra-contrib library.
     def capture(&block)
       block.call
-      eval('', block.binding)
+      eval("", block.binding)
     end
 
     def root_path
@@ -15,12 +15,12 @@ module Zhong
     end
 
     def current_path
-      @current_path ||= request.path_info.gsub(/^\//,'')
+      @current_path ||= request.path_info.gsub(%r(^\/),"")
     end
 
     def relative_time(time)
       if time
-        %{<time datetime="#{time.getutc.iso8601}">#{time}</time>}
+        %(<time datetime="#{time.getutc.iso8601}">#{time}</time>)
       else
         "never"
       end
@@ -41,14 +41,12 @@ module Zhong
     end
 
     def to_display(arg)
+      arg.inspect
+    rescue
       begin
-        arg.inspect
-      rescue
-        begin
-          arg.to_s
-        rescue => ex
-          "Cannot display argument: [#{ex.class.name}] #{ex.message}"
-        end
+        arg.to_s
+      rescue => ex
+        "Cannot display argument: [#{ex.class.name}] #{ex.message}"
       end
     end
 
@@ -59,8 +57,8 @@ module Zhong
         return number
       end
 
-      options = {delimiter: ',', separator: '.'}
-      parts = number.to_s.to_str.split('.')
+      options = {delimiter: ",", separator: "."}
+      parts = number.to_s.to_str.split(".")
       parts[0].gsub!(/(\d)(?=(\d\d\d)+(?!\d))/, "\\1#{options[:delimiter]}")
       parts.join(options[:separator])
     end
@@ -68,13 +66,13 @@ module Zhong
     def h(text)
       ::Rack::Utils.escape_html(text)
     rescue ArgumentError => e
-      raise unless e.message.eql?('invalid byte sequence in UTF-8')
-      text.encode!('UTF-16', 'UTF-8', invalid: :replace, replace: '').encode!('UTF-8', 'UTF-16')
+      raise unless e.message.eql?("invalid byte sequence in UTF-8")
+      text.encode!("UTF-16", "UTF-8", invalid: :replace, replace: "").encode!("UTF-8", "UTF-16")
       retry
     end
 
     def environment_title_prefix
-      environment = ENV['RAILS_ENV'] || ENV['RACK_ENV'] || 'development'
+      environment = ENV["RAILS_ENV"] || ENV["RACK_ENV"] || "development"
 
       "[#{environment.upcase}] " unless environment == "production"
     end

data/test/helper.rb

@@ -0,0 +1,33 @@
+$LOAD_PATH.unshift File.expand_path("../../lib", __FILE__)
+
+if ENV["CODECLIMATE_REPO_TOKEN"]
+  require "codeclimate-test-reporter"
+  ::SimpleCov.add_filter "helper"
+  CodeClimate::TestReporter.start
+end
+
+require "zhong"
+require "minitest/autorun"
+require "rack/test"
+
+ENV["RACK_ENV"] = ENV["RAILS_ENV"] = "test"
+
+def assert_contains(expected_substring, string, *args)
+  assert string.include?(expected_substring), *args
+end
+
+Zhong.logger = begin
+  l = Logger.new(STDOUT)
+  l.level = Logger::ERROR
+  l
+end
+
+Zhong.redis = Redis.new(url: ENV["REDIS_URL"] || "redis://localhost/13")
+
+def test_default_config
+  @default_config ||= {
+    redis: Zhong.redis,
+    logger: Zhong.logger,
+    long_running_timeout: 10.seconds
+  }
+end

data/test/{at_test.rb → test_at.rb}

@@ -1,4 +1,4 @@
-require "test_helper"
+require_relative "helper"
 
 # Many At tests lifted from Clockwork (thanks Clockwork!)
 class TestAt < Minitest::Test
@@ -139,6 +139,32 @@ class TestAt < Minitest::Test
     assert_equal time_in_day(8, 20, 3), at.next_at(time_in_day(12, 31, 2))
   end
 
+  def test_to_s
+    at = Zhong::At.parse("thr 12:59")
+
+    assert_equal "12:59 on Thr", at.to_s
+
+    at = Zhong::At.parse(["8:20", "tues 12:30"])
+
+    assert_equal "08:20, 12:30 on Tues", at.to_s
+  end
+
+  def test_as_json
+    at = Zhong::At.parse("tues 23:01")
+
+    assert_equal({m: 1, h: 23, w: 2, g: 0.seconds}, at.as_json)
+
+    at = Zhong::At.parse(["8:**", "sun 12:30"])
+
+    assert_equal([{m: nil, h: 8, w: nil, g: 0.seconds}, {m: 30, h: 12, w: 0, g: 0.seconds}], at.as_json)
+  end
+
+  def test_serialize
+    at = Zhong::At.parse(["8:20", "tues 12:30"])
+
+    assert_equal Zhong::At.deserialize(at.serialize), at
+  end
+
   def test_invalid_time_32
     assert_raises Zhong::At::FailedToParse do
       Zhong::At.parse("32:00")

data/test/{every_test.rb → test_every.rb}

@@ -1,4 +1,4 @@
-require "test_helper"
+require_relative "helper"
 
 class TestEvery < Minitest::Test
   def time_in_day(hour, minute, day = 0, sec = 0)

data/test/test_job.rb

@@ -0,0 +1,74 @@
+require_relative "helper"
+
+class TestJob < Minitest::Test
+  def test_initialize
+    job = Zhong::Job.new("test_initialize", {at: "12:00"}.merge(test_default_config))
+
+    assert job
+    assert !job.running?
+    assert_equal "test_initialize", job.to_s
+  end
+
+  def test_should_run
+    sleep 1
+
+    job = Zhong::Job.new("test_should_run", {every: 1.second}.merge(test_default_config))
+
+    assert_equal true, job.run?
+  end
+
+  def test_run
+    success_counter = Queue.new
+    job = Zhong::Job.new("test_run", {every: 1.second}.merge(test_default_config)) { success_counter << 1 }
+    now = Time.now
+
+    assert_equal 0, success_counter.size
+    assert_equal true, job.run?(now)
+    job.run(now)
+    assert_equal false, job.run?(now)
+    assert_equal 1, success_counter.size
+  end
+
+  def test_run_at
+    success_counter = Queue.new
+    job = Zhong::Job.new("test_run_at", {every: 1.second, at: ["**:**"]}.merge(test_default_config)) { success_counter << 1 }
+    now = Time.now
+
+    assert_equal 0, success_counter.size
+    assert_equal true, job.run?(now)
+    job.run(now)
+    assert_equal false, job.run?(now)
+    assert_equal 1, success_counter.size
+  end
+
+  def test_run_at_change
+    success_counter = Queue.new
+    job = Zhong::Job.new("test_run_at_change", {every: 1.second, at: ["**:**"]}.merge(test_default_config)) { success_counter << 1 }
+    now = Time.now
+
+    assert_equal 0, success_counter.size
+    assert_equal true, job.run?(now)
+    job.run(now)
+    assert_equal false, job.run?(now)
+    assert_equal 1, success_counter.size
+
+    job = Zhong::Job.new("test_run_at_change", {every: 1.second, at: ["**:**", "**:**"]}.merge(test_default_config)) { success_counter << 1 }
+    assert_equal true, job.run?(now)
+    job.run(now)
+    assert_equal false, job.run?(now)
+    assert_equal 2, success_counter.size
+  end
+
+  def test_disable
+    success_counter = Queue.new
+    job = Zhong::Job.new("test_disable", {every: 1.second}.merge(test_default_config)) { success_counter << 1 }
+    now = Time.now
+
+    job.disable
+
+    assert_equal true, job.run?(now)
+    job.run(now)
+    assert_equal true, job.run?(now)
+    assert_equal 0, success_counter.size
+  end
+end

data/test/test_library.rb

@@ -0,0 +1,23 @@
+require_relative "helper"
+
+class TestLibrary < Minitest::Test
+  def test_that_it_has_a_version_number
+    refute_nil ::Zhong::VERSION
+  end
+
+  def teardown
+    Zhong.stop
+    sleep 1
+  end
+
+  def test_heartbeats
+    Zhong.schedule { nil }
+    t = Thread.new { Zhong.start }
+    sleep(1)
+    assert_equal true, Zhong.any_running?
+    assert_in_delta Zhong.redis_time.to_f, Time.now.to_f, 0.1
+    assert_in_delta Zhong.redis_time.to_f, Zhong.latest_heartbeat.to_f, 1
+    Zhong.stop
+    t.join
+  end
+end

data/test/test_scheduler.rb

@@ -0,0 +1,80 @@
+require_relative "helper"
+
+class TestScheduler < Minitest::Test
+  def setup
+    Zhong.clear
+  end
+
+  def test_scheduler
+    test_one_counter = 0
+    test_two_counter = 0
+
+    Zhong.schedule do
+      every(10.seconds, "test_one") { test_one_counter += 1 }
+      every(3.seconds, "test_two") { test_two_counter += 1 }
+    end
+
+    t = Thread.new { Zhong.start }
+    sleep(7)
+    Zhong.stop
+    t.join
+
+    assert_equal 1, test_one_counter
+    assert_equal 3, test_two_counter
+  end
+
+  def test_scheduler_categories
+    Zhong.schedule do
+      category "cat1" do
+        every(10.seconds, "cat_test_one") { nil }
+      end
+    end
+
+    assert_equal 1, Zhong.jobs.size
+    assert_equal "cat1.cat_test_one", Zhong.jobs.values.first.to_s
+  end
+
+  def test_scheduler_nested_category
+    assert_raises RuntimeError do
+      Zhong.schedule do
+        category "cat1" do
+          category "cat2"
+        end
+      end
+    end
+  end
+
+  def test_scheduler_callbacks
+    test_before_tick = 0
+    test_after_tick = 0
+    test_errors = 0
+    test_before_run = 0
+    test_after_run = 0
+
+    Zhong.schedule do
+      on(:before_tick) { test_before_tick += 1; true }
+      on(:after_tick) { test_after_tick += 1 }
+      on(:before_run) { test_before_run += 1; true }
+      on(:after_run) { |_, _, ran| test_after_run += 1 if ran }
+      error_handler { test_errors += 1 }
+
+      every(1.second, "test_every_second") { nil }
+      every(1.second, "break_every_second") { raise "boom" }
+    end
+
+    t = Thread.new { Zhong.start }
+    sleep(3)
+    Zhong.stop
+    t.join
+
+    assert_operator 2, :<=, test_before_tick
+    assert_operator 4, :>=, test_before_tick
+    assert_operator 2, :<=, test_after_tick
+    assert_operator 4, :>=, test_after_tick
+    assert_operator 6, :<=, test_before_run
+    assert_operator 8, :>=, test_before_run
+    assert_operator 2, :<=, test_after_run
+    assert_operator 4, :>=, test_after_run
+    assert_operator 2, :<=, test_errors
+  end
+end

data/test/test_web.rb

@@ -0,0 +1,86 @@
+require_relative "helper"
+require "zhong/web"
+require "tilt/erubis"
+
+class TestWeb < Minitest::Test
+  include Rack::Test::Methods
+
+  def app
+    Zhong::Web
+  end
+
+  def setup
+    Zhong.clear
+  end
+
+  def test_index
+    get "/"
+    assert last_response.ok?
+    assert_contains "<title>[TEST] Zhong</title>", last_response.body
+    assert_contains Zhong::VERSION, last_response.body
+  end
+
+  def test_index_job
+    Zhong.schedule do
+      every(10.minutes, "test_web_job") { nil }
+    end
+
+    get "/"
+    assert last_response.ok?
+    assert_contains "test_web_job", last_response.body
+    assert_contains "every 10 minutes", last_response.body
+  end
+
+  def test_disable_job
+    Zhong.schedule do
+      every(30.seconds, "test_disable_web_job") { nil }
+    end
+
+    job = Zhong.scheduler.find_by_name("test_disable_web_job")
+
+    job.enable
+
+    assert_equal false, job.disabled?
+
+    post "/", "disable" => job.id
+    assert last_response.ok?
+    assert_contains "test_disable_web_job", last_response.body
+    assert_contains "every 30 seconds", last_response.body
+    assert_contains 'name="enable"', last_response.body
+    assert_equal true, job.disabled?
+  end
+
+  def test_enable_job
+    Zhong.schedule do
+      every(12.hours, "test_enable_web_job") { nil }
+    end
+
+    job = Zhong.scheduler.find_by_name("test_enable_web_job")
+
+    job.disable
+
+    assert_equal true, job.disabled?
+
+    post "/", "enable" => job.id
+    assert last_response.ok?
+    assert_contains "test_enable_web_job", last_response.body
+    assert_contains "every 12 hours", last_response.body
+    assert_contains 'name="disable"', last_response.body
+    assert_equal false, job.disabled?
+  end
+
+  def test_heartbeat
+    hostname = `hostname`.strip
+    pid = Process.pid
+
+    t = Thread.new { Zhong.start }
+    sleep(1)
+    Zhong.stop
+    t.join
+
+    get "/"
+    assert last_response.ok?
+    assert_contains hostname, last_response.body
+    assert_contains "PID #{pid}", last_response.body
+  end
+end

data/zhong.gemspec

@@ -32,4 +32,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rubocop", "~> 0.30.0"
   spec.add_development_dependency "minitest", "~> 5.5.0"
   spec.add_development_dependency "codeclimate-test-reporter", "~> 0.4.7"
+  spec.add_development_dependency "sinatra", "~> 1.4", ">= 1.4.6"
+  spec.add_development_dependency "rack-test", "~> 0.6"
+  spec.add_development_dependency "tilt"
+  spec.add_development_dependency "erubis"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zhong
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Nick Elser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-28 00:00:00.000000000 Z
+date: 2016-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: suo
@@ -136,6 +136,68 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.4.7
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.4.6
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.4.6
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+- !ruby/object:Gem::Dependency
+  name: tilt
+  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: erubis
+  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: Reliable, distributed cron.
 email:
 - nick.elser@gmail.com
@@ -165,15 +227,17 @@ files:
 - lib/zhong/every.rb
 - lib/zhong/job.rb
 - lib/zhong/scheduler.rb
+- lib/zhong/util.rb
 - lib/zhong/version.rb
 - lib/zhong/web.rb
 - lib/zhong/web_helpers.rb
-- test/at_test.rb
-- test/every_test.rb
-- test/job_test.rb
-- test/library_test.rb
-- test/scheduler_test.rb
-- test/test_helper.rb
+- test/helper.rb
+- test/test_at.rb
+- test/test_every.rb
+- test/test_job.rb
+- test/test_library.rb
+- test/test_scheduler.rb
+- test/test_web.rb
 - web/assets/javascript/application.js
 - web/assets/javascript/vendor.min.js
 - web/views/index.erb
@@ -203,10 +267,11 @@ signing_key:
 specification_version: 4
 summary: Reliable, distributed cron.
 test_files:
-- test/at_test.rb
-- test/every_test.rb
-- test/job_test.rb
-- test/library_test.rb
-- test/scheduler_test.rb
-- test/test_helper.rb
+- test/helper.rb
+- test/test_at.rb
+- test/test_every.rb
+- test/test_job.rb
+- test/test_library.rb
+- test/test_scheduler.rb
+- test/test_web.rb
 has_rdoc: 

data/test/job_test.rb

@@ -1,60 +0,0 @@
-require "test_helper"
-
-class TestJob < Minitest::Test
-  def default_config
-    @default_config ||= {
-      redis: Redis.new,
-      logger: logger,
-      long_running_timeout: 5.minutes
-    }
-  end
-
-  def logger
-    @logger ||= begin
-      l = Logger.new(STDOUT)
-      l.level = Logger::UNKNOWN
-      l
-    end
-  end
-
-  def test_initialize
-    job = Zhong::Job.new("test_initialize", {at: "12:00"}.merge(default_config))
-
-    assert job
-    assert !job.running?
-    assert_equal "test_initialize", job.to_s
-  end
-
-  def test_should_run
-    sleep 1
-
-    job = Zhong::Job.new("test_should_run", {every: 1.second}.merge(default_config))
-
-    assert_equal true, job.run?
-  end
-
-  def test_run
-    success_counter = Queue.new
-    job = Zhong::Job.new("test_run", {every: 1.second}.merge(default_config)) { success_counter << 1 }
-    now = Time.now
-
-    assert_equal 0, success_counter.size
-    assert_equal true, job.run?(now)
-    job.run(now)
-    assert_equal false, job.run?(now)
-    assert_equal 1, success_counter.size
-  end
-
-  def test_disable
-    success_counter = Queue.new
-    job = Zhong::Job.new("test_disable", {every: 1.second}.merge(default_config)) { success_counter << 1 }
-    now = Time.now
-
-    job.disable
-
-    assert_equal true, job.run?(now)
-    job.run(now)
-    assert_equal true, job.run?(now)
-    assert_equal 0, success_counter.size
-  end
-end

data/test/library_test.rb

@@ -1,7 +0,0 @@
-require "test_helper"
-
-class TestLibrary < Minitest::Test
-  def test_that_it_has_a_version_number
-    refute_nil ::Zhong::VERSION
-  end
-end

data/test/scheduler_test.rb

@@ -1,30 +0,0 @@
-require "test_helper"
-
-class TestScheduler < Minitest::Test
-  def logger
-    @logger ||= begin
-      l = Logger.new(STDOUT)
-      l.level = Logger::UNKNOWN
-      l
-    end
-  end
-
-  def test_scheduler
-    test_one_counter = 0
-    test_two_counter = 0
-
-    Zhong.logger = logger
-
-    Zhong.schedule do
-      every(10.seconds, "test_one") { test_one_counter += 1 }
-      every(3.seconds, "test_two") { test_two_counter += 1 }
-    end
-
-    t = Thread.new { Zhong.start }
-    sleep(7)
-    Zhong.stop
-    t.join
-    assert_equal 1, test_one_counter
-    assert_equal 3, test_two_counter
-  end
-end

data/test/test_helper.rb

@@ -1,11 +0,0 @@
-$LOAD_PATH.unshift File.expand_path("../../lib", __FILE__)
-
-if ENV["CODECLIMATE_REPO_TOKEN"]
-  require "codeclimate-test-reporter"
-  CodeClimate::TestReporter.start
-end
-
-require "zhong"
-require "minitest/autorun"
-
-ENV["ZHONG_TEST"] = "true"