rufus-scheduler 3.0.3 → 3.0.4

data/CHANGELOG.txt

@@ -2,6 +2,11 @@
 = rufus-scheduler CHANGELOG.txt
 
 
+== rufus-scheduler - 3.0.4    released 2014/10/19
+
+- make CronLine#frequency faster (to avoid 20s schedule_cron times)
+
+
 == rufus-scheduler - 3.0.3    released 2013/12/12
 
 - CronLine#previous_time fix by Yassen Bantchev (https://github.com/yassenb)

data/LICENSE.txt

@@ -1,5 +1,5 @@
 
-Copyright (c) 2005-2013, John Mettraux, jmettraux@gmail.com
+Copyright (c) 2005-2014, John Mettraux, jmettraux@gmail.com
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -717,16 +717,22 @@ Rufus::Scheduler.parse('* * * * * *').frequency       # ==> 1
 Rufus::Scheduler.parse('5 23 * * *').frequency        # ==> 24 * 3600
 Rufus::Scheduler.parse('5 * * * *').frequency         # ==> 3600
 Rufus::Scheduler.parse('10,20,30 * * * *').frequency  # ==> 600
+
+Rufus::Scheduler.parse('10,20,30 * * * * *').frequency  # ==> 10
 ```
 
 It's used to determine if the job frequency is higher than the scheduler frequency (it raises an ArgumentError if that is the case).
 
+### brute_frequency
+
+Cron jobs also have a ```#brute_frequency``` method that looks a one year of intervals to determine the shortest delta for the cron. This method can take between 20 to 50 seconds for cron lines that go the second level. ```#frequency``` above, when encountering second level cron lines will take a shortcut to answer as quickly as possible with a usable value.
+
 
 ## looking up jobs
 
 ### Scheduler#job(job_id)
 
-The scheduler #job(job_id) method can be used to lookup Job instances.
+The scheduler ```#job(job_id)``` method can be used to lookup Job instances.
 
 ```ruby
   require 'rufus-scheduler'

data/lib/rufus/scheduler.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2006-2013, John Mettraux, jmettraux@gmail.com
+# Copyright (c) 2006-2014, John Mettraux, jmettraux@gmail.com
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -38,7 +38,7 @@ module Rufus
     require 'rufus/scheduler/cronline'
     require 'rufus/scheduler/job_array'
 
-    VERSION = '3.0.3'
+    VERSION = '3.0.4'
 
     #
     # A common error class for rufus-scheduler

data/lib/rufus/scheduler/cronline.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2006-2013, John Mettraux, jmettraux@gmail.com
+# Copyright (c) 2006-2014, John Mettraux, jmettraux@gmail.com
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -197,6 +197,28 @@ class Rufus::Scheduler
       ]
     end
 
+    # Returns a quickly computed approximation of the frequency for this
+    # cron line.
+    #
+    # #brute_frequency, on the other hand, will compute the frequency by
+    # examining a whole, that can take more than seconds for a seconds
+    # level cron...
+    #
+    def frequency
+
+      return brute_frequency unless @seconds && @seconds.length > 1
+
+      delta = 60
+      prev = @seconds[0]
+
+      @seconds[1..-1].each do |sec|
+        d = sec - prev
+        delta = d if d < delta
+      end
+
+      delta
+    end
+
     # Returns the shortest delta between two potential occurences of the
     # schedule described by this cronline.
     #
@@ -221,7 +243,7 @@ class Rufus::Scheduler
     # See https://github.com/jmettraux/rufus-scheduler/issues/89
     # for a discussion about this method.
     #
-    def frequency
+    def brute_frequency
 
       delta = 366 * DAY_S
 

data/lib/rufus/scheduler/job_array.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2006-2013, John Mettraux, jmettraux@gmail.com
+# Copyright (c) 2006-2014, John Mettraux, jmettraux@gmail.com
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

data/lib/rufus/scheduler/jobs.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2006-2013, John Mettraux, jmettraux@gmail.com
+# Copyright (c) 2006-2014, John Mettraux, jmettraux@gmail.com
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -535,6 +535,11 @@ module Rufus
         @cron_line.frequency
       end
 
+      def brute_frequency
+
+        @cron_line.brute_frequency
+      end
+
       protected
 
       def set_next_time(is_post, trigger_time)

data/lib/rufus/scheduler/util.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2006-2013, John Mettraux, jmettraux@gmail.com
+# Copyright (c) 2006-2014, John Mettraux, jmettraux@gmail.com
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

data/spec/cronline_spec.rb

@@ -396,6 +396,23 @@ describe Rufus::Scheduler::CronLine do
       match '* * * * sun#2,sun#3', local(1970, 1, 18)
       no_match '* * * * sun#2,sun#3', local(1970, 1, 25)
     end
+
+    it 'matches correctly for seconds' do
+
+      match '* * * * * *', local(1970, 1, 11)
+      match '* * * * * *', local(1970, 1, 11, 0, 0, 13)
+    end
+
+    it 'matches correctly for seconds / interval' do
+
+      match '*/2 * * * * *', local(1970, 1, 11)
+      match '*/5 * * * * *', local(1970, 1, 11)
+      match '*/5 * * * * *', local(1970, 1, 11, 0, 0, 0)
+      no_match '*/5 * * * * *', local(1970, 1, 11, 0, 0, 1)
+      match '*/5 * * * * *', local(1970, 1, 11, 0, 0, 5)
+      match '*/2 * * * * *', local(1970, 1, 11, 0, 0, 2)
+      match '*/2 * * * * *', local(1970, 1, 11, 0, 0, 2, 500)
+    end
   end
 
   describe '#monthdays' do
@@ -420,12 +437,43 @@ describe Rufus::Scheduler::CronLine do
 
     it 'returns the shortest delta between two occurrences' do
 
-      Rufus::Scheduler::CronLine.new('* * * * *').frequency.should == 60
-      Rufus::Scheduler::CronLine.new('* * * * * *').frequency.should == 1
+      Rufus::Scheduler::CronLine.new(
+          '* * * * *').frequency.should == 60
+      Rufus::Scheduler::CronLine.new(
+          '* * * * * *').frequency.should == 1
+
+      Rufus::Scheduler::CronLine.new(
+          '5 23 * * *').frequency.should == 24 * 3600
+      Rufus::Scheduler::CronLine.new(
+          '5 * * * *').frequency.should == 3600
+      Rufus::Scheduler::CronLine.new(
+          '10,20,30 * * * *').frequency.should == 600
+
+      Rufus::Scheduler::CronLine.new(
+          '10,20,30 * * * * *').frequency.should == 10
+    end
+  end
+
+  describe '#brute_frequency' do
+
+    it 'returns the shortest delta between two occurrences' do
+
+      Rufus::Scheduler::CronLine.new(
+          '* * * * *').brute_frequency.should == 60
+      Rufus::Scheduler::CronLine.new(
+          '* * * * * *').brute_frequency.should == 1
 
-      Rufus::Scheduler::CronLine.new('5 23 * * *').frequency.should == 24 * 3600
-      Rufus::Scheduler::CronLine.new('5 * * * *').frequency.should == 3600
-      Rufus::Scheduler::CronLine.new('10,20,30 * * * *').frequency.should == 600
+      Rufus::Scheduler::CronLine.new(
+          '5 23 * * *').brute_frequency.should == 24 * 3600
+      Rufus::Scheduler::CronLine.new(
+          '5 * * * *').brute_frequency.should == 3600
+      Rufus::Scheduler::CronLine.new(
+          '10,20,30 * * * *').brute_frequency.should == 600
+
+      #Rufus::Scheduler::CronLine.new(
+      #    '10,20,30 * * * * *').brute_frequency.should == 10
+        #
+        # takes > 20s ...
     end
   end
 end

data/spec/job_cron_spec.rb

@@ -62,6 +62,45 @@ describe Rufus::Scheduler::CronJob do
       job.first_at.should be_within_1s_of(t + 3)
       job.last_time.should == nil
     end
+
+    it 'triggers for the first time at first_at' do
+
+      first_time = nil
+      t = Time.now
+
+      job = @scheduler.schedule_cron '* * * * * *', :first_in => '3s' do
+        first_time ||= Time.now
+      end
+      sleep 4.5
+
+      job.first_at.should be_within_1s_of(t + 3)
+      first_time.should be_within_1s_of(job.first_at)
+    end
+  end
+
+  context 'scheduling the cron itself' do
+
+    # for https://github.com/jmettraux/rufus-scheduler/issues/95
+    #
+    # schedule_cron takes more than 30 seconds, blocking...
+    #
+    it 'does not sit scheduling and blocking...' do
+
+      n = Time.now
+      first = nil
+
+      job = @scheduler.schedule_cron '*/2 * * * * *' do
+        first ||= Time.now
+      end
+
+      (Time.now - n).should < 1.0
+
+      loop do
+        next unless first
+        (first - n).should < 4.0
+        break
+      end
+    end
   end
 end
 

data/spec/scheduler_spec.rb

@@ -363,37 +363,16 @@ describe Rufus::Scheduler do
     end
   end
 
-  describe '#work_threads(:all)' do
+  describe '#work_threads(:all | :vacant)' do
 
     it 'returns an empty array when the scheduler has not yet done anything' do
 
       @scheduler.work_threads.should == []
-    end
-
-    it 'lists all the work threads in the pool' do
-
-      @scheduler.in '0s' do
-        sleep(0.2)
-      end
-      @scheduler.in '0s' do
-        sleep(2.0)
-      end
-
-      sleep 0.6
-
-      @scheduler.work_threads.size.should == 2
-      @scheduler.work_threads(:all).size.should == 2
-    end
-  end
-
-  describe '#work_threads(:vacant)' do
-
-    it 'returns an empty array when the scheduler has not yet done anything' do
-
+      @scheduler.work_threads(:all).should == []
       @scheduler.work_threads(:vacant).should == []
     end
 
-    it 'lists all the vacant work threads in the pool' do
+    it 'lists the [vacant] work threads in the pool' do
 
       @scheduler.in '0s' do
         sleep(0.2)
@@ -402,10 +381,17 @@ describe Rufus::Scheduler do
         sleep(2.0)
       end
 
-      sleep 0.6
+      sleep 0.7
 
-      @scheduler.work_threads(:all).size.should == 2
-      @scheduler.work_threads(:vacant).size.should == 1
+      if @scheduler.work_threads.size == 1
+        @scheduler.work_threads.size.should == 1
+        @scheduler.work_threads(:all).size.should == 1
+        @scheduler.work_threads(:vacant).size.should == 0
+      else
+        @scheduler.work_threads.size.should == 2
+        @scheduler.work_threads(:all).size.should == 2
+        @scheduler.work_threads(:vacant).size.should == 1
+      end
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rufus-scheduler
 version: !ruby/object:Gem::Version
-  version: 3.0.3
+  version: 3.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-11 00:00:00.000000000 Z
+date: 2014-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tzinfo
@@ -103,7 +103,7 @@ files:
 homepage: http://github.com/jmettraux/rufus-scheduler
 licenses:
 - MIT
-post_install_message: ! "\n***\n\nThanks for installing rufus-scheduler 3.0.3\n\nIt
+post_install_message: ! "\n***\n\nThanks for installing rufus-scheduler 3.0.4\n\nIt
   might not be 100% compatible with rufus-scheduler 2.x.\n\nIf you encounter issues
   with this new rufus-scheduler, especially\nif your app worked fine with previous
   versions of it, you can\n\nA) Forget it and peg your Gemfile to rufus-scheduler