cron_format 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 16b339c6d41735353e8cf1268fd8faf1bef76e8c
-  data.tar.gz: bdf4d4506b8234269bc979096a8cb58545758255
+SHA256:
+  metadata.gz: 5ae188fa6fbdd52dfef8995dc0b9b1f164d036bd77e9a15c5e30e9acc5ae8575
+  data.tar.gz: 362ebbce43c0f775441efb0106a611b175cae5ecceccd803ebc8b583b92ae408
 SHA512:
-  metadata.gz: 8fd195d79177cdf7295dd15c35179b458914e0f6785999ce554bfc169dfb98dce90b155b5acce4a669662f56a10b026fba31ba31c0af6fdbcbbce30ea7b77365
-  data.tar.gz: 51e59d602b155bafa33692277762010bf21f563591a9d6fec6dc0fa4b3ef7e286f24e1a3ee8e1ba63a138d63f5fd92845b36612d9b5a8c1db6b4a724b82bd186
+  metadata.gz: 48cb5f44186323f31f2ed2d3cec40a0031955c4de6bd1a66cc19fb5ef05f30d3e6059f2788e786c75f3dffc9e1f088ae6253a87c7a333a3dd618f654d261dcb5
+  data.tar.gz: 4774ef323ddcdcc36f4313b2bd5ee91f5b5d2b5a8a5bdbb02c6fec79ce4e06b3bd806b34647ce6182eaf18492c58744a91ebae2ade7da3b929983c210b7e1dc5

data/lib/cron_format.rb

@@ -4,6 +4,7 @@
 
 require 'date'
 require 'time'
+require 'c32'
 
 
 MINUTE = 60
@@ -14,12 +15,17 @@ TF = "%s-%s-%s %s:%s"
 
 
 class CronFormat
+  using ColouredText
 
   attr_reader :to_time, :to_expression
 
   def initialize(cron_string, now=Time.now, debug: false)  
-    @cron_string, @to_time, @debug = cron_string, now, debug
+    
+    puts 'inside CronFormat'.info if debug
+    @cron_string, @now, @debug = cron_string, now, debug
+    @to_time = @now
     parse()
+    
   end
   
   # supply a Time object. Modifying the date can be helpful when 
@@ -51,7 +57,7 @@ class CronFormat
   def nudge()
 
     t1 = @to_time
-    puts 't1: ' + t1.inspect if @debug
+    puts ('t1: ' + t1.inspect).debug if @debug
     a  =  @cron_string.split
     
     val = if @cron_string =~ %r{[/,-]} then
@@ -62,7 +68,7 @@ class CronFormat
     
     index, n = 0, 1
     
-    puts 'val: ' + val.inspect if @debug
+    puts ('val: ' + val.inspect).debug if @debug
 
     if val then
       index = a.index(val)
@@ -83,7 +89,7 @@ class CronFormat
       end
     end
 
-    puts 'index: ' + index.inspect if @debug
+    puts ('index: ' + index.inspect).debug if @debug
     
     month_proc = lambda {|t1,n|
       a = t1.to_a
@@ -104,13 +110,13 @@ class CronFormat
     ]
     
     if @debug then
-      puts '@to_time: ' + @to_time.inspect 
-      puts 'n: ' + n.inspect
+      puts ('@to_time: ' + @to_time.inspect).debug
+      puts ('n: ' + n.inspect).debug
     end
     
     r = units[index].call @to_time, n
     
-    puts 'r: ' + r.inspect if @debug
+    puts ('r: ' + r.inspect).debug if @debug
     
     @to_time = if n > 1 then
     
@@ -125,6 +131,8 @@ class CronFormat
   end    
   
   def parse()
+    
+    puts ('0. @to_time: ' + @to_time.inspect).debug if @debug
 
     raw_a = @cron_string.split
     raw_a << '*' if raw_a.length <= 5 # add the year?
@@ -135,9 +143,28 @@ class CronFormat
                                                 @to_time.month == month.to_i
     end
     
+    puts ('1. @to_time: ' + @to_time.inspect).debug if @debug
+    
+    #
+    
+    if @debug then
+      puts ('1.5 @to_time: ' + @to_time.inspect).debug 
+      puts ('hours: ' + hours.inspect).debug
+      puts ('mins: ' + mins.inspect).debug
+    end
+    
     if mins[/^\d+$/] and hours[/^\d+$/] then
-      @to_time += MINUTE until @to_time.min == mins.to_i and \
-                                                  @to_time.hour == hours.to_i
+
+      if @to_time.to_date != @now.to_date then
+        @to_time = Time.local(@to_time.year, @to_time.month, @to_time.day)
+      end
+      
+      until (@to_time.min == mins.to_i and @to_time.hour == hours.to_i) \
+          or (@to_time - 1).isdst != @to_time.isdst do
+        
+        puts ('1.7 @to_time: ' + @to_time.inspect).debug if @debug
+        @to_time += MINUTE
+      end
       @to_time -= MINUTE
     else
       
@@ -147,7 +174,9 @@ class CronFormat
       end
       
       @to_time += HOUR until @to_time.hour == hours.to_i if hours[/^\d+$/]
-    end    
+    end
+
+    puts ('2. @to_time: ' + @to_time.inspect).debug if @debug    
     
     if wday[/^[0-6]$/] and @to_time.wday != wday.to_i then
       @to_time += DAY until @to_time.wday == wday.to_i
@@ -163,6 +192,8 @@ class CronFormat
 
       @to_time = dt2.to_time 
     end
+    
+    puts ('3. @to_time: ' + @to_time.inspect).debug if @debug
 
     units = @to_time.to_a.values_at(1..4) + [nil, @to_time.year]
 
@@ -239,7 +270,9 @@ class CronFormat
       end
     end  
 
-    dates = inflate(raw_date)    
+    dates = inflate(raw_date)
+
+    puts ('dates: ' + dates.inspect).debug if @debug
 
     a = dates.map do |date|
 
@@ -278,6 +311,11 @@ class CronFormat
       # starting from the biggest unit, attempt to increment that 
       #                       unit where it is equal to '*'
 
+      if @debug then
+        puts ('t: ' + t.inspect).debug
+        puts ('@to_time: ' + @to_time.inspect).debug
+      end
+      
       if t < @to_time then
 
         if t.month < @to_time.month and raw_a[4] == '*' then
@@ -285,6 +323,7 @@ class CronFormat
           # increment the year
           d[4].succ!
           t = Time.parse(TF % d.reverse)
+          puts 't: ' + t.inspect if @debug
 
           if repeaters[4] then
 
@@ -345,6 +384,8 @@ class CronFormat
 
       t     
     end
+    
+    puts ('a: ' + a.inspect).debug if @debug
 
     @to_time = a.compact.min
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cron_format
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - James Robertson
@@ -30,8 +30,28 @@ cert_chain:
   Jde8bC6zoA/f/DUUzBf2TtjXPuoAdtsV3CT3nIo880mXyihT9CL9ulTHMJCBR73I
   fsk=
   -----END CERTIFICATE-----
-date: 2018-04-09 00:00:00.000000000 Z
-dependencies: []
+date: 2019-01-09 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: c32
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.2
 description: 
 email: james@jamesrobertson.eu
 executables: []
@@ -59,7 +79,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Accepts a cron expression and outputs the relative time (e.g. 0 7 1 1 * *