montrose 0.13.0 → 0.15.0

data/lib/montrose/clock.rb

@@ -10,32 +10,32 @@ module Montrose
       @every = @options.fetch(:every) { fail ConfigurationError, "Required option :every not provided" }
       @interval = @options.fetch(:interval)
       @start_time = @options.fetch(:start_time)
-      @at = @options.fetch(:at, nil)
+      @at = @options.fetch(:at, []).sort
     end
 
     # Advances time to new unit by increment and sets
     # new time as "current" time for next tick
     #
     def tick
-      @time = peek
+      @time = next_time(true)
     end
 
     def peek
-      return @start_time if @time.nil?
+      next_time(false)
+    end
 
-      if @at
-        times = @at.map { |hour, min, sec = 0| @time.change(hour: hour, min: min, sec: sec) }
+    private
 
-        (min_next = times.select { |t| t > @time }.min) && (return min_next)
+    def next_time(tick)
+      return @start_time if @time.nil?
 
-        advance_step(times.min || @time)
+      if @at.present?
+        next_time_at(@time, tick)
       else
         advance_step(@time)
       end
     end
 
-    private
-
     def advance_step(time)
       time.advance(step)
     end
@@ -54,6 +54,51 @@ module Montrose
         unit_step(:year)
     end
 
+    # @private
+    #
+    # Returns next time using :at option. Tries to calculate
+    # a time for the current date by incrementing the index
+    # of the :at option. Once all items have been exhausted
+    # the minimum time is generated for the current date and
+    # we advance to the next date based on interval
+    #
+    def next_time_at(time, tick)
+      if current_at_index && (next_time = time_at(time, current_at_index + 1))
+        @current_at_index += 1 if tick
+
+        next_time
+      else
+        min_time = time_at(time, 0)
+        @current_at_index = 0 if tick
+
+        advance_step(min_time)
+      end
+    end
+
+    # @private
+    #
+    # Returns time with hour, minute and second from :at option
+    # at specified index
+    #
+    def time_at(time, index)
+      parts = @at[index]
+
+      return unless parts
+
+      hour, min, sec = parts
+      time.change(hour: hour, min: min, sec: sec || 0)
+    end
+
+    # @private
+    #
+    # Keep track of which index we are currently at for :at option.
+    #
+    def current_at_index
+      @current_at_index ||= @at.index do |hour, min, sec = 0|
+        @start_time.hour == hour && @start_time.min == min && @start_time.sec == sec
+      end
+    end
+
     # @private
     #
     # Returns hash representing unit and amount to advance time

data/lib/montrose/frequency.rb

@@ -104,7 +104,7 @@ module Montrose
     protected
 
     def interval_str
-      @interval != 1 ? "*/#{@interval}" : "*"
+      (@interval != 1) ? "*/#{@interval}" : "*"
     end
   end
 end

data/lib/montrose/ical.rb

@@ -71,9 +71,9 @@ module Montrose
     end
 
     def parse_timezone(time_string)
-       time_zone_rule, _ = time_string.split(":")
-       _label, time_zone = (time_zone_rule || "").split("=")
-       time_zone
+      time_zone_rule, _ = time_string.split(":")
+      _label, time_zone = (time_zone_rule || "").split("=")
+      time_zone
     end
 
     def parse_time(time_string)

data/lib/montrose/recurrence.rb

@@ -227,13 +227,13 @@ module Montrose
         return dump(load(obj)) if obj.is_a?(String)
 
         hash = case obj
-               when Hash
-                 obj
-               when self
-                 obj.to_hash
-               else
-                 fail SerializationError,
-                   "Object was supposed to be a #{self}, but was a #{obj.class}. -- #{obj.inspect}"
+        when Hash
+          obj
+        when self
+          obj.to_hash
+        else
+          fail SerializationError,
+            "Object was supposed to be a #{self}, but was a #{obj.class}. -- #{obj.inspect}"
         end
 
         JSON.dump(hash)

data/lib/montrose/schedule.rb

@@ -35,13 +35,13 @@ module Montrose
         return dump(load(obj)) if obj.is_a?(String)
 
         array = case obj
-                when Array
-                  new(obj).to_a
-                when self
-                  obj.to_a
-                else
-                  fail SerializationError,
-                    "Object was supposed to be a #{self}, but was a #{obj.class}. -- #{obj.inspect}"
+        when Array
+          new(obj).to_a
+        when self
+          obj.to_a
+        else
+          fail SerializationError,
+            "Object was supposed to be a #{self}, but was a #{obj.class}. -- #{obj.inspect}"
         end
 
         JSON.dump(array)

data/lib/montrose/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Montrose
-  VERSION = "0.13.0"
+  VERSION = "0.15.0"
 end

data/montrose.gemspec

@@ -20,14 +20,15 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = ">= 2.6.0"
+  spec.required_ruby_version = ">= 2.7.0"
 
   spec.add_dependency "activesupport", ">= 5.2", "< 7.1"
 
-  spec.add_development_dependency "appraisal"
+  spec.add_development_dependency "coveralls"
   spec.add_development_dependency "m"
   spec.add_development_dependency "minitest"
   spec.add_development_dependency "rake", ">= 12.3.3"
   spec.add_development_dependency "standard"
   spec.add_development_dependency "timecop"
+  spec.add_development_dependency "yard"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: montrose
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.15.0
 platform: ruby
 authors:
 - Ross Kaffenberger
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-01-14 00:00:00.000000000 Z
+date: 2023-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -31,7 +31,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '7.1'
 - !ruby/object:Gem::Dependency
-  name: appraisal
+  name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -114,6 +114,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: yard
+  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: A library for specifying, quering, and enumerating recurring events for
   calendars in Ruby.
 email:
@@ -125,16 +139,18 @@ files:
 - ".circleci/config.yml"
 - ".codeclimate.yml"
 - ".gitignore"
-- Appraisals
+- ".rubocop.yml"
+- ".ruby-version"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
+- Gemfile.lock
 - Guardfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - bin/_guard-core
-- bin/appraisal
+- bin/bundle-all
 - bin/console
 - bin/guard
 - bin/m
@@ -142,9 +158,13 @@ files:
 - bin/setup
 - bin/standardrb
 - gemfiles/activesupport_5.2.gemfile
+- gemfiles/activesupport_5.2.gemfile.lock
 - gemfiles/activesupport_6.0.gemfile
+- gemfiles/activesupport_6.0.gemfile.lock
 - gemfiles/activesupport_6.1.gemfile
+- gemfiles/activesupport_6.1.gemfile.lock
 - gemfiles/activesupport_7.0.gemfile
+- gemfiles/activesupport_7.0.gemfile.lock
 - lib/montrose.rb
 - lib/montrose/chainable.rb
 - lib/montrose/clock.rb
@@ -205,14 +225,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.4.6
 signing_key:
 specification_version: 4
 summary: Recurring events in Ruby

data/Appraisals

@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-appraise "activesupport-7.0" do
-  gem "activesupport", "~> 7.0"
-end
-
-appraise "activesupport-6.1" do
-  gem "activesupport", "~> 6.1"
-end
-
-appraise "activesupport-6.0" do
-  gem "activesupport", "~> 6.0"
-end
-
-appraise "activesupport-5.2" do
-  gem "activesupport", "~> 5.2"
-end

data/bin/appraisal

@@ -1,17 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-#
-# This file was generated by Bundler.
-#
-# The application 'appraisal' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require "rubygems"
-require "bundler/setup"
-
-load Gem.bin_path("appraisal", "appraisal")