rufus-scheduler 3.1.9 → 3.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 03122e92f3b47a4af3d12b06762f5f4caa604341
-  data.tar.gz: 8db6b1570347d1ffa1871fe9d90163729fbf7516
+  metadata.gz: 5b6294bd5d0ba45b0ae97cd681c4a915d3f4f15d
+  data.tar.gz: 1670414782d681e46791acd641524cde44aa8063
 SHA512:
-  metadata.gz: 0bf2d0ab22e975dc6832fc651dd415708a998960b4b9503865fe560c9b78284b54ac2b5957d8c912d1415776898e211eb6fe6a56c456613df85f5b4afcf35e0f
-  data.tar.gz: 52b001210ccea2c628e4a95e2bde023725cbb1ce9ee78bd635cfedddafcbed9851abda8eb0edb46e5816ba7ddc80e55dae256588a6caf079f9ebd126d5dbd3c7
+  metadata.gz: 769cdd5e8e86acb0f4a7dfac068710a0cc12210604604cd7423ea896b9ce2bd68b4f7bd16932c9122577d1121ebc05db7e15af76403e63ff404a60e35d6c96f6
+  data.tar.gz: cf3b2a402f6bad0411cdba7e9ce8a62021de7cd90bbfb4db321cd3b11b19af28dee9a87c3d1d481957f73a766cd84200a4eaccceb804365003f276876fb798b9

data/CHANGELOG.txt

@@ -2,6 +2,13 @@
 = rufus-scheduler CHANGELOG.txt
 
 
+== rufus-scheduler - 3.1.10    released 2015-11-18
+
+- allow for :first_in => 0, gh-179 by https://github.com/JonMcPherson
+  for https://github.com/Shopify/dashing/commit/ea3730fa4
+- stop shipping specs in gem
+
+
 == rufus-scheduler - 3.1.9    released 2015-11-12
 
 - fix potential RuntimeError in CronLine#prev_second,

data/CREDITS.txt

@@ -4,6 +4,7 @@
 
 == Contributors
 
+- 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
 - Claude Vessaz (https://github.com/claudeatsafe) ack #unscheduled_at in #scheduled?

data/README.md

@@ -123,7 +123,6 @@ 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)
-* [Unicorn and rufus-scheduler](https://jkraemer.net/running-rufus-scheduler-in-a-unicorn-rails-app)
 
 
 ## scheduling

data/lib/rufus/scheduler.rb

@@ -39,7 +39,7 @@ module Rufus
     require 'rufus/scheduler/job_array'
     require 'rufus/scheduler/locks'
 
-    VERSION = '3.1.9'
+    VERSION = '3.1.10'
 
     #
     # A common error class for rufus-scheduler
@@ -629,7 +629,7 @@ module Rufus
 
       job = job_class.new(self, t, opts, block || callable)
 
-      raise ArgumentError.new(
+      fail ArgumentError.new(
         "job frequency (#{job.frequency}) is higher than " +
         "scheduler frequency (#{@frequency})"
       ) if job.respond_to?(:frequency) && job.frequency < @frequency

data/lib/rufus/scheduler/cronline.rb

@@ -48,7 +48,7 @@ class Rufus::Scheduler
 
     def initialize(line)
 
-      raise ArgumentError.new(
+      fail ArgumentError.new(
         "not a string: #{line.inspect}"
       ) unless line.is_a?(String)
 
@@ -58,7 +58,7 @@ class Rufus::Scheduler
 
       @timezone = items.pop if ZoTime.is_timezone?(items.last)
 
-      raise ArgumentError.new(
+      fail ArgumentError.new(
         "not a valid cronline : '#{line}'"
       ) unless items.length == 5 or items.length == 6
 
@@ -73,7 +73,7 @@ class Rufus::Scheduler
 
       [ @seconds, @minutes, @hours, @months ].each do |es|
 
-        raise ArgumentError.new(
+        fail ArgumentError.new(
           "invalid cronline: '#{line}'"
         ) if es && es.find { |e| ! e.is_a?(Fixnum) }
       end
@@ -327,7 +327,7 @@ class Rufus::Scheduler
 
         if m = it.match(/^(.+)#(l|-?[12345])$/)
 
-          raise ArgumentError.new(
+          fail ArgumentError.new(
             "ranges are not supported for monthdays (#{it})"
           ) if m[1].index('-')
 
@@ -340,7 +340,7 @@ class Rufus::Scheduler
           expr = it.dup
           WEEKDAYS.each_with_index { |a, i| expr.gsub!(/#{a}/, i.to_s) }
 
-          raise ArgumentError.new(
+          fail ArgumentError.new(
             "invalid weekday expression (#{it})"
           ) if expr !~ /^0*[0-7](-0*[0-7])?$/
 
@@ -362,7 +362,7 @@ class Rufus::Scheduler
 
       r = item.split(',').map { |i| parse_range(i.strip, min, max) }.flatten
 
-      raise ArgumentError.new(
+      fail ArgumentError.new(
         "found duplicates in #{item.inspect}"
       ) if r.uniq.size < r.size
 
@@ -381,7 +381,7 @@ class Rufus::Scheduler
 
       m = item.match(RANGE_REGEX)
 
-      raise ArgumentError.new(
+      fail ArgumentError.new(
         "cannot parse #{item.inspect}"
       ) unless m
 
@@ -395,7 +395,7 @@ class Rufus::Scheduler
       inc = m[3]
       inc = inc ? inc.to_i : 1
 
-      raise ArgumentError.new(
+      fail ArgumentError.new(
         "#{item.inspect} is not in range #{min}..#{max}"
       ) if sta < min || edn > max
 

data/lib/rufus/scheduler/jobs.rb

@@ -91,7 +91,7 @@ module Rufus
 
         @id = determine_id
 
-        raise(
+        fail(
           ArgumentError,
           'missing block or callable to schedule',
           caller[2..-1]
@@ -235,7 +235,7 @@ module Rufus
 
       rescue StandardError => se
 
-        raise se unless do_rescue
+        fail se unless do_rescue
 
         return if se.is_a?(KillSignal) # discard
 
@@ -402,7 +402,7 @@ module Rufus
 
         @times = opts[:times]
 
-        raise ArgumentError.new(
+        fail ArgumentError.new(
           "cannot accept :times => #{@times.inspect}, not nil or an int"
         ) unless @times == nil || @times.is_a?(Fixnum)
 
@@ -416,27 +416,34 @@ module Rufus
 
       def first_at=(first)
 
-        return @first_at = nil if first == nil
+        return (@first_at = nil) if first == nil
 
-        n = Time.now
-        first = n + 0.003 if first == :now || first == :immediately
+        n0 = Time.now
+        n1 = n0 + 0.003
+
+        first = n0 if first == :now || first == :immediately || first == 0
 
         @first_at = Rufus::Scheduler.parse_to_time(first)
+        @first_at = n1 if @first_at >= n0 && @first_at < n1
 
-        raise ArgumentError.new(
+        fail ArgumentError.new(
           "cannot set first[_at|_in] in the past: " +
           "#{first.inspect} -> #{@first_at.inspect}"
-        ) if first != 0 && @first_at < n
+        ) if @first_at < n0
+
+        @first_at
       end
 
       def last_at=(last)
 
         @last_at = last ? Rufus::Scheduler.parse_to_time(last) : nil
 
-        raise ArgumentError.new(
+        fail ArgumentError.new(
           "cannot set last[_at|_in] in the past: " +
           "#{last.inspect} -> #{@last_at.inspect}"
         ) if last && @last_at < Time.now
+
+        @last_at
       end
 
       def trigger(time)
@@ -522,7 +529,7 @@ module Rufus
 
         @frequency = Rufus::Scheduler.parse_in(@original)
 
-        raise ArgumentError.new(
+        fail ArgumentError.new(
           "cannot schedule #{self.class} with a frequency " +
           "of #{@frequency.inspect} (#{@original.inspect})"
         ) if @frequency <= 0
@@ -560,7 +567,7 @@ module Rufus
 
         @interval = Rufus::Scheduler.parse_in(@original)
 
-        raise ArgumentError.new(
+        fail ArgumentError.new(
           "cannot schedule #{self.class} with an interval " +
           "of #{@interval.inspect} (#{@original.inspect})"
         ) if @interval <= 0

data/lib/rufus/scheduler/util.rb

@@ -38,7 +38,7 @@ module Rufus
       parse_cron(o, opts) ||
       parse_in(o, opts) || # covers 'every' schedule strings
       parse_at(o, opts) ||
-      raise(ArgumentError.new("couldn't parse \"#{o}\""))
+      fail(ArgumentError.new("couldn't parse \"#{o}\""))
     end
 
     def self.parse_in(o, opts={})
@@ -53,7 +53,7 @@ module Rufus
     rescue StandardError => se
 
       return nil if opts[:no_error]
-      raise se
+      fail se
     end
 
     def self.parse_cron(o, opts)
@@ -63,7 +63,7 @@ module Rufus
     rescue ArgumentError => ae
 
       return nil if opts[:no_error]
-      raise ae
+      fail ae
     end
 
     def self.parse_to_time(o)
@@ -72,7 +72,7 @@ module Rufus
       t = parse(t) if t.is_a?(String)
       t = Time.now + t if t.is_a?(Numeric)
 
-      raise ArgumentError.new(
+      fail ArgumentError.new(
         "cannot turn #{o.inspect} to a point in time, doesn't make sense"
       ) unless t.is_a?(Time)
 
@@ -132,7 +132,7 @@ module Rufus
       m = string.match(/^(-?)([\d\.#{DURATION_LETTERS}]+)$/)
 
       return nil if m.nil? && opts[:no_error]
-      raise ArgumentError.new("cannot parse '#{string}'") if m.nil?
+      fail ArgumentError.new("cannot parse '#{string}'") if m.nil?
 
       mod = m[1] == '-' ? -1.0 : 1.0
       val = 0.0
@@ -150,9 +150,7 @@ module Rufus
         elsif opts[:no_error]
           return nil
         else
-          raise ArgumentError.new(
-            "cannot parse '#{string}' (especially '#{s}')"
-          )
+          fail ArgumentError.new("cannot parse '#{string}' (especially '#{s}')")
         end
         break unless m && m[3]
         s = m[3]

data/lib/rufus/scheduler/zotime.rb

@@ -101,7 +101,7 @@ class Rufus::Scheduler
       begin
         DateTime.parse(str)
       rescue
-        raise ArgumentError, "no time information in #{o.inspect}"
+        fail ArgumentError, "no time information in #{o.inspect}"
       end if RUBY_VERSION < '1.9.0'
 
       zone = nil

data/rufus-scheduler.gemspec

@@ -22,7 +22,7 @@ job scheduler for Ruby (at, cron, in and every jobs).
   #s.files = `git ls-files`.split("\n")
   s.files = Dir[
     'Rakefile',
-    'lib/**/*.rb', 'spec/**/*.rb', 'test/**/*.rb',
+    'lib/**/*.rb', #'spec/**/*.rb', 'test/**/*.rb',
     '*.gemspec', '*.txt', '*.rdoc', '*.md'
   ]
 

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: rufus-scheduler
 version: !ruby/object:Gem::Version
-  version: 3.1.9
+  version: 3.1.10
 platform: ruby
 authors:
 - John Mettraux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-11 00:00:00.000000000 Z
+date: 2015-11-17 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
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.13.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.13.0
 - !ruby/object:Gem::Dependency
   name: chronic
   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: tzinfo
   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'
 description: job scheduler for Ruby (at, cron, in and every jobs).
@@ -73,14 +73,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- CHANGELOG.txt
-- CREDITS.txt
-- LICENSE.txt
-- README.md
 - Rakefile
-- TODO.txt
-- lib/rufus-scheduler.rb
-- lib/rufus/scheduler.rb
 - lib/rufus/scheduler/cronline.rb
 - lib/rufus/scheduler/job_array.rb
 - lib/rufus/scheduler/jobs.rb
@@ -88,33 +81,15 @@ files:
 - lib/rufus/scheduler/util.rb
 - lib/rufus/scheduler/zones.rb
 - lib/rufus/scheduler/zotime.rb
+- lib/rufus/scheduler.rb
+- lib/rufus-scheduler.rb
 - rufus-scheduler.gemspec
-- spec/basics_spec.rb
-- spec/cronline_spec.rb
-- spec/error_spec.rb
-- spec/job_array_spec.rb
-- spec/job_at_spec.rb
-- spec/job_cron_spec.rb
-- spec/job_every_spec.rb
-- spec/job_in_spec.rb
-- spec/job_interval_spec.rb
-- spec/job_repeat_spec.rb
-- spec/job_spec.rb
-- spec/lock_custom_spec.rb
-- spec/lock_flock_spec.rb
-- spec/lock_lockfile_spec.rb
-- spec/lock_spec.rb
-- spec/parse_spec.rb
-- spec/schedule_at_spec.rb
-- spec/schedule_cron_spec.rb
-- spec/schedule_every_spec.rb
-- spec/schedule_in_spec.rb
-- spec/schedule_interval_spec.rb
-- spec/scheduler_spec.rb
-- spec/spec_helper.rb
-- spec/threads_spec.rb
-- spec/zotime_spec.rb
+- CHANGELOG.txt
+- CREDITS.txt
+- LICENSE.txt
 - t.txt
+- TODO.txt
+- README.md
 homepage: http://github.com/jmettraux/rufus-scheduler
 licenses:
 - MIT
@@ -125,17 +100,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: rufus
-rubygems_version: 2.2.2
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: job scheduler for Ruby (at, cron, in and every jobs)

data/spec/basics_spec.rb

@@ -1,54 +0,0 @@
-
-#
-# Specifying rufus-scheduler
-#
-# Sun Jun  1 05:52:24 JST 2014
-#
-
-require 'spec_helper'
-
-
-describe 'basics' do
-
-  def tts(time)
-
-    time.strftime('%Y-%m-%d %H:%M:%S %z') + (time.dst? ? ' dst' : '')
-  end
-
-  describe 'Time.new' do
-
-    it 'accepts a timezone final argument' do
-
-      if jruby? or ruby18?
-
-        expect(true).to be(true)
-
-      else
-
-        expect(
-          tts(Time.new(2014, 1, 1, 1, 0, 0, '+01:00'))
-        ).to eq('2014-01-01 01:00:00 +0100')
-        expect(
-          tts(Time.new(2014, 8, 1, 1, 0, 0, '+01:00'))
-        ).to eq('2014-08-01 01:00:00 +0100')
-        expect(
-          tts(Time.new(2014, 8, 1, 1, 0, 0, '+01:00'))
-        ).to eq('2014-08-01 01:00:00 +0100')
-      end
-    end
-  end
-
-  describe 'Time.local' do
-
-    it 'works as expected' do
-
-      expect(
-        tts(in_zone('Europe/Berlin') { Time.local(2014, 1, 1, 1, 0, 0) })
-      ).to eq('2014-01-01 01:00:00 +0100')
-      expect(
-        tts(in_zone('Europe/Berlin') { Time.local(2014, 8, 1, 1, 0, 0) })
-      ).to eq('2014-08-01 01:00:00 +0200 dst')
-    end
-  end
-end
-