rsched 0.3.0 → 0.3.1

data/ChangeLog

@@ -1,4 +1,11 @@
 
+== 2011-07-20 version 0.3.1
+
+* Run task exactly at XX:XX:00
+* Use InnoDB on MySQL
+* Show kind message when DBI driver is not found
+
+
 == 2011-07-19 version 0.3.0
 
 * Changed not to release a lock when a task is failed

data/README.rdoc

@@ -32,6 +32,11 @@ _Example:_
   # Run every day at 00:00
   $ rsched -a 'mywork 0 0 * * * aaaa uuu ee' ...
 
+  # Use SQLite3 for the lock database
+  $ rsched -T mysql -H myhost -D mydb -u myuser -p mypassword ...
+
+  # Use MySQL for the lock database
+  $ rsched -T sqlite3 -D /path/to/db.sqlite3 ...
 
 == Usage
 

data/lib/rsched/command/rsched.rb

@@ -243,7 +243,17 @@ if conf[:daemon]
 end
 
 
-lock = RSched::DBLock.new(conf[:name], conf[:timeout], dbi, conf[:db_user].to_s, conf[:db_password].to_s)
+begin
+  lock = RSched::DBLock.new(conf[:name], conf[:timeout], dbi, conf[:db_user].to_s, conf[:db_password].to_s)
+rescue DBI::InterfaceError
+  STDERR.puts "Can't initialize DBI interface: #{$!}"
+  STDERR.puts "You may have to install database driver first:"
+  STDERR.puts ""
+  STDERR.puts "  $ gem install dbd-mysql"
+  STDERR.puts "  $ gem install dbd-sqlite3"
+  STDERR.puts ""
+  exit 1
+end
 worker = RSched::Engine.new(lock, conf)
 
 schedule.each {|e|

data/lib/rsched/dblock.rb

@@ -7,18 +7,31 @@ class DBLock < Lock
     super(hostname, timeout)
     require 'dbi'
     @db = DBI.connect(uri, user, pass)
-    init_db
+    init_db(uri.split(':',3)[1])
   end
 
-  def init_db
+  def init_db(type)
     sql = ''
-    sql << 'CREATE TABLE IF NOT EXISTS rsched ('
-    sql << '  ident VARCHAR(256) NOT NULL,'
-    sql << '  time INT NOT NULL,'
-    sql << '  host VARCHAR(256),'
-    sql << '  timeout INT,'
-    sql << '  finish INT,'
-    sql << '  PRIMARY KEY (ident, time));'
+    case type
+    when /mysql/i
+      sql << 'CREATE TABLE IF NOT EXISTS rsched ('
+      sql << '  ident VARCHAR(256) CHARACTER SET ASCII NOT NULL,'
+      sql << '  time INT NOT NULL,'
+      sql << '  host VARCHAR(256) CHARACTER SET ASCII,'
+      sql << '  timeout INT,'
+      sql << '  finish INT,'
+      sql << '  PRIMARY KEY (ident, time)'
+      sql << ') ENGINE=INNODB;'
+    else
+      sql << 'CREATE TABLE IF NOT EXISTS rsched ('
+      sql << '  ident VARCHAR(256) NOT NULL,'
+      sql << '  time INT NOT NULL,'
+      sql << '  host VARCHAR(256),'
+      sql << '  timeout INT,'
+      sql << '  finish INT,'
+      sql << '  PRIMARY KEY (ident, time)'
+      sql << ');'
+    end
     @db.execute(sql)
   end
 

data/lib/rsched/engine.rb

@@ -14,14 +14,14 @@ class Engine
       @action = action
       @sched_start = sched_start
       @queue = []
-      @last_time = from
+      @last_time = from.to_i / 60 * 60
       sched(to)
     end
 
     attr_reader :queue, :action
 
-    def sched(now)
-      while @last_time <= now
+    def sched(sched_time)
+      while @last_time <= sched_time
         t = Time.at(@last_time).utc
         if @tab.is_specification_in_effect?(t)
           time = create_time_key(t)
@@ -68,7 +68,7 @@ class Engine
   # {cron => (ident,action)}
   def set_sched(ident, action, cron)
     now = Time.now.to_i
-    @ss[ident] = Sched.new(cron, action, @sched_start, now-@resume, now-@delay)
+    @ss[ident] = Sched.new(cron, action, @sched_start, now-@delay-@resume, now-@delay)
   end
 
   def init_proc(run_proc, kill_proc)
@@ -81,10 +81,10 @@ class Engine
     until @finished
       one = false
 
-      now = Time.now.to_i - @delay
+      sched_time = Time.now.to_i - @delay
       @ss.each_pair {|ident,s|
 
-        s.sched(now)
+        s.sched(sched_time)
         s.queue.delete_if {|time|
           next if @finished
 

data/lib/rsched/lock.rb

@@ -14,7 +14,7 @@ class Lock
   def acquire(ident, time, now=Time.now.to_i)
   end
 
-  def release(token, next_timeout=Time.now.to_i)
+  def release(token)
   end
 
   def finish(token, now=Time.now.to_i)

data/lib/rsched/version.rb

@@ -1,5 +1,5 @@
 module RSched
 
-VERSION = '0.3.0'
+VERSION = '0.3.1'
 
 end

data/test/sched_test.rb

@@ -39,7 +39,7 @@ class SchedTest < Test::Unit::TestCase
     assert_equal [now, now+HOUR, now+HOUR*3], sched.queue
   end
 
-  it 'sched hours' do
+  it 'sched days' do
     now = Time.parse("2010-02-02 00:00:00 UTC").to_i
     sched_start = now
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rsched
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Sadayuki Furuhashi
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-18 00:00:00 +09:00
+date: 2011-07-20 00:00:00 +09:00
 default_executable: rsched
 dependencies: 
 - !ruby/object:Gem::Dependency