crono 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc81f4353cb4604f685c551dbf09ed6c6eee6fcf38daede4f0ce858818220c32
-  data.tar.gz: a507754afba5ca7f0db233e4564f8bb5b62e86ac5fd570c19de56847fc508db9
+  metadata.gz: ba6fb8bfaeaa6f982bb87dd401748c4678bd75a77073bbfa7a9acbe042f3cd76
+  data.tar.gz: 1c5a36409b2e602767b1a2536f719bd52f563728206510e5be2b6ebcd3fe4a17
 SHA512:
-  metadata.gz: cf1e7b64777a524a154b5c867a76e7736506a71378faea6c42dc3c0d7362aeee75b16df8705679a5c3b90a8d1fbcd4e743dff29a8ff0599590c30ed232dec295
-  data.tar.gz: ac6045954b72a3f7ddb98b5a38d70053bc0b28d1df81d3bbccbb260ad5b283f18c487ccf1a1fc14a60f890385d903a738147e1ed7d70c83688515a913f25b766
+  metadata.gz: d82b9b8ae012b7a7d275ebdaa81435128d726f75797d4f60224fdd458af84d14b708b114cacbea02d26d10d8d130b2d99c87a8808e401a057d02e3db26fc00de
+  data.tar.gz: 0aecebbbd8ac29daf3af5a065494eda766ceaecc8bb356d105a6d45673ce728828f9c2a6335469e213e79fc9d4b000d807841c402704ee03100497e2b7f3356e

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/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 || {}

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.0.1'
 end

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