cronspeak 0.1.6 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b48ca04c5db37a5257d2ea8cc6f1ba312a87a4f6
-  data.tar.gz: 87b13a3016a874fb2fde426160aab10b1f1c7e33
+  metadata.gz: df8bd5c0ec37ff03435123527aed4d6b91617c6d
+  data.tar.gz: add6f5b6d785e22ccbcaf5d00c1d2b4f1cfbf470
 SHA512:
-  metadata.gz: f6d79fb18d64a2a53c8128cc8cf904b808548d0be2c196c0a97a3b9d85214b37132008c748221c6f3483eae2924c3735d6a318808b440e9cfab78c6a1dedbf12
-  data.tar.gz: b8388d7c30bd5d5d1578efcebbc7c24a530ef0b80d44ae09e521bb76ed1c619f99303d9bd8e69d7e13653bf7735ff3b8360ee50708ce2aaf1f020b2ba233f6c4
+  metadata.gz: 56d8bbc77f4e9b418be69b109603bd480d4567141287d920fcbd9a0471cd1d680326ab9ec7fd6a8ef144d1cb9b470366ba2e0ec3ceb63c44b150d102bb695de3
+  data.tar.gz: 5b4b65e42751d75241e147ec9657b5117c5a13e9b2047dffa3df2064f587ab3b29b071ab875efa09e260aed4dd2910e8f486afb7efcf973de7d54e8f8e4b8b3a

data/lib/cronspeak.rb

@@ -6,7 +6,7 @@ require 'date'
 require 'time'
 
 module Ordinal
-  refine Fixnum do
+  refine Integer do
 
     def ordinal
       self.to_s + ( (10...20).include?(self) ? 'th' : 
@@ -25,7 +25,7 @@ class CronSpeak
 
     @count = 0
     m, h, d, mon, raw_dow = s.scan(/([\d,\*-\/]+)\s*/).flatten(1)
-    dow(raw_dow)
+    @dow = dow(raw_dow)
 
     @to_s = if m+h =~ /^\d+$/ then
       [Time.parse(h + ':' + m)\
@@ -39,13 +39,11 @@ class CronSpeak
   private
 
   def mins(m='*')
-
-    return 'every minute of ' if m == '*'
       
-    r = case m
+    case m
+    when /^\*$/ then 'every minute of '
     when /^\*\//
-      m = m[/^\*\/(\d+)/,1]      
-      "every %s minute of " % [m.to_i.ordinal]
+      "every %s minute of " % [m[/^\*\/(\d+)/,1].to_i.ordinal]
     when /,/
       "%s minutes of " % m.split(/,/).map {|x| x.to_i.ordinal }.join(' and ')
     when /\-/
@@ -55,7 +53,6 @@ class CronSpeak
       "%s minute of " % [m.to_i.ordinal]
     end
 
-    return r
   end
 
   def hrs(h='*')
@@ -65,9 +62,7 @@ class CronSpeak
     @count += 2    
 
     return case h  
-    when /^\*\//
-      h = h[/^\*\/(\d+)/,1]      
-      " of every %s hour" % [h.to_i.ordinal]
+    when /^\*\// then " of every %s hour" % [h[/^\*\/(\d+)/,1].to_i.ordinal]
     when /,/
       h.split(/,/)\
         .map {|x| Time.parse(x+':00').strftime("%l%P").lstrip }.join(' and ')
@@ -87,12 +82,10 @@ class CronSpeak
     return " %s in " % @dow if @count >= 8
       
     return case d
-    when /^\*$/ then
-      ' every day'
+    when /^\*$/ then ' every day'
     when/^\*\//
-      d = d[/^\*\/(\d+)/,1]      
       @count += 4
-      " of every %s day" % [d.to_i.ordinal] 
+      " of every %s day" % [d[/^\*\/(\d+)/,1].to_i.ordinal] 
     when /,/
       @count += 8
       "the %s of " % d.split(/,/).map {|x| x.to_i.ordinal }.join(' and ')
@@ -118,15 +111,13 @@ class CronSpeak
         s + 'every month'
       end
 
-    when /^\*\//
-      mon = mon[/^\*\/(\d+)/,1]      
-      @count += 16
-      " of every %s month" % [mon.to_i.ordinal] 
+    when /^\*\// then " of every %s month" % [mon[/^\*\/(\d+)/,1].to_i.ordinal]
     when /,/
       " of %s" % mon.split(/,/)\
                         .map {|x| Date::MONTHNAMES[x.to_i] }.join(' and ')  
     when /\-/
-      " of %s" % mon.split('-',2).map {|x| Date::MONTHNAMES[x.to_i] }.join(' through ')
+      " of %s" % mon.split('-',2).map {|x| Date::MONTHNAMES[x.to_i] }\
+                                                          .join(' through ')
     else
       s = @count < 8 ? 'of ' : ''
       " %s%s" % [s, Date::MONTHNAMES[mon.to_i]]
@@ -139,9 +130,8 @@ class CronSpeak
 
   def dow(raw_dow='*')
  
-    @dow = case raw_dow
-    when /^\*$/
-      ''
+    case raw_dow
+    when /^\*$/ then ''
     when /,/
       @count += 8
       raw_dow.split(/,/).map {|x| Date::DAYNAMES[x.to_i] + 's' }.join(' and ')
@@ -161,4 +151,4 @@ end
 if __FILE__ == $0 then
   cs = CronSpeak.new(ARGV[0])
   cs.to_s
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cronspeak
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.2.0
 platform: ruby
 authors:
 - James Robertson
@@ -12,26 +12,26 @@ cert_chain:
   -----BEGIN CERTIFICATE-----
   MIIDljCCAn6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBIMRIwEAYDVQQDDAlnZW1t
   YXN0ZXIxHjAcBgoJkiaJk/IsZAEZFg5qYW1lc3JvYmVydHNvbjESMBAGCgmSJomT
-  8ixkARkWAmV1MB4XDTE0MDcyODE4NTUxMVoXDTE1MDcyODE4NTUxMVowSDESMBAG
+  8ixkARkWAmV1MB4XDTE2MTIyNTExMDUyOFoXDTE3MTIyNTExMDUyOFowSDESMBAG
   A1UEAwwJZ2VtbWFzdGVyMR4wHAYKCZImiZPyLGQBGRYOamFtZXNyb2JlcnRzb24x
   EjAQBgoJkiaJk/IsZAEZFgJldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-  ggEBAKorHaDyE7nD6g5weJEzNGGMylBxB8ZhQonaw7VosHaTNr9/T8DTQIL7JC2g
-  jiiYGD2x6xtsmcTG98IsiKO+hOcNF/6KNCKv9azDUkKHHJSng59Zd8ISuOg3fLjW
-  ZXKk9amtpnpXgLam4EirZVZxznBWrIwoG6tyZ2tpW7xyv5Cg4GZLi+UcrcTTOJdq
-  agm85xEc3oBySaZ1F+uZp8ZtLlr9GNiEmBQVt+nVTaneimsyUwvm2c3eM/3uZsGS
-  UIFEK1GqyeMVaZD0bjpSjq3Nh5djRPYs2MTjGTMc9wntbxIaKTbZU95c0mgwSndL
-  xGM/Hk9+/bhMK0J4WIBx/ZKdtjcCAwEAAaOBijCBhzAJBgNVHRMEAjAAMAsGA1Ud
-  DwQEAwIEsDAdBgNVHQ4EFgQU66tf+rrpbCVVkwTnF2FmrLrVdlYwJgYDVR0RBB8w
+  ggEBALJHpi/M38k6ruxjjNS5hyeMfHdue0pRe+9VXCq0I2Js625gOXrZxn/TUP0K
+  MswRd+O7BwY3Xf9SM0Co5MMwdVSYUbKDlcWZOxFmdSBK51tuGZaO/g+SYmJAYHnq
+  erjp0Cm4C+5h5kcclRlaUki1OmVE+8YA6c+VLUNN4neu03RgjqTq9OM45jXAkKV9
+  Qzh0REO77g5KpJYLSBHbCvqU3gqDJTURajC0lGI1Hvp4KvMdHdAqRMwilucpwkde
+  l7jgKTSidoDrlZtsgH+pVXXSMsCrqduZYLzAOfJkmMpY8QbQonhPjhG4dRoSXePB
+  1nOPPa+Rb3GJno5ZR3sLlKwQXwECAwEAAaOBijCBhzAJBgNVHRMEAjAAMAsGA1Ud
+  DwQEAwIEsDAdBgNVHQ4EFgQUiCnOrbmIEXzqcgIAxn4fhUhVCnAwJgYDVR0RBB8w
   HYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1h
-  c3RlckBqYW1lc3JvYmVydHNvbi5ldTANBgkqhkiG9w0BAQUFAAOCAQEAhiJ2lyRp
-  vcYZ4wg7DHbArQfL0te4sVoVWFN2lSg4gel0ZzRDh0qrQWRPIIwLnrPmpb/hfguF
-  QWpyQzV92VYhHKni+Mx9uIAuo4PJnTn+pYJx2zQNUNlbHrKRm1Iwj7BSLq8XA3mG
-  SvHwmahqNXG3+14ZLba+/BqFbGuXarK6/Axl0S0wwueU1OcgnAe4UE2jf2mwBXBB
-  +DIJ5eEj8jLgRhNjkuG8vxHIaJ+NNr6maOFFQ4iu+qKSgioVl5L62UI/6f/4DTiN
-  /qxj4jzSVHouRW0P3Zn5Ksu2Nr182B5rd4vXuOR2ZgSLjWu8iQUgGG6Mz6U+bTUO
-  Qz3ThjR4bQCxiQ==
+  c3RlckBqYW1lc3JvYmVydHNvbi5ldTANBgkqhkiG9w0BAQUFAAOCAQEAGSacZFdF
+  lR4osZTsPRJxn0RS6CCPaKh3x+KRQYByv7p1HeaJkkSUCgLX7uQRMzOTUuwgc2Mm
+  GhsestRbEx+ca4tItWMW9FdI53LiAsBEq6ZXQP1Okmx+fnk+0X/j5V48Mi3R9HCI
+  sNYDsJGiIRPADTdc147zus01akntBjX49+eM0OKtqWNgjjGT9tkTpmcq7jmnajRs
+  13pQ3IadRY6jGO7rbP4lUYGiqyM+u9OhL7GNy6QPBl7cdShaVBiqU0qcWPGtbpfS
+  BTR26NhGRU/X5PkLwUPyCglk9XZwTESJOHI81rH9qg6mT9hvVnSsmfzu+QxaZDDv
+  RwIL6sS1+XxVzw==
   -----END CERTIFICATE-----
-date: 2014-07-30 00:00:00.000000000 Z
+date: 2016-12-25 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: james@r0bertson.co.uk
@@ -60,9 +60,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Translates a cron expression into natural language
 test_files: []
-has_rdoc: