schked 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b8b3e6f7d5d7a1db0b90f3ca5ec69ff064b79ab0923aa956a6ecde419426703
-  data.tar.gz: 26f4ec5f80c97e1311913cc381448578b735a6b44517b1c2192cf8702e89e1c9
+  metadata.gz: e7a1a402bae88d8b2da45e9042700f5b5c4c47fb96a645859fa81da00dc8314d
+  data.tar.gz: cb6e164f3ce79f164b1f66e301b723f6b2a71e6dc899520d0f067db6c2645f54
 SHA512:
-  metadata.gz: 0fa825e6c8ea53aa82e575542da294e92c8d0c19ecb1ef3e2419460ce99c6306c606ebe3518daf2a57d0478c5c122c74a37df8578ad7bd2231fdd1542b8263b2
-  data.tar.gz: be98b368b66d02c8c3656ac26015e9f9a4ab841c7d9d37a87988860500208d1a1abcdbb46b25ed272342d017356aff5580c2efba20af318db0b374431b7612da
+  metadata.gz: 84ff673846e38e623eca53cba4d76489cd6d4ebedc2520d5c356689ccb730fa4a89333138d59fec3287036ddd9d82aa9bce3ee8e7776dd8c54cea0f0d0a79a0b
+  data.tar.gz: c520cbf6f29f77d321280951902bb9cb4827aff680e7d638ea9c78786a46a95001adfd741d750665e3dcfc2f7b96266ed07ea9c8185ec2d131dc9b2e007149ba

data/lib/schked/cli.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require "schked"
 require "thor"
 require "shellwords"
 
@@ -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| require(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,33 @@
+# frozen_string_literal: true
+
+require "logger"
+
+module Schked
+  class Config
+    attr_writer :logger
+
+    def paths
+      @paths ||= []
+    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,12 @@
+# frozen_string_literal: true
+
+require "rails/railtie"
+
+module Schked
+  class Railtie < Rails::Railtie
+    initializer "schked.paths" do |app|
+      Schked.config.paths << app.root.join("config", "schedule.rb")
+      Schked.config.logger = ::Rails.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.2.0"
 end

data/lib/schked/worker.rb

@@ -0,0 +1,62 @@
+# 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 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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: schked
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - bibendi@evilmartians.com
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-29 00:00:00.000000000 Z
+date: 2019-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rufus-scheduler
@@ -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: {}