cronspeak 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8168d5636c84fbe53bd754a9a0da21316e32bd6e
-  data.tar.gz: 4d26cf71856166a857a5f0dd56488b5214f04868
+  metadata.gz: 2b4b7a0ba7777f11fc5a11179f51e27dc7a8061f
+  data.tar.gz: 66bd312c008506aae67a5d8292790351d5fe5037
 SHA512:
-  metadata.gz: 04d332af1cef61eb10a734a2d59227e93d941fa8100424e57749ec8ca43ec461c6509565986c258af90dab8d32bb8f6ad609522482561955328633c7fc5986c9
-  data.tar.gz: b9cc50148546e2c125d2d564a19aa7920428cbbdd870c01a7b04a14b960718577367876973e5a37adc90b9c3579210abce2ee46d29e3d5fa1b3c5262ba9e3cc1
+  metadata.gz: 5b419fde882bb07a5bf215c1071a876f4a22cab941666b428b828d80ae65b79cfd1b0c63e8a889b959c184529781d32e9fbb4d777b0fe9d07e9c18d119b7f1a7
+  data.tar.gz: 8ff63549378d549e7b4ade1c669acf1a88f9a171a3c0e4b734091de66ef5d215f13134aec490a2348b3bba2cb149725b5d79d5a7b398a97db41f08e53a46efcd

checksums.yaml.gz.sig

@@ -1,2 +1 @@
-Z���ъU�4���2��zԛ����`:\��4ӰW|���pg����q]H��B�@�
����[���X�����>v��5���1kPȮX�½;Pht�'���!oˆ�B���+�*��ّP��5�VhT��S�j�eX��@p.׵zхs��I�;�[�����#dF듹��Jc
-u�T.{�U2ꐪ����b����F�l��I�8
�w�����c�|f�m��z���7��G7hUa�p�~V�d
+��"��]�)/{	��Ĭ
�/�#dK0�TA��������"�nO`��ɨ2�Xy�N��-�&S�G�b��ieV�_��'G��4���Ծ�e*��b�qPH�2H7Nnj 5ҚK�v����%���fHl��}�϶yƓ�u��2���\���Y��NHN�?���*�N|�_����;�,*��>���/�{��k�m�X�8�6���9���o�a$��Q(�=G�1�

data/lib/cronspeak.rb

@@ -26,7 +26,13 @@ class CronSpeak
     @count = 0
     m, h, d, mon, raw_dow = s.scan(/([\d,\*-\/]+)\s*/).flatten(1)
     dow(raw_dow)
-    @to_s = [mins(m), hrs(h), days(d), months(mon)].join
+
+    @to_s = if m+h =~ /^\d+$/ then
+      [Time.parse(h + ':' + m)\
+                     .strftime("%l:%M%P ").lstrip, days(d), months(mon)].join
+    else
+      [mins(m), hrs(h), days(d), months(mon)].join
+    end
 
   end
 
@@ -35,12 +41,14 @@ class CronSpeak
   def mins(m='*')
 
     r = if m == '*' then
-      'every minute'
+      'every minute of '
     elsif m[/^\*\//]
       m = m[/^\*\/(\d+)/,1]      
-      "every %s minute" % [m.to_i.ordinal]
+      "every %s minute of " % [m.to_i.ordinal]
+    elsif m =~ /,/
+      "%s minutes of " % m.split(/,/).map {|x| x.to_i.ordinal }.join(' and ')
     else
-      "%s minute" % [m.to_i.ordinal]
+      "%s minute of " % [m.to_i.ordinal]
     end
 
     return r
@@ -49,12 +57,17 @@ class CronSpeak
   def hrs(h='*')
 
     r = if h == '*' then
-      ' of every hour' 
+      'every hour' 
     elsif h[/^\*\//]
       h = h[/^\*\/(\d+)/,1]      
       " of every %s hour" % [h.to_i.ordinal]
+    elsif h =~ /,/
+      "%s" % h.split(/,/)\
+        .map {|x| Time.parse(x+':00').strftime("%l%P").lstrip }.join(' and ')
+    elsif h =~ /,/
+      "%s of " % h.split(/,/).map {|x| x.to_i.ordinal }.join(' and ')
     else
-      " of %s%s" % [h, Time.parse(h+':00').strftime("%P")]
+      "%s" % [Time.parse(h+':00').strftime("%l%P").lstrip]
     end
     
     @count += 2
@@ -72,6 +85,9 @@ class CronSpeak
       d = d[/^\*\/(\d+)/,1]      
       @count += 4
       " of every %s day" % [d.to_i.ordinal] 
+    elsif d =~ /,/
+      @count += 8
+      "the %s of " % d.split(/,/).map {|x| x.to_i.ordinal }.join(' and ')
     else
       @count += 4
       " the %s" % [d.to_i.ordinal]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cronspeak
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - James Robertson