cron_format 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d71309cad3ce363f9caa6acb54bd9db812dc478
-  data.tar.gz: b31861bc243bf0a1fdf435c35f463c1aceb89a37
+  metadata.gz: 68d7f091de5a9dd5f4c75422b84c041db74258c9
+  data.tar.gz: 071ecfa7aad169c864ce1a67ffd5424c0227b302
 SHA512:
-  metadata.gz: 704219aeee5658b323c3c3d38c436b8a7bce7fcfa110f01bbc177266b40df2581345cf83193f9978499d86e34fa4f6e50239063bb35a4fd56436433c2c12d533
-  data.tar.gz: 3680a1f37ba2e619ba2afa8909b615834d80a771cfcf761a1745d6c5321fe85b97b2c7ba5a6d304a2b379c6503a4de026fdea2001686117a6e36d661c71a7c89
+  metadata.gz: 0062418d22527232e7d93a9a3294963d8c42924f0bb81139754a12f82e07bbb590e0402735145478eb4377a29c2ee95cc36855f31c91ffdc5c7e77ef0eaa2f6b
+  data.tar.gz: 7c3306a11ba674ac0b5017f79874b8dd08f51b0cb3dba4523aa8aa29fab62fea6de4961c3de74980c1fa5ae1e0dfa2dab829e022b2b29bbbbe30078ae2e37247

data/lib/cron_format.rb

@@ -9,6 +9,8 @@ require 'time'
 MINUTE = 60
 HOUR = MINUTE * 60
 DAY = HOUR * 24
+TF = "%s-%s-%s %s:%s"
+
 
 class Array
 
@@ -51,7 +53,7 @@ class CronFormat
     month_proc = lambda {|t1,n|
       a = t1.to_a
       a[4] = a[4] + n <= 12 ? a[4] + n  : a[4] + n - 12
-      t = Time.parse("%s-%s-%s %s:%s" % a.values_at(5,4,3,2,1,0))
+      t = Time.parse(TF % a.values_at(5,4,3,2,1,0))
       t -= DAY until t.month == a[4]
       return t
     }
@@ -78,17 +80,17 @@ class CronFormat
     units = @to_time.to_a.values_at(1..4) + [nil, @to_time.year]
       
     procs = {
-      min: lambda{|x, interval| x += (interval * MINUTE).to_i},
-      hour: lambda{|x, interval| x += (interval * HOUR).to_i},
-      day: lambda{|x, interval| x += (interval * DAY).to_i}, 
-      month: lambda{|x, interval| 
+        min: lambda {|x, interval| x += (interval * MINUTE).to_i},
+       hour: lambda {|x, interval| x += (interval * HOUR).to_i},
+        day: lambda {|x, interval| x += (interval * DAY).to_i}, 
+      month: lambda {|x, interval| 
          date = x.to_a.values_at(1..5)
          interval.times { date[3].succ! }
-         Time.parse("%s-%s-%s %s:%s" % date.reverse)},
-      year: lambda{|x, interval| 
+         Time.parse(TF % date.reverse)},
+       year: lambda {|x, interval| 
          date = x.to_a.values_at(1..5)
          interval.times { date[4].succ! }
-         Time.parse("%s-%s-%s %s:%s" % date.reverse)}
+         Time.parse(TF % date.reverse)}
     }
 
     dt = units.map do |start|
@@ -113,12 +115,13 @@ class CronFormat
       raw_units << v1
       repeaters << v2
     end
-
-    raw_units[4].gsub!(/(sun|mon|tues|wed|thurs|fri|satur|sun)(day)?|tue|thu|sat/) do |x|
+    
+    r = /(sun|mon|tues|wed|thurs|fri|satur|sun)(day)?|tue|thu|sat/i
+    raw_units[4].gsub!(r) do |x|
       a = %w(sunday monday tuesday wednesday thursday friday saturday)
       a.index a.grep(/#{x}/i).first
     end
-
+    
     raw_date = raw_units.map.with_index {|x,i| dt[i].call(x) }
     
     # expand the repeater
@@ -137,6 +140,7 @@ class CronFormat
       end
     end  
    
+    
     dates = raw_date.inflate
     
     a = dates.map do |date|
@@ -147,11 +151,11 @@ class CronFormat
       d << year
 
       next unless day_valid? d.reverse.take 3
-      t = Time.parse("%s-%s-%s %s:%s" % d.reverse)
+      t = Time.parse(TF % d.reverse)
         
       if t < @to_time and wday and wday != t.wday then
         d[2], d[3] = @to_time.to_a.values_at(3,4).map(&:to_s)
-        t = Time.parse("%s-%s-%s %s:%s" % d.reverse)
+        t = Time.parse(TF % d.reverse)
         t += DAY until t.wday == wday.to_i
       end
 
@@ -159,7 +163,7 @@ class CronFormat
       while t < @to_time and i >= 0 and raw_a[i][/\*/]
 
         d[i] = @to_time.to_a[i+1].to_s
-        t = Time.parse("%s-%s-%s %s:%s" % d.reverse)
+        t = Time.parse(TF % d.reverse)
         i -= 1
       end
 
@@ -169,11 +173,11 @@ class CronFormat
           # increment the year
 
           d[4].succ!
-          t = Time.parse("%s-%s-%s %s:%s" % d.reverse)
+          t = Time.parse(TF % d.reverse)
 
           if repeaters[4] then
             d[4].succ!
-            t = Time.parse("%s-%s-%s %s:%s" % d.reverse)
+            t = Time.parse(TF % d.reverse)
           end
         elsif t.day < @to_time.day and raw_a[3] == '*' then
 
@@ -184,7 +188,7 @@ class CronFormat
             d[3] = '1'
             d[4].succ!
           end
-          t = Time.parse("%s-%s-%s %s:%s" % d.reverse)
+          t = Time.parse(TF % d.reverse)
         elsif  (t.hour < @to_time.hour or (t.hour == @to_time.hour \
           and t.min < @to_time.min and raw_a[1] != '*') ) \
             and raw_a[2] == '*' then

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cron_format
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   9DFxFCS6sgAw21S+V+ym9ft8kbqgy7zOGdPRRNlwgb/V+UWqH4yaCtk7yJT+n8vm
   LHkRlhnm0ScZYw==
   -----END CERTIFICATE-----
-date: 2013-07-08 00:00:00.000000000 Z
+date: 2013-07-11 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: 

metadata.gz.sig

@@ -1,2 +1 @@
-Hr�nb�ܟ��Ǿ��C���_�5�]��zM��%s\�w����^�_��Q9��)�,V�~���I�2,�t)݁�����}	�2�_,�� O����)QE�A�D�σ��Z���o�W'����k�u���}Y��
mE��wX-3��F=�n��x��)U��ԐKcwI
-��G�shw���k��@.�H�9b��I:��x����{q\�����)߇�y~��tA(���4�
+��@�#v�N%�ng�3�In���\<4���MTF�L�Ԟ�o��5i��['�