fugit 1.1.6 → 1.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 43d809bb38ebcb6023200f72d6805c838582c2e5
-  data.tar.gz: 487f5c3dd2da3a7a6607432c8350012278bf3fa9
+  metadata.gz: 06b510a4263280ff9bccbc45da080d66aaceeedc
+  data.tar.gz: db42c613d90cb57152159bab92a0c6175df06872
 SHA512:
-  metadata.gz: a22e4bf53a63a6bf12fa219a0aeb862e13adc21f48fb0c4ae429873057c57a29a238b42d95aad0ea3717003ed7235c329f98248a01ccdec78d8a911f5d8b7faa
-  data.tar.gz: 5607348dd17a19e43c39f62497c1b9c224f02ad693a7c6cce3edb19285010fc669cc131ffcfa2454f186405b6fdf17d82680dd6a7baa8bed530ca89cd313b8c5
+  metadata.gz: a430e9a966158192af7d58658a96841e838f9c1a5c36c640552d4a3681c3126a33589be6591863d093af444727a8a53a49cdead95e71648bbf875451f6355d85
+  data.tar.gz: ddfb07e67ed544e8bbe2c4d4f18c44f4f681399f1ab8726b86eed1a23b73947895437bc5d200b11f14fa57bfc7beeb127e61e91ec9855dcb2b8e7a23a6b4f084

data/CHANGELOG.md

@@ -2,6 +2,13 @@
 # CHANGELOG.md
 
 
+## fugit 1.1.7  released 2019-01-15
+
+* Add breaker to Cron #next_time / #previous_time, gh-13
+* Prevent 0 as a month in crons, gh-10
+* Prevent 0 as a day of month in crons, gh-10
+
+
 ## fugit 1.1.6  released 2018-09-05
 
 * Ensure `Etc/GMT-11` and all Olson timezone names are recognized

data/CREDITS.md

@@ -1,12 +1,14 @@
 
 # fugit credits
 
-* Nils Mueller https://github.com/Tolsto missing Olson timezone names, gh-9
-* jakemack https://github.com/jakemack issue when going out of DST, gh-6
-* Cristian Bica https://github.com/cristianbica Nat improvements, gh-7
+* Wenhui Wang https://github.com/w11th #next_time vs Chronic+ActiveSupport #11
+* Lin-Jen Shin https://github.com/godfat #next_time untamed loop, #13
+* Nils Mueller https://github.com/Tolsto missing Olson timezone names, #9
+* jakemack https://github.com/jakemack issue when going out of DST, #6
+* Cristian Bica https://github.com/cristianbica Nat improvements, #7
 * Utilum https://github.com/utilum silenced Ruby warnings
 * Tero Marttila https://github.com/SpComb added missing Cron#seconds
-* Harry Lascelles https://github.com/hlascelles timezone reminder
+* Harry Lascelles https://github.com/hlascelles timezone reminder and more
 * John Mettraux https://github.com/jmettraux author and maintainer
 
 

data/LICENSE.txt

@@ -1,5 +1,5 @@
 
-Copyright (c) 2017-2018, John Mettraux, jmettraux+flor@gmail.com
+Copyright (c) 2017-2019, John Mettraux, jmettraux+flor@gmail.com
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/Makefile

@@ -35,5 +35,18 @@ spec:
 test: spec
 
 
-.PHONY: count_lines gemspec_validate name cw build push spec
+## specific to project ##
+
+info:
+	uname -a
+	bundle exec ruby -v
+	bundle exec ruby -Ilib -r et-orbi -e "EtOrbi._make_info"
+
+tzones:
+	bundle exec ruby -r tzinfo -e "TZInfo::Timezone.all.each { |tz| p tz.name }"
+#tzonesd:
+#	bundle exec ruby -r tzinfo -r tzinfo-data -e "::TZInfo::Timezone.all.each { |tz| p tz.name }"
+
+
+.PHONY: count_lines gemspec_validate name cw build push spec info tzones
 

data/fugit.gemspec

@@ -41,9 +41,10 @@ Time tools for flor and the floraison project. Cron parsing and occurrence compu
     # this dependency appears in 'et-orbi'
 
   s.add_runtime_dependency 'raabro', '~> 1.1'
-  s.add_runtime_dependency 'et-orbi', '~> 1.1', '>= 1.1.6'
+  s.add_runtime_dependency 'et-orbi', '~> 1.1', '>= 1.1.7'
 
   s.add_development_dependency 'rspec', '~> 3.7'
+  s.add_development_dependency 'chronic', '~> 0.10'
 
   s.require_path = 'lib'
 end

data/lib/fugit.rb

@@ -1,7 +1,7 @@
 
 module Fugit
 
-  VERSION = '1.1.6'
+  VERSION = '1.1.7'
 end
 
 require 'time'

data/lib/fugit/cron.rb

@@ -43,7 +43,7 @@ module Fugit
       def do_parse(s)
 
         parse(s) ||
-        fail(ArgumentError.new("not a cron string #{s.inspect}"))
+        fail(ArgumentError.new("invalid cron string #{s.inspect}"))
       end
     end
 
@@ -166,19 +166,39 @@ module Fugit
       hour_match?(t) && min_match?(t) && sec_match?(t)
     end
 
+    BREAKER_S = 41 * (365 + 1) * 24 * 3600
+      # 41 years and a few days... there wont'be a next or a previous time
+
     def next_time(from=::EtOrbi::EoTime.now)
 
       from = ::EtOrbi.make_time(from)
       sfrom = from.strftime('%F/%T')
+      ifrom = from.to_i
 
       t = TimeCursor.new(from.translate(@timezone))
         #
         # the translation occurs in the timezone of
         # this Fugit::Cron instance
 
+      ti = 0
+      stalling = false
+
       loop do
 
-        (from.to_i == t.to_i) && (t.inc(1); next)
+        ti1 = t.to_i
+
+        fail RuntimeError.new(
+          "loop stalled for #{@original.inspect} #next_time, breaking"
+        ) if stalling && ti == ti1
+
+        stalling = (ti == ti1)
+        ti = ti1
+
+        fail RuntimeError.new(
+          "too many loops for #{@original.inspect} #next_time, breaking"
+        ) if (ti - ifrom).abs > BREAKER_S
+
+        (ifrom == ti) && (t.inc(1); next)
         month_match?(t) || (t.inc_month; next)
         day_match?(t) || (t.inc_day; next)
         hour_match?(t) || (t.inc_hour; next)
@@ -186,7 +206,7 @@ module Fugit
         sec_match?(t) || (t.inc_sec(@seconds); next)
 
         st = t.time.strftime('%F/%T')
-        (from, sfrom = t.time, st; next) if st == sfrom
+        (from, sfrom, ifrom = t.time, st, t.time.to_i; next) if st == sfrom
           #
           # when transitioning out of DST, this prevents #next_time from
           # yielding the same literal time twice in a row, see gh-6
@@ -203,11 +223,28 @@ module Fugit
     def previous_time(from=::EtOrbi::EoTime.now)
 
       from = ::EtOrbi.make_time(from)
+      ti = 0
+      ifrom = from.to_i
+
       t = TimeCursor.new(from.translate(@timezone))
+      stalling = false
 
       loop do
-#p [ :l, Fugit.time_to_s(t.time) ]
-        (from.to_i == t.to_i) && (t.inc(-1); next)
+
+        ti1 = t.to_i
+
+        fail RuntimeError.new(
+          "loop stalled for #{@original.inspect} #previous_time, breaking"
+        ) if stalling && ti == ti1
+
+        stalling = (ti == ti1)
+        ti = ti1
+
+        fail RuntimeError.new(
+          "too many loops for #{@original.inspect} #previous_time, breaking"
+        ) if (ifrom - ti).abs > BREAKER_S
+
+        (ifrom == ti) && (t.inc(-1); next)
         month_match?(t) || (t.dec_month; next)
         day_match?(t) || (t.dec_day; next)
         hour_match?(t) || (t.dec_hour; next)
@@ -237,6 +274,7 @@ module Fugit
           t = EtOrbi.make_time("#{year}-01-01") - 1
           t0 = nil
           t1 = nil
+
           loop do
             t1 = next_time(t)
             deltas << (t1 - t).to_i if t0
@@ -484,8 +522,8 @@ module Fugit
 
       def core_mos(i); rex(:mos, i, /[0-5]?\d/); end # min or sec
       def core_hou(i); rex(:hou, i, /(2[0-4]|[01]?[0-9])/); end
-      def core_dom(i); rex(:dom, i, /(-?(3[01]|[012]?[0-9])|last|l)/i); end
-      def core_mon(i); rex(:mon, i, /(1[0-2]|0?[0-9]|#{MONTHS[1..-1].join('|')})/i); end
+      def core_dom(i); rex(:dom, i, /(-?(3[01]|[12][0-9]|0?[1-9])|last|l)/i); end
+      def core_mon(i); rex(:mon, i, /(1[0-2]|0?[1-9]|#{MONTHS[1..-1].join('|')})/i); end
       def core_dow(i); rex(:dow, i, /([0-7]|#{WEEKDS.join('|')})/i); end
 
       def dow_hash(i); rex(:hash, i, /#(-?[1-5]|last|l)/i); end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fugit
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.1.7
 platform: ruby
 authors:
 - John Mettraux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-04 00:00:00.000000000 Z
+date: 2019-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: raabro
@@ -33,7 +33,7 @@ dependencies:
         version: '1.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.6
+        version: 1.1.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -43,7 +43,7 @@ dependencies:
         version: '1.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.6
+        version: 1.1.7
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -58,6 +58,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.7'
+- !ruby/object:Gem::Dependency
+  name: chronic
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
 description: Time tools for flor and the floraison project. Cron parsing and occurrence
   computing. Timestamps and more.
 email: