crono 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc81f4353cb4604f685c551dbf09ed6c6eee6fcf38daede4f0ce858818220c32
-  data.tar.gz: a507754afba5ca7f0db233e4564f8bb5b62e86ac5fd570c19de56847fc508db9
+  metadata.gz: a4a47f2dab12bf47efc092db5d753eda1f9e3b688222dc7bfab09ae57053a0e6
+  data.tar.gz: 10e04f4b9bf1b059cf49aa4a72c8b9831cba8e8dc4ad7028bd7ef404429a1e2a
 SHA512:
-  metadata.gz: cf1e7b64777a524a154b5c867a76e7736506a71378faea6c42dc3c0d7362aeee75b16df8705679a5c3b90a8d1fbcd4e743dff29a8ff0599590c30ed232dec295
-  data.tar.gz: ac6045954b72a3f7ddb98b5a38d70053bc0b28d1df81d3bbccbb260ad5b283f18c487ccf1a1fc14a60f890385d903a738147e1ed7d70c83688515a913f25b766
+  metadata.gz: 278094bd699ec6f935b706bbd8788b49b5fae93d16584dffbc4313bd435f9911bc918d3b12f805d420ad5016266059254373f267b18f9e195eb71b0f3b92edf6
+  data.tar.gz: cc1a4d3a67b6751ab0ca5259e8fd0bcf5d82c1832b2300e3594ce05bbcfb8bd79c3e96779e3eea0945089b9242a75e58f8c0bcd639ee308136b114ca7e79d665

data/lib/crono/cli.rb

@@ -24,7 +24,7 @@ module Crono
 
       setup_log
 
-      write_pid unless config.daemonize
+      write_pid if config.daemonize
       load_rails
       Cronotab.process(File.expand_path(config.cronotab))
       print_banner

data/lib/crono/engine.rb

@@ -3,7 +3,11 @@ module Crono
     isolate_namespace Crono
 
     initializer 'crono.assets.precompile' do |app|
-      app.config.assets.precompile += %w( crono/application.css crono/materialize.min.css )
+      if app.config.respond_to?(:assets)
+        app.config.assets.precompile += %w( crono/application.css crono/materialize.min.css )
+      else
+        fail "Crono requires either Propshaft or Sprockets to be installed."
+      end
     end
 
     config.generators do |g|

data/lib/crono/job.rb

@@ -9,10 +9,10 @@ module Crono
     attr_accessor :performer, :period, :job_args, :last_performed_at, :job_options,
                   :next_performed_at, :job_log, :job_logger, :healthy, :execution_interval
 
-    def initialize(performer, period, job_args, job_options = nil)
+    def initialize(performer, period, job_args = nil, job_options = nil)
       self.execution_interval = 0.minutes
       self.performer, self.period = performer, period
-      self.job_args = JSON.generate(job_args)
+      self.job_args = JSON.generate(job_args) if job_args.present?
       self.job_log = StringIO.new
       self.job_logger = Logger.new(job_log)
       self.job_options = job_options || {}
@@ -47,7 +47,7 @@ module Crono
       @semaphore.synchronize do
         update_model
         clear_job_log
-        ActiveRecord::Base.clear_active_connections!
+        ActiveRecord::Base.connection_handler.clear_active_connections!
       end
     end
 

data/lib/crono/performer_proxy.rb

@@ -1,14 +1,15 @@
 module Crono
   # Crono::PerformerProxy is a proxy used in cronotab.rb semantic
   class PerformerProxy
-    def initialize(performer, scheduler, job_args)
+    def initialize(performer, scheduler, job_args = nil, job_options = nil)
       @performer = performer
       @scheduler = scheduler
       @job_args = job_args
+      @job_options = job_options
     end
 
     def every(period, **options)
-      @job = Job.new(@performer, Period.new(period, **options), @job_args, @options)
+      @job = Job.new(@performer, Period.new(period, **options), @job_args, @job_options)
       @scheduler.add_job(@job)
       self
     end
@@ -19,12 +20,12 @@ module Crono
     end
 
     def with_options(options)
-      @options = options
+      @job_options = options
       self
     end
   end
 
   def self.perform(performer, *job_args)
-    PerformerProxy.new(performer, Crono.scheduler, job_args)
+    PerformerProxy.new(performer, Crono.scheduler, *job_args)
   end
 end

data/lib/crono/version.rb

@@ -1,3 +1,3 @@
 module Crono
-  VERSION = '2.0.0'
+  VERSION = '2.1.0'
 end

data/lib/crono.rb

@@ -3,7 +3,6 @@ module Crono
 end
 
 require 'rails'
-require 'sprockets/railtie'
 require 'active_support/all'
 require 'crono/version'
 require 'crono/engine'

data/spec/cli_spec.rb

@@ -11,7 +11,7 @@ describe Crono::CLI do
       expect(cli).to receive(:start_working_loop)
       expect(cli).to receive(:parse_options)
       expect(cli).to receive(:parse_command)
-      expect(cli).to receive(:write_pid)
+      expect(cli).not_to receive(:write_pid)
       expect(Crono::Cronotab).to receive(:process)
       cli.run
     end
@@ -25,7 +25,8 @@ describe Crono::CLI do
         expect(cli).to receive(:start_working_loop_in_daemon)
         expect(cli).to receive(:parse_options)
         expect(cli).to receive(:parse_command)
-        expect(cli).not_to receive(:write_pid)
+        expect(cli).to receive(:setup_log)
+        expect(cli).to receive(:write_pid)
         expect(Crono::Cronotab).to receive(:process)
         cli.run
       end