cron2english 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a01772090289d43ea8107377b683a0060305a5f
-  data.tar.gz: bdc98b43514bc72d2d4344d28af64e267df367f2
+  metadata.gz: 5f0c4fdb001bf4e32751f5ff92f76cf720fcdd2b
+  data.tar.gz: a20937a800f0cf8f79c00bad5cde785fe07a4e6c
 SHA512:
-  metadata.gz: a0d4fa4d5ac9e52c47cb270a0adb4c71ea2cf14cd54ddb14533b555f33ef5c57d55e620521928da88f2a8cb76d63aa035f19f844d11954739ea529c164660d67
-  data.tar.gz: 6e0806962bbaa505730ce4b8edeb14c6fba085a1416fa49989da2ae251337a03a399b91b402aa857c2a3551e5c8ffa036406a5aba4605e3ecb4cb9200f0e4748
+  metadata.gz: 5635cdffe190d29b003b2b489a82824298d409d2ad6a2b053db9636790f8a97d3f2a6e85ae06a7f8c5c886076fcebb2241c8602471068b6e429e1b60a7b11192
+  data.tar.gz: 30b408ac1087d9b0f7c0a414f03f8e8b854e80c564f799d3395b35862262f2ed0a7a3b8861e711b098f81d17ae46f0407df8d47753ab119614a9a0a5081dde8c

data/README.md

@@ -27,7 +27,9 @@ Cron2English understands just about anything you'll find in a crontab, including
 * `1-9,15-30 * * * *`
 * `1-9/3,15-30/4 * * * *`
 * `1 2 3 4 mON`
+* `1 2 3 4 mON-fri`
 * `1 2 3 jan 5`
+* `1 2 3 jan-apr 5`
 * `@reboot`
 * `@yearly`
 * `@annually`

data/lib/cron2english/all.rb

@@ -65,17 +65,23 @@ module Cron2English
     end
 
     def process_trad(m, h, day_of_month, month, dow)
-      if month =~ MONTH_REGEX
-        month = MONTH2NUM[$1.downcase]
-      elsif month =~ MONTH_RANGE_REGEX
-        month = [$1, $2].map{|x| MONTH2NUM[x.downcase]}.join('-')
-      end
+      month = month.split(',').map{|month_part|
+        if month_part =~ MONTH_REGEX
+          month_part = MONTH2NUM[$1.downcase]
+        elsif month_part =~ MONTH_RANGE_REGEX
+          month_part = [$1, $2].map{|x| MONTH2NUM[x.downcase]}.join('-')
+        end
+        month_part
+      }.join(',')
       month = month.to_s if month
-      if dow =~ DOW_REGEX
-        dow = DOW2NUM[$1.downcase]
-      elsif dow =~ DOW_RANGE_REGEX
-        dow = [$1, $2].map{|d| DOW2NUM[d.downcase]}.join('-')
-      end
+      dow = dow.split(',').map{|dow_part|
+        if dow_part =~ DOW_REGEX
+          dow_part = DOW2NUM[$1.downcase]
+        elsif dow_part =~ DOW_RANGE_REGEX
+          dow_part = [$1, $2].map{|d| DOW2NUM[d.downcase]}.join('-')
+        end
+        dow_part
+      }.join(',')
       dow = dow.to_s if dow
       bits = [m, h, day_of_month, month, dow]
       unparseable = []

data/lib/cron2english/version.rb

@@ -1,3 +1,3 @@
 module Cron2English
-  VERSION = '0.1.5'
+  VERSION = '0.1.6'
 end

data/spec/parse_spec.rb

@@ -8,6 +8,7 @@ describe Cron2English do
     ["10 8 15 * *", ["8:10am on", "the 15th of", "every month"]],
     ["40 5 * * *", ["5:40am", "every day"]],
     ["50 6 * * 1", ["6:50am", "every Monday"]],
+    ["0 17 * * Fri", ["5pm", "every Friday"]],
     ["1 2 * apr mOn", ["2:01am", "every Monday in", "April"]],
     ["1 2 * apr mon-fri", ["2:01am", "every Monday through Friday in", "April"]],
     ["1 2 * apr-jun mOn", ["2:01am", "every Monday in", "from April to June"]],
@@ -19,6 +20,18 @@ describe Cron2English do
     ["1 2 3 jan mon", ["2:01am on", "the third of -- or every Monday in --", "January"]],
     ["1 2 3 4 mON", ["2:01am on", "the third of -- or every Monday in --", "April"]],
     ["1 2 3 jan 5", ["2:01am on", "the third of -- or every Friday in --", "January"]],
+    ["30 9 * 1-2 mon", ["9:30am", "every Monday in", "from January to February"]],
+    ["30 9 * 1,2 mon", ["9:30am", "every Monday in", "January and February"]],
+    ["30 9 * jan-feb mon", ["9:30am", "every Monday in", "from January to February"]],
+    ["30 9 * jan,feb mon", ["9:30am", "every Monday in", "January and February"]],
+    ["30 9 * 1-2,4 mon", ["9:30am", "every Monday in", "from January to February; and April"]],
+    ["30 9 * jan-feb,apr mon", ["9:30am", "every Monday in", "from January to February; and April"]],
+    ["30 9 * * 1-2", ["9:30am", "every Monday through Tuesday"]],
+    ["30 9 * * 1,2", ["9:30am", "every Monday or Tuesday"]],
+    ["30 9 * * Mon-Tue", ["9:30am", "every Monday through Tuesday"]],
+    ["30 9 * * Mon,Tue", ["9:30am", "every Monday or Tuesday"]],
+    ["30 9 * * 1-2,4", ["9:30am", "every Monday through Tuesday or Thursday"]],
+    ["30 9 * * Mon-Tue,Thu", ["9:30am", "every Monday through Tuesday or Thursday"]],
     ["@reboot", ["reboot"]],
     ["@yearly", ["yearly"]],
     ["@annually", ["annually"]],

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cron2english
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Paul A. Jungwirth
@@ -60,7 +60,6 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
-- .rvmrc
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt

data/.rvmrc

@@ -1,2 +0,0 @@
-rvm_gemset_create_on_use_flag=1
-rvm gemset use ruby-2.0.0-p247@cron2english