cron_config_parser 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dbc1edeff71f699025ba9d6821319ccf0fb7070b6162d08359f6f80996672dca
-  data.tar.gz: 86ddd6f709afa0a42a935ad1ac2fe7aa46643ee75b0c47adb1fe3b7f394d73e6
+  metadata.gz: db6d213a9e546d2a205cfa9d33d8379d6ebdd700e57ed92223849df51617dd00
+  data.tar.gz: 617ad627ff951edb6dd964856ef0ad52046059f302de8acf8b87d1d3044c3349
 SHA512:
-  metadata.gz: c047af12dbc736dec3ea0df5df321da98eef3d3ce77c48072a779193fa6354c61abd47b04580417773ae2a892ed46893d0b2d120224674af606cc7acc3ae02c1
-  data.tar.gz: fa4b863a04e751653d8237e407d789645203ca441219baf32632d64b416936db3e5beadb5075c2a6ab09fda296af8b9d6564bc421f7a8526960c07a350984330
+  metadata.gz: 368313c9f355a836757b1052bf5e44c39af15ce0aba840e5912ddacba24d69bc21819438d5de1475f9c5da69713e203d12820a83da54d9e1ccedb485badf8530
+  data.tar.gz: 64b590e2b6cfa54dd8c742471705cfa461792d92ed2c2c8090289599961ed0b247c5d41113f23930d4e98db1b24461776815f323bd55e4fe156980d0eecd2e61

data/Gemfile.lock

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

data/README.md

@@ -32,7 +32,7 @@ CronConfigParser.call('00 5 * * * Asia/Tokyo')
  @wdays=["*"]>
 ```
 
-enable check configured properties.
+You can check configured properties.
 
 ``` ruby
 # return false if configured nil or '*'
@@ -43,20 +43,21 @@ config.days_configured?
 => false
 ```
 
-enable check next execute time.
+You can check next execute time.
 
 ``` ruby
 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')
+
+# You can check execute schedule in future by execute_schedule.
+config.execute_schedule(execute_count: 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.
@@ -82,6 +83,12 @@ CronConfigParser.call('00 5,a * * * Asia/Tokyo', validation: false)
  @wdays=["*"]>
 ```
 
+## Code Status
+
+[![Gem Version](https://badge.fury.io/rb/cron_config_parser.svg)](https://badge.fury.io/rb/cron_config_parser)
+
+[![Build Status](https://travis-ci.com/Madogiwa0124/cron_config_parser.svg?branch=master)](https://travis-ci.com/Madogiwa0124/cron_config_parser)
+
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/Madogiwa0124/cron_config_parser. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.

data/lib/cron_config_parser.rb

@@ -134,15 +134,31 @@ module CronConfigParser
 
     def call
       next_minute
+      return execute_at if returnable?
       next_hour
+      return execute_at if returnable?
       next_day
+      return execute_at if returnable?
       next_wday
+      return execute_at if returnable?
       next_month
       execute_at
     end
 
     private
 
+    # check calculated next execution date by below conditions
+    # 1.execute_at is future.(remove default add 1 minutes)
+    # 2.propaty is not configured or propaty include configured values.
+    def returnable?
+      execute_at.ago(1.minute) > basis_datetime \
+      && (!cron_config.minutes_configured? || cron_config.minutes.include?(execute_at.min)) \
+      && (!cron_config.hours_configured? || cron_config.hours.include?(execute_at.hour)) \
+      && (!cron_config.days_configured? || cron_config.days.include?(execute_at.day)) \
+      && (!cron_config.wdays_configured? || cron_config.wdays.include?(execute_at.wday)) \
+      && (!cron_config.months_configured? || cron_config.months.include?(execute_at.month))
+    end
+
     def prepare_cron_config
       @cron_config.minutes = parse_config_property(:minutes)
       @cron_config.hours   = parse_config_property(:hours)
@@ -156,11 +172,13 @@ module CronConfigParser
     end
 
     def parse_config_property(property_sym)
-      cron_config.send(property_sym).map do |property|
+      result = cron_config.send(property_sym).map do |property|
         next to_i(property) unless property.match?(/\/|-/)
         next parse_for_devided_config(property, property_sym) if property.include?('/')
         next parse_for_range_config(property) if property.include?('-')
       end.flatten.uniq.sort
+      result.delete(60)
+      result
     end
 
     def parse_for_devided_config(property, property_sym)
@@ -181,62 +199,42 @@ 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
       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
+      @execute_at = change_to_property_and_move_up(property: next_hour, property_sym: :hours)
+      # reset minute when execute in freture and not configured minute
+      reset_execute_at(min: 0)
     end
 
     def next_day
       return unless cron_config.days_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
+      @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
+      reset_execute_at(min: 0, hour: 0)
     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, 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?
+      reset_execute_at(min: 0, hour: 0)
     end
 
     def next_month
       return unless cron_config.months_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
+      @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
+      reset_execute_at(min: 0, hour: 0, day: 1)
     end
 
-    def changed_basis_datetime_future?(check_hash)
-      execute_at <= basis_datetime.change(check_hash)
+    def reset_execute_at(min: execute_at.min, hour: execute_at.hour, day: execute_at.day)
+      @execute_at = @execute_at.change(min: min) unless cron_config.minutes_configured?
+      @execute_at = @execute_at.change(hour: hour) unless cron_config.hours_configured?
+      @execute_at = @execute_at.change(day: day) unless cron_config.days_configured?
     end
 
     def change_to_property_and_move_up(property:, property_sym:)

data/lib/cron_config_parser/version.rb

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

metadata

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