cronex 0.11.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba036396e2d9547853a5b7ea2fd71e951a7553c4939771493b5fe66b14f6850d
-  data.tar.gz: 0106175d262f6897fc826fd4b4a9b67126ae854e31417d8071ab06b412bb92bf
+  metadata.gz: 27e7637c0b490441441238824af2bd3a54c6f263e88acc9490ee20190c852258
+  data.tar.gz: bc2e41a12f8a15f21d50cffa2fef998647b8cc7e3429e2b4b5b7297d83d02c02
 SHA512:
-  metadata.gz: 53f41387e3df259309bf46ab5fccbb7e12484007cd95692545e2c725f9081d404699284e7691184a32674fcb7474ca8b0362bbebea8f8cfd7332cc60863e1c0a
-  data.tar.gz: 7f97a2b9c76f68538e72681165c958788ccb3f70b938b7eea06c0a58181301a88205d3092ec20ff78b481f4c10b84722724bbc4b5bf8dc1e294466d4bf2bf9f4
+  metadata.gz: a73574bad6da9bfa391897a9a34f86ec3353718406da131faaa2af8f7b63a5f6f7694a45f67f47b24ff352179798c9342e21966f9104ed423c00dae41e144539
+  data.tar.gz: '081dbbc263ed70ab9f6f514f3359f17df56c270ff1eea91a72b197426c31b6403bd10d4020e7289b6b9f7cc64069714d3decd1e43481e6a6384ec0601472169f'

data/.github/workflows/test.yml

@@ -0,0 +1,20 @@
+---
+name: Test
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: [2.5, 2.6, 2.7]
+    name: Ruby ${{ matrix.ruby-version }}
+    steps:
+      - uses: actions/checkout@v2
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+      - run: bundle install
+      - run: bundle exec rake

data/.travis.yml

@@ -3,7 +3,6 @@ language: ruby
 cache: bundler
 
 rvm:
-  - 2.3
-  - 2.4
   - 2.5
   - 2.6
+  - 2.7

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+### [0.12.0] - 2023-04-16
+* Add "strict_quartz" option for Java Quartz implementation (quartz-scheduler)
+
+### [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

@@ -1,7 +1,7 @@
 # Cronex
 
 [![Gem Version](https://badge.fury.io/rb/cronex.svg)](https://badge.fury.io/rb/cronex)
-[![Build Status](https://travis-ci.org/alpinweis/cronex.svg?branch=master)](https://travis-ci.org/alpinweis/cronex)
+[![Build Status](https://github.com/alpinweis/cronex/actions/workflows/test.yml/badge.svg?branch=master)](https://github.com/alpinweis/cronex/actions/workflows/test.yml?query=branch%3Amaster)
 
 A Ruby library that converts cron expressions into human readable strings.
 Translated to Ruby from [cron-expression-descriptor](https://github.com/bradyholt/cron-expression-descriptor) (C#) via
@@ -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
 
@@ -70,6 +70,11 @@ Or install it yourself as:
     => Every minute between 4:00 AM and 4:10 AM # PDT or
     => Every minute between 3:00 AM and 3:10 AM # PST
 
+### Strict quartz-scheduler implementation support
+
+    Cronex::ExpressionDescriptor.new('* * * * *', strict_quartz: true).description
+    => Cronex::ExpressionError (Error: Expression only has 5 parts. For 'strict_quartz' option, at least 6 parts are required)
+
 See spec tests for more examples.
 
 ### Contributing

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/exp_descriptor.rb

@@ -13,6 +13,7 @@ module Cronex
     zero_based_dow: true,
     use_24_hour_time_format: false,
     throw_exception_on_parse_error: true,
+    strict_quartz: false,
     locale: nil,
     timezone: nil
   }

data/lib/cronex/parser.rb

@@ -27,6 +27,7 @@ module Cronex
       if len < 5
         fail ExpressionError, "Error: Expression only has #{len} parts. At least 5 parts are required"
       elsif len == 5
+        fail ExpressionError, "Error: Expression only has 5 parts. For 'strict_quartz' option, at least 6 parts are required" if options[:strict_quartz]
         # 5 part CRON so shift array past seconds element
         parsed_parts.insert(1, *parts)
       elsif len == 6

data/lib/cronex/version.rb

@@ -1,3 +1,3 @@
 module Cronex
-  VERSION = '0.11.0'
+  VERSION = '0.12.0'
 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
@@ -386,6 +390,12 @@ module Cronex
       end
     end
 
+    context 'strict_quartz' do
+      it '5 part cron fails' do
+        expect { desc('* * * * *', strict_quartz: true) }.to raise_error(Cronex::ExpressionError)
+      end
+    end
+
     context 'timezone' do
       it 'minute span' do
         tz = TZInfo::Timezone.get('America/Los_Angeles')

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.12.0
 platform: ruby
 authors:
 - Adrian Kazaku
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-04 00:00:00.000000000 Z
+date: 2023-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tzinfo
@@ -87,6 +87,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
@@ -148,7 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: Ruby library that converts cron expressions into human readable strings