rufus-scheduler 2.0.7 → 2.0.8

data/CHANGELOG.txt

@@ -2,6 +2,11 @@
 = rufus-scheduler CHANGELOG.txt
 
 
+== rufus-scheduler - 2.0.8    released 2010/12/31
+
+- issue with cron '0 7-23/2 * * *' fixed. Thanks Pickerel
+
+
 == rufus-scheduler - 2.0.7    released 2010/11/09
 
 - cron and timezones, thanks Tanzeeb Khalili

data/CREDITS.txt

@@ -4,6 +4,7 @@
 
 == Contributors
 
+- Chris Kampemeier (http://github.com/chrisk) rspec 2.0 refinements
 - Tanzeeb Khalili (http://github.com/tanzeeb) cron and timezones
 - Adam Davies (http://github.com/adz), @allow_overlap = false
 - Klaas Jan Wierenga, at/every/in stress tests (1.0 and 2.0)
@@ -12,6 +13,7 @@
 
 == Feedback
 
+- pickerel - https://github.com/pickerel
 - Gonzalo Suarez - parse_time_string(s) issue
 - Tony Day - http://github.com/tonyday - every and overlapping timeout issue
 - Nate Wiger (Schedulable call/trigger issue)

data/LICENSE.txt

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

@@ -359,6 +359,13 @@ More and more ruby applications are using EventMachine. This flavour of the sche
   }
 
 
+== with Passenger
+
+"it terminates for no apparent reason !"
+
+https://github.com/jmettraux/rufus-scheduler/issues/issue/10
+
+
 == tested with
 
 * 1.8.7-p249

data/Rakefile

@@ -1,21 +1,23 @@
 
-require 'rubygems'
-require 'rake'
+$:.unshift('.') # 1.9.2
 
+require 'rubygems'
 
-load 'lib/rufus/sc/version.rb'
+require 'rake'
+require 'rake/clean'
+require 'rake/rdoctask'
 
 
 #
-# CLEAN
+# clean
 
-require 'rake/clean'
-CLEAN.include('pkg', 'tmp', 'rdoc')
+CLEAN.include('pkg', 'rdoc')
 
 
 #
-# TEST / SPEC
+# test / spec
 
+#task :spec => :check_dependencies do
 task :spec do
   sh 'rspec spec/'
 end
@@ -25,64 +27,59 @@ task :default => :spec
 
 
 #
-# GEM
-
-require 'jeweler'
+# gem
 
-Jeweler::Tasks.new do |gem|
+GEMSPEC_FILE = Dir['*.gemspec'].first
+GEMSPEC = eval(File.read(GEMSPEC_FILE))
+GEMSPEC.validate
 
-  gem.version = Rufus::Scheduler::VERSION
-  gem.name = 'rufus-scheduler'
-  gem.summary = 'job scheduler for Ruby (at, cron, in and every jobs)'
 
-  gem.description = %{
-    job scheduler for Ruby (at, cron, in and every jobs).
+desc %{
+  builds the gem and places it in pkg/
+}
+task :build do
 
-    By default uses a Ruby thread, if EventMachine is present, it will rely on it.
-  }
-  gem.email = 'jmettraux@gmail.com'
-  gem.homepage = 'http://github.com/jmettraux/rufus-scheduler/'
-  gem.authors = [ 'John Mettraux' ]
-  gem.rubyforge_project = 'rufus'
-
-  #gem.test_file = 'spec/spec.rb'
+  sh "gem build #{GEMSPEC_FILE}"
+  sh "mkdir pkg" rescue nil
+  sh "mv #{GEMSPEC.name}-#{GEMSPEC.version}.gem pkg/"
+end
 
-  gem.add_dependency 'tzinfo'
-  gem.add_development_dependency 'rake'
-  gem.add_development_dependency 'rspec'
-  gem.add_development_dependency 'jeweler'
+desc %{
+  builds the gem and pushes it to rubygems.org
+}
+task :push => :build do
 
-  # gemspec spec : http://www.rubygems.org/read/chapter/20
+  sh "gem push pkg/#{GEMSPEC.name}-#{GEMSPEC.version}.gem"
 end
-Jeweler::GemcutterTasks.new
 
 
 #
-# DOC
-
+# rdoc
 #
 # make sure to have rdoc 2.5.x to run that
-#
-require 'rake/rdoctask'
+
 Rake::RDocTask.new do |rd|
 
-  rd.main = 'README.rdoc'
-  rd.rdoc_dir = 'rdoc/rufus-scheduler'
-  rd.title = "rufus-scheduler #{Rufus::Scheduler::VERSION}"
+  rd.main = 'README.txt'
+  rd.rdoc_dir = "rdoc/#{GEMSPEC.name}"
+
+  rd.rdoc_files.include('README.rdoc', 'CHANGELOG.txt', 'lib/**/*.rb')
 
-  rd.rdoc_files.include(
-    'README.rdoc', 'CHANGELOG.txt', 'LICENSE.txt', 'CREDITS.txt', 'lib/**/*.rb')
+  rd.title = "#{GEMSPEC.name} #{GEMSPEC.version}"
 end
 
 
 #
-# TO THE WEB
+# upload_rdoc
 
+desc %{
+  upload the rdoc to rubyforge
+}
 task :upload_rdoc => [ :clean, :rdoc ] do
 
   account = 'jmettraux@rubyforge.org'
-  webdir = '/var/www/gforge-projects/rufus'
+  webdir = "/var/www/gforge-projects/rufus"
 
-  sh "rsync -azv -e ssh rdoc/rufus-scheduler #{account}:#{webdir}/"
+  sh "rsync -azv -e ssh rdoc/#{GEMSPEC.name} #{account}:#{webdir}/"
 end
 

data/dump.txt

@@ -0,0 +1,18 @@
+
+jmettraux@sanma ~/tmp/billen/bill 円 script/server 
+=> Booting WEBrick
+=> Rails 2.3.10 application starting on http://0.0.0.0:3000
+=> Call with -d to detach
+=> Ctrl-C to shutdown server
+[2010-12-15 09:41:55] INFO  WEBrick 1.3.1
+[2010-12-15 09:41:55] INFO  ruby 1.8.7 (2010-04-19) [i686-darwin10.5.0]
+[2010-12-15 09:41:55] INFO  WEBrick::HTTPServer#start: pid=15393 port=3000
+"Wed Dec 15 09:43:00 +0900 2010 - run 0"
+"Wed Dec 15 10:43:00 +0900 2010 - run 1"
+"Wed Dec 15 11:43:00 +0900 2010 - run 2"
+"Wed Dec 15 12:43:00 +0900 2010 - run 3"
+"Wed Dec 15 13:43:00 +0900 2010 - run 4"
+"Wed Dec 15 14:43:00 +0900 2010 - run 5"
+"Wed Dec 15 15:43:00 +0900 2010 - run 6"
+"Wed Dec 15 16:43:00 +0900 2010 - run 7"
+

data/lib/rufus/sc/cronline.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2006-2010, John Mettraux, jmettraux@gmail.com
+# Copyright (c) 2006-2011, 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
@@ -224,7 +224,7 @@ module Rufus
         istart = Integer(item[0..i - 1])
 
         if j
-          iend = Integer(item[i + 1..j])
+          iend = Integer(item[i + 1..j - 1])
         else
           iend = Integer(item[i + 1..-1])
         end

data/lib/rufus/sc/jobqueues.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2006-2010, John Mettraux, jmettraux@gmail.com
+# Copyright (c) 2006-2011, 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
@@ -103,8 +103,9 @@ module Scheduler
 
     def delete(job_id)
 
-      j = @jobs.find { |j| j.job_id == job_id }
-      @jobs.delete(j) if j
+      if job = @jobs.find { |j| j.job_id == job_id }
+        @jobs.delete(job)
+      end
     end
 
     # Returns the next job to trigger. Returns nil if none eligible.

data/lib/rufus/sc/jobs.rb

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

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2005-2010, John Mettraux, jmettraux@gmail.com
+# Copyright (c) 2005-2011, 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/scheduler.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2006-2010, John Mettraux, jmettraux@gmail.com
+# Copyright (c) 2006-2011, 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-2010, John Mettraux, jmettraux@gmail.com
+# Copyright (c) 2006-2011, 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.7'
+  VERSION = '2.0.8'
 end
 end
 

data/rufus-scheduler.gemspec

@@ -1,107 +1,32 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
-# -*- encoding: utf-8 -*-
+# encoding: utf-8
 
 Gem::Specification.new do |s|
-  s.name = %q{rufus-scheduler}
-  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-11-09}
-  s.description = %q{
-    job scheduler for Ruby (at, cron, in and every jobs).
+  s.name = 'rufus-scheduler'
+  s.version = File.read('lib/rufus/sc/version.rb').match(/VERSION = '([^']+)'/)[1]
+  s.platform = Gem::Platform::RUBY
+  s.authors = [ 'John Mettraux' ]
+  s.email = [ 'jmettraux@gmail.com' ]
+  s.homepage = 'http://github.com/jmettraux/rufus-scheduler'
+  s.rubyforge_project = 'rufus'
+  s.summary = 'job scheduler for Ruby (at, cron, in and every jobs)'
 
-    By default uses a Ruby thread, if EventMachine is present, it will rely on it.
-  }
-  s.email = %q{jmettraux@gmail.com}
-  s.extra_rdoc_files = [
-    "LICENSE.txt",
-     "README.rdoc"
-  ]
-  s.files = [
-    ".gitignore",
-     ".rspec",
-     "CHANGELOG.txt",
-     "CREDITS.txt",
-     "LICENSE.txt",
-     "README.rdoc",
-     "Rakefile",
-     "TODO.txt",
-     "lib/rufus-scheduler.rb",
-     "lib/rufus/otime.rb",
-     "lib/rufus/sc/cronline.rb",
-     "lib/rufus/sc/jobqueues.rb",
-     "lib/rufus/sc/jobs.rb",
-     "lib/rufus/sc/rtime.rb",
-     "lib/rufus/sc/scheduler.rb",
-     "lib/rufus/sc/version.rb",
-     "lib/rufus/scheduler.rb",
-     "misc/cronline_next_time_cost.rb",
-     "rufus-scheduler.gemspec",
-     "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"
-  ]
-  s.homepage = %q{http://github.com/jmettraux/rufus-scheduler/}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubyforge_project = %q{rufus}
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{job scheduler for Ruby (at, cron, in and every jobs)}
-  s.test_files = [
-    "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"
+  s.description = %{
+job scheduler for Ruby (at, cron, in and every jobs).
+  }.strip
+
+  #s.files = `git ls-files`.split("\n")
+  s.files = Dir[
+    'Rakefile',
+    'lib/**/*.rb', 'spec/**/*.rb', 'test/**/*.rb',
+    '*.gemspec', '*.txt', '*.rdoc', '*.md'
   ]
 
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+  s.add_runtime_dependency 'tzinfo', '>= 0.3.23'
+
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'rspec', '>= 2.0'
 
-    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<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<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<rspec>, [">= 0"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
-  end
+  s.require_path = 'lib'
 end
 

data/spec/cronline_spec.rb

@@ -59,6 +59,19 @@ describe Rufus::CronLine do
       lambda { cl '* * * * * NotATimeZone' }.should raise_error
       lambda { cl '* * * * * * NotATimeZone' }.should raise_error
     end
+
+    it 'interprets cron strings with / (slashes) correctly' do
+
+      to_a(
+        '0 */2 * * *',
+        [[0], [0], [0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24], nil, nil, nil, nil])
+      to_a(
+        '0 7-23/2 * * *',
+        [[0], [0], [7, 9, 11, 13, 15, 17, 19, 21, 23], nil, nil, nil, nil])
+      to_a(
+        '*/10 * * * *',
+        [[0], [0, 10, 20, 30, 40, 50], nil, nil, nil, nil, nil])
+    end
   end
 
   describe '#next_time' do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 2
   - 0
-  - 7
-  version: 2.0.7
+  - 8
+  version: 2.0.8
 platform: ruby
 authors: 
 - John Mettraux
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-09 00:00:00 +09:00
+date: 2010-12-31 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,7 +27,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        version: "0"
+        - 3
+        - 23
+        version: 0.3.23
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -52,42 +54,22 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
+        - 2
         - 0
-        version: "0"
+        version: "2.0"
   type: :development
   version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: jeweler
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id004
-description: "\n    job scheduler for Ruby (at, cron, in and every jobs).\n\n    By default uses a Ruby thread, if EventMachine is present, it will rely on it.\n  "
-email: jmettraux@gmail.com
+description: job scheduler for Ruby (at, cron, in and every jobs).
+email: 
+- jmettraux@gmail.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- LICENSE.txt
-- README.rdoc
+extra_rdoc_files: []
+
 files: 
-- .gitignore
-- .rspec
-- CHANGELOG.txt
-- CREDITS.txt
-- LICENSE.txt
-- README.rdoc
 - Rakefile
-- TODO.txt
-- lib/rufus-scheduler.rb
 - lib/rufus/otime.rb
 - lib/rufus/sc/cronline.rb
 - lib/rufus/sc/jobqueues.rb
@@ -96,8 +78,7 @@ files:
 - lib/rufus/sc/scheduler.rb
 - lib/rufus/sc/version.rb
 - lib/rufus/scheduler.rb
-- misc/cronline_next_time_cost.rb
-- rufus-scheduler.gemspec
+- lib/rufus-scheduler.rb
 - spec/at_in_spec.rb
 - spec/at_spec.rb
 - spec/blocking_spec.rb
@@ -114,13 +95,20 @@ files:
 - spec/timeout_spec.rb
 - test/kjw.rb
 - test/t.rb
+- rufus-scheduler.gemspec
+- CHANGELOG.txt
+- CREDITS.txt
+- LICENSE.txt
+- TODO.txt
+- dump.txt
+- README.rdoc
 has_rdoc: true
-homepage: http://github.com/jmettraux/rufus-scheduler/
+homepage: http://github.com/jmettraux/rufus-scheduler
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -146,20 +134,5 @@ rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: job scheduler for Ruby (at, cron, in and every jobs)
-test_files: 
-- 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
+test_files: []
+

data/.gitignore

@@ -1,2 +0,0 @@
-.rvmrc
-rdoc

data/.rspec

@@ -1 +0,0 @@
---colour --format documentation

data/misc/cronline_next_time_cost.rb

@@ -1,14 +0,0 @@
-
-$:.unshift('lib')
-require 'rufus/scheduler'
-
-loop do
-
-  print "> "
-  s = gets
-
-  t = Time.now
-  puts Rufus::CronLine.new(s).next_time
-  puts "took #{Time.now - t} secs"
-end
-