rufus-scheduler 2.0.6 → 2.0.7

data/lib/rufus/sc/version.rb

@@ -26,7 +26,7 @@
 module Rufus
 module Scheduler
 
-  VERSION = '2.0.6'
+  VERSION = '2.0.7'
 end
 end
 

data/lib/rufus/scheduler.rb

@@ -36,7 +36,7 @@ module Rufus::Scheduler
   # If EventMachine is present and running will create an EmScheduler, else
   # it will create a PlainScheduler instance.
   #
-  def self.start_new (opts={})
+  def self.start_new(opts={})
 
     if defined?(EM) and EM.reactor_running?
       EmScheduler.start_new(opts)
@@ -47,7 +47,7 @@ module Rufus::Scheduler
 
   # Returns true if the given string seems to be a cron string.
   #
-  def self.is_cron_string (s)
+  def self.is_cron_string(s)
 
     s.match(/.+ .+ .+ .+ .+/) # well...
   end

data/rufus-scheduler.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rufus-scheduler}
-  s.version = "2.0.6"
+  s.version = "2.0.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["John Mettraux"]
-  s.date = %q{2010-05-01}
+  s.date = %q{2010-11-09}
   s.description = %q{
     job scheduler for Ruby (at, cron, in and every jobs).
 
@@ -21,7 +21,9 @@ Gem::Specification.new do |s|
      "README.rdoc"
   ]
   s.files = [
-    "CHANGELOG.txt",
+    ".gitignore",
+     ".rspec",
+     "CHANGELOG.txt",
      "CREDITS.txt",
      "LICENSE.txt",
      "README.rdoc",
@@ -49,7 +51,6 @@ Gem::Specification.new do |s|
      "spec/rtime_spec.rb",
      "spec/schedulable_spec.rb",
      "spec/scheduler_spec.rb",
-     "spec/spec.rb",
      "spec/spec_base.rb",
      "spec/stress_schedule_unschedule_spec.rb",
      "spec/timeout_spec.rb",
@@ -60,31 +61,46 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{rufus}
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{job scheduler for Ruby (at, cron, in and every jobs)}
   s.test_files = [
-    "spec/spec.rb"
+    "spec/at_in_spec.rb",
+     "spec/at_spec.rb",
+     "spec/blocking_spec.rb",
+     "spec/cron_spec.rb",
+     "spec/cronline_spec.rb",
+     "spec/every_spec.rb",
+     "spec/exception_spec.rb",
+     "spec/in_spec.rb",
+     "spec/rtime_spec.rb",
+     "spec/schedulable_spec.rb",
+     "spec/scheduler_spec.rb",
+     "spec/spec_base.rb",
+     "spec/stress_schedule_unschedule_spec.rb",
+     "spec/timeout_spec.rb",
+     "test/kjw.rb",
+     "test/t.rb"
   ]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<tzinfo>, [">= 0"])
       s.add_development_dependency(%q<rake>, [">= 0"])
-      s.add_development_dependency(%q<yard>, [">= 0"])
-      s.add_development_dependency(%q<bacon>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
     else
+      s.add_dependency(%q<tzinfo>, [">= 0"])
       s.add_dependency(%q<rake>, [">= 0"])
-      s.add_dependency(%q<yard>, [">= 0"])
-      s.add_dependency(%q<bacon>, [">= 0"])
+      s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
     end
   else
+    s.add_dependency(%q<tzinfo>, [">= 0"])
     s.add_dependency(%q<rake>, [">= 0"])
-    s.add_dependency(%q<yard>, [">= 0"])
-    s.add_dependency(%q<bacon>, [">= 0"])
+    s.add_dependency(%q<rspec>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
   end
 end

data/spec/at_in_spec.rb

@@ -5,20 +5,20 @@
 # Sun Mar 22 16:47:28 JST 2009
 #
 
-require File.dirname(__FILE__) + '/spec_base'
+require File.join(File.dirname(__FILE__), 'spec_base')
 
 
 describe SCHEDULER_CLASS do
 
-  before do
+  before(:each) do
     @s = start_scheduler
   end
-  after do
+  after(:each) do
     stop_scheduler(@s)
   end
 
 
-  it 'should override jobs with the same id' do
+  it 'overrides jobs with the same id' do
 
     hits = []
 
@@ -33,16 +33,15 @@ describe SCHEDULER_CLASS do
     end
 
     wait_next_tick
-    @s.jobs.size.should.equal(1)
+    @s.jobs.size.should == 1
 
-    hits.should.be.empty
+    hits.should == []
 
     sleep 1.5
 
-    hits.should.equal([ 1 ])
+    hits.should == [ 1 ]
 
-    @s.jobs.size.should.equal(0)
+    @s.jobs.size.should == 0
   end
-
 end
 

data/spec/at_spec.rb

@@ -5,30 +5,30 @@
 # Sat Mar 21 20:19:30 JST 2009
 #
 
-require File.dirname(__FILE__) + '/spec_base'
+require File.join(File.dirname(__FILE__), 'spec_base')
 
 
 describe "#{SCHEDULER_CLASS}#schedule_at" do
 
-  before do
+  before(:each) do
     @s = start_scheduler
   end
-  after do
+  after(:each) do
     stop_scheduler(@s)
   end
 
-  it 'should have job ids with the class name in it' do
+  it 'has job ids with the class name in it' do
 
     j0 = @s.at(Time.now + 1) {}
-    j0.job_id.should.match(/Rufus::Scheduler::AtJob/)
+    j0.job_id.should match(/Rufus::Scheduler::AtJob/)
   end
 
-  it "should accept integers as 'at'" do
+  it "accepts integers as 'at'" do
 
-    lambda { @s.at(1) {} }.should.not.raise
+    lambda { @s.at(1) {} }.should_not raise_error
   end
 
-  it "should schedule at 'top + 1'" do
+  it "schedules at 'top + 1'" do
 
     var = nil
 
@@ -36,14 +36,14 @@ describe "#{SCHEDULER_CLASS}#schedule_at" do
       var = true
     end
 
-    var.should.be.nil
+    var.should == nil
     sleep 1.5
 
-    var.should.be.true
-    @s.jobs.should.be.empty
+    var.should == true
+    @s.jobs.should == {}
   end
 
-  it 'should trigger immediately jobs in the past' do
+  it 'triggers immediately jobs in the past' do
 
     var = nil
 
@@ -51,40 +51,39 @@ describe "#{SCHEDULER_CLASS}#schedule_at" do
       var = true
     end
 
-    j.should.not.be.nil
+    j.should_not == nil
 
     #wait_next_tick
     sleep 0.500
 
-    var.should.be.true
-    @s.jobs.should.be.empty
+    var.should == true
+    @s.jobs.should == {}
   end
 
-  it 'should unschedule' do
+  it 'unschedules' do
 
     job = @s.at Time.now + 3 * 3600 do
     end
 
     wait_next_tick
 
-    @s.jobs.size.should.equal(1)
+    @s.jobs.size.should == 1
 
     @s.unschedule(job.job_id)
 
-    @s.jobs.size.should.equal(0)
+    @s.jobs.size.should == 0
   end
 
-  it 'should accept tags for jobs' do
+  it 'accepts tags for jobs' do
 
     job = @s.at Time.now + 3 * 3600, :tags => 'spec' do
     end
 
     wait_next_tick
 
-    @s.find_by_tag('spec').size.should.equal(1)
-    @s.find_by_tag('spec').first.job_id.should.equal(job.job_id)
+    @s.find_by_tag('spec').size.should == 1
+    @s.find_by_tag('spec').first.job_id.should == job.job_id
   end
-
 end
 
 describe Rufus::Scheduler::AtJob do
@@ -96,7 +95,7 @@ describe Rufus::Scheduler::AtJob do
     stop_scheduler(@s)
   end
 
-  it 'should unschedule itself' do
+  it 'unschedules itself' do
 
     job = @s.at Time.now + 3 * 3600 do
     end
@@ -105,17 +104,17 @@ describe Rufus::Scheduler::AtJob do
 
     job.unschedule
 
-    @s.jobs.size.should.equal(0)
+    @s.jobs.size.should == 0
   end
 
-  it 'should respond to #next_time' do
+  it 'responds to #next_time' do
 
     t = Time.now + 3 * 3600
 
     job = @s.at Time.now + 3 * 3600 do
     end
 
-    job.next_time.to_i.should.equal(t.to_i)
+    job.next_time.to_i.should == t.to_i
   end
 end
 

data/spec/blocking_spec.rb

@@ -5,15 +5,15 @@
 # Sat Mar 21 17:36:36 JST 2009
 #
 
-require File.dirname(__FILE__) + '/spec_base'
+require File.join(File.dirname(__FILE__), 'spec_base')
 
 
 describe SCHEDULER_CLASS do
 
-  before do
+  before(:each) do
     @s = start_scheduler
   end
-  after do
+  after(:each) do
     stop_scheduler(@s)
   end
 
@@ -29,7 +29,7 @@ describe SCHEDULER_CLASS do
     end
   end
 
-  it 'should not block when :blocking => nil' do
+  it "doesn't block when :blocking => nil" do
 
     $var = []
     @s.in('1s') { JOB.call(1) }
@@ -37,10 +37,10 @@ describe SCHEDULER_CLASS do
 
     sleep 5.0
 
-    [ %w{ a1 a2 b1 b2 }, %w{ a1 a2 b2 b1 } ].should.include($var)
+    [ %w{ a1 a2 b1 b2 }, %w{ a1 a2 b2 b1 } ].should include($var)
   end
 
-  it 'should block when :blocking => true' do
+  it 'blocks when :blocking => true' do
 
     $var = []
     @s.in('1s', :blocking => true) { JOB.call(8) }
@@ -48,7 +48,7 @@ describe SCHEDULER_CLASS do
 
     sleep 4.5
 
-    $var.should.equal(%w{ a8 b8 a9 b9 })
+    $var.should == %w[ a8 b8 a9 b9 ]
   end
 end
 

data/spec/cron_spec.rb

@@ -5,25 +5,25 @@
 # Sun Mar 22 19:59:12 JST 2009
 #
 
-require File.dirname(__FILE__) + '/spec_base'
+require File.join(File.dirname(__FILE__), 'spec_base')
 
 
 describe "#{SCHEDULER_CLASS}#cron" do
 
-  before do
+  before(:each) do
     @s = start_scheduler
   end
-  after do
+  after(:each) do
     stop_scheduler(@s)
   end
 
-  it 'should have job ids with the class name in it' do
+  it 'has job ids with the class name in it' do
 
     j0 = @s.cron('7 10-12 * * * *') {}
-    j0.job_id.should.match(/Rufus::Scheduler::CronJob/)
+    j0.job_id.should match(/Rufus::Scheduler::CronJob/)
   end
 
-  it 'should cron every second' do
+  it 'crons every second' do
 
     seconds = []
 
@@ -34,10 +34,10 @@ describe "#{SCHEDULER_CLASS}#cron" do
 
     job.unschedule
 
-    seconds.uniq.size.should.equal(seconds.size)
+    seconds.uniq.size.should == seconds.size
   end
 
-  it 'should unschedule' do
+  it 'unschedules' do
 
     second = nil
 
@@ -45,11 +45,11 @@ describe "#{SCHEDULER_CLASS}#cron" do
       second = job.last.sec
     end
 
-    second.should.be.nil
+    second.should == nil
 
     sleep 2
 
-    second.should.not.be.nil
+    second.should_not == nil
 
     job.unschedule
 
@@ -57,31 +57,31 @@ describe "#{SCHEDULER_CLASS}#cron" do
 
     sleep 2
 
-    second.should.equal(after)
+    second.should == after
   end
 
-  it 'should keep track of cron jobs' do
+  it 'keeps track of cron jobs' do
 
     j0 = @s.cron '7 10-12 * * * *' do
     end
     j1 = @s.cron '7 10-12 * * * *' do
     end
 
-    @s.cron_jobs.keys.sort.should.equal([ j0.job_id, j1.job_id ].sort)
+    @s.cron_jobs.keys.sort.should == [ j0.job_id, j1.job_id ].sort
   end
 
-  it 'should accept tags for jobs' do
+  it 'accepts tags for jobs' do
 
     job = @s.cron '* * * * * *', :tags => 'spec' do
     end
 
     wait_next_tick
 
-    @s.find_by_tag('spec').size.should.equal(1)
-    @s.find_by_tag('spec').first.job_id.should.equal(job.job_id)
+    @s.find_by_tag('spec').size.should == 1
+    @s.find_by_tag('spec').first.job_id.should == job.job_id
   end
 
-  it 'should accept job.unschedule within the job' do
+  it 'accepts job.unschedule within the job' do
 
     stack = []
 
@@ -96,27 +96,27 @@ describe "#{SCHEDULER_CLASS}#cron" do
 
     sleep 4
 
-    @s.jobs.size.should.equal(0)
-    stack.should.equal(%w[ ok ok ok done ])
+    @s.jobs.size.should == 0
+    stack.should == %w[ ok ok ok done ]
   end
 
 end
 
 describe Rufus::Scheduler::CronJob do
 
-  before do
+  before(:each) do
     @s = start_scheduler
   end
-  after do
+  after(:each) do
     stop_scheduler(@s)
   end
 
-  it 'should respond to #next_time' do
+  it 'responds to #next_time' do
 
     job = @s.cron '* * * * *' do
     end
 
-    (job.next_time.to_i - Time.now.to_i).should.satisfy { |v| v < 60 }
+    (job.next_time.to_i - Time.now.to_i).should satisfy { |v| v < 60 }
   end
 end