rufus-scheduler 2.0.16 → 2.0.17

data/CHANGELOG.txt

@@ -2,6 +2,12 @@
 = rufus-scheduler CHANGELOG.txt
 
 
+== rufus-scheduler - 2.0.17    released 2012/06/14
+
+- @andrehjr patch to make it work on Ruby 1.9.3
+- raises ArgumentError on unknown/unsupported options (Idea Tero Tilus)
+
+
 == rufus-scheduler - 2.0.16    released 2011/12/31
 
 - hardened Rufus.parse_time_string

data/CREDITS.txt

@@ -4,6 +4,7 @@
 
 == Contributors
 
+- André Luis Leal Cardoso Junior (https://github.com/andrehjr) 1.9.3 patch
 - Anthony Lewis (https://github.com/anthonylewis) cron lines and 09 issue
 - concept47 (https://github.com/concept47) every and :discard_past
 - Chris Kampemeier (http://github.com/chrisk) rspec 2.0 refinements
@@ -15,6 +16,7 @@
 
 == Feedback
 
+- Tero Tilus - raises on unsupported/unknown options
 - Louis Coilliot - Scheduler#running_jobs
 - Henrique G. Testa - pause/resume concept
 - Sam Gibson - https://github.com/samfoo - exception handling hardening

data/LICENSE.txt

@@ -1,5 +1,5 @@
 
-Copyright (c) 2005-2011, John Mettraux, jmettraux@gmail.com
+Copyright (c) 2005-2012, 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.rdoc

@@ -124,6 +124,10 @@ at then end of it will make the current (main) thread join the scheduler and pre
 
 You shouldn't be exposed to this issue when using EventMachine, since while running EM, your runtime won't exit.
 
+=== important note about #join
+
+DO NOT CALL this #join method if you're running rufus-scheduler from Rails or Sinatra or any application that's already some kind of 'daemon'. It's not necessary! #join is meant for small standalone scripts.
+
 
 == block parameters
 

data/lib/rufus/sc/cronline.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2006-2011, John Mettraux, jmettraux@gmail.com
+# Copyright (c) 2006-2012, 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/sc/jobqueues.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2006-2011, John Mettraux, jmettraux@gmail.com
+# Copyright (c) 2006-2012, 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/sc/jobs.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2006-2011, John Mettraux, jmettraux@gmail.com
+# Copyright (c) 2006-2012, 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
@@ -30,7 +30,7 @@ module Scheduler
   # The base class for all types of jobs.
   #
   class Job
-
+      
     # A reference to the scheduler owning this job
     #
     attr_accessor :scheduler
@@ -76,6 +76,8 @@ module Scheduler
       @params = params
       @block = block || params[:schedulable]
 
+      raise_on_unknown_params
+
       @running = false
       @paused = false
 
@@ -235,6 +237,39 @@ module Scheduler
 
       @scheduler.unschedule(self.job_id)
     end
+
+    protected
+
+    def known_params
+
+      [ :allow_overlapping,
+        :blocking,
+        :discard_past,
+        :job_id,
+        :mutex,
+        :schedulable,
+        :tags,
+        :timeout ]
+    end
+
+    def self.known_params(*args)
+
+      define_method :known_params do
+        super() + args
+      end
+    end
+
+    def raise_on_unknown_params
+
+      rem = @params.keys - known_params
+
+      raise(
+        ArgumentError,
+        "unknown option#{rem.size > 1 ? 's' : '' }: " +
+        "#{rem.map(&:inspect).join(', ')}",
+        caller[3..-1]
+      ) if rem.any?
+    end
   end
 
   #
@@ -246,6 +281,8 @@ module Scheduler
     #
     attr_reader :at
 
+    # Last time it triggered
+    #
     attr_reader :last
 
     def determine_at
@@ -266,12 +303,15 @@ module Scheduler
   #
   class InJob < SimpleJob
 
+    known_params :parent
+
     # If this InJob is a timeout job, parent points to the job that
     # is subject to the timeout.
     #
     attr_reader :parent
 
     def initialize(scheduler, t, params)
+
       @parent = params[:parent]
       super
     end
@@ -298,6 +338,8 @@ module Scheduler
   #
   class EveryJob < SimpleJob
 
+    known_params :first_in, :first_at
+
     # The frequency, in seconds, of this EveryJob
     #
     attr_reader :frequency
@@ -323,8 +365,11 @@ module Scheduler
 
     def determine_frequency
 
-      @frequency = @t.is_a?(Fixnum) || @t.is_a?(Float) ?
-        @t : Rufus.parse_duration_string(@t)
+      @frequency = if @t.is_a?(Fixnum) || @t.is_a?(Float)
+        @t
+      else
+        Rufus.parse_duration_string(@t)
+      end
     end
 
     def determine_at

data/lib/rufus/sc/scheduler.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2006-2011, John Mettraux, jmettraux@gmail.com
+# Copyright (c) 2006-2012, 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/sc/version.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2006-2011, John Mettraux, jmettraux@gmail.com
+# Copyright (c) 2006-2012, 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
@@ -26,7 +26,7 @@
 module Rufus
 module Scheduler
 
-  VERSION = '2.0.16'
+  VERSION = '2.0.17'
 end
 end
 

data/lib/rufus/scheduler.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2006-2011, John Mettraux, jmettraux@gmail.com
+# Copyright (c) 2006-2012, 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/out.txt

@@ -0,0 +1,4 @@
+ruby-1.8.7-p249 :001 > nada
+NameError: undefined local variable or method `nada' for #<Object:0x1001d1298>
+	from (irb):1
+ruby-1.8.7-p249 :002 > ^D

data/spec/at_spec.rb

@@ -113,5 +113,13 @@ describe "#{SCHEDULER_CLASS}#schedule_at" do
     r.size.should == 3
     r.first.class.should == Rufus::Scheduler::AtJob
   end
+
+  it 'raises on unknown options' do
+
+    lambda {
+      @s.at Time.now + 3600, :first_at => (Time.now + 3600).to_s do
+      end
+    }.should raise_error(ArgumentError)
+  end
 end
 

data/spec/cron_spec.rb

@@ -122,5 +122,13 @@ describe "#{SCHEDULER_CLASS}#cron" do
     @s.jobs.size.should == 0
     stack.should == %w[ ok ok ok done ]
   end
+
+  it 'raises on unknown options' do
+
+    lambda {
+      @s.cron '* * * * *', :pool => :party do
+      end
+    }.should raise_error(ArgumentError)
+  end
 end
 

data/spec/every_spec.rb

@@ -247,5 +247,13 @@ describe "#{SCHEDULER_CLASS}#every" do
 
     $exceptions.size.should be > 1
   end
+
+  it 'raises on unknown options' do
+
+    lambda {
+      @s.every '1s', :pool => :party do
+      end
+    }.should raise_error(ArgumentError)
+  end
 end
 

data/spec/in_spec.rb

@@ -138,5 +138,13 @@ describe "#{SCHEDULER_CLASS}#in" do
     @s.find_by_tag('spec').size.should == 1
     @s.find_by_tag('spec').first.job_id.should == job.job_id
   end
+
+  it 'raises on unknown options' do
+
+    lambda {
+      @s.in '2d', :first_at => (Time.now + 3600).to_s do
+      end
+    }.should raise_error(ArgumentError)
+  end
 end
 

data/spec/schedulable_spec.rb

@@ -75,5 +75,23 @@ describe Rufus::Scheduler::Schedulable do
 
     j.value.class.should == Rufus::Scheduler::InJob
   end
+
+  class MySchedulable
+    def self.job
+      @@job
+    end
+    def self.call(job)
+      @@job = job
+    end
+  end
+
+  it 'accepts schedulable classes as second param' do
+
+    @s.in '1s', MySchedulable
+
+    sleep 1.4
+
+    MySchedulable.job.class.should == Rufus::Scheduler::InJob
+  end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rufus-scheduler
 version: !ruby/object:Gem::Version
-  version: 2.0.16
+  version: 2.0.17
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-31 00:00:00.000000000 +09:00
-default_executable: 
+date: 2012-06-13 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tzinfo
-  requirement: &2153487720 !ruby/object:Gem::Requirement
+  requirement: &2153074260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +21,10 @@ dependencies:
         version: 0.3.23
   type: :runtime
   prerelease: false
-  version_requirements: *2153487720
+  version_requirements: *2153074260
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2153487240 !ruby/object:Gem::Requirement
+  requirement: &2153072940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153487240
+  version_requirements: *2153072940
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2153486660 !ruby/object:Gem::Requirement
+  requirement: &2153072180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,7 +43,7 @@ dependencies:
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *2153486660
+  version_requirements: *2153072180
 description: job scheduler for Ruby (at, cron, in and every jobs).
 email:
 - jmettraux@gmail.com
@@ -84,9 +83,9 @@ files:
 - CHANGELOG.txt
 - CREDITS.txt
 - LICENSE.txt
+- out.txt
 - TODO.txt
 - README.rdoc
-has_rdoc: true
 homepage: http://github.com/jmettraux/rufus-scheduler
 licenses: []
 post_install_message: 
@@ -107,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: rufus
-rubygems_version: 1.6.2
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: job scheduler for Ruby (at, cron, in and every jobs)