fugit 1.7.0 → 1.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea7cc032d87a0f7ae6b3d1c10b78b3a51ed489db18a1c8dd63f52ef05cfb165f
-  data.tar.gz: 737984c5dfc4898ce0db368b63ddc8768feb5a88a02406dcb2ba17990e6e04ba
+  metadata.gz: d28dc94bc31e025df55b67c79f2f59eed365940872e287479e788cb9023178dd
+  data.tar.gz: 6f8d62b8d8921831a4de92d60a23c4cf83cfe79eea852c625744951156cb3d05
 SHA512:
-  metadata.gz: 41f17852170b61062dabba069888f8e6323a9f58df21fb00855b151f9312c15bbc8dbcfdad9afc3704a5c0033ff753880c8cbc89b0886be620766637bc934486
-  data.tar.gz: 47381199f997c6ad29d65eb1364fe5f931f025f32ef94c2c9c07badfa34a29aad9b8854c97b36151db7d0b976d053079e14f1411050107920cf15928c6d97300
+  metadata.gz: 3afc5fd6553abed3c73d7526e25b871ba0f5f26b8f415fccfec183b261e5ccb4e9f3fc6b176b550fa47de385f8991efe08936d2d96d6951a15dba81533f2ebcc
+  data.tar.gz: e5cbdb64a9f6ee28e8f938c76dcdf44211ce751ca0dc1834d669b8494e40424fb7c5e8e98f7eb608e8855c29648b9c99e9faf06436ab05a795a87bffc771118c

data/CHANGELOG.md

@@ -2,6 +2,18 @@
 # CHANGELOG.md
 
 
+## fugit 1.7.2 released 2022-11-03
+
+* Fix 'every day at 12:15 am', gh-81
+* Fix 'every day at 5:00pm', gh-81
+
+
+## fugit 1.7.1 released 2022-09-21
+
+* Change behaviour for "0 0/5 * * *", gh-79
+  go "every 5h start hour 0", previous behaviour only triggered at hour 0
+
+
 ## fugit 1.7.0 released 2022-09-15
 
 * Introduce the & cron syntax (day-of-month AND day-of-week), gh-78

data/CREDITS.md

@@ -1,6 +1,8 @@
 
 # fugit credits
 
+* ski-nine, https://github.com/ski-nine, gh-81
+* Joseph Halter, https://github.com/JosephHalter, gh-79
 * James Healy, https://github.com/yob, gh-76
 * John Bachir, https://github.com/jjb, gh-74
 * Vivek Miyani, https://github.com/vivekmiyani, gh-71

data/README.md

@@ -399,6 +399,36 @@ Fugit::Nat.parse('every day at 16:15 nada 18:30', multi: true)
 `"Every day at midnight"` is supported, but `"Every monday at midnight"` will be interpreted (as of Fugit <= 1.4.x) as `"Every monday at 00:00"`. Sorry about that.
 
 
+### 12 AM and PM
+
+How does fugit react with `"12 am"`, `"12 pm"`, `"12 midnight"`, etc?
+
+```ruby
+require 'fugit'
+
+p Fugit.parse('every day at 12am').original  # ==> "0 0 * * *"
+p Fugit.parse('every day at 12pm').original  # ==> "0 12 * * *"
+
+p Fugit.parse('every day at 12:00am').original   # ==> "0 0 * * *"
+p Fugit.parse('every day at 12:00pm').original   # ==> "0 12 * * *"
+p Fugit.parse('every day at 12:00 am').original  # ==> "0 0 * * *"
+p Fugit.parse('every day at 12:00 pm').original  # ==> "0 12 * * *"
+p Fugit.parse('every day at 12:15am').original   # ==> "15 0 * * *"
+p Fugit.parse('every day at 12:15pm').original   # ==> "15 12 * * *"
+p Fugit.parse('every day at 12:15 am').original  # ==> "15 0 * * *"
+p Fugit.parse('every day at 12:15 pm').original  # ==> "15 12 * * *"
+
+p Fugit.parse('every day at 12 noon').original         # ==> "0 12 * * *"
+p Fugit.parse('every day at 12 midnight').original     # ==> "0 24 * * *"
+p Fugit.parse('every day at 12:00 noon').original      # ==> "0 12 * * *"
+p Fugit.parse('every day at 12:00 midnight').original  # ==> "0 24 * * *"
+p Fugit.parse('every day at 12:15 noon').original      # ==> "15 12 * * *"
+p Fugit.parse('every day at 12:15 midnight').original  # ==> "15 24 * * *"
+
+  # as of fugit 1.7.2
+```
+
+
 ## LICENSE
 
 MIT, see [LICENSE.txt](LICENSE.txt)

data/fugit.gemspec

@@ -32,7 +32,7 @@ Time tools for flor and the floraison project. Cron parsing and occurrence compu
   s.files = Dir[
     'README.{md,txt}',
     'CHANGELOG.{md,txt}', 'CREDITS.{md,txt}', 'LICENSE.{md,txt}',
-    'Makefile',
+    #'Makefile',
     'lib/**/*.rb', #'spec/**/*.rb', 'test/**/*.rb',
     "#{s.name}.gemspec",
   ]

data/lib/fugit/cron.rb

@@ -509,8 +509,6 @@ module Fugit
 
       sta, edn, sla = r
 
-      sla = nil if sla == 1 # don't get fooled by /1
-
       edn = max if sla && edn.nil?
 
       return [ nil ] if sta.nil? && edn.nil? && sla.nil?
@@ -525,6 +523,8 @@ module Fugit
 
     def range(min, max, sta, edn, sla)
 
+      return [ nil ] if sta == min && edn == max && sla == 1
+
       fail ArgumentError.new(
         'both start and end must be negative in ' +
         { min: min, max: max, sta: sta, edn: edn, sla: sla }.inspect

data/lib/fugit/nat.rb

@@ -176,6 +176,7 @@ module Fugit
         #'every week on monday 18:23' => '23 18 * * 1',
         #
         # every month on the 1st
+        #
       def on(i)
         seq(:on, i, :_on, :on_objects)
       end
@@ -196,12 +197,6 @@ module Fugit
         seq(nil, i, :_in_or_on, '?', :tz)
       end
 
-      def digital_hour(i)
-        rex(
-          :digital_hour, i,
-          /(2[0-4]|[0-1]?[0-9]):([0-5][0-9])([ \t]*(am|pm))?/i)
-      end
-
       def ampm(i)
         rex(:ampm, i, /[ \t]*(am|pm|noon|midday|midnight)/i)
       end
@@ -209,6 +204,13 @@ module Fugit
         rex(:dark, i, /[ \t]*dark/i)
       end
 
+      def digital_h(i)
+        rex(:digital_h, i, /(2[0-4]|[0-1]?[0-9]):([0-5][0-9])/i)
+      end
+      def digital_hour(i)
+        seq(:digital_hour, i, :digital_h, :ampm, '?')
+      end
+
       def simple_h(i)
          rex(:simple_h, i, /#{(0..24).to_a.reverse.join('|')}/)
       end
@@ -451,20 +453,24 @@ module Fugit
       end
 
       def rewrite_tz(t)
+
         slot(:tz, t.string)
       end
 
       def rewrite_weekday(t)
+
         Fugit::Cron::Parser::WEEKDS.index(t.string[0, 3].downcase)
       end
 
       def rewrite_weekdays(t)
+
 #Raabro.pp(t, colours: true)
         slot(:weekday, _rewrite_subs(t, :weekday))
       end
       alias rewrite_on_weekdays rewrite_weekdays
 
       def rewrite_to_weekday(t)
+
         wd0, wd1 = _rewrite_subs(t, :weekday)
         #wd1 = 7 if wd1 == 0
         slot(:weekday, "#{wd0}-#{wd1}")
@@ -475,21 +481,35 @@ module Fugit
         slot(:monthday, "#{md0}-#{md1}")
       end
 
-      def adjust_h(h, ap)
-        h = h.to_i
-        ap = ap || ''
-        (h < 12 && ap == 'pm' || ap == 'midnight') ? h + 12 : h
+      # Try to follow https://en.wikipedia.org/wiki/12-hour_clock#Confusion_at_noon_and_midnight
+      #
+      def adjust_h(h, m, ap)
+
+        if ap == 'midnight' && h == 12
+          24
+        elsif ap == 'pm' && h < 12 # post meridian
+          h + 12
+        elsif ap == 'am' && h == 12 # ante meridian
+          0
+        else
+          h
+        end
       end
 
       def rewrite_digital_hour(t)
-        h, m, ap = t.strinpd.split(/[: \t]+/)
-        h, m = adjust_h(h, ap), m.to_i
+
+        h, m = t.sublookup(:digital_h).strinpd.split(':').collect(&:to_i)
+        ap = t.sublookup(:ampm)
+        h, m = adjust_h(h, m, ap && ap.strinpd), m
+
         slot(:hm, h, m)
       end
 
       def rewrite_simple_hour(t)
+
         h, ap = t.subgather(nil).collect(&:strinpd)
-        h = adjust_h(h, ap)
+        h = adjust_h(h.to_i, 0, ap)
+
         slot(:hm, h, 0)
       end
 
@@ -501,12 +521,10 @@ module Fugit
 
         h = ht.strinp
         m = mt ? mt.strinp : 0
-#p [ 0, '-->', h, m ]
         h = NHOURS[h]
         m = NMINUTES[m] || m
-#p [ 1, '-->', h, m ]
 
-        h = adjust_h(h, apt && apt.strinpd)
+        h = adjust_h(h, m, apt && apt.strinpd)
 
         slot(:hm, h, m)
       end

data/lib/fugit.rb

@@ -3,7 +3,7 @@
 
 module Fugit
 
-  VERSION = '1.7.0'
+  VERSION = '1.7.2'
 end
 
 require 'time'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fugit
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.7.2
 platform: ruby
 authors:
 - John Mettraux
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-15 00:00:00.000000000 Z
+date: 2022-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: raabro
@@ -83,7 +83,6 @@ files:
 - CHANGELOG.md
 - CREDITS.md
 - LICENSE.txt
-- Makefile
 - README.md
 - fugit.gemspec
 - lib/fugit.rb
@@ -102,7 +101,7 @@ metadata:
   bug_tracker_uri: https://github.com/floraison/fugit/issues
   homepage_uri: https://github.com/floraison/fugit
   source_code_uri: https://github.com/floraison/fugit
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -118,7 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.6
-signing_key: 
+signing_key:
 specification_version: 4
 summary: time tools for flor
 test_files: []

data/Makefile

@@ -1,55 +0,0 @@
-
-## gem tasks ##
-
-NAME = \
-  $(shell ruby -e "s = eval(File.read(Dir['*.gemspec'][0])); puts s.name")
-VERSION = \
-  $(shell ruby -e "s = eval(File.read(Dir['*.gemspec'][0])); puts s.version")
-
-count_lines:
-	find lib -name "*.rb" | xargs cat | ruby -e "p STDIN.readlines.count { |l| l = l.strip; l[0, 1] != '#' && l != '' }"
-	find spec -name "*_spec.rb" | xargs cat | ruby -e "p STDIN.readlines.count { |l| l = l.strip; l[0, 1] != '#' && l != '' }"
-cl: count_lines
-
-scan:
-	scan lib/**/*.rb
-
-gemspec_validate:
-	@echo "---"
-	ruby -e "s = eval(File.read(Dir['*.gemspec'].first)); p s.validate"
-	@echo "---"
-
-name: gemspec_validate
-	@echo "$(NAME) $(VERSION)"
-
-cw:
-	find lib -name "*.rb" -exec ruby -cw {} \;
-
-build: gemspec_validate
-	gem build $(NAME).gemspec
-	mkdir -p pkg
-	mv $(NAME)-$(VERSION).gem pkg/
-
-push: build
-	gem push --otp "$(OTP)" pkg/$(NAME)-$(VERSION).gem
-
-spec:
-	bundle exec rspec
-test: 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 scan gemspec_validate name cw build push spec info tzones
-