CronR 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e5bf402529ecd7ebee8d859c478097caeb4c7cba
-  data.tar.gz: 7673acb5eff3379c352bfa2c000541b394e1199d
+  metadata.gz: aba2673998541390349e2c859d1fb796c9350d2a
+  data.tar.gz: 3ae6120d76daa6531c349483a9e3ddc02320bcd4
 SHA512:
-  metadata.gz: 75736376f3bd20879fbc8c850b39efb20251b9e3e364fc393e8e9960597c05e0bb8895059419296042199d1660f92250e5d0c9f162dc8272057a470aac3e0a0f
-  data.tar.gz: 8e3711b87137ae5d03d7c58c721bbaf341f3c2b0d3b3bfd361d4149d3d31e16b2542cba1d339267828dcb975751e9f02b848b0a92aa4f69cb9d90bd532bbf3d7
+  metadata.gz: 722679cce5b117e2f7994fc660cbe488271f1ff697b5e2a568d3a8c130c884e60f100d891a78401a138256ea8c7bc21feddc47bf3bbd67f5f940d5786596e2bd
+  data.tar.gz: acf5be4c58347d60842325aad87c14c354f65824834b2957299a4d82557293d96612511f13ca4983069a1ae8c1945389dbb218ffc428c5c4376c00022e20b877

data/lib/CronR/CronJob.rb

@@ -19,6 +19,12 @@ module CronR
   # cp.job = {...} => a non-proc job
   # 
   # CRON PARAMETERS:
+  #
+  # CronR parameters are represented as either:
+  # 
+  # i)   booleans = '*'
+  # ii)  Fixnums  = 'n' where n is an integer
+  # iii) Array    = 'n-m' 'n,m' 'n-m/k' 'n-m,o-p'
   # 
   # cp[s] where s can be :minute,:hour,:day,:dow,:month .
   # 

data/lib/CronR/utils.rb

@@ -5,8 +5,59 @@
 # LICENSE.txt.
 
 module CronR
+
   module Utils
 
+    # Parse a single cron parameter into a format that CronR uses.
+    #
+    # Currently not used directly by CronR.  But may be handy for
+    # translating cron parameters.
+    #
+    # '*' => true
+    # '1' => 1
+    # '1-3' => [1,2,3]
+    # Other forms which translate to arrays:
+    # '*/3' '1-5/2' '2,4,8' '2-4,6-8'
+    #
+    # In the case of */3 we do: (1..59).step(3).to_a
+    # which will hopefully cover all cases.
+
+    def self.parse_param str
+      parts = str.split(',')
+      if parts.empty? || parts.detect{|i| i.empty? } then
+        raise "Not enough information to process parameter: '#{str}'."
+      end
+      parts.map { |p|
+        n, step = p.split('/')
+        raise "No number before slash: '#{str}'" if n.empty?
+        a, b = n.split('-')
+        raise "No number before hyphen: '#{str}'" if a.empty?
+        a = a.strip
+        raise "Not a number or asterisk: '#{a}'" unless /^\d+$|^\*$/ === a
+        if b then
+          a, b = a.to_i, b.to_i
+          if step then
+            (a..b).step(step.to_i).to_a
+          else
+            (a..b).to_a
+          end
+        else
+          case a
+          when '*'
+            if step then
+              # Bit cheap, basically we'll cover ourselves for all
+              # component types by going up to 59
+              (0..59).step(step.to_i).to_a
+            else
+              return true  # ick, exit def
+            end
+          else
+            [a.to_i]
+          end
+        end
+      }.flatten
+    end
+
     # Wake up every minute and call &block.
     #
     # Returns the thread that does the waking up.
@@ -18,7 +69,7 @@ module CronR
       Thread.new {
         now = Time.now
         wait = secs-now.sec-now.usec.to_f/mil
-        p "[every_minute] sleeping #{wait}" if debug
+        #p "[every_minute] sleeping #{wait}" if debug
         sleep wait
         loop {
           result = block.call
@@ -27,7 +78,7 @@ module CronR
           end
           now = Time.now
           wait = secs-now.sec-now.usec.to_f/mil
-          p "[every_minute] sleeping #{wait}" if debug
+          #p "[every_minute] sleeping #{wait}" if debug
           sleep(wait)
         }
       }
@@ -45,7 +96,7 @@ module CronR
           if result==true then
             break
           end
-          p "[every] sleeping #{secs}" if debug
+          #p "[every] sleeping #{secs}" if debug
           sleep secs
         }
       }
@@ -121,4 +172,5 @@ module CronR
     end
 
   end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: CronR
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Daniel Bush
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-03 00:00:00.000000000 Z
+date: 2014-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport