schedule_job 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 887f7a67ad740ea939e3c585534e820ad03d85695d07a74b26390c4300a8cb04
-  data.tar.gz: d61192e8ac1ba8b74f62de780b4b000d4b235aeb13f202d24e374f381f7c65ba
+  metadata.gz: 5a0f470384777a45f805dc1ff41c9f6386db8378c509eec95b647a577f43e06e
+  data.tar.gz: 9fa202bc1743951f7a2e350c379a1d0d79e0a5f2926fad5aa3c9393be042287d
 SHA512:
-  metadata.gz: 86af048f9a4e1c2e50f9c7a63ffbe483fd5c8ffbda9ec521b5c7d2c39a8a6228367e239f0ab347d3c681a2fbbf03918691e3cbf95d67cbf5c256b8439e2dbfe3
-  data.tar.gz: 7866e34e5591ed82159cc81a268166562f07e50033998cee9ff0000baeafd92772df00a7ed3953a6e50f8d627f64fb636898bd432fe460f7099a958f7c078ae5
+  metadata.gz: ddd20ca47d699cf56bd6e653a84065fe45c10133fd716af28fc092e2550deffe9a5465041e21ee287a3f4e9bfb34a9cdb14dd642ee5db1b3a807b6430fd9da28
+  data.tar.gz: 2e268c4aaa999e4c75df56aa0d4396a0269d9064cc9c46498598c0a5a0086ac1fe7e809cf243b8ddb2df98020b13fde6f6d40fd076e43ad440dc518918dadf81

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    schedule_job (1.0.4)
+    schedule_job (1.0.6)
 
 GEM
   remote: https://rubygems.org/

data/lib/schedule_job/cron.rb

@@ -82,14 +82,18 @@ module ScheduleJob
           puts "Scheduling: #{job.to_s}"
           install_cron_job(job)
         end
-        puts "Next three runs:"
-        cron_parser = CronParser.new(job.schedule_spec)
-        first_run_time = cron_parser.next(Time.now)
-        second_run_time = cron_parser.next(first_run_time)
-        third_run_time = cron_parser.next(second_run_time)
-        puts "1. #{first_run_time}"
-        puts "2. #{second_run_time}"
-        puts "3. #{third_run_time}"
+
+        cron_parser = CronParser.new(job.schedule_spec) rescue nil
+        if cron_parser
+          puts "Next three runs:"
+          first_run_time = cron_parser.next(Time.now)
+          second_run_time = cron_parser.next(first_run_time)
+          third_run_time = cron_parser.next(second_run_time)
+
+          puts "1. #{first_run_time}"
+          puts "2. #{second_run_time}"
+          puts "3. #{third_run_time}"
+        end
       end
 
       def install_cron_job(job)
@@ -161,14 +165,14 @@ module ScheduleJob
         hour = next_moment.hour
         day = next_moment.day
         schedule_spec = case duration_unit_of_time
-          when "m"
-            "*/#{duration_quantity} * * * *"
-          when "h"
-            "#{minute} */#{duration_quantity} * * *"
-          when "d"
-            "#{minute} #{hour} */#{duration_quantity} * *"
-          when "M"
-            "#{minute} #{hour} #{day} */#{duration_quantity} *"
+        when "m"
+          "*/#{duration_quantity} * * * *"
+        when "h"
+          "#{minute} */#{duration_quantity} * * *"
+        when "d"
+          "#{minute} #{hour} */#{duration_quantity} * *"
+        when "M"
+          "#{minute} #{hour} #{day} */#{duration_quantity} *"
         end
         self.new(schedule_spec, command)
       end
@@ -218,7 +222,23 @@ module ScheduleJob
       end
 
       def to_s
-        schedule = Cronex::ExpressionDescriptor.new(@schedule_spec).description
+        schedule = case @schedule_spec
+        when "@reboot"
+          "at every reboot"
+        when "@yearly", "@annually"
+          "every year"
+        when "@monthly"
+          "every month"
+        when "@weekly"
+          "every week"
+        when "@daily"
+          "every day"
+        when "@hourly"
+          "every hour"
+        else
+          Cronex::ExpressionDescriptor.new(@schedule_spec).description
+        end
+            
         # str = "#{@command} #{schedule} (line #{@line_number}, pos #{@pos_offset})"
         str = "#{@command} #{schedule}"
       end

data/lib/schedule_job/version.rb

@@ -1,3 +1,3 @@
 module ScheduleJob
-  VERSION = "1.0.5"
+  VERSION = "1.0.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: schedule_job
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - David Ellis