schked 0.1.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b8b3e6f7d5d7a1db0b90f3ca5ec69ff064b79ab0923aa956a6ecde419426703
-  data.tar.gz: 26f4ec5f80c97e1311913cc381448578b735a6b44517b1c2192cf8702e89e1c9
+  metadata.gz: 90b8205a097b70389092670aa9611f7d20ab5084566db58383259c1bfed475ac
+  data.tar.gz: ced62e04d7b71e2e96a43762ab39377ada35a5d6aaeb518099d6f74a0ef6026a
 SHA512:
-  metadata.gz: 0fa825e6c8ea53aa82e575542da294e92c8d0c19ecb1ef3e2419460ce99c6306c606ebe3518daf2a57d0478c5c122c74a37df8578ad7bd2231fdd1542b8263b2
-  data.tar.gz: be98b368b66d02c8c3656ac26015e9f9a4ab841c7d9d37a87988860500208d1a1abcdbb46b25ed272342d017356aff5580c2efba20af318db0b374431b7612da
+  metadata.gz: 4e95232f135a84da9346dfae02a5d915ab52ad36ae1ec98f7b8133e72c32b3417567f1a647d1439ac42445b24f56231b84d19168b5b622f9ddf4ba20dca98831
+  data.tar.gz: 1b21245b148b5532c117a9d2a41d475fba6186a7c166fd13cdb8e2e30172162c7c9e1121d61d06378925b471236517cad75423fc10ab846e43867bfbd50afd39

data/Rakefile

@@ -1,8 +1,3 @@
 # frozen_string_literal: true
 
 require "bundler/gem_tasks"
-require "rspec/core/rake_task"
-
-RSpec::Core::RakeTask.new(:spec)
-
-task default: :spec

data/exe/schked

@@ -4,4 +4,11 @@
 require "bundler/setup"
 require "schked/cli"
 
-Schked::CLI.start(ARGV)
+begin
+  Schked::CLI.start(ARGV)
+rescue Exception => e
+  $stderr.puts "Schked exited with error"
+  $stderr.puts(e.message) if e.respond_to?(:message)
+  $stderr.puts(e.backtrace.join("\n")) if e.respond_to?(:backtrace) && e.backtrace.respond_to?(:join)
+  exit 1
+end

data/lib/schked.rb

@@ -1,25 +1,18 @@
 # frozen_string_literal: true
 
-require "rufus/scheduler"
-
 require "schked/version"
+require "schked/config"
+require "schked/worker"
+require "schked/railtie" if defined?(Rails)
 
 module Schked
   module_function
 
-  def paths
-    @paths ||= []
-  end
-
-  def schedule
-    paths.
-      map { |path| File.read(path) }.
-      join("\n")
+  def config
+    @config ||= Config.new
   end
 
-  def start
-    scheduler = Rufus::Scheduler.new
-    scheduler.instance_eval(schedule)
-    scheduler.join
+  def worker
+    @worker ||= Worker.new(config: config)
   end
 end

data/lib/schked/cli.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require "schked"
 require "thor"
 require "shellwords"
 
@@ -8,12 +7,12 @@ module Schked
   class CLI < Thor
     def self.start(argv)
       if File.exist?(".schked")
-        argv += File.
-          read(".schked").
-          split("\n").
-          join(" ").
-          strip.
-          shellsplit
+        argv += File
+          .read(".schked")
+          .split("\n")
+          .join(" ")
+          .strip
+          .shellsplit
       end
 
       super(argv)
@@ -30,7 +29,7 @@ module Schked
     def start
       load_requires
 
-      Schked.start
+      Schked.worker.wait
     end
 
     desc "show", "Output schedule to stdout"
@@ -39,16 +38,19 @@ module Schked
       load_requires
 
       puts "====="
-      puts Schked.schedule
+      puts Schked.worker.schedule
       puts "====="
     end
 
     private
 
     def load_requires
-      return unless options[:require]&.any?
+      if options[:require]&.any?
+        options[:require].each { |file| load(File.join(Dir.pwd, file)) }
+      end
 
-      options[:require].each { |file| require(File.join(Dir.pwd, file)) }
+      # We have to load Schked at here, because of Rails and our railtie.
+      require "schked"
     end
   end
 end

data/lib/schked/config.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require "logger"
+
+module Schked
+  class Config
+    attr_writer :logger
+
+    def paths
+      @paths ||= []
+    end
+
+    def logger?
+      !!@logger
+    end
+
+    def logger
+      @logger ||= Logger.new(STDOUT).tap { |l| l.level = Logger::INFO }
+    end
+
+    def register_callback(name, &block)
+      callbacks[name] << block
+    end
+
+    def fire_callback(name, *args)
+      callbacks[name].each do |callback|
+        callback.call(*args)
+      end
+    end
+
+    private
+
+    def callbacks
+      @callbacks ||= Hash.new { |hsh, key| hsh[key] = [] }
+    end
+  end
+end

data/lib/schked/railtie.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require "rails/railtie"
+
+module Schked
+  class Railtie < Rails::Railtie
+    class PathsConfig
+      def self.call(app)
+        if (root_schedule = app.root.join("config", "schedule.rb")).exist?
+          path = root_schedule.to_s
+          Schked.config.paths << path unless Schked.config.paths.include?(path)
+        end
+      end
+    end
+
+    initializer("schked.paths", &PathsConfig.method(:call))
+
+    config.to_prepare do
+      Schked.config.logger = ::Rails.logger unless Schked.config.logger?
+    end
+  end
+end

data/lib/schked/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Schked
-  VERSION = "0.1.1"
+  VERSION = "0.3.2"
 end

data/lib/schked/worker.rb

@@ -0,0 +1,70 @@
+# frozen_string_literal: true
+
+require "rufus/scheduler"
+
+module Schked
+  class Worker
+    def initialize(config:)
+      @config = config
+
+      @scheduler = Rufus::Scheduler.new
+
+      define_callbacks
+      load_schedule
+    end
+
+    def job(as)
+      scheduler.jobs.find { |job| job.opts[:as] == as }
+    end
+
+    def pause
+      scheduler.pause
+    end
+
+    def wait
+      scheduler.join
+    end
+
+    def stop
+      scheduler.stop
+    end
+
+    def schedule
+      config
+        .paths
+        .map { |path| File.read(path) }
+        .join("\n")
+    end
+
+    private
+
+    attr_reader :config, :scheduler
+
+    def define_callbacks
+      cfg = config
+
+      scheduler.define_singleton_method(:on_error) do |job, error|
+        cfg.logger.fatal("Task #{job.opts[:as] || job.job_id} failed with error: #{error.message}")
+        cfg.logger.error(error.backtrace.join("\n")) if error.backtrace
+
+        cfg.fire_callback(:on_error, job, error)
+      end
+
+      scheduler.define_singleton_method(:on_pre_trigger) do |job, time|
+        cfg.logger.info("Started task: #{job.opts[:as] || job.job_id}")
+
+        cfg.fire_callback(:before_start, job, time)
+      end
+
+      scheduler.define_singleton_method(:on_post_trigger) do |job, time|
+        cfg.logger.info("Finished task: #{job.opts[:as] || job.job_id}")
+
+        cfg.fire_callback(:after_finish, job, time)
+      end
+    end
+
+    def load_schedule
+      scheduler.instance_eval(schedule)
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: schked
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.3.2
 platform: ruby
 authors:
 - bibendi@evilmartians.com
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-29 00:00:00.000000000 Z
+date: 2020-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rufus-scheduler
@@ -39,103 +39,103 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
-  name: pry-byebug
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '1.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '1.16'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: combustion
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.9'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.60'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.60'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
-  name: rubocop-rspec
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.9'
 - !ruby/object:Gem::Dependency
   name: standard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.4'
 description: Rufus-scheduler wrapper to run recurring jobs
 email: 
 executables:
@@ -147,7 +147,10 @@ files:
 - exe/schked
 - lib/schked.rb
 - lib/schked/cli.rb
+- lib/schked/config.rb
+- lib/schked/railtie.rb
 - lib/schked/version.rb
+- lib/schked/worker.rb
 homepage: 
 licenses: []
 metadata: {}
@@ -166,8 +169,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Ruby Scheduler