abstractivator 0.19.0 → 0.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa308fb24eaca6de3e2a5eddb13440132389500d
-  data.tar.gz: cc8c74507569d19ab177c44f039b4e31462a8e02
+  metadata.gz: 9d8d6676d13a2a95b17380a56ff9aad9519ffe6b
+  data.tar.gz: 0e7915e40d07dcdf2649676832ef97b99303d8c7
 SHA512:
-  metadata.gz: cd21f917e5fbf77bf98e28d87c50257dd5ebeb418dc9136f527900c8888780f12a3490a5a26a41a917c2f8e44919488bbe0c01a751d3f47741b12aafbdb8fd87
-  data.tar.gz: 3d194facb41a48787458721dc0b51dc54b59a8509dabdcafc354df00e4d350e564a3ea14a1b307cc604c36d4bc8db3e6860c9c056bcd985ea71e941e5d2185c6
+  metadata.gz: a01461876e5d373d11bffcb2f8867981a16e18645b473866dd84346480b3029c6ddad9c84e16e20bda10e741357777fed2b75e45bf71d834cc2e00f9baad8d06
+  data.tar.gz: bc7ae55e317a072a1f9efcc8ba058a864e6ba735d29fdbb233379db72f532d7d8b19ae279ea53db5f5e67db2ff4283f463ea7144ac188d293c1a5a1173f0f003

data/lib/abstractivator/version.rb

@@ -1,3 +1,3 @@
 module Abstractivator
-  VERSION = '0.19.0'
+  VERSION = '0.20.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: abstractivator
 version: !ruby/object:Gem::Version
-  version: 0.19.0
+  version: 0.20.0
 platform: ruby
 authors:
 - Peter Winton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-14 00:00:00.000000000 Z
+date: 2017-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -131,9 +131,6 @@ files:
 - lib/abstractivator/module_ext.rb
 - lib/abstractivator/numbers.rb
 - lib/abstractivator/proc_ext.rb
-- lib/abstractivator/schedule.rb
-- lib/abstractivator/schedule/schedule.rb
-- lib/abstractivator/schedule/schedule_runner.rb
 - lib/abstractivator/sort.rb
 - lib/abstractivator/trees.rb
 - lib/abstractivator/trees/block_collector.rb
@@ -155,9 +152,6 @@ files:
 - spec/lib/abstractivator/module_ext_spec.rb
 - spec/lib/abstractivator/numbers_spec.rb
 - spec/lib/abstractivator/proc_ext_spec.rb
-- spec/lib/abstractivator/schedule/em_util.rb
-- spec/lib/abstractivator/schedule/schedule_runner_spec.rb
-- spec/lib/abstractivator/schedule/schedule_spec.rb
 - spec/lib/abstractivator/sort_spec.rb
 - spec/lib/abstractivator/trees/recursive_delete_spec.rb
 - spec/lib/abstractivator/trees/tree_compare_spec.rb
@@ -203,9 +197,6 @@ test_files:
 - spec/lib/abstractivator/module_ext_spec.rb
 - spec/lib/abstractivator/numbers_spec.rb
 - spec/lib/abstractivator/proc_ext_spec.rb
-- spec/lib/abstractivator/schedule/em_util.rb
-- spec/lib/abstractivator/schedule/schedule_runner_spec.rb
-- spec/lib/abstractivator/schedule/schedule_spec.rb
 - spec/lib/abstractivator/sort_spec.rb
 - spec/lib/abstractivator/trees/recursive_delete_spec.rb
 - spec/lib/abstractivator/trees/tree_compare_spec.rb

data/lib/abstractivator/schedule.rb

@@ -1,2 +0,0 @@
-require 'abstractivator/schedule/schedule'
-require 'abstractivator/schedule/schedule_runner'

data/lib/abstractivator/schedule/schedule.rb

@@ -1,104 +0,0 @@
-class Schedule
-
-  WEEKDAYS = 'UMTWRFS' # Sunday through Saturday
-
-  def initialize(str)
-    @periods = parse_periods(str)
-    unless @periods.any?
-      raise 'At least one period must be specified'
-    end
-  end
-
-  def permits?(localtime)
-    @periods.any?{|p| p.includes?(localtime)}
-  end
-
-  def downtime_minutes_from(localtime)
-    return 0 if permits?(localtime)
-    wmin = Wmin.from_localtime(localtime)
-    @periods.map{|p| (p.start - wmin + Wmin::WEEK) % Wmin::WEEK}.min
-  end
-
-  private
-
-  def parse_periods(str)
-    str.split(/[, ]+/).map(&method(:parse_period)).flatten
-  end
-
-  def parse_period(str)
-    # the regex for matching a period.
-    # don't restrict days here; otherwise, garbage will cause the optional days clause to fail,
-    # which would be massaged to "UMTWRFS", which is not what we want.
-    m = str.match /^(?<sh>\d\d?):(?<sm>\d\d?)-(?<eh>\d\d?):(?<em>\d\d?)([^\d:\-\.UMTWRFS ](?<days>.+))?$/
-    m or raise "Could not parse period: #{str}"
-    day_chars = m[:days] || WEEKDAYS
-    day_chars.chars.map do |day_char|
-      start = Wmin.parse(day_char, m[:sh], m[:sm])
-      stop = Wmin.parse(day_char, m[:eh], m[:em])
-      if stop < start
-        stop = Wmin.add_day(stop)
-      end
-      if stop < Wmin::WEEK
-        Period.new(start, stop)
-      else
-        [Period.new(start, Wmin::WEEK), Period.new(0, stop % Wmin::WEEK)]
-      end
-    end
-  end
-
-  class Period
-    attr_accessor :start # inclusive
-    attr_accessor :stop  # exclusive
-
-    def initialize(start, stop)
-      @start = start
-      @stop = stop
-    end
-
-    def includes?(localtime)
-      wmin = Wmin.from_localtime(localtime)
-      result = start <= wmin && wmin < stop
-      #puts "#{to_s} includes? #{to_clock(wmin)} (#{localtime}) : #{result}"
-      #puts "  #{start} <= #{wmin} && #{wmin} < #{stop}"
-      result
-    end
-
-    def to_s
-      "#{to_clock(start)}-#{to_clock(stop)}"
-    end
-
-    def to_clock(wmin)
-      day = (wmin / Wmin::DAY) % 7
-      minutes = wmin % Wmin::DAY
-      "#{minutes / 60}:#{minutes % 60}#{WEEKDAYS[day]}"
-    end
-  end
-
-  # a 'wmin' is a week-minute: a time in any given week, represented as the number of minutes since
-  # midnight on Sunday. Saturday 23:59 is the largest wmin (7 * 24 * 60 - 1)
-  module Wmin
-    DAY = 24 * 60
-    WEEK = 7 * DAY
-
-    def self.parse(day_char, hour, min)
-      day = WEEKDAYS.index(day_char)
-      unless day
-        raise "Invalid day specifier: '#{day_char}'"
-      end
-      make(day, hour.to_i, min.to_i)
-    end
-
-    def self.make(day, hour, minute)
-      minute + hour * 60 + day * 24 * 60
-    end
-
-    def self.from_localtime(localtime)
-      make(localtime.wday, localtime.hour, localtime.min)
-    end
-
-    def self.add_day(wmin)
-      wmin + DAY
-    end
-
-  end
-end

data/lib/abstractivator/schedule/schedule_runner.rb

@@ -1,34 +0,0 @@
-begin
-  require 'eventmachine'
-rescue
-  raise "ScheduleRunner requires EventMachine but `require 'eventmachine'` failed."
-end
-
-# Performs an action periodically, but only at times allowed by a Schedule.
-class ScheduleRunner
-  def self.run_on_schedule(task, &action)
-    ScheduleRunner.new(task, action).start
-  end
-
-  def initialize(task, action)
-    @task = task
-    @action = action
-  end
-
-  def start
-    run_after(@task.interval_seconds)
-  end
-
-  def run_after(seconds_to_wait)
-    @task.before_waiting(seconds_to_wait)
-    @task.pump.add_timer(seconds_to_wait) do
-      schedule = @task.schedule
-      if schedule.permits?(Time.now)
-        @action.call
-        run_after(@task.interval_seconds)
-      else
-        run_after(schedule.downtime_minutes_from(Time.now) * 60)
-      end
-    end
-  end
-end

data/spec/lib/abstractivator/schedule/em_util.rb

@@ -1,16 +0,0 @@
-require 'eventmachine'
-
-def em
-  EM.run do
-    EM.add_timer(in_debug_mode? ? 999999 : 3) { raise 'EM spec timed out' }
-    yield
-  end
-end
-
-def in_debug_mode?
-  ENV['RUBYLIB'] =~ /ruby-debug-ide/ # http://stackoverflow.com/questions/22039807/determine-if-a-program-is-running-in-debug-mode
-end
-
-def done
-  EM.stop
-end

data/spec/lib/abstractivator/schedule/schedule_runner_spec.rb

@@ -1,62 +0,0 @@
-require 'rspec/core'
-require 'abstractivator/schedule/schedule'
-require 'abstractivator/schedule/schedule_runner'
-require_relative './em_util'
-
-describe ScheduleRunner do
-  let(:task) {double}
-  let(:interval) {0.1}
-
-  before(:each) do
-    allow(task).to receive(:interval_seconds) {interval}
-    allow(task).to receive(:before_waiting)
-    allow(task).to receive(:pump) {EventMachine}
-    allow(task).to receive(:schedule) {Schedule.new('00:00-24:00')}
-  end
-
-  describe '::run_on_schedule' do
-    it 'waits for an interval before starting' do
-      em do
-        start = Time.now
-        ScheduleRunner.run_on_schedule(task) do
-          expect(Time.now - start).to be_within(ten_percent_of(interval)).of(interval)
-          done
-        end
-      end
-    end
-    it 'runs periodically' do
-      em do
-        last = Time.now
-        n = 0
-        ScheduleRunner.run_on_schedule(task) do
-          n += 1
-          expect(Time.now - last).to be_within(ten_percent_of(interval)).of(interval)
-          last = Time.now
-          done if n == 3
-        end
-      end
-    end
-    it 'only runs during scheduled times' do
-      em do
-        start = Time.now + 3 * 60
-        stop = Time.now + 4 * 60
-        allow(task).to receive(:schedule) {Schedule.new("#{start.hour}:#{start.min}-#{stop.hour}:#{stop.min}")}
-        orig_add_timer = EventMachine.method(:add_timer)
-        expect(EventMachine).to receive(:add_timer).with(interval) {|s, &block| orig_add_timer.(s, &block)}.ordered
-        expect(EventMachine).to receive(:add_timer).with(3 * 60) {done}.ordered
-        ScheduleRunner.run_on_schedule(task) {}
-      end
-    end
-    it 'calls before_waiting before waiting' do
-      em do
-        expect(task).to receive(:before_waiting).with(interval).ordered
-        expect(EventMachine).to receive(:add_timer) {done}.ordered
-        ScheduleRunner.run_on_schedule(task) {}
-      end
-    end
-  end
-
-  def ten_percent_of(x)
-    x / 10.0
-  end
-end

data/spec/lib/abstractivator/schedule/schedule_spec.rb

@@ -1,97 +0,0 @@
-require 'rspec/core'
-require 'abstractivator/schedule/schedule'
-
-describe Schedule do
-  let(:sunday) { 0 }
-  let(:monday) { 1 }
-  let(:tuesday) { 2 }
-  let(:wednesday) { 3 }
-  let(:thursday) { 4 }
-  let(:friday) { 5 }
-  let(:saturday) { 6 }
-  describe '#new' do
-    it 'raises an exception when no periods are specified' do
-      expect{Schedule.new('')}.to raise_exception StandardError
-      expect{Schedule.new(',,,')}.to raise_exception StandardError
-      expect{Schedule.new('asdf')}.to raise_exception StandardError
-    end
-    it 'accepts schedule strings delimited by commas and/or spaces' do
-      expect(Schedule.new('1:00-12:00,15:00-16:00')).to be_a Schedule
-      expect(Schedule.new('1:00-12:00 15:00-16:00')).to be_a Schedule
-      expect(Schedule.new('1:00-12:00, 15:00-16:00')).to be_a Schedule
-      expect(Schedule.new('1:00-12:00 ,15:00-16:00')).to be_a Schedule
-    end
-  end
-  describe '#permits?' do
-    it 'indicates if schedule permits the given time' do
-      s = Schedule.new('1:00-2:00')
-      assert_rejects(s, 0, 59)
-      assert_permits(s, 1, 0)
-      assert_permits(s, 1, 30)
-      assert_permits(s, 1, 59)
-      assert_rejects(s, 2, 00)
-    end
-    it 'allows day-of-week specifiers' do
-      s = Schedule.new('1:00-2:00#MWF')
-      assert_rejects(s, 1, 30, sunday)
-      assert_permits(s, 1, 30, monday)
-      assert_rejects(s, 1, 30, tuesday)
-      assert_permits(s, 1, 30, wednesday)
-      assert_rejects(s, 1, 30, thursday)
-      assert_permits(s, 1, 30, friday)
-      assert_rejects(s, 1, 30, saturday)
-    end
-    it 'allows any reasonable day-of-week delimiter' do
-      good = %w(# @ / |)
-      good.each do |delimiter|
-        Schedule.new("1:00-2:00#{delimiter}MWF")
-      end
-      bad = %w(- : . 4 M) + [' ']
-      bad.each do |delimiter|
-        expect { Schedule.new("1:00-2:00#{delimiter}MWF") }.to raise_error RuntimeError
-      end
-    end
-    it 'raises an exception when a bad day-of-week specifier is provided' do
-      expect{Schedule.new('1:00-2:00#X')}.to raise_exception RuntimeError
-    end
-    it 'handles periods that cross midnight' do
-      s = Schedule.new('23:30-0:30')
-      assert_rejects(s, 23, 29)
-      assert_permits(s, 23, 30)
-      assert_permits(s, 0, 29)
-      assert_rejects(s, 0, 30)
-    end
-    it 'handles periods that cross the end of the week' do
-      s = Schedule.new('23:30-0:30#S')
-      assert_rejects(s, 23, 29, saturday)
-      assert_permits(s, 23, 30, saturday)
-      assert_permits(s, 0, 29, sunday)
-      assert_rejects(s, 0, 30, sunday)
-    end
-  end
-  describe '#downtime_minutes_from' do
-    it 'returns zero if the given time is permitted' do
-      s = Schedule.new('1:00-2:00')
-      expect(s.downtime_minutes_from(make_time(1, 23))).to eql 0
-    end
-    it 'returns the number of seconds until the start of the next permitted period' do
-      s = Schedule.new('1:00-2:00#M,3:00-4:00#M,3:00-4:00#T')
-      expect(s.downtime_minutes_from(make_time(0, 55, monday))).to eql 5
-      expect(s.downtime_minutes_from(make_time(2, 55, monday))).to eql 5
-      expect(s.downtime_minutes_from(make_time(4, 00, monday))).to eql 23 * 60
-      expect(s.downtime_minutes_from(make_time(4, 00, tuesday))).to eql (21 + 5 * 24) * 60
-    end
-  end
-
-  def assert_permits(s, hour, minute, day_of_week=0)
-    expect(s.permits?(make_time(hour, minute, day_of_week))).to be true
-  end
-
-  def assert_rejects(s, hour, minute, day_of_week=0)
-    expect(s.permits?(make_time(hour, minute, day_of_week))).to be false
-  end
-
-  def make_time(hour, minute, day_of_week=0, seconds=0)
-    Time.local(2014, 6, day_of_week + 1, hour, minute, seconds)
-  end
-end