rufus-scheduler 3.5.1 → 3.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f4e266cabe7da6408e8646fbedabd788ad74188f
-  data.tar.gz: bf8312e05826c8f7aeb150c4f69c874d446f8c55
+SHA256:
+  metadata.gz: cc94e118313d64c54f5690f3c2a144c21f7b56c0719c36a0642982f468469750
+  data.tar.gz: 52f2bf8923744d67938cbf0dfa764d8e6304fab512188c916505cf342203ec54
 SHA512:
-  metadata.gz: 14064eb823dd4efcdf5bcc3cf53de39307184237d1ea95ec826f79fc3398d74ff76edf3206c7bdf113895b9c82d9a27899b4b50dd633fcb56155a36fbec7f8b6
-  data.tar.gz: dc32167e6b96204a8aa377b8a8c084518ad406eb3b02b8a2ebc7e26698ab3657a4fd6c702093bf7facae54defc0e786a0dd0e69059a653bbfeda2994007309ac
+  metadata.gz: f02d8f20e5acaeaa27a8c9e0895e8c1fc5ba534c2c228e683ac36042e32f5306cade78225dc8335e38fab8f724a6edf23b0196d5506d53c989af0e88e65cdbef
+  data.tar.gz: 9aa6c0211441f60d3b326b6d35abde28dbe01558830288b3a4f7d2aed9523e6bf690345ca39656dafc976dec3a658b435735ea8f568cc02856861e074de2f226

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 # CHANGELOG.md
 
 
+### rufus-scheduler 3.5.2 - released 2018-08-01
+
+* Use Fugit::Cron#rough_frequency
+* Improve Job#check_frequency performance, gh-276, @drcapulet
+
+
 ### rufus-scheduler 3.5.1 - released 2018-07-20
 
 * Upgrade fugit to 1.1.4 (with out of DST issue fix)

data/CREDITS.md

@@ -4,10 +4,11 @@
 
 ## Contributors
 
-* Vais Salikhov (https://github.com/vais) - many document clarifications
-* Wes McNamee (https://github.com/ghostsquad) - let #schedule accept a CronLine
-* Joe Rafaniello (https://github.com/jrafanie) - Travis Ruby 2.4.1
-* Benjamin Fleischer (https://github.com/bf4) - ZoTime#subtract
+* Alex Coomans (https://github.com/drcapulet) gh-276 freq check pref improvement
+* Vais Salikhov (https://github.com/vais) many document clarifications
+* Wes McNamee (https://github.com/ghostsquad) let #schedule accept a CronLine
+* Joe Rafaniello (https://github.com/jrafanie) Travis Ruby 2.4.1
+* Benjamin Fleischer (https://github.com/bf4) ZoTime#subtract
 * Sam Rowe (https://github.com/riddley) gh-240 timezone for Debian
 * Daniel Rodgers-Pryor (https://github.com/djrodgerspryor), gh-238 fix ZooKeeper example
 * Cody Cutrer (https://github.com/ccutrer) gh-232 is_a?(Fixnum) replacement

data/README.md

@@ -46,6 +46,9 @@ end
 scheduler.every '3h' do
   # do something every 3 hours
 end
+scheduler.every '3h10m' do
+  # do something every 3 hours and 10 minutes
+end
 
 scheduler.cron '5 0 * * *' do
   # do something every day, five minutes after midnight

data/lib/rufus/scheduler.rb

@@ -11,7 +11,7 @@ module Rufus
 
   class Scheduler
 
-    VERSION = '3.5.1'
+    VERSION = '3.5.2'
 
     EoTime = ::EtOrbi::EoTime
 
@@ -615,36 +615,7 @@ module Rufus
         end
 
       job = job_class.new(self, t, opts, block || callable)
-
-      #fail ArgumentError.new(
-      #  "job frequency (#{job.frequency}) is higher than " +
-      #  "scheduler frequency (#{@frequency})"
-      #) if job.respond_to?(:frequency) && job.frequency < @frequency
-        #
-        # This was expensive
-
-      if (
-        ! job.is_a?(Rufus::Scheduler::IntervalJob) &&
-        job.methods.include?(:next_time_from)
-      ) then
-
-        nts = (1..365)
-          .inject([ job.send(:next_time_from, EtOrbi.now) ]) { |a, i|
-            a << job.send(:next_time_from, a.last); a }
-        deltas = []; prev = nts.shift
-        while (nt = nts.shift); deltas << (nt - prev).to_f; prev = nt; end
-
-        deltas = deltas[1..-1] \
-          if opts.keys.find { |k| k.to_s.match(/\Afirst/) }
-            #
-            # do not consider the first delta if there is a first, first_at,
-            # or first_in involved
-
-        fail ArgumentError.new(
-          "job frequency (~max #{deltas.min}s) is higher than " +
-          "scheduler frequency (#{@frequency})"
-        ) if deltas.min < @frequency * 0.9
-      end
+      job.check_frequency
 
       @jobs.push(job)
 

data/lib/rufus/scheduler/jobs.rb

@@ -95,6 +95,14 @@ module Rufus
 
       alias job_id id
 
+      # Will fail with an ArgumentError if the job frequency is higher than
+      # the scheduler frequency.
+      #
+      def check_frequency
+
+        # this parent implementation never fails
+      end
+
       def trigger(time)
 
         @previous_time = @next_time
@@ -543,6 +551,14 @@ module Rufus
         set_next_time(nil)
       end
 
+      def check_frequency
+
+        fail ArgumentError.new(
+         "job frequency (#{@frequency}s) is higher than " +
+         "scheduler frequency (#{@scheduler.frequency}s)"
+        ) if @frequency < @scheduler.frequency
+      end
+
       protected
 
       def set_next_time(trigger_time, is_post=false)
@@ -620,11 +636,31 @@ module Rufus
         set_next_time(nil)
       end
 
+      def check_frequency
+
+        return if @scheduler.frequency <= 1
+          #
+          # The minimum time delta in a cron job is 1 second, so if the
+          # scheduler frequency is less than that, no worries.
+
+        f = @cron_line.rough_frequency
+
+        fail ArgumentError.new(
+         "job frequency (min ~#{f}s) is higher than " +
+         "scheduler frequency (#{@scheduler.frequency}s)"
+        ) if f < @scheduler.frequency
+      end
+
       def brute_frequency
 
         @cron_line.brute_frequency
       end
 
+      def rough_frequency
+
+        @cron_line.rough_frequency
+      end
+
       protected
 
       def set_next_time(trigger_time, is_post=false)

data/rufus-scheduler.gemspec

@@ -19,6 +19,16 @@ Gem::Specification.new do |s|
 Job scheduler for Ruby (at, cron, in and every jobs). Not a replacement for crond.
   }.strip
 
+  s.metadata = {
+    'changelog_uri' => s.homepage + '/blob/master/CHANGELOG.md',
+    'bug_tracker_uri' => s.homepage + '/issues',
+    'homepage_uri' =>  s.homepage,
+    'source_code_uri' => s.homepage,
+    #'wiki_uri' => s.homepage + '/flor/wiki',
+    #'documentation_uri' => s.homepage + '/tree/master/doc',
+    #'mailing_list_uri' => 'https://groups.google.com/forum/#!forum/floraison',
+  }
+
   #s.files = `git ls-files`.split("\n")
   s.files = Dir[
     'README.{md,txt}',
@@ -30,7 +40,7 @@ Job scheduler for Ruby (at, cron, in and every jobs). Not a replacement for cron
 
   s.required_ruby_version = '>= 1.9'
 
-  s.add_runtime_dependency 'fugit', '~> 1.1', '>= 1.1.4'
+  s.add_runtime_dependency 'fugit', '~> 1.1', '>= 1.1.5'
 
   s.add_development_dependency 'rspec', '~> 3.7'
   s.add_development_dependency 'chronic', '~> 0.10'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rufus-scheduler
 version: !ruby/object:Gem::Version
-  version: 3.5.1
+  version: 3.5.2
 platform: ruby
 authors:
 - John Mettraux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-20 00:00:00.000000000 Z
+date: 2018-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fugit
@@ -19,7 +19,7 @@ dependencies:
         version: '1.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.4
+        version: 1.1.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '1.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.4
+        version: 1.1.5
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -81,7 +81,11 @@ files:
 homepage: http://github.com/jmettraux/rufus-scheduler
 licenses:
 - MIT
-metadata: {}
+metadata:
+  changelog_uri: http://github.com/jmettraux/rufus-scheduler/blob/master/CHANGELOG.md
+  bug_tracker_uri: http://github.com/jmettraux/rufus-scheduler/issues
+  homepage_uri: http://github.com/jmettraux/rufus-scheduler
+  source_code_uri: http://github.com/jmettraux/rufus-scheduler
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -98,7 +102,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: rufus
-rubygems_version: 2.5.2.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: job scheduler for Ruby (at, cron, in and every jobs)