cronex 0.11.0 → 0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba036396e2d9547853a5b7ea2fd71e951a7553c4939771493b5fe66b14f6850d
-  data.tar.gz: 0106175d262f6897fc826fd4b4a9b67126ae854e31417d8071ab06b412bb92bf
+  metadata.gz: 5326f654a688b504da9a79818cc3ae5c9e5b36797246ef53d8311946543c5432
+  data.tar.gz: 5609b37b9e49f3a850937df6c912236e737def16c397a556fa549e173867aab3
 SHA512:
-  metadata.gz: 53f41387e3df259309bf46ab5fccbb7e12484007cd95692545e2c725f9081d404699284e7691184a32674fcb7474ca8b0362bbebea8f8cfd7332cc60863e1c0a
-  data.tar.gz: 7f97a2b9c76f68538e72681165c958788ccb3f70b938b7eea06c0a58181301a88205d3092ec20ff78b481f4c10b84722724bbc4b5bf8dc1e294466d4bf2bf9f4
+  metadata.gz: c2a0b1c000223a3c63c6b74c3f479a6be6e21534db10c7abaac4c329d11b5c06d425173c82f527ffef0f333e1a632974bceaf520f5fbe21f82c63a490a46c3cd
+  data.tar.gz: d80c695bbac875c1fc77ab5681e56261aa5161327baa6c45110b050156448f8a8bf7fa89762a59fec7809b2ef113483137629cddedf88b979105d239c26dd420

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+### [0.11.1] - 2020-10-21
+* Fix two consecutive commas in interval expressions
+
 ### [0.11.0] - 2020-10-05
 * Fix handling L in day of month expressions
 

data/README.md

@@ -18,7 +18,7 @@ Original Author & Credit: Brady Holt (http://www.geekytidbits.com).
  * Supports printing to locale specific human readable format
  * Supports displaying times in specific timezones
 
-For a quick intro to cron see Quartz [Cron Tutorial](http://www.quartz-scheduler.org/documentation/quartz-1.x/tutorials/crontrigger).
+For a quick intro to cron see Quartz [Cron Tutorial](http://www.quartz-scheduler.org/documentation/quartz-2.3.0/tutorials/crontrigger.html).
 
 ## Available Locales
 

data/lib/cronex/description/base.rb

@@ -12,11 +12,11 @@ module Cronex
       ['/', '-', ',']
     end
 
-    def segment_description(expression, all_description)
+    def segment_description(expression, all_values_description)
       if expression.empty? || expression == '0'
         desc = ''
       elsif expression == '*'
-        desc = all_description
+        desc = all_values_description
       elsif !Cronex::Utils.include_any?(expression, special_chars)
         desc = format(description_format(expression), single_item_description(expression))
       elsif expression.include?('/')
@@ -26,10 +26,12 @@ module Cronex
         if segments[0].include?('-')
           between_segment_of_interval = segments[0]
           between_segments = between_segment_of_interval.split('-')
-          desc += ', ' + format(
+          between = format(
             between_description_format(between_segment_of_interval),
             single_item_description(between_segments[0]),
             single_item_description(between_segments[1]).gsub(':00', ':59'))
+          desc += ', ' if !between.start_with?(', ')
+          desc += between
         elsif !Cronex::Utils.include_any?(segments[0], special_chars + ['*'])
           desc += ', ' + format(starting_description_format(segments[0]), single_item_description(segments[0]))
         end

data/lib/cronex/version.rb

@@ -1,3 +1,3 @@
 module Cronex
-  VERSION = '0.11.0'
+  VERSION = '0.11.1'
 end

data/spec/exp_descriptor_de_spec.rb

@@ -298,6 +298,10 @@ module Cronex
         'Alle 2 Minuten, Minuten 00 bis 30 nach der vergangenen Stunde, um 5:00 PM, Montag bis Freitag')
     end
 
+    it 'every x days with interval' do
+      expect(desc('30 7 1-L/2 * *')).to eq('Um 7:30 AM, Alle 2 Tagen, zwischen Tag 1 und der letzte Tag des Monats')
+    end
+
     it 'one year only with seconds' do
       expect(desc('* * * * * * 2013')).to eq('Jede Sekunde, nur in 2013')
     end

data/spec/exp_descriptor_en_spec.rb

@@ -298,6 +298,10 @@ module Cronex
         'Every 2 minutes, minutes 00 through 30 past the hour, at 5:00 PM, Monday through Friday')
     end
 
+    it 'every x days with interval' do
+      expect(desc('30 7 1-L/2 * *')).to eq('At 7:30 AM, every 2 days, between day 1 and the last day of the month')
+    end
+
     it 'one year only with seconds' do
       expect(desc('* * * * * * 2013')).to eq('Every second, only in 2013')
     end

data/spec/exp_descriptor_fr_spec.rb

@@ -298,6 +298,10 @@ module Cronex
         "Tous les 2 minutes, minutes 00 à 30 après l'heure, à 5:00 PM, lundi à vendredi")
     end
 
+    it 'every x days with interval' do
+      expect(desc('30 7 1-L/2 * *')).to eq('À 7:30 AM, tous les 2 jours, entre le jour 1 et le dernier jour du mois')
+    end
+
     it 'one year only with seconds' do
       expect(desc('* * * * * * 2013')).to eq('Chaque seconde, seulement en 2013')
     end

data/spec/exp_descriptor_it_spec.rb

@@ -298,6 +298,10 @@ module Cronex
         'Ogni 2 minuti, dal minuto 00 al 30 dopo l\'ora, alle(ai) 5:00 PM, da lunedì a venerdì')
     end
 
+    it 'every x days with interval' do
+      expect(desc('30 7 1-L/2 * *')).to eq('Alle(ai) 7:30 AM, ogni 2 giorni, tra il giorno 1 e il ultimo giorno del mese')
+    end
+
     it 'one year only with seconds' do
       expect(desc('* * * * * * 2013')).to eq('Ogni secondo, solo a(nel) 2013')
     end

data/spec/exp_descriptor_pt_BR_spec.rb

@@ -298,6 +298,10 @@ module Cronex
         'A cada 2 minutos, entre 00 e 30 minutos após a hora, 5:00 PM, de segunda-feira a sexta-feira')
     end
 
+    it 'every x days with interval' do
+      expect(desc('30 7 1-L/2 * *')).to eq('Às 7:30 AM, a cada 2 dias, entre os dias 1 e último dia do mês')
+    end
+
     it 'one year only with seconds' do
       expect(desc('* * * * * * 2013')).to eq('A cada segundo, em 2013')
     end

data/spec/exp_descriptor_ro_spec.rb

@@ -298,6 +298,10 @@ module Cronex
         'La fiecare 2 minute, între minutele 00 și 30, la 5:00 PM, de luni până vineri')
     end
 
+    it 'every x days with interval' do
+      expect(desc('30 7 1-L/2 * *')).to eq('La 7:30 AM, la fiecare 2 zile, între zilele 1 și ultima zi a lunii')
+    end
+
     it 'one year only with seconds' do
       expect(desc('* * * * * * 2013')).to eq('În fiecare secundă, numai în 2013')
     end

data/spec/exp_descriptor_ru_spec.rb

@@ -298,6 +298,10 @@ module Cronex
         'Каждые 2 минут, минуты с 00 по 30, в 5:00 PM, понедельник - пятница')
     end
 
+    it 'every x days with interval' do
+      expect(desc('30 7 1-L/2 * *')).to eq('В 7:30 AM, каждые 2 дня(ей), между 1 днем и последним днем месяца')
+    end
+
     it 'one year only with seconds' do
       expect(desc('* * * * * * 2013')).to eq('Каждую секунду, только 2013')
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cronex
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.11.1
 platform: ruby
 authors:
 - Adrian Kazaku
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-04 00:00:00.000000000 Z
+date: 2020-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tzinfo