cronspeak 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 090dd9e7057e945fcbc2a39dcba90a97caa8a8ea
-  data.tar.gz: 7b45c0fc3ded2d376feabf7084585d731038c281
+  metadata.gz: a38a73ad588e687432e4ca91c52118f8a14d0fed
+  data.tar.gz: 02918efd0b34f93fdd7b5600d3a99c0b203d09f0
 SHA512:
-  metadata.gz: ba5c62615e0adfdfdc01ab1aa0257e2503a553b9eb92f57fb4b80f247fcbf4e3e4190864e277913089c30af1e86eb33879837843f35060c4211b5cb0899d572b
-  data.tar.gz: 9ae42228ac8ee1243d7b49c996095c2a2072c4016d5274808d5723f2a755745d844271c69b61b673400500da2767a3fc9e896c7d9966ce1b8ed5616449bfd6b5
+  metadata.gz: 0ea71d0ad7375a1a22d6c029d57d76524dc9bc259ab174f4be469a63c1cc9ee37d038910194746dde85b35eb3868833c68a547d1d393a3d8fb0861039fc59bab
+  data.tar.gz: f77db0fea584cb18c8cf75687a9ceb07745ab039cd33c35b87cee3b4c04ad64effee4f53210d8c2cb52a90e0309dc9846c90fb1726ea2e3c54d39d05952fc9f0

data/lib/cronspeak.rb

@@ -33,7 +33,7 @@ class CronSpeak
   private
 
   def mins(m='*')
-    puts 'm : ' + m.inspect
+
     r = if m == '*' then
       'every minute'
     elsif m[/^\*\//]
@@ -46,10 +46,20 @@ class CronSpeak
     return r
   end
 
-  def hrs(h='*') 
-    return ' of every hour' if h == '*'
+  def hrs(h='*')
+
+    r = if h == '*' then
+      ' of every hour' 
+    elsif h[/^\*\//]
+      h = h[/^\*\/(\d+)/,1]      
+      " of every %s hour" % [h.to_i.ordinal]
+    else
+      " of %s%s" % [h, Time.parse(h+':00').strftime("%P")]
+    end
+    
     @count += 2
-    " of %s%s" % [h, Time.parse(h+':00').strftime("%P")]    
+
+    return r
   end
 
   def days(d='*') 
@@ -57,7 +67,11 @@ class CronSpeak
     r = if @count >= 8 then
       " %s in " % @dow
     elsif d == '*' then
-      ' every day' 
+      ' every day'
+    elsif d[/^\*\//]
+      d = d[/^\*\/(\d+)/,1]      
+      @count += 4
+      " of every %s day" % [d.to_i.ordinal] 
     else
       @count += 4
       " the %s of" % [d.to_i.ordinal]
@@ -69,11 +83,18 @@ class CronSpeak
   def months(mon='*') 
 
     r = if mon == '*' then
+
       if @count < 4 then
         '' 
       else
-        ' every month'
+        s = @count < 8 ? ' of' : ''
+        s + ' every month'
       end
+
+    elsif mon[/^\*\//]
+      mon = mon[/^\*\/(\d+)/,1]      
+      @count += 16
+      " of every %s month" % [mon.to_i.ordinal] 
     else
       s = @count < 8 ? 'of ' : ''
       " %s%s" % [s, Date::MONTHNAMES[mon.to_i]]

data.tar.gz.sig

@@ -1,2 +1,2 @@
-&���&���*�/\�*�_b��Kn�/��d�;���0���@��䌺R�b�1��<���z�ƅN�&��H�!�{c�x>�i�Ji�'J3چ_��M���{�@�>�ד�ʿV���4-~6)!��%O�V��B[����~o�R^��5��Tm��s�>�ROs�`��7�V�5��l��6�+W�kO�:R�r��%Q9k�}X
-=s6�u�z��ӈ:�	_�L��o��'l'�S-�����M�uPM�ҵiAk
+Y����y�uB�s���a�&�b}9�z?��/��9,��h/���zG�}��_�e�c
�ԇ����5��X�s=��^h��x��������s�зz;[�b��ּ.��@��;Ƨ�I6�:�U4��Hj��{5]��:���dB������V^氼�>n=��ڦ�-���nF�L���������яT�'���L~=�u[����e�P�^K�(�-�>����@*jbڔ��AE��C��8����N���
+�ħF2-�R

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cronspeak
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   /qxj4jzSVHouRW0P3Zn5Ksu2Nr182B5rd4vXuOR2ZgSLjWu8iQUgGG6Mz6U+bTUO
   Qz3ThjR4bQCxiQ==
   -----END CERTIFICATE-----
-date: 2014-07-28 00:00:00.000000000 Z
+date: 2014-07-29 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: james@r0bertson.co.uk