rufus-scheduler 3.1.10 → 3.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b6294bd5d0ba45b0ae97cd681c4a915d3f4f15d
-  data.tar.gz: 1670414782d681e46791acd641524cde44aa8063
+  metadata.gz: c40e276338f283e1d434b24ff0914bb4f9e4772c
+  data.tar.gz: 6f675ccf7f32737bd45e96119db3f0217a9294c0
 SHA512:
-  metadata.gz: 769cdd5e8e86acb0f4a7dfac068710a0cc12210604604cd7423ea896b9ce2bd68b4f7bd16932c9122577d1121ebc05db7e15af76403e63ff404a60e35d6c96f6
-  data.tar.gz: cf3b2a402f6bad0411cdba7e9ce8a62021de7cd90bbfb4db321cd3b11b19af28dee9a87c3d1d481957f73a766cd84200a4eaccceb804365003f276876fb798b9
+  metadata.gz: 5a263aaebb6f8f434f7b1eeeb138e0e77d19dd11cb87dcb347be5543fd079e90ab4352aa3a3df297ea46fe8be76d2d25950dee02afbc427e49aab4d316fee385
+  data.tar.gz: 5037bcda9d0650d1404bc2c134cd3ad36e0b9fc90f95dfde27af416fb2a8794c844777ddfa42b24cbb5b07f0694c3a58b8006795321c2a3699404710c61d4860

data/CHANGELOG.txt

@@ -2,6 +2,22 @@
 = rufus-scheduler CHANGELOG.txt
 
 
+== rufus-scheduler - 3.2.1    released 2016-05-04
+
+- accept '* * * * 5L' (last friday) (equivalent to '* * * * 5#-1')
+- CronLine#to_a (#to_array aliasing to it)
+- simplify .parse_duration (and trim input)
+- raise on "*/0 * * * *", by https://github.com/simook
+- introduce "days to end of month" in cron strings
+
+
+== rufus-scheduler - 3.2.0    released 2015-12-28
+
+- cache CronLine#brute_frequency results, gh-188 and gh-89
+- "every" shift prevention by https://github.com/Korrigan
+- Ruby warnings silenced by https://github.com/vivitar
+
+
 == rufus-scheduler - 3.1.10    released 2015-11-18
 
 - allow for :first_in => 0, gh-179 by https://github.com/JonMcPherson

data/CREDITS.txt

@@ -4,6 +4,11 @@
 
 == Contributors
 
+- Kyle Simukka (https://githuc.om/simook) raise on "*/0 * * * *"
+- Ryan McGeary (https://github.com/rmm5t) svg badges for the readme
+- Balasankar C (https://github.com/balasankarc) fix CronJob spec vs December
+- Matthieu Rosinski (https://github.com/Korrigan) prevent "every" shifts
+- vivitar (https://github.com/vivitar) silenced a set of Ruby warnings
 - Jon McPherson (https://github.com/JonMcPherson) :first_in => 0 back
 - Calinoiu Alexandru Nicolae (https://github.com/alexandru-calinoiu) CronLine#prev_second fix
 - Alyssa Pohahau (https://github.com/alyssa) out of DST transition specs
@@ -43,6 +48,10 @@
 
 == Feedback
 
+- Anjali Sharma - https://github.com/anjali-sharma - fix typographical error
+- Jonathan Campos - https://github.com/jonbcampos - negative cron day idea
+- Andrey Morskov - https://github.com/accessd - fix typographical error
+- Eduardo Maia - https://github.com/emaiax - rufus and the Rails console
 - Suisea - https://github.com/suisea - readme rewording
 - Radek - http://stackoverflow.com/users/250422 - gh-166
 - Patrik Ragnarsson - https://github.com/dentarg - timeout vs nil, gh-156

data/LICENSE.txt

@@ -1,5 +1,5 @@
 
-Copyright (c) 2005-2015, John Mettraux, jmettraux@gmail.com
+Copyright (c) 2005-2016, 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/Makefile

@@ -0,0 +1,23 @@
+
+NAME = \
+  $(shell ruby -e "s = eval(File.read(Dir['*.gemspec'][0])); puts s.name")
+VERSION = \
+  $(shell ruby -e "s = eval(File.read(Dir['*.gemspec'][0])); puts s.version")
+
+
+gemspec_validate:
+	@echo "---"
+	ruby -e "s = eval(File.read(Dir['*.gemspec'].first)); p s.validate"
+	@echo "---"
+
+name: gemspec_validate
+	@echo "$(NAME) $(VERSION)"
+
+build: gemspec_validate
+	gem build $(NAME).gemspec
+	mkdir -p pkg
+	mv $(NAME)-$(VERSION).gem pkg/
+
+push: build
+	gem push pkg/$(NAME)-$(VERSION).gem
+

data/README.md

@@ -1,8 +1,8 @@
 
 # rufus-scheduler
 
-[![Build Status](https://secure.travis-ci.org/jmettraux/rufus-scheduler.png)](http://travis-ci.org/jmettraux/rufus-scheduler)
-[![Gem Version](https://badge.fury.io/rb/rufus-scheduler.png)](http://badge.fury.io/rb/rufus-scheduler)
+[![Build Status](https://secure.travis-ci.org/jmettraux/rufus-scheduler.svg)](http://travis-ci.org/jmettraux/rufus-scheduler)
+[![Gem Version](https://badge.fury.io/rb/rufus-scheduler.svg)](http://badge.fury.io/rb/rufus-scheduler)
 
 Job scheduler for Ruby (at, cron, in and every jobs).
 
@@ -10,6 +10,8 @@ Job scheduler for Ruby (at, cron, in and every jobs).
 
 Quickstart:
 ```ruby
+# quickstart.rb
+
 require 'rufus-scheduler'
 
 scheduler = Rufus::Scheduler.new
@@ -21,6 +23,7 @@ end
 scheduler.join
   # let the current thread join the scheduler thread
 ```
+(run with `ruby quickstart.rb`)
 
 Various forms of scheduling are supported:
 ```ruby
@@ -59,9 +62,10 @@ It does not persist your schedules. When the process is gone and the scheduler i
 
 ## related and similar gems
 
-* [whenever](https://github.com/javan/whenever) - let cron call back your Ruby code, trusted and reliable cron drives your schedule
-* [clockwork](https://github.com/tomykaira/clockwork) - rufus-scheduler inspired gem
-* [crono](https://github.com/plashchynski/crono) - an in-Rails cron scheduler
+* [Whenever](https://github.com/javan/whenever) - let cron call back your Ruby code, trusted and reliable cron drives your schedule
+* [Clockwork](https://github.com/tomykaira/clockwork) - rufus-scheduler inspired gem
+* [Crono](https://github.com/plashchynski/crono) - an in-Rails cron scheduler
+* [PerfectSched](https://github.com/treasure-data/perfectsched) - highly available distributed cron built on [Sequel](http://sequel.jeremyevans.net) and more
 
 (please note: rufus-scheduler is not a cron replacement)
 
@@ -101,12 +105,6 @@ Go read [how to report bugs effectively](http://www.chiark.greenend.org.uk/~sgta
 
 Update: [help_help.md](https://gist.github.com/jmettraux/310fed75f568fd731814) might help help you.
 
-### on StackOverflow
-
-Use this [form](http://stackoverflow.com/questions/ask?tags=rufus-scheduler+ruby). It'll create a question flagged "rufus-scheduler" and "ruby".
-
-Here are the [questions tagged rufus-scheduler](http://stackoverflow.com/questions/tagged/rufus-scheduler).
-
 ### on IRC
 
 I sometimes haunt #ruote on freenode.net. The channel is not dedicated to rufus-scheduler, so if you ask a question, first mention it's about rufus-scheduler.
@@ -123,6 +121,10 @@ Yes, issues can be reported in [rufus-scheduler issues](https://github.com/jmett
 * [I want a refund](http://blog.nodejitsu.com/getting-refunds-on-open-source-projects)
 * [Passenger and rufus-scheduler](http://stackoverflow.com/questions/18108719/debugging-rufus-scheduler/18156180#18156180)
 * [Passenger and rufus-scheduler (2)](http://stackoverflow.com/questions/21861387/rufus-cron-job-not-working-in-apache-passenger#answer-21868555)
+* [Passenger in-depth spawn methods](https://www.phusionpassenger.com/library/indepth/ruby/spawn_methods/)
+* [Passenger in-depth spawn methods (smart spawning)](https://www.phusionpassenger.com/library/indepth/ruby/spawn_methods/#smart-spawning-hooks)
+* [The scheduler comes up when running the Rails console](https://github.com/jmettraux/rufus-scheduler#avoid-scheduling-when-running-the-ruby-on-rails-console)
+* [I don't get any of this, I just want it to work in my Rails application](#so-rails)
 
 
 ## scheduling
@@ -179,6 +181,8 @@ Interval jobs, trigger, execute and then trigger again after the interval elapse
 
 Cron jobs are based on the venerable cron utility (```man 5 crontab```). They trigger following a pattern given in (almost) the same language cron uses.
 
+#### 
+
 ### #schedule_x vs #x
 
 schedule_in, schedule_at, schedule_cron, etc will return the new Job instance.
@@ -1346,7 +1350,6 @@ Rufus::Scheduler.parse('* * * * mon#1').next_time
 L can be used in the "day" slot:
 
 In this example, the cronline is supposed to trigger every last day of the month at noon:
-
 ```ruby
 require 'rufus-scheduler'
 Time.now
@@ -1355,6 +1358,21 @@ Rufus::Scheduler.parse('00 12 L * *').next_time
   # => 2013-10-31 12:00:00 +0900
 ```
 
+#### negative day (x days before the end of the month)
+
+It's OK to pass negative values in the "day" slot:
+```ruby
+scheduler.cron '0 0 -5 * *' do
+  # do it at 00h00 5 days before the end of the month...
+end
+```
+
+Negative ranges (`-10--5-`: 10 days before the end of the month to 5 days before the end of the month) are OK, but mixed positive / negative ranges will raise an `ArgumentError`.
+
+Negative ranges with increments (`-10---2/2`) are accepted as well.
+
+Descending day ranges are not accepted (`10-8` or `-8--10` for example).
+
 
 ## a note about timezones
 
@@ -1427,6 +1445,34 @@ The rufus-scheduler singleton is instantiated in the ```config/initializers/sche
 
 *Warning*: this works well with single-process Ruby servers like Webrick and Thin. Using rufus-scheduler with Passenger or Unicorn requires a bit more knowledge and tuning, gently provided by a bit of googling and reading, see [Faq](#faq) above.
 
+### avoid scheduling when running the Ruby on Rails console
+
+(Written in reply to https://github.com/jmettraux/rufus-scheduler/issues/186 )
+
+If you don't want rufus-scheduler to kick in when running the Ruby on Rails console, you can wrap your initializer in a conditional:
+
+```ruby
+#
+# config/initializers/scheduler.rb
+
+require 'rufus-scheduler'
+
+s = Rufus::Scheduler.singleton
+
+
+unless defined?(Rails::Console)
+  # only schedule when not running from the Ruby on Rails console
+
+  s.every '1m' do
+
+    Rails.logger.info "hello, it's #{Time.now}"
+    Rails.logger.flush
+  end
+end
+```
+
+It should work for Ruby on Rails 3 and 4.
+
 ### rails server -d
 
 (Written in reply to https://github.com/jmettraux/rufus-scheduler/issues/165 )

data/lib/rufus/scheduler/cronline.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2006-2015, John Mettraux, jmettraux@gmail.com
+# Copyright (c) 2006-2016, 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
@@ -42,8 +42,8 @@ class Rufus::Scheduler
     attr_reader :hours
     attr_reader :days
     attr_reader :months
+    #attr_reader :monthdays # reader defined below
     attr_reader :weekdays
-    attr_reader :monthdays
     attr_reader :timezone
 
     def initialize(line)
@@ -67,7 +67,7 @@ class Rufus::Scheduler
       @seconds = offset == 1 ? parse_item(items[0], 0, 59) : [ 0 ]
       @minutes = parse_item(items[0 + offset], 0, 59)
       @hours = parse_item(items[1 + offset], 0, 24)
-      @days = parse_item(items[2 + offset], 1, 31)
+      @days = parse_item(items[2 + offset], -30, 31)
       @months = parse_item(items[3 + offset], 1, 12)
       @weekdays, @monthdays = parse_weekdays(items[4 + offset])
 
@@ -188,9 +188,9 @@ class Rufus::Scheduler
 
     # Returns an array of 6 arrays (seconds, minutes, hours, days,
     # months, weekdays).
-    # This method is used by the cronline unit tests.
+    # This method is mostly used by the cronline specs.
     #
-    def to_array
+    def to_a
 
       [
         toa(@seconds),
@@ -203,6 +203,7 @@ class Rufus::Scheduler
         @timezone
       ]
     end
+    alias to_array to_a
 
     # Returns a quickly computed approximation of the frequency for this
     # cron line.
@@ -223,6 +224,10 @@ class Rufus::Scheduler
       }[1]
     end
 
+    # Caching facility. Currently only used for brute frequencies.
+    #
+    @cache = {}; class << self; attr_reader :cache; end
+
     # Returns the shortest delta between two potential occurences of the
     # schedule described by this cronline.
     #
@@ -239,16 +244,13 @@ class Rufus::Scheduler
     # Of course, this method can get VERY slow if you call on it a second-
     # based cronline...
     #
-    # Since it's a rarely used method, I haven't taken the time to make it
-    # smarter/faster.
-    #
-    # One obvious improvement would be to cache the result once computed...
-    #
-    # See https://github.com/jmettraux/rufus-scheduler/issues/89
-    # for a discussion about this method.
-    #
     def brute_frequency
 
+      key = "brute_frequency:#{@original}"
+
+      delta = self.class.cache[key]
+      return delta if delta
+
       delta = 366 * DAY_S
 
       t0 = previous_time(Time.local(2000, 1, 1))
@@ -268,7 +270,7 @@ class Rufus::Scheduler
         t0 = t1
       end
 
-      delta
+      self.class.cache[key] = delta
     end
 
     def next_second(time)
@@ -318,33 +320,33 @@ class Rufus::Scheduler
 
       return nil if item == '*'
 
-      items = item.downcase.split(',')
-
       weekdays = nil
       monthdays = nil
 
-      items.each do |it|
+      item.downcase.split(',').each do |it|
+
+        WEEKDAYS.each_with_index { |a, i| it.gsub!(/#{a}/, i.to_s) }
 
-        if m = it.match(/^(.+)#(l|-?[12345])$/)
+        it = it.gsub(/([^#])l/, '\1#-1')
+          # "5L" == "5#-1" == the last Friday
+
+        if m = it.match(/\A(.+)#(l|-?[12345])\z/)
 
           fail ArgumentError.new(
             "ranges are not supported for monthdays (#{it})"
           ) if m[1].index('-')
 
-          expr = it.gsub(/#l/, '#-1')
+          it = it.gsub(/#l/, '#-1')
 
-          (monthdays ||= []) << expr
+          (monthdays ||= []) << it
 
         else
 
-          expr = it.dup
-          WEEKDAYS.each_with_index { |a, i| expr.gsub!(/#{a}/, i.to_s) }
-
           fail ArgumentError.new(
-            "invalid weekday expression (#{it})"
-          ) if expr !~ /^0*[0-7](-0*[0-7])?$/
+            "invalid weekday expression (#{item})"
+          ) if it !~ /\A0*[0-7](-0*[0-7])?\z/
 
-          its = expr.index('-') ? parse_range(expr, 0, 7) : [ Integer(expr) ]
+          its = it.index('-') ? parse_range(it, 0, 7) : [ Integer(it) ]
           its = its.collect { |i| i == 7 ? 0 : i }
 
           (weekdays ||= []).concat(its)
@@ -371,13 +373,13 @@ class Rufus::Scheduler
       Set.new(r)
     end
 
-    RANGE_REGEX = /^(\*|\d{1,2})(?:-(\d{1,2}))?(?:\/(\d{1,2}))?$/
+    RANGE_REGEX = /\A(\*|-?\d{1,2})(?:-(-?\d{1,2}))?(?:\/(\d{1,2}))?\z/
 
     def parse_range(item, min, max)
 
       return %w[ L ] if item == 'L'
 
-      item = '*' + item if item.match(/^\//)
+      item = '*' + item if item[0, 1] == '/'
 
       m = item.match(RANGE_REGEX)
 
@@ -385,8 +387,10 @@ class Rufus::Scheduler
         "cannot parse #{item.inspect}"
       ) unless m
 
+      mmin = min == -30 ? 1 : min # days
+
       sta = m[1]
-      sta = sta == '*' ? min : sta.to_i
+      sta = sta == '*' ? mmin : sta.to_i
 
       edn = m[2]
       edn = edn ? edn.to_i : sta
@@ -395,16 +399,28 @@ class Rufus::Scheduler
       inc = m[3]
       inc = inc ? inc.to_i : 1
 
+      fail ArgumentError.new(
+        "#{item.inspect} positive/negative ranges not allowed"
+      ) if (sta < 0 && edn > 0) || (sta > 0 && edn < 0)
+
+      fail ArgumentError.new(
+        "#{item.inspect} descending day ranges not allowed"
+      ) if min == -30 && sta > edn
+
       fail ArgumentError.new(
         "#{item.inspect} is not in range #{min}..#{max}"
       ) if sta < min || edn > max
 
+      fail ArgumentError.new(
+        "#{item.inspect} increment must be greater than zero"
+      ) if inc == 0
+
       r = []
       val = sta
 
       loop do
         v = val
-        v = 0 if max == 24 && v == 24
+        v = 0 if max == 24 && v == 24 # hours
         r << v
         break if inc == 1 && val == edn
         val += inc
@@ -420,9 +436,19 @@ class Rufus::Scheduler
       value = time.send(accessor)
 
       return true if values.nil?
-      return true if values.include?('L') && (time + DAY_S).day == 1
 
-      return true if value == 0 && accessor == :hour && values.include?(24)
+      if accessor == :day
+
+        values.each do |v|
+          return true if v == 'L' && (time + DAY_S).day == 1
+          return true if v.to_i < 0 && (time + (1 - v) * DAY_S).day == 1
+        end
+      end
+
+      if accessor == :hour
+
+        return true if value == 0 && values.include?(24)
+      end
 
       values.include?(value)
     end
@@ -465,7 +491,7 @@ class Rufus::Scheduler
         neg = neg - 1
       end
 
-      [ "#{WEEKDAYS[date.wday]}##{pos}", "#{WEEKDAYS[date.wday]}##{neg}" ]
+      [ "#{date.wday}##{pos}", "#{date.wday}##{neg}" ]
     end
   end
 end

data/lib/rufus/scheduler/job_array.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2006-2015, John Mettraux, jmettraux@gmail.com
+# Copyright (c) 2006-2016, 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-2015, John Mettraux, jmettraux@gmail.com
+# Copyright (c) 2006-2016, 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
@@ -391,7 +391,7 @@ module Rufus
       attr_reader :paused_at
 
       attr_reader :first_at
-      attr_accessor :last_at
+      attr_reader :last_at
       attr_accessor :times
 
       def initialize(scheduler, duration, opts, block)
@@ -543,9 +543,12 @@ module Rufus
 
         return if is_post
 
+        n = Time.now
+
         @next_time =
-          if @first_at == nil || @first_at < Time.now
-            (trigger_time || Time.now) + @frequency
+          if @first_at == nil || @first_at < n
+            nt = (@next_time || trigger_time || n) + @frequency
+            nt > n ? nt : (trigger_time || n) + @frequency
           else
             @first_at
           end

data/lib/rufus/scheduler/locks.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2006-2015, John Mettraux, jmettraux@gmail.com
+# Copyright (c) 2006-2016, 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
@@ -41,7 +41,7 @@ class Rufus::Scheduler
   end
 
   #
-  # The standard flock mecha, with its own class thanks to @ecin
+  # The standard flock mechanism, with its own class thanks to @ecin
   #
   class FileLock
 

data/lib/rufus/scheduler/util.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2006-2015, John Mettraux, jmettraux@gmail.com
+# Copyright (c) 2006-2016, 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
@@ -125,38 +125,24 @@ module Rufus
     #
     def self.parse_duration(string, opts={})
 
-      string = string.to_s
+      s = string.to_s.strip
+      mod = s[0, 1] == '-' ? -1 : 1
+      s = s[1..-1] if mod == -1
 
-      return 0.0 if string == ''
+      ss = mod < 0 ? '-' : ''
+      r = 0.0
 
-      m = string.match(/^(-?)([\d\.#{DURATION_LETTERS}]+)$/)
-
-      return nil if m.nil? && opts[:no_error]
-      fail ArgumentError.new("cannot parse '#{string}'") if m.nil?
-
-      mod = m[1] == '-' ? -1.0 : 1.0
-      val = 0.0
-
-      s = m[2]
+      s.scan(/(\d*\.\d+|\d+\.?)([#{DURATION_LETTERS}]?)/) do |f, d|
+        ss += "#{f}#{d}"
+        r += f.to_f * (DURATIONS[d] || 1.0)
+      end
 
-      while s.length > 0
-        m = nil
-        if m = s.match(/^(\d+|\d+\.\d*|\d*\.\d+)([#{DURATION_LETTERS}])(.*)$/)
-          val += m[1].to_f * DURATIONS[m[2]]
-        elsif s.match(/^\d+$/)
-          val += s.to_i
-        elsif s.match(/^\d*\.\d*$/)
-          val += s.to_f
-        elsif opts[:no_error]
-          return nil
-        else
-          fail ArgumentError.new("cannot parse '#{string}' (especially '#{s}')")
-        end
-        break unless m && m[3]
-        s = m[3]
+      if ss == '-' || ss != string.to_s.strip
+        return nil if opts[:no_error]
+        fail ArgumentError.new("invalid time duration #{string.inspect}")
       end
 
-      mod * val
+      mod * r
     end
 
     class << self

data/lib/rufus/scheduler/zones.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2006-2015, John Mettraux, jmettraux@gmail.com
+# Copyright (c) 2006-2016, 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/zotime.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2006-2015, John Mettraux, jmettraux@gmail.com
+# Copyright (c) 2006-2016, 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
@@ -85,7 +85,7 @@ class Rufus::Scheduler
       @seconds
     end
 
-    #DELTA_TZ_REX = /^[+-][0-1][0-9]:?[0-5][0-9]$/
+    #DELTA_TZ_REX = /\A[+-][0-1][0-9]:?[0-5][0-9]\z/
 
     def self.envtzable?(s)
 

data/lib/rufus/scheduler.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2006-2015, John Mettraux, jmettraux@gmail.com
+# Copyright (c) 2006-2016, 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
@@ -39,7 +39,7 @@ module Rufus
     require 'rufus/scheduler/job_array'
     require 'rufus/scheduler/locks'
 
-    VERSION = '3.1.10'
+    VERSION = '3.2.1'
 
     #
     # A common error class for rufus-scheduler
@@ -385,7 +385,7 @@ module Rufus
     #
     def scheduled?(job_or_job_id)
 
-      job, job_id = fetch(job_or_job_id)
+      job, _ = fetch(job_or_job_id)
 
       !! (job && job.unscheduled_at.nil? && job.next_time != nil)
     end
@@ -441,7 +441,7 @@ module Rufus
       if format == :timeline
         a = []
         h.each { |j, ts| ts.each { |t| a << [ t, j ] } }
-        a.sort_by { |(t, j)| t }
+        a.sort_by { |(t, _)| t }
       else
         h
       end

data/rufus-scheduler.gemspec

@@ -21,14 +21,13 @@ job scheduler for Ruby (at, cron, in and every jobs).
 
   #s.files = `git ls-files`.split("\n")
   s.files = Dir[
-    'Rakefile',
+    'Makefile',
     'lib/**/*.rb', #'spec/**/*.rb', 'test/**/*.rb',
     '*.gemspec', '*.txt', '*.rdoc', '*.md'
   ]
 
   #s.add_runtime_dependency 'tzinfo'
 
-  s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec', '>= 2.13.0'
   s.add_development_dependency 'chronic'
   s.add_development_dependency 'tzinfo'

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: rufus-scheduler
 version: !ruby/object:Gem::Version
-  version: 3.1.10
+  version: 3.2.1
 platform: ruby
 authors:
 - John Mettraux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-17 00:00:00.000000000 Z
+date: 2016-05-04 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -73,7 +59,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- Rakefile
+- Makefile
 - lib/rufus/scheduler/cronline.rb
 - lib/rufus/scheduler/job_array.rb
 - lib/rufus/scheduler/jobs.rb
@@ -87,7 +73,6 @@ files:
 - CHANGELOG.txt
 - CREDITS.txt
 - LICENSE.txt
-- t.txt
 - TODO.txt
 - README.md
 homepage: http://github.com/jmettraux/rufus-scheduler

data/Rakefile

@@ -1,83 +0,0 @@
-
-require 'rubygems'
-
-require 'rake'
-require 'rake/clean'
-require 'rdoc/task'
-
-
-#
-# clean
-
-CLEAN.include('pkg', 'rdoc')
-
-
-#
-# test / spec
-
-#task :spec => :check_dependencies do
-task :spec do
-  exec 'rspec spec/'
-end
-task :test => :spec
-
-task :default => :spec
-
-
-#
-# gem
-
-GEMSPEC_FILE = Dir['*.gemspec'].first
-GEMSPEC = eval(File.read(GEMSPEC_FILE))
-GEMSPEC.validate
-
-
-desc %{
-  builds the gem and places it in pkg/
-}
-task :build do
-
-  sh "gem build #{GEMSPEC_FILE}"
-  sh "mkdir -p pkg"
-  sh "mv #{GEMSPEC.name}-#{GEMSPEC.version}.gem pkg/"
-end
-
-desc %{
-  builds the gem and pushes it to rubygems.org
-}
-task :push => :build do
-
-  sh "gem push pkg/#{GEMSPEC.name}-#{GEMSPEC.version}.gem"
-end
-
-
-#
-# rdoc
-#
-# make sure to have rdoc 2.5.x to run that
-
-Rake::RDocTask.new do |rd|
-
-  rd.main = 'README.txt'
-  rd.rdoc_dir = "rdoc/#{GEMSPEC.name}"
-
-  rd.rdoc_files.include('README.rdoc', 'CHANGELOG.txt', 'lib/**/*.rb')
-
-  rd.title = "#{GEMSPEC.name} #{GEMSPEC.version}"
-end
-
-
-#
-# upload_rdoc
-
-desc %{
-  upload the rdoc to rubyforge
-}
-task :upload_rdoc => [ :clean, :rdoc ] do
-
-  account = 'jmettraux@rubyforge.org'
-  webdir = '/var/www/gforge-projects/rufus'
-
-  sh "rsync -azv -e ssh rdoc/#{GEMSPEC.name} #{account}:#{webdir}/"
-end
-

data/t.txt

@@ -1,31 +0,0 @@
-
-JRUBY
-
-1) Rufus::Scheduler::CronLine fall time correctly decrements every minute through a DST transition
-
-Failure/Error: expect(points).to eq([
-
-expected: ["0101-8(0901)", "0100-8(0900)", "0159-7(0859)", "0158-7(0858)"]
-     got: ["0101-7(0801)", "0100-7(0800)", "0059-7(0759)", "0058-7(0758)"]
-
-(compared using ==)
-# ./spec/cronline_spec.rb:1013:in `(root)'
-# ./spec/spec_helper.rb:69:in `in_zone'
-# ./spec/cronline_spec.rb:1001:in `(root)'
-
-
-RUBY1.8
-
-1) Rufus::Scheduler::CronLine fall time correctly decrements every minute through a DST transition
-
-Failure/Error: expect(points).to eq([
-
-expected: ["0101-8(0901)", "0100-8(0900)", "0159-7(0859)", "0158-7(0858)"]
-     got: ["0101-7(0801)", "0100-7(0800)", "0059-7(0759)", "0058-7(0758)"]
-
-(compared using ==)
-# ./spec/cronline_spec.rb:1013
-# ./spec/spec_helper.rb:69:in `call'
-# ./spec/spec_helper.rb:69:in `in_zone'
-# ./spec/cronline_spec.rb:1001
-