rufus-scheduler 1.0.7 → 1.0.8

data/test/cronline_test.rb

@@ -7,7 +7,6 @@
 # Sun Oct 29 16:18:25 JST 2006
 #
 
-require 'pp'
 require 'test/unit'
 
 require 'rufus/scheduler'

data/test/scheduler_0_test.rb

@@ -62,7 +62,7 @@ class Scheduler0Test < Test::Unit::TestCase
     scheduler = Rufus::Scheduler.new
     scheduler.start
 
-    sid = scheduler.schedule_in('1s') do
+    sid = scheduler.in('1s') do
       $var = "ok..1"
     end
 
@@ -144,7 +144,7 @@ class Scheduler0Test < Test::Unit::TestCase
 
     es = EverySchedulable.new
 
-    job_id = scheduler.schedule_every "500", es
+    job_id = scheduler.every "500", es
 
     #puts "1 job_id : " + job_id.to_s
 
@@ -160,6 +160,9 @@ class Scheduler0Test < Test::Unit::TestCase
 
     assert_equal 6, es.count
 
+    assert_nil scheduler.get_job(job_id)
+    assert_equal 1, scheduler.every_job_count # one left from before
+
     # done
 
     scheduler.sstop
@@ -265,12 +268,11 @@ class Scheduler0Test < Test::Unit::TestCase
   #
   def test_8b
 
-    scheduler = Rufus::Scheduler.new
-    scheduler.start
+    scheduler = Rufus::Scheduler.start_new
 
     var = nil
 
-    job_id = scheduler.schedule_at(Time.now.to_s, :discard_past => true) do
+    job_id = scheduler.at(Time.now.to_s, :discard_past => true) do
       var = "something"
     end
 

data/test/scheduler_1_test.rb

@@ -47,8 +47,7 @@ class Scheduler1Test < Test::Unit::TestCase
 
   def test_1
 
-    scheduler = Rufus::Scheduler.new
-    scheduler.start
+    scheduler = Rufus::Scheduler.start_new
 
     job_id = scheduler.schedule_every "500", :tags => "Avery" do
       # don't do a thing
@@ -59,8 +58,8 @@ class Scheduler1Test < Test::Unit::TestCase
     count = 1
 
     200_000.times do
-      #assert_equal 1, scheduler.find_jobs("Avery").size
       count = scheduler.find_jobs("Avery").size
+      #p scheduler.instance_variable_get(:@non_cron_jobs).keys if count != 1
       break if count != 1
     end
 
@@ -74,8 +73,7 @@ class Scheduler1Test < Test::Unit::TestCase
   #
   def _test_2
 
-    scheduler = Rufus::Scheduler.new
-    scheduler.start
+    scheduler = Rufus::Scheduler.start_new
     last = nil
     job_id = scheduler.schedule_every "1s" do
       t = Time.now

data/test/scheduler_3_test.rb

@@ -41,7 +41,7 @@ class Scheduler3Test < Test::Unit::TestCase
     scheduler.schedule "* * * * *", :tags => "fish" do
       value = "cron-fish"
     end
-    scheduler.schedule "* * * * *", :tags => "vegetable" do
+    scheduler.cron "* * * * *", :tags => "vegetable" do
       value = "daikon"
     end
 

data/test/scheduler_4_test.rb

@@ -47,7 +47,7 @@ class Scheduler4Test < Test::Unit::TestCase
     end
     #p Time.now.to_f
 
-    sleep 10.300
+    sleep 10.600
 
     s.stop
 

data/test/scheduler_7_test.rb

@@ -0,0 +1,51 @@
+
+#
+# Testing the 'rufus-scheduler'
+#
+# John Mettraux at openwfe.org
+#
+# Sun Jul 13 19:20:27 JST 2008
+#
+
+require 'test/unit'
+require 'rufus/scheduler'
+
+
+#
+# checking if bug #20893 got fixed
+#
+
+class Scheduler7Test < Test::Unit::TestCase
+
+  #def setup
+  #end
+
+  #def teardown
+  #end
+
+  def test_0
+
+    count = 0
+
+    s = Rufus::Scheduler.start_new
+
+    job_id = s.schedule_every('5s') do |job_id, at, params|
+      count += 1
+      sleep 3
+    end
+
+    sleep 6
+
+    assert_equal 1, s.every_job_count
+
+    s.unschedule job_id
+
+    sleep 6
+
+    s.stop
+
+    assert_equal 0, s.every_job_count
+    assert_equal 1, count
+  end
+end
+

data/test/test.rb

@@ -11,6 +11,7 @@ require 'scheduler_3_test'
 require 'scheduler_4_test'
 require 'scheduler_5_test'
 require 'scheduler_6_test'
+require 'scheduler_7_test'
 
 require 'cron_test'
 require 'cronline_test'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rufus-scheduler
 version: !ruby/object:Gem::Version 
-  version: 1.0.7
+  version: 1.0.8
 platform: ruby
 authors: 
 - John Mettraux
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-06-17 00:00:00 +09:00
+date: 2008-07-18 00:00:00 +09:00
 default_executable: 
 dependencies: []
 
@@ -28,6 +28,7 @@ files:
 - lib/openwfe/util
 - lib/openwfe/util/scheduler.rb
 - lib/rufus
+- lib/rufus/cronline.rb
 - lib/rufus/otime.rb
 - lib/rufus/scheduler.rb
 - test/cron_test.rb
@@ -40,6 +41,7 @@ files:
 - test/scheduler_4_test.rb
 - test/scheduler_5_test.rb
 - test/scheduler_6_test.rb
+- test/scheduler_7_test.rb
 - test/scheduler_name_test.rb
 - test/test.rb
 - test/time_0_test.rb
@@ -69,7 +71,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.1.0
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: scheduler for Ruby (at, cron and every jobs), formerly known as 'openwferu-scheduler'