Merge pull request #88 from delbetu/parse-nat-support-last

Parse Nat support for 1st and last of the month
floraison · Sep 26, 2023 · d3d7984 · d3d7984
2 parents 051a7f2 + 8bec4b4
commit d3d7984
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/lib/fugit/nat.rb b/lib/fugit/nat.rb
@@ -691,8 +691,10 @@ def parse_cron(hm, opts)
         a << tz.data0 if tz
         a.shift if a.first == [ '0' ]
 
+        letters_first = ->(x) { x.is_a?(Numeric) ? x : 0 }
+
         s = a
-          .collect { |e| e.uniq.sort.collect(&:to_s).join(',') }
+          .collect { |e| e.uniq.sort_by(&letters_first).collect(&:to_s).join(',') }
           .join(' ')
 
         c = Fugit::Cron.parse(s)

diff --git a/spec/nat_spec.rb b/spec/nat_spec.rb
@@ -67,6 +67,8 @@
         'every month on the 1st and 2nd at 12:00 pm' => '0 12 1,2 * *',
         'every month on the 1st and the 2nd at 12:00 pm' => '0 12 1,2 * *',
         'every month on the 1st and the second at 12:00 pm' => '0 12 1,2 * *',
+        'every month on the 1st and last at 12:00 pm' => '0 12 L,1 * *',
+        'every month on the 1st and the last at 12:00 pm' => '0 12 L,1 * *',
           #
           # gh-57, 12pm --> noon