schedule_job 1.0.2 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 11be78ebaf233db44fee63212623c4e68518fa16c1853df6cb87479f7a6733c9
-  data.tar.gz: a0d22e81142823bc94a5c0c2ee1f69677ffa2bccd536026841308d12bcc1421d
+  metadata.gz: 8c49297585195ae17aee50d2b57a41494d54de392821199543822ccfb6c41847
+  data.tar.gz: 79ea5e5b3631c2e089ef0e61dd4d11e157ac8763802e2943a8be741fa893b9e5
 SHA512:
-  metadata.gz: 67070c26ee315c66e29833ca42b5cb2aff986b6f2c40110e30cc0e513e5a3429da8a0e7e7c8ea83c39f67bd0e478f5fe912e6b1e021ae54e981693e0cde9ee47
-  data.tar.gz: 1598e6c9a1085a9119307c6511aa8886257e2ee617740e66a6e9377ab876899f4c84469ddf26e65395fafab1e59be90154cd1ee49e29701ebf40cff7f2b74ff3
+  metadata.gz: 857fbc0559cf6bd4f6249aa9f8d4e5bc59d7db984aa9541faee46095debb61f115556b2e45e2fddcd7b7706f28fe261d6453de91743d2bce2d9008111290103d
+  data.tar.gz: c1a626fe30d047386eb84a8dcffc315f484bd6bba3503f6c5d0ff29de96f7c3fc0a66e22a8adf72247650198c7b5e96bdb31c266589c76d587eabf9fae23ed42

data/Gemfile

@@ -2,11 +2,3 @@ source "https://rubygems.org"
 
 # Specify your gem's dependencies in schedule.gemspec
 gemspec
-
-gem "citrus"
-# gem "whenever"
-gem "cronex"
-gem "parse-cron"
-gem "activesupport"
-# gem "treetop"
-# gem "polyglot"

data/Gemfile.lock

@@ -1,7 +1,11 @@
 PATH
   remote: .
   specs:
-    schedule_job (1.0.0)
+    schedule_job (1.0.6)
+      activesupport
+      citrus
+      cronex
+      parse-cron
 
 GEM
   remote: https://rubygems.org/
@@ -22,7 +26,6 @@ GEM
       concurrent-ruby (~> 1.0)
     minitest (5.14.4)
     parse-cron (0.1.4)
-    rake (13.0.6)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
       rspec-expectations (~> 3.10.0)
@@ -45,12 +48,7 @@ PLATFORMS
   x86_64-darwin-18
 
 DEPENDENCIES
-  activesupport
   bundler
-  citrus
-  cronex
-  parse-cron
-  rake
   rspec
   schedule_job!
 

data/README.md

@@ -17,64 +17,71 @@ Done installing documentation for schedule_job after 0 seconds
 
 Example usage:
 ```
-~ ❯ schedule -h
+~ ❯ schedule --help
 Usage: schedule [options] command
     -d, --dryrun                     Report what would happen but do not install the scheduled job.
     -l, --list                       List installed cron jobs.
     -r, --rm JOB_ID                  Remove the specified job id as indicated by --list
     -u, --user USER                  User that the crontab belongs to.
-    -e, --every DURATION             Run command every DURATION units of time.
+    -e, --every DURATION             Run command every DURATION units of time (valid suffixes are m, h, d, M). DURATION may also be one of the special keywords: reboot, year, month, week, day, hour
         For example:
-        --every 10m                       # meaning, every 10 minutes
-        --every 5h                        # meaning, every 5 hours
-        --every 2d                        # meaning, every 2 days
-        --every 3M                        # meaning, every 3 months
+        --every 10m                       # every 10 minutes
+        --every 5h                        # every 5 hours
+        --every 2d                        # every 2 days
+        --every 3M                        # every 3 months
+
+        Special durations:
+        --every reboot                    # after every reboot
+        --every year                      # every year
+        --every month                     # every month
+        --every week                      # every week
+        --every day                       # every day
+        --every hour                      # every hour
 
     -c, --cron CRON                  Run command on the given cron schedule.
         For example:
-        --cron "*/5 15 * * 1-5"          # meaning, Every 5 minutes, at 3:00 PM, Monday through Friday
-        --cron "0 0/30 8-9 5,20 * ?"     # meaning, Every 30 minutes, between 8:00 AM and 9:59 AM, on day 5 and 20 of the month
+        --cron "*/5 15 * * 1-5"          # Every 5 minutes, at 3:00 PM, Monday through Friday
+        --cron "0 0/30 8-9 5,20 * ?"     # Every 30 minutes, between 8:00 AM and 9:59 AM, on day 5 and 20 of the month
 
 ~ ❯ schedule -l
 ~ ❯ schedule -d -e 10m backup.sh
 Scheduling: backup.sh Every 10 minutes
 Next three runs:
-1. 2021-11-01 21:40:00 -0500
-2. 2021-11-01 21:50:00 -0500
-3. 2021-11-01 22:00:00 -0500
+1. 2021-11-01 21:50:00 -0500
+2. 2021-11-01 22:00:00 -0500
+3. 2021-11-01 22:10:00 -0500
 ~ ❯ schedule -l
 Jobs
 1. backup.sh Every 10 minutes
 ~ ❯ crontab -l
 */10 * * * * backup.sh
-
 ~ ❯ schedule -e 3M quarterly_backup.sh
-Scheduling: quarterly_backup.sh At 9:43 PM, on day 1 of the month, every 3 months
+Scheduling: quarterly_backup.sh At 9:50 PM, on day 1 of the month, every 3 months
 Next three runs:
-1. 2022-01-01 21:43:00 -0600
-2. 2022-04-01 21:43:00 -0500
-3. 2022-07-01 21:43:00 -0500
+1. 2022-01-01 21:50:00 -0600
+2. 2022-04-01 21:50:00 -0500
+3. 2022-07-01 21:50:00 -0500
 ~ ❯ schedule -l
 Jobs
 1. backup.sh Every 10 minutes
-2. quarterly_backup.sh At 9:43 PM, on day 1 of the month, every 3 months
+2. quarterly_backup.sh At 9:50 PM, on day 1 of the month, every 3 months
 ~ ❯ crontab -l
 */10 * * * * backup.sh
-43 21 1 */3 * quarterly_backup.sh
-
+50 21 1 */3 * quarterly_backup.sh
 ~ ❯ schedule --dryrun --rm 1
 Would remove: backup.sh Every 10 minutes
 ~ ❯ schedule --dryrun --rm 2
-Would remove: quarterly_backup.sh At 9:43 PM, on day 1 of the month, every 3 months
+Would remove: quarterly_backup.sh At 9:50 PM, on day 1 of the month, every 3 months
 ~ ❯ schedule --rm 1
 Removing: backup.sh Every 10 minutes
 ~ ❯ schedule -l
 Jobs
-1. quarterly_backup.sh At 9:43 PM, on day 1 of the month, every 3 months
+1. quarterly_backup.sh At 9:50 PM, on day 1 of the month, every 3 months
 ~ ❯ schedule --rm 1
-Removing: quarterly_backup.sh At 9:43 PM, on day 1 of the month, every 3 months
+Removing: quarterly_backup.sh At 9:50 PM, on day 1 of the month, every 3 months
 ~ ❯ schedule -l
 ~ ❯ crontab -l
+~ ❯
 ```
 
 ## License

data/lib/schedule_job/cli.rb

@@ -1,7 +1,5 @@
 require "optparse"
 
-# schedule --every 10m "my_command --foo --bar"
-
 module ScheduleJob
   class Cli
     def self.run(argv = ARGV)
@@ -32,20 +30,28 @@ module ScheduleJob
           options[:crontab_user] = user
         end
 
-        opts.on("-e", "--every DURATION", "Run command every DURATION units of time.
+        opts.on("-e", "--every DURATION", "Run command every DURATION units of time (valid suffixes are m, h, d, M). DURATION may also be one of the special keywords: reboot, year, month, week, day, hour
         For example:
-        --every 10m                       # meaning, every 10 minutes
-        --every 5h                        # meaning, every 5 hours
-        --every 2d                        # meaning, every 2 days
-        --every 3M                        # meaning, every 3 months
+        --every 10m                       # every 10 minutes
+        --every 5h                        # every 5 hours
+        --every 2d                        # every 2 days
+        --every 3M                        # every 3 months
+
+        Special durations:
+        --every reboot                    # after every reboot
+        --every year                      # every year
+        --every month                     # every month
+        --every week                      # every week
+        --every day                       # every day
+        --every hour                      # every hour
         ") do |every|
           options[:every] = every
         end
 
         opts.on("-c", "--cron CRON", "Run command on the given cron schedule.
         For example:
-        --cron \"*/5 15 * * 1-5\"          # meaning, Every 5 minutes, at 3:00 PM, Monday through Friday
-        --cron \"0 0/30 8-9 5,20 * ?\"     # meaning, Every 30 minutes, between 8:00 AM and 9:59 AM, on day 5 and 20 of the month
+        --cron \"*/5 15 * * 1-5\"          # Every 5 minutes, at 3:00 PM, Monday through Friday
+        --cron \"0 0/30 8-9 5,20 * ?\"     # Every 30 minutes, between 8:00 AM and 9:59 AM, on day 5 and 20 of the month
         ") do |cron_schedule|
           options[:cron] = cron_schedule
         end
@@ -63,6 +69,8 @@ module ScheduleJob
         remove_job(args)
       when args[:cron] || args[:every]    # write jobs
         install_job(args)
+      else
+        puts "No parameters specified. Please specify one of: --every, --cron, --list, or --rm"
       end
     end
 
@@ -90,13 +98,14 @@ module ScheduleJob
         Cron::Job.new(cron_schedule, command)
       when args[:every]
         duration = args[:every]
-        match = duration.match(/(\d+)(m|h|d|M)/)
-        if match
+        if match = duration.match(/(\d+)(m|h|d|M)/)
           qty = match[1].to_i
           unit_of_time = match[2].to_s
           Cron::Job.every(qty, unit_of_time, command)
+        elsif duration.match(/reboot|year|month|week|day|hour/)
+          Cron::Job.every_simple_duration(duration, command)
         else
-          puts "'#{duration}' is an invalid duration. The duration must be specified as: integer followed immediately by m (minutes), h (hours), d (days), M (months) (e.g. 10m)"
+          puts "'#{duration}' is an invalid duration. The duration must be specified as either (1) integer followed immediately by m (minutes), h (hours), d (days), M (months) (e.g. 10m) or (2) reboot, year, month, week, day, hour"
           exit(1)
         end
       end

data/lib/schedule_job/cron.rb

@@ -50,12 +50,6 @@ module ScheduleJob
 
         raise("Unable to read crontab: #{error_output}") if !exit_status.success? && !no_crontab
 
-        # puts "read_crontab()"
-        # puts "stdout:"
-        # puts stdout
-        # puts "stderr:"
-        # puts stderr
-        
         crontab_output
       end
 
@@ -63,16 +57,8 @@ module ScheduleJob
       def parse_crontab(user_crontab)
         parser = TableParser.new(user_crontab)
 
-        # user_crontab.each_line do |line|
-        #   puts line
-        #   puts "valid? #{LineParser.valid?(line)}"
-        #   puts LineParser.parse(line)
-        # end
-
         return [], [] unless parser.valid?
 
-        # puts "valid!"
-
         environment_vars = parser.environment_vars&.map do |env_directive|
           name = env_directive[:var].to_s
           expr = env_directive[:expr].to_s
@@ -96,19 +82,22 @@ 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)
         job_spec = job.specification
-        # puts "Installing new cron job: #{job_spec}"
 
         new_crontab = [read_crontab(@user).strip, job_spec.strip].reject(&:empty?).join("\n")
         new_crontab << "\n"   # add a trailing newline
@@ -136,21 +125,12 @@ module ScheduleJob
       end
 
       def write_crontab(new_crontab, user = @user)
+        # overwrite crontab interactively, per https://stackoverflow.com/questions/610839/how-can-i-programmatically-create-a-new-cron-job
         command = ["crontab"]
         command << "-u #{user}" if user
         command << "-"
         command = command.join(" ")
 
-        # command = "(crontab -l ; echo \"#{job_spec}\") | crontab -"   # add new job to bottom of crontab, per https://stackoverflow.com/questions/610839/how-can-i-programmatically-create-a-new-cron-job
-        # puts "writing new crontab:"
-        # puts new_crontab
-        # puts "*" * 80
-
-        # puts "write_crontab:"
-        # puts "command: #{command}"
-        # puts "new crontab:"
-        # puts new_crontab
-
         stdout, stderr, exit_status = Open3.capture3(command, stdin_data: new_crontab)
         crontab_output = stdout
         error_output = stderr
@@ -185,14 +165,33 @@ 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
+
+      # duration is one of: reboot, year, month, week, day, hour
+      def self.every_simple_duration(duration, command)
+        schedule_spec = case duration
+        when "reboot"
+          "@reboot"
+        when "year"
+          "@yearly"
+        when "month"
+          "@monthly"
+        when "week"
+          "@weekly"
+        when "day"
+          "@daily"
+        when "hour"
+          "@hourly"
         end
         self.new(schedule_spec, command)
       end
@@ -223,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/cron_parser.rb

@@ -17,10 +17,6 @@ end
 
 Citrus.require("schedule_job/cron")
 
-# require "polyglot"
-# require "treetop"
-# require "schedule_job/cron.treetop"
-
 module ScheduleJob
   module Cron
     Grammar = ScheduleCronParser
@@ -34,7 +30,6 @@ module ScheduleJob
 
       def self.parse(user_crontab_string)
         Grammar.parse(user_crontab_string, root: :user_crontab)
-        # ::CrontabParser.new.parse(user_crontab_string, root: :user_crontab)
       end
 
       def initialize(user_crontab_string)
@@ -55,17 +50,10 @@ module ScheduleJob
       
       def environment_vars
         @user_crontab&.capture(:environment)&.captures(:directive)
-        # puts @user_crontab.methods.sort.inspect
-        # puts @user_crontab.inspect
-        # puts "*" * 80
-        # puts @user_crontab.environment_spec.inspect
-        # exit()
-        # @user_crontab&.environment&.directive
       end
 
       def job_specs
         @user_crontab&.capture(:jobspecs)&.captures(:jobspec)
-        # @user_crontab&.jobspecs&.jobspec
       end
     end
 
@@ -78,7 +66,6 @@ module ScheduleJob
 
       def self.parse(cron_line)
         Grammar.parse(cron_line, root: :jobspec, consume: false)
-        # ::CrontabParser.new.parse(cron_line, root: :jobspec, consume_all_input: false)
       end
     end
   end

data/lib/schedule_job/version.rb

@@ -1,3 +1,3 @@
 module ScheduleJob
-  VERSION = "1.0.2"
+  VERSION = "1.0.7"
 end

data/schedule_job.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.description   = "job scheduler"
   spec.homepage      = "https://github.com/davidkellis/scheduler"
   spec.license       = "MIT"
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
 
   spec.files = Dir["**/**"].
                 grep_v(/.gem$/).
@@ -20,6 +20,10 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler"
-  spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
+
+  spec.add_dependency "citrus"
+  spec.add_dependency "cronex"
+  spec.add_dependency "parse-cron"
+  spec.add_dependency "activesupport"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: schedule_job
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.7
 platform: ruby
 authors:
 - David Ellis
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,13 +39,55 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: citrus
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: cronex
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: parse-cron
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -69,7 +111,6 @@ files:
 - lib/schedule_job/cli.rb
 - lib/schedule_job/cron.citrus
 - lib/schedule_job/cron.rb
-- lib/schedule_job/cron.treetop
 - lib/schedule_job/cron_parser.rb
 - lib/schedule_job/version.rb
 - schedule_job.gemspec
@@ -85,7 +126,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/lib/schedule_job/cron.treetop

@@ -1,167 +0,0 @@
-grammar Crontab
-  rule user_crontab
-    sep?
-    environment_spec:(environment sep)?
-    jobspecs?
-    sep?
-  end
-
-  rule environment
-    head:directive tail:(sep directive)*
-  end
-
-  rule directive
-    var space "=" space expr
-  end
-
-  rule var
-    alpha alphanumeric?
-  end
-
-  rule expr
-    command
-  end
-
-  rule jobspecs
-    head:jobspec tail:(sep jobspec)*
-  end
-
-  rule jobspec
-    schedule_spec space command ws*
-  end
-
-  rule schedule_spec
-    standard / special
-  end
-
-  rule standard
-    minute space hour space dayofmonth space month space dayofweek
-  end
-
-  rule special
-    "@" ("yearly" / "annually" / "monthly" / "weekly" / "daily" / "hourly" / "reboot")
-  end
-
-  rule minute
-    step
-  end
-
-  rule hour
-    step
-  end
-
-  rule dayofmonthtypes
-    step
-  end
-
-  rule monthtypes
-    step / altmonths
-  end
-
-  rule dayofweektypes
-    step / altdays
-  end
-
-  rule dayofmonth
-    dayofmonthtypes ("," dayofmonthtypes)*
-  end
-
-  rule month
-    monthtypes ("," monthtypes)*
-  end
-
-  rule dayofweek
-    dayofweektypes ("," dayofweektypes)*
-  end
-
-  rule command
-    quoted_string
-    / (!("\n" / comment) .)+
-  end
-
-  rule step
-    common ("/" int)?
-  end
-
-  rule common
-    range / int / any
-  end
-
-  rule range
-    int "-" int
-  end
-
-  rule altdays
-    days ("," days)*
-  end
-
-  rule altmonths
-    months ("," months)*
-  end
-
-  rule days
-    "MON" / "TUE" / "WED" / "THU" / "FRI" / "SAT" / "SUN"
-  end
-
-  rule months
-    "JAN" / "FEB" / "MAR" / "APR" / "MAY" / "JUN" / "JUL" / "AUG" / "SEP" / "OCT" / "NOV" / "DEC"
-  end
-
-  rule any
-    "*"
-  end
-
-  rule int
-    [0-9]+
-  end
-
-  rule alpha
-    [a-zA-Z]+
-  end
-  
-  rule alphanumeric
-    [a-zA-Z0-9]+
-  end
-
-  rule sep
-    (ws* nl)+
-  end
-
-  rule ws
-    space / comment
-  end
-
-  rule space
-    [ \t]+
-  end
-
-  rule nl
-    [\n]+
-  end
-
-  rule comment
-    "#" (!"\n" .)*
-  end
-
-  rule quoted_string
-    "\"" ( (!("\"" / "\\") .) / escape)*  "\""
-    / "'" ( (!("'" / "\\") .) / escape)*  "'"
-  end
-
-  rule escape
-    "\\" escape_sequence
-  end
-
-  rule escape_sequence
-    "'"
-    / "\""
-    / "\\"
-    / "b"
-    / "f"
-    / "n"
-    / "r"
-    / "t"
-    / "v"
-  end
-
-end