cron_config_parser 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 895da1f251f953d6815a2bb37ade3974189abbef9e6215c80de705b7164e6874
-  data.tar.gz: 1d1bcd7003feaf1453b86d87d96ff89126c2214d8c2218cb492e383e3b87d5cd
+  metadata.gz: dbc1edeff71f699025ba9d6821319ccf0fb7070b6162d08359f6f80996672dca
+  data.tar.gz: 86ddd6f709afa0a42a935ad1ac2fe7aa46643ee75b0c47adb1fe3b7f394d73e6
 SHA512:
-  metadata.gz: cbd0de9b030fe9134482ea5edc26fe82a87204572bf6fcdd54d9071476c1b8ee1388512236ed20c8ab4372dddcfeedf0102865b90a7357c2d5346b31822e2726
-  data.tar.gz: 9fafca4d6b2d9d03f716adf58e729fff7113009f0d1fc7ddd302d9ee3ad5dd040ddaa667e53c544a894821c4c452c867f3340a22bf7d91476df650699ae2c09d
+  metadata.gz: c047af12dbc736dec3ea0df5df321da98eef3d3ce77c48072a779193fa6354c61abd47b04580417773ae2a892ed46893d0b2d120224674af606cc7acc3ae02c1
+  data.tar.gz: fa4b863a04e751653d8237e407d789645203ca441219baf32632d64b416936db3e5beadb5075c2a6ab09fda296af8b9d6564bc421f7a8526960c07a350984330

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cron_config_parser (0.1.2)
+    cron_config_parser (0.1.3)
       activesupport (~> 5.2)
 
 GEM

data/README.md

@@ -19,10 +19,10 @@ Or install it yourself as:
 
 ## Usage
 
-You can parse the cron configuration for readability with `CronConfigParser::Parser.call`.
+You can parse the cron configuration for readability with `CronConfigParser.call`.
 
 ``` ruby
-CronConfigParser::Parser.call('00 5 * * * Asia/Tokyo')
+CronConfigParser.call('00 5 * * * Asia/Tokyo')
 => #<CronConfigParser::CronConfig:0x00007fa4f492e820
  @days=["*"],
  @hours=["5"],
@@ -36,7 +36,7 @@ enable check configured properties.
 
 ``` ruby
 # return false if configured nil or '*'
-config = CronConfigParser::Parser.call('00 5 * * * Asia/Tokyo')
+config = CronConfigParser.call('00 5 * * * Asia/Tokyo')
 config.minutes_configured?
 => true
 config.days_configured?
@@ -46,9 +46,17 @@ config.days_configured?
 enable check next execute time.
 
 ``` ruby
-config = CronConfigParser::Parser.call('00 5 * * * Asia/Tokyo')
+config = CronConfigParser.call('00 5 * * * Asia/Tokyo')
 config.next_execute_at
 => 2019-05-23 05:00:00 +0900
+config.execute_schedule(execute_conut: 5, annotation: 'DailyJob')
+=>
+[{:annotation=>"DailyJob", :execute_at=>2019-05-23 05:00:00 +0900},
+ {:annotation=>"DailyJob", :execute_at=>2019-05-24 05:00:00 +0900},
+ {:annotation=>"DailyJob", :execute_at=>2019-05-25 05:00:00 +0900},
+ {:annotation=>"DailyJob", :execute_at=>2019-05-26 05:00:00 +0900},
+ {:annotation=>"DailyJob", :execute_at=>2019-05-27 05:00:00 +0900}]
+=>
 ```
 
 This gem check simple validation when CronConfigParser::CronConfig object initialize.
@@ -56,15 +64,15 @@ If the config is invalid, Config::SyntaxError or Config::RequiredError is raised
 
 ``` ruby
 # not configured require property.
-CronConfigParser::Parser.call('00 5,13 * * ')
+CronConfigParser.call('00 5,13 * * ')
 => CronConfigParser::ConfigRequiredError
 
 # configured invalid property.
-CronConfigParser::Parser.call('00 5,a * * * Asia/Tokyo')
+CronConfigParser.call('00 5,a * * * Asia/Tokyo')
 => CronConfigParser::ConfigSyntaxError
 
 # this check is Invalidationable.
-CronConfigParser::Parser.call('00 5,a * * * Asia/Tokyo', validation: false)
+CronConfigParser.call('00 5,a * * * Asia/Tokyo', validation: false)
 => #<CronConfigParser::CronConfig:0x00007fcedf09cdf0
  @days=["*"],
  @hours=["5", "a"],

data/lib/cron_config_parser/version.rb

@@ -1,3 +1,3 @@
 module CronConfigParser
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/lib/cron_config_parser.rb

@@ -2,6 +2,12 @@ require "cron_config_parser/version"
 require 'active_support/all'
 
 module CronConfigParser
+  def self.call(cron_config, validation: true)
+    Parser.call(cron_config, validation: true)
+  end
+
+  private
+
   class Parser
     def self.call(cron_config, validation: true)
       new(cron_config, validation: validation).call
@@ -33,6 +39,17 @@ module CronConfigParser
     attr_accessor :minutes, :hours, :days, :months, :wdays, :timezone
 
     def next_execute_at(basis_datetime: Time.current)
+      calc_next_execute_at(basis_datetime)
+    end
+
+    def execute_schedule(basis_datetime: Time.current, execute_count: 1, annotation: '')
+      (1..execute_count).map do
+        basis_datetime = calc_next_execute_at(basis_datetime)
+        { annotation: annotation, execute_at: basis_datetime }
+      end
+    end
+
+    def calc_next_execute_at(basis_datetime)
       ExecuteAtCalculator.new(cron_config: self, basis_datetime: basis_datetime).call
     end
 
@@ -107,7 +124,7 @@ module CronConfigParser
     WDAYS = %i[sunday monday tuesday wednesday thursday friday saturday].freeze
 
     def initialize(cron_config:, basis_datetime:)
-      @cron_config = cron_config
+      @cron_config = cron_config.dup
       @basis_datetime = basis_datetime
       @execute_at = basis_datetime
       prepare_cron_config
@@ -164,35 +181,62 @@ module CronConfigParser
 
     def next_hour
       return unless cron_config.hours_configured?
+      # reset hour if configured cron hour
+      @execute_at = @execute_at.change(hour: basis_datetime.hour) if @execute_at.hour >= basis_datetime.hour
       next_hour = cron_config.hours.select { |config_hour| config_hour > execute_at.hour }.first
-      @execute_at = change_to_property_and_move_up(property: next_hour, property_sym: :hours)
-      # reset minute when execute in freture and not configured minute
-      @execute_at = @execute_at.change(min: 0) unless cron_config.minutes_configured?
+      check_hash = { hour: next_hour.presence || cron_config.hours[0], min: execute_at.min }
+      # Do not change the time if it is a future time or other than the specified value
+      if cron_config.hours.exclude?(execute_at.hour) || changed_basis_datetime_future?(check_hash)
+        @execute_at = change_to_property_and_move_up(property: next_hour, property_sym: :hours)
+        # reset minute when execute in freture and not configured minute
+        @execute_at = @execute_at.change(min: 0) unless cron_config.minutes_configured?
+      end
     end
 
     def next_day
       return unless cron_config.days_configured?
-      next_day = cron_config.days.select { |config_day| config_day > execute_at.day }.first
-      @execute_at = change_to_property_and_move_up(property: next_day, property_sym: :days)
-      # reset minute when execute in freture and not configured minute
-      @execute_at = @execute_at.change(min: 0) unless cron_config.minutes_configured?
+      # reset hour if configured cron hour
+      @execute_at = @execute_at.change(hour: basis_datetime.hour) if @execute_at.hour >= basis_datetime.hour
+      next_day = cron_config.days.select { |config_day| config_day >= execute_at.day }.first
+      check_hash = { day: next_day.presence || cron_config.days[0], hour: execute_at.hour, min: execute_at.min }
+      # Do not change the time if it is a future time or other than the specified value
+      if cron_config.days.exclude?(execute_at.day) || changed_basis_datetime_future?(check_hash)
+        @execute_at = change_to_property_and_move_up(property: next_day, property_sym: :days)
+        # reset minute when execute in freture and not configured minute, hour
+        @execute_at = @execute_at.change(min: 0) unless cron_config.minutes_configured?
+        @execute_at = @execute_at.change(hour: 0) unless cron_config.minutes_configured?
+      end
     end
 
     def next_wday
       return unless cron_config.wdays_configured?
+      @execute_at = @execute_at.change(hour: basis_datetime.hour) if @execute_at.hour >= basis_datetime.hour
       next_wday = cron_config.wdays.select { |config_wday| config_wday > execute_at.wday }.first
       next_wday_sym = next_wday ? WDAYS[next_wday] : WDAYS[cron_config.wdays.first]
       @execute_at = execute_at.next_occurring(next_wday_sym)
-      # reset minute when execute in freture and not configured minute
+      # reset minute when execute in freture and not configured minute, hour
       @execute_at = @execute_at.change(min: 0) unless cron_config.minutes_configured?
+      @execute_at = @execute_at.change(hour: 0) unless cron_config.minutes_configured?
     end
 
     def next_month
       return unless cron_config.months_configured?
-      next_month = cron_config.months.select { |config_month| config_month > execute_at.month }.first
-      @execute_at = change_to_property_and_move_up(property: next_month, property_sym: :months)
-      # reset minute when execute in freture and not configured minute
-      @execute_at = @execute_at.change(min: 0) unless cron_config.minutes_configured?
+      @execute_at = @execute_at.change(hour: basis_datetime.hour) if @execute_at.hour >= basis_datetime.hour
+      next_month = cron_config.months.select { |config_month| config_month >= execute_at.month }.first
+      check_next_month = next_month.presence || cron_config.months[0]
+      check_hash = { month: check_next_month, day: execute_at.day, hour: execute_at.hour, min: execute_at.min }
+      # Do not change the time if it is a future time or other than the specified value
+      if cron_config.months.exclude?(execute_at.month) || changed_basis_datetime_future?(check_hash)
+        @execute_at = change_to_property_and_move_up(property: next_month, property_sym: :months)
+        # reset minute when execute in freture and not configured minute, hour, day
+        @execute_at = @execute_at.change(min: 0) unless cron_config.minutes_configured?
+        @execute_at = @execute_at.change(hour: 0) unless cron_config.hours_configured?
+        @execute_at = @execute_at.change(day: 1) unless cron_config.days_configured?
+      end
+    end
+
+    def changed_basis_datetime_future?(check_hash)
+      execute_at <= basis_datetime.change(check_hash)
     end
 
     def change_to_property_and_move_up(property:, property_sym:)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cron_config_parser
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Madogiwa
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-21 00:00:00.000000000 Z
+date: 2019-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport