cron_format 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c876978dc3f4b5ceacd3d314d1a8184c123a184c
-  data.tar.gz: 00c674f845160a27ee3696ccda6c11c7557e3cdf
+  metadata.gz: 3c5c6f011a03923600318a6a64ea5b641cd0355d
+  data.tar.gz: 6e83610d7fc452f921a90009da3c75192669b36f
 SHA512:
-  metadata.gz: 98586dbd16b8644edd4c24fbb5297c19e0bf9141bb768d4ffc7ff48af5a23829b710f0565db7b6511521a7b9f0ea627d88bdcb7df1bb62416687b5012c5ead9d
-  data.tar.gz: d3187eaff6b8a6e01d3efc044eb005bba7d50c9cb09ae9ab9ca2991f278ce567f5f4927787e8561c163db17fd61aa5174f470fdc290a743fdc8cb0550b4ee2d0
+  metadata.gz: 63b4f3dd0d85709480e0ff391f7589ddc3484f470f7faf7439955aab4a444e12cb6b076d4a74d438635f9b07b7b03a91e69d161600112ab633ef17b12f930d5c
+  data.tar.gz: 03cbe6fa7d0327236bb37d774fcc6ddd008943f87127dd4716747e7f86ebd379d5520209587c8d294fe380fb002cbd4fca3343169276a6b70848280cb222b5e1

data/lib/cron_format.rb

@@ -23,8 +23,8 @@ class CronFormat
   end
   
   def next()
-
-    nudge() unless @cron_string =~ %r{/}
+    
+    nudge() #unless @cron_string =~ %r{/}
     parse()
   end
   
@@ -33,13 +33,24 @@ class CronFormat
   def nudge()
 
     a  =  @cron_string.split
-    val = a.detect{|x| x != '*'}
+    
+    val = if @cron_string =~ %r{/} then
+      a.reverse.detect{|x| x[/\//]}
+    else
+      a.detect{|x| x != '*'}
+    end
+    
     index, n = 0, 1
 
     if val then
       index = a.index(val)
       r = val[/\/(\d+)$/,1]     
-      n = r.to_i if r
+
+      n =  if r then
+        r.to_i * 7 if index == 4
+      else
+        val.to_i
+      end
     end
 
     month_proc = lambda {|t1,n|
@@ -61,7 +72,6 @@ class CronFormat
     ]
 
     r = units[index].call @to_time, n
-
     @to_time = r
 
   end    
@@ -89,7 +99,7 @@ class CronFormat
       end
       
       @to_time += HOUR until @to_time.hour == hours.to_i if hours[/^\d+$/]
-    end
+    end    
     
     if wday[/^[0-6]$/] and @to_time.wday != wday.to_i then
       @to_time += DAY until @to_time.wday == wday.to_i
@@ -181,7 +191,7 @@ class CronFormat
       end
     end  
 
-    dates = inflate(raw_date)
+    dates = inflate(raw_date)    
 
     a = dates.map do |date|
 

metadata

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