cron_format 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ebce971a3172e6d89ba2775731d78de3c474bed
-  data.tar.gz: 0d4636996d9774e16ec0eada15006eaa2ae8f502
+  metadata.gz: c57e56c6118c71ec947e6e8b204594d8849e3293
+  data.tar.gz: a40f45eb9830c5adedc8bf115c42464189337564
 SHA512:
-  metadata.gz: 5f1b7e3d60615e556b7f243d39e59c46f967818833adf72a934faf7311d4ed03bc52d4f47d34bb7d44812622ad81549f4d79017d0c70fd56133e100cd774745c
-  data.tar.gz: 24352852a4e28e5145b7fceac40d7eb698c41a8a0cc76246ec7724ff2ceac36b2e49a931fb98815926abbcf6c2016f000a71692f5a5a97ffb0a9fc6bd1f77764
+  metadata.gz: b8cf6fbc415bed166afe1c8b9373633eeb8134a07b66fe06de1e09303b53c5856d010fc378c46faa62eeb0c2f9384f1d6c22d15998acbb98d0e49cc0e997d42e
+  data.tar.gz: 2ba604ae1fb8ba9c56cc42112895f72e308092d861f01f847a15957ceaca7c5e9a133206b9f92afcbaf1d51ceac0bfaedd3942fd6fb378dabf4cf2f4f896869a

checksums.yaml.gz.sig

@@ -1,2 +1,2 @@
-!֑�i[�@�+��$�=
j
-��>��y!�#���NY�%:�O@�:��7
m��B�	y�oT{���吩ͷ��+�
+_�K�8���هv[8tg�����dO7�E��S�Z��
�'�0���pu��N����okDk<�ls
+ҡ�c<�=���j��" ��=���p`W�\�`W���6�s�/:����[~d/%a�B8EH�Rؑ��	tt5W��SI��`�P؉�

data/lib/cron_format.rb

@@ -34,8 +34,8 @@ class CronFormat
 
     a  =  @cron_string.split
     
-    val = if @cron_string =~ %r{/} then
-      a.reverse.detect{|x| x[/\//]}
+    val = if @cron_string =~ %r{[/,]} then
+      a.reverse.detect{|x| x[/[\/,]/]}
     else
       a.detect{|x| x != '*'}
     end
@@ -45,12 +45,19 @@ class CronFormat
     if val then
       index = a.index(val)
 
-      r = val[/\/(\d+)$/,1]     
+      r = val[/,|\/(\d+)$/,1]      
 
       n =  if r then
+      
         index == 4 ? r.to_i * 7 : 0
+        
       else
-        val.to_i
+                
+        if val =~ /,/ then
+          1
+        else
+          val.to_i
+        end
       end
     end
 
@@ -74,6 +81,7 @@ class CronFormat
     ]
 
     r = units[index].call @to_time, n
+
     @to_time = r
 
   end    

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cron_format
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   MmJuAQVfTk9wZd03YN619a64hLGIvud4ASW7UVAW0B4U0PcmbhHvne07e11jt7j5
   WwVcDIvT38Bo3hAt
   -----END CERTIFICATE-----
-date: 2015-03-04 00:00:00.000000000 Z
+date: 2015-03-11 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: james@r0bertson.co.uk