cron2english 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 318c80673ee9abd528b79ae2fe4d6f77cbfb5e28
-  data.tar.gz: 723cf67b3ef626af6ae467eab3ee937f72bba113
+  metadata.gz: b236d44027a4d50bf559893ebf8ae87cb0c4f248
+  data.tar.gz: 5d2f02db75a40f95f3f95fe8b35d017e8e8d39c8
 SHA512:
-  metadata.gz: 3c484d2755e34717f137b262b3275b7344a2463e7c1e88fdef153361d6c3143c1261d0c326948ab644b5e77ad1c57ba3eee90898f8f5bcba70292acea929f708
-  data.tar.gz: 6abe543ed6d611f736179f9937af9a74b2b186a970d562c7768fb0e0a138d2658eafe86cf4261260f02e6d2334236a3c1e14f21c03d56420777dcc224a4cc18e
+  metadata.gz: b900e08c5073587555f0aab42af39f053ec70e764ff582fc4149d895a11c3e50bf235348a52376e3a2f2899ac8be9a57dd4b31c5157045dda7a248e682d76c06
+  data.tar.gz: a6e29b4551d6d3f21e9c7019ec2b9149724c020e89e5b06f899a4d60cce82d51374b8275a344c230cb2ff93fca00c7ee54c2a1439ecac972f4201df778ebcfe2

data/lib/cron2english/all.rb

@@ -9,6 +9,7 @@ module Cron2English
   NUM2MONTH = Hash[(1..12).zip(MONTHS)]
   # unshift @months, '';    # What is this about??
   DOW_REGEX = %r{^(#{DAYS_OF_WEEK.join("|")})$}i
+  DOW_RANGE_REGEX = %r{^(#{DAYS_OF_WEEK.join("|")})-(#{DAYS_OF_WEEK.join("|")})$}i
   MONTH_REGEX = %r{^(#{MONTHS.join("|")}|)$}i
   NUM2MONTH_LONG = Hash[(1..12).zip(%w{January February March April May June July August September October November December})]
   NUM2DOW_LONG = %w{Sunday Monday Tuesday Wednesday Thursday Friday Saturday Sunday}
@@ -65,7 +66,11 @@ module Cron2English
     def process_trad(m, h, day_of_month, month, dow)
       month = MONTH2NUM[$1.downcase] if month =~ MONTH_REGEX
       month = month.to_s if month
-      dow = DOW2NUM[$1.downcase] if dow =~ DOW_REGEX
+      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.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.3'
+  VERSION = '0.1.4'
 end

data/spec/parse_spec.rb

@@ -9,6 +9,7 @@ describe Cron2English do
     ["40 5 * * *", ["5:40am", "every day"]],
     ["50 6 * * 1", ["6:50am", "every Monday"]],
     ["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 3 4 7", ["2:01am on", "the third of -- or every Sunday in --", "April"]],
     ["1-20/3 * * * *", ["every 3 minutes from 1 to 20 past", "every hour of", "every day"]],
     ["1,2,3 * * * *", ["1, 2, and 3 minutes past", "every hour of", "every day"]],

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cron2english
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Paul A. Jungwirth