robodash 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 65059c95fa5cea36a3ea54ee951bb94e3ff334a1fb5eeab87ce21ac415da9916
-  data.tar.gz: 3907f86684c81227d4c1a0f531ddd947057c65460f2fcedcdc7f7d81b5f94edd
+  metadata.gz: ddd20a1df16bb150163a7c2d2681ca0cd63b4cbe2100801087eba5f4536bbe8d
+  data.tar.gz: a2c185bc91ee8f1e5759ed8bbbad4254e5ab7c9ca03e41b99cce37446c3cae26
 SHA512:
-  metadata.gz: 9e8b1a4e239ddd79ac6153338bc16dad795055c1b7b571644efbcddc6f43445f4018654bf26d9dc8e9806895b5562c1b399404903c0bf1ebbfd745cb320aeaac
-  data.tar.gz: a2126467af0fc8216e6436e1c9baa1c47fc47c78fe16da0cb547e0edf31df4028681c84b1dda6f6e2ab412cb110a73ce690ff7fefa51e8ae49f573c5468ca4c0
+  metadata.gz: 49c2472b56fa3983f4c3628a399b0be585189a7260f9e4947874905f257e3fc9a8f32dd4c5832466d17310facd2a93dd60d9630ac1f0528f9f645bc2d7bb125e
+  data.tar.gz: ea6b47792eb289f1942d3199e7f4808f9215a3d25ac22034fd66fa19e4c56309214817cf58ff8f29667db3e65c021dcb53419123cb0ce84bf6aa1af1322b7a0f

data/lib/robodash/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Robodash
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/lib/robodash.rb

@@ -11,6 +11,9 @@ module Robodash
   OPEN_TIMEOUT = 2
   READ_TIMEOUT = 5
 
+  # Parse flexible format like "every 30 minutes", "3 days", "2 hours"
+  SCHEDULE_REGEX = /^(?:every\s+)?(\d+)\s*(minute|hour|day|week|month|year)s?$/
+
   class << self
     attr_accessor :api_token, :host, :enabled
 
@@ -26,13 +29,16 @@ module Robodash
     # - weekly
     # - monthly
     # - yearly
-    def ping(name, schedule_number = 1, schedule_period = "day", grace_period: 1.minute)
-      fire_and_forget("ping", {
-        name: name, 
-        schedule_number: schedule_number,
-        schedule_period: schedule_period,
-        grace_period: grace_period.to_i
-      })
+    #
+    # Examples:
+    # Robodash.ping("Some task", :daily, grace_period: 10.minutes)
+    # Robodash.ping("Some task", "every 10 minutes", grace_period: 10.minutes)
+    def ping(name, schedule = nil, grace_period: nil)
+      params = {name: name}
+      params.merge!({grace_period: grace_period.to_i}) if grace_period.present?
+      params.merge!(parse_schedule(schedule)) if schedule.present?
+
+      fire_and_forget("ping", params)
     end
 
     # Count should always be an integer
@@ -41,6 +47,27 @@ module Robodash
     end
 
     private
+      
+      def parse_schedule(schedule)
+        schedule = schedule.to_s.strip.downcase
+        return predefined_schedules[schedule] if predefined_schedules[schedule]
+
+        match = schedule.match(SCHEDULE_REGEX)
+        return {schedule_number: match[1].to_i, schedule_period: match[2]} if match
+        
+        {}
+      end
+
+      def predefined_schedules
+        {
+          "minutely" => {schedule_period: "minute", schedule_number: 1},
+          "hourly" => {schedule_period: "hour", schedule_number: 1},
+          "daily" => {schedule_period: "day", schedule_number: 1},
+          "weekly" => {schedule_period: "week", schedule_number: 1},
+          "monthly" => {schedule_period: "month", schedule_number: 1},
+          "yearly" => {schedule_period: "year", schedule_number: 1}
+        }
+      end
 
       def fire_and_forget(endpoint, body)
         return false unless enabled?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: robodash
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Bram Jetten