perfectsched 0.8.6 → 0.8.7

data/ChangeLog

@@ -1,4 +1,8 @@
 
+== 2014-04-23 version 0.8.7
+
+* Reverted commits for 0.8.5 and applied commits for 0.8.6, in particular, added commit for MySQL's SSL support
+
 == 2014-04-21 version 0.8.6
 
 * Added SSL support for MySQL backend

data/lib/perfectsched.rb

@@ -1,7 +1,7 @@
 #
 # PerfectSched
 #
-# Copyright (C) 2012-2013 Sadayuki Furuhashi
+# Copyright (C) 2012 FURUHASHI Sadayuki
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.

data/lib/perfectsched/application.rb

@@ -1,7 +1,7 @@
 #
 # PerfectSched
 #
-# Copyright (C) 2012-2013 Sadayuki Furuhashi
+# Copyright (C) 2012 FURUHASHI Sadayuki
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.

data/lib/perfectsched/application/base.rb

@@ -1,7 +1,7 @@
 #
 # PerfectSched
 #
-# Copyright (C) 2012-2013 Sadayuki Furuhashi
+# Copyright (C) 2012 FURUHASHI Sadayuki
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.

data/lib/perfectsched/application/decider.rb

@@ -1,7 +1,7 @@
 #
 # PerfectSched
 #
-# Copyright (C) 2012-2013 Sadayuki Furuhashi
+# Copyright (C) 2012 FURUHASHI Sadayuki
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -40,7 +40,7 @@ module PerfectSched
         begin
           m = method(type)
         rescue NameError
-          raise UndefinedDecisionError, "Undefined decision #{type} options=#{opts.inspect}"
+          raise UndefinedDecisionError, "Undefined decision #{type} options=#{opt.inspect}"
         end
         m.call(opts)
       end

data/lib/perfectsched/application/dispatch.rb

@@ -1,7 +1,7 @@
 #
 # PerfectSched
 #
-# Copyright (C) 2012-2013 Sadayuki Furuhashi
+# Copyright (C) 2012 FURUHASHI Sadayuki
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -22,10 +22,10 @@ module PerfectSched
     class Dispatch < Runner
       # Runner interface
       def initialize(task)
-        base = self.class.router.route(task.key)
+        base = self.class.router.route(task.type)
         unless base
-          task.retry!  # TODO or release?
-          raise "Unknown task key #{task.key.inspect}"   # TODO error class
+          task.retry!
+          raise "Unknown task type #{task.type.inspect}"   # TODO error class
         end
         @runner = base.new(task)
         super

data/lib/perfectsched/application/router.rb

@@ -1,7 +1,7 @@
 #
 # PerfectSched
 #
-# Copyright (C) 2012-2013 Sadayuki Furuhashi
+# Copyright (C) 2012 FURUHASHI Sadayuki
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.

data/lib/perfectsched/backend.rb

@@ -1,7 +1,7 @@
 #
 # PerfectSched
 #
-# Copyright (C) 2012-2013 Sadayuki Furuhashi
+# Copyright (C) 2012 FURUHASHI Sadayuki
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.

data/lib/perfectsched/backend/rdb_compat.rb

@@ -1,7 +1,7 @@
 #
 # PerfectSched
 #
-# Copyright (C) 2012-2013 Sadayuki Furuhashi
+# Copyright (C) 2012 FURUHASHI Sadayuki
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@ module PerfectSched
     class RDBCompatBackend
       include BackendHelper
 
-      class Token < Struct.new(:row_id, :scheduled_time, :cron, :delay, :timezone, :data)
+      class Token < Struct.new(:row_id, :scheduled_time, :cron, :delay, :timezone)
       end
 
       def initialize(client, config)
@@ -76,13 +76,13 @@ module PerfectSched
       def init_database(options)
         sql = %[
           CREATE TABLE IF NOT EXISTS `#{@table}` (
-            id VARCHAR(256) character set ascii NOT NULL,
+            id VARCHAR(256) NOT NULL,
             timeout INT NOT NULL,
             next_time INT NOT NULL,
-            cron VARCHAR(128) character set ascii NOT NULL,
+            cron VARCHAR(128) NOT NULL,
             delay INT NOT NULL,
-            timezone VARCHAR(256) character set ascii NULL,
             data BLOB NOT NULL,
+            timezone VARCHAR(256) NULL,
             PRIMARY KEY (id)
           );]
         connect {
@@ -92,7 +92,7 @@ module PerfectSched
 
       def get_schedule_metadata(key, options={})
         connect {
-          row = @db.fetch("SELECT id, timeout, next_time, cron, delay, timezone, data FROM `#{@table}` WHERE id=? LIMIT 1", key).first
+          row = @db.fetch("SELECT id, timeout, next_time, cron, delay, data, timezone FROM `#{@table}` WHERE id=? LIMIT 1", key).first
           unless row
             raise NotFoundError, "schedule key=#{key} does not exist"
           end
@@ -103,7 +103,7 @@ module PerfectSched
 
       def list(options, &block)
         connect {
-          @db.fetch("SELECT id, timeout, next_time, cron, delay, timezone, data FROM `#{@table}` ORDER BY timeout ASC") {|row|
+          @db.fetch("SELECT id, timeout, next_time, cron, delay, data, timezone FROM `#{@table}` ORDER BY timeout ASC") {|row|
             attributes = create_attributes(row)
             sched = ScheduleWithMetadata.new(@client, row[:id], attributes)
             yield sched
@@ -111,11 +111,12 @@ module PerfectSched
         }
       end
 
-      def add(key, cron, delay, timezone, next_time, next_run_time, options)
-        data = options[:data] || {}
+      def add(key, type, cron, delay, timezone, data, next_time, next_run_time, options)
+        data = data ? data.dup : {}
+        data['type'] = type
         connect {
           begin
-            n = @db["INSERT INTO `#{@table}` (id, timeout, next_time, cron, delay, timezone, data) VALUES (?, ?, ?, ?, ?, ?, ?)", key, next_run_time, next_time, cron, delay, timezone, data.to_json].insert
+            n = @db["INSERT INTO `#{@table}` (id, timeout, next_time, cron, delay, data, timezone) VALUES (?, ?, ?, ?, ?, ?, ?);", key, next_run_time, next_time, cron, delay, data.to_json, timezone].insert
             return Schedule.new(@client, key)
           rescue Sequel::DatabaseError
             raise IdempotentAlreadyExistsError, "schedule key=#{key} already exists"
@@ -125,7 +126,7 @@ module PerfectSched
 
       def delete(key, options)
         connect {
-          n = @db["DELETE FROM `#{@table}` WHERE id=?", key].delete
+          n = @db["DELETE FROM `#{@table}` WHERE id=?;", key].delete
           if n <= 0
             raise IdempotentNotFoundError, "schedule key=#{key} does no exist"
           end
@@ -136,17 +137,12 @@ module PerfectSched
         ks = []
         vs = []
         [:cron, :delay, :timezone].each {|k|
+          # TODO type and data are not supported
           if v = options[k]
             ks << k
             vs << v
           end
         }
-        [:data].each {|k|
-          if v = options[k]
-            ks << k
-            vs << v.to_json
-          end
-        }
         return nil if ks.empty?
 
         sql = "UPDATE `#{@table}` SET "
@@ -167,29 +163,17 @@ module PerfectSched
       def acquire(alive_time, max_acquire, options)
         now = (options[:now] || Time.now).to_i
         next_timeout = now + alive_time
-        only_keys = options[:only_keys]
-
-        select_sql = "SELECT id, timeout, next_time, cron, delay, timezone, data FROM `#{@table}` WHERE timeout <= ?"
-        select_params = [select_sql, now]
-        if only_keys
-          select_sql << " AND id IN ("
-          select_sql << only_keys.map {|k|
-            select_params << k
-            '?'
-          }.join(', ')
-          select_sql << ')'
-        end
-        select_sql << " ORDER BY timeout ASC LIMIT #{MAX_SELECT_ROW}"
 
         connect {
           while true
             rows = 0
-            @db.fetch(*select_params) {|row|
-              n = @db["UPDATE `#{@table}` SET timeout=? WHERE id=? AND timeout=?", next_timeout, row[:id], row[:timeout]].update
+            @db.fetch("SELECT id, timeout, next_time, cron, delay, data, timezone FROM `#{@table}` WHERE timeout <= ? ORDER BY timeout ASC LIMIT #{MAX_SELECT_ROW};", now) {|row|
+
+              n = @db["UPDATE `#{@table}` SET timeout=? WHERE id=? AND timeout=?;", next_timeout, row[:id], row[:timeout]].update
               if n > 0
                 scheduled_time = row[:next_time]
                 attributes = create_attributes(row)
-                task_token = Token.new(row[:id], row[:next_time], attributes[:cron], attributes[:delay], attributes[:timezone], attributes[:data].dup)
+                task_token = Token.new(row[:id], row[:next_time], attributes[:cron], attributes[:delay], attributes[:timezone])
                 task = Task.new(@client, row[:id], attributes, scheduled_time, task_token)
                 return [task]
               end
@@ -210,7 +194,7 @@ module PerfectSched
         next_run_time = now + alive_time
 
         connect {
-          n = @db["UPDATE `#{@table}` SET timeout=? WHERE id=? AND next_time=?", next_run_time, row_id, scheduled_time].update
+          n = @db["UPDATE `#{@table}` SET timeout=? WHERE id=? AND next_time=?;", next_run_time, row_id, scheduled_time].update
           if n <= 0  # TODO fix
             row = @db.fetch("SELECT id, timeout, next_time FROM `#{@table}` WHERE id=? AND next_time=? LIMIT 1", row_id, scheduled_time).first
             if row == nil
@@ -229,20 +213,9 @@ module PerfectSched
         scheduled_time = task_token.scheduled_time
         next_time = PerfectSched.next_time(task_token.cron, scheduled_time, task_token.timezone)
         next_run_time = next_time + task_token.delay
-        update_data = options[:update_data]
-
-        update_sql = "UPDATE `#{@table}` SET timeout=?, next_time=?"
-        update_params = [update_sql, next_run_time, next_time]
-        if update_data
-          new_data = task_token.data.merge(update_data)
-          update_sql << ", data=?"
-          update_params << new_data.to_json
-        end
-        update_sql << " WHERE id=? AND next_time=?"
-        update_params << row_id << scheduled_time
 
         connect {
-          n = @db[*update_params].update
+          n = @db["UPDATE `#{@table}` SET timeout=?, next_time=? WHERE id=? AND next_time=?;", next_run_time, next_time, row_id, scheduled_time].update
           if n <= 0
             raise IdempotentAlreadyFinishedError, "task time=#{Time.at(scheduled_time).utc} is already finished"
           end
@@ -293,6 +266,11 @@ module PerfectSched
           end
         end
 
+        type = data.delete('type')
+        if type == nil || type.empty?
+          type = row[:id].split(/\./, 2)[0]
+        end
+
         attributes = {
           :timezone => timezone,
           :delay => delay,
@@ -300,7 +278,9 @@ module PerfectSched
           :data => data,
           :next_time => next_time,
           :next_run_time => next_run_time,
-          #:node => nil,  # not supported
+          :type => type,
+          :message => nil,  # not supported
+          :node => nil,  # not supported
         }
       end
 

data/lib/perfectsched/blocking_flag.rb

@@ -1,7 +1,7 @@
 #
 # PerfectSched
 #
-# Copyright (C) 2012-2013 Sadayuki Furuhashi
+# Copyright (C) 2012 FURUHASHI Sadayuki
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.

data/lib/perfectsched/client.rb

@@ -1,7 +1,7 @@
 #
 # PerfectSched
 #
-# Copyright (C) 2012-2013 Sadayuki Furuhashi
+# Copyright (C) 2012 FURUHASHI Sadayuki
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -47,13 +47,14 @@ module PerfectSched
     # :data
     # :delay => 0
     # :timezone => UTC
-    def add(key, options={})
+    def add(key, type, options={})
       cron = options[:cron]
 
       raise ArgumentError, ":cron option is required" unless cron
 
       delay = options[:delay] || 0
       timezone = options[:timezone] || @timezone
+      data = options[:data] || {}
 
       next_time = options[:next_time] || Time.now.to_i
       next_time = PerfectSched.cron_time(cron, next_time.to_i, timezone)
@@ -65,7 +66,7 @@ module PerfectSched
         next_run_time = next_time + delay
       end
 
-      @backend.add(key, cron, delay, timezone, next_time, next_run_time, options)
+      @backend.add(key, type, cron, delay, timezone, data, next_time, next_run_time, options)
 
       # TODO return value
       return next_time, next_run_time

data/lib/perfectsched/command/perfectsched.rb

@@ -7,7 +7,7 @@ op.banner += %[ <command>
 
 commands:
     list                             Show list of registered schedules
-    add <key> <cron> <data>          Register a new schedule
+    add <key> <type> <cron> <data>   Register a new schedule
     delete <key>                     Delete a registered schedule
     run <class>                      Run a worker process
     init                             Initialize a backend database
@@ -91,8 +91,8 @@ begin
 
   when 'add'
     cmd = :add
-    usage nil unless ARGV.length == 3
-    key, cron, data = *ARGV
+    usage nil unless ARGV.length == 4
+    key, type, cron, data = *ARGV
     require 'json'
     data = JSON.load(data)
 
@@ -130,11 +130,11 @@ when :list
   n = 0
   PerfectSched.open(config_load_proc.call) {|scheds|
     format = "%30s %15s %18s %7s %11s %28s %28s  %s"
-    puts format % ['key', 'cron', 'delay', 'timezone', 'next_time', 'next_run_time', 'data']
+    puts format % ['key', 'type', 'cron', 'delay', 'timezone', 'next_time', 'next_run_time', 'data']
     scheds.list {|sched|
       next_time = sched.next_time ? Time.at(sched.next_time) : sched.next_time
       next_run_time = sched.next_run_time ? Time.at(sched.next_run_time) : sched.next_run_time
-      puts format % [sched.key, sched.cron, sched.delay, sched.timezone, next_time, next_run_time, sched.data]
+      puts format % [sched.key, sched.type, sched.cron, sched.delay, sched.timezone, next_time, next_run_time, sched.data]
       n += 1
     }
   }
@@ -149,7 +149,7 @@ when :add
   PerfectSched.open(config_load_proc.call) {|scheds|
     add_options[:cron] = cron
     add_options[:data] = data
-    scheds.add(key, add_options)
+    scheds.add(key, type, add_options)
   }
 
 when :run

data/lib/perfectsched/daemons_logger.rb

@@ -1,7 +1,7 @@
 #
 # PerfectSched
 #
-# Copyright (C) 2012-2013 Sadayuki Furuhashi
+# Copyright (C) 2012 FURUHASHI Sadayuki
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.

data/lib/perfectsched/engine.rb

@@ -1,7 +1,7 @@
 #
 # PerfectSched
 #
-# Copyright (C) 2012-2013 Sadayuki Furuhashi
+# Copyright (C) 2012 FURUHASHI Sadayuki
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.

data/lib/perfectsched/error.rb

@@ -1,7 +1,7 @@
 #
 # PerfectSched
 #
-# Copyright (C) 2012-2013 Sadayuki Furuhashi
+# Copyright (C) 2012 FURUHASHI Sadayuki
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.

data/lib/perfectsched/model.rb

@@ -1,7 +1,7 @@
 #
 # PerfectSched
 #
-# Copyright (C) 2012-2013 Sadayuki Furuhashi
+# Copyright (C) 2012 FURUHASHI Sadayuki
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.

data/lib/perfectsched/runner.rb

@@ -1,7 +1,7 @@
 #
 # PerfectSched
 #
-# Copyright (C) 2012-2013 Sadayuki Furuhashi
+# Copyright (C) 2012 FURUHASHI Sadayuki
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.

data/lib/perfectsched/schedule.rb

@@ -1,7 +1,7 @@
 #
 # PerfectSched
 #
-# Copyright (C) 2012-2013 Sadayuki Furuhashi
+# Copyright (C) 2012 FURUHASHI Sadayuki
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.

data/lib/perfectsched/schedule_collection.rb

@@ -1,7 +1,7 @@
 #
 # PerfectSched
 #
-# Copyright (C) 2012-2013 Sadayuki Furuhashi
+# Copyright (C) 2012 FURUHASHI Sadayuki
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -49,8 +49,8 @@ module PerfectSched
     # :data => Hash
     # :cron
     # :timezone
-    def add(key, options={})
-      @client.add(key, options)
+    def add(key, type, options={})
+      @client.add(key, type, options)
     end
 
     def close

data/lib/perfectsched/schedule_metadata.rb

@@ -1,7 +1,7 @@
 #
 # PerfectSched
 #
-# Copyright (C) 2012-2013 Sadayuki Furuhashi
+# Copyright (C) 2012 FURUHASHI Sadayuki
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -21,6 +21,10 @@ module PerfectSched
   module ScheduleMetadataAccessors
     attr_reader :attributes
 
+    def type
+      @attributes[:type]
+    end
+
     def data
       @attributes[:data]
     end
@@ -48,6 +52,10 @@ module PerfectSched
     alias scheduled_time next_time
 
     alias scheduled_run_time next_run_time
+
+    def message
+      @attributes[:message]
+    end
   end
 
   class ScheduleMetadata
@@ -56,7 +64,6 @@ module PerfectSched
     def initialize(client, key, attributes)
       super(client)
       @key = key
-      @attributes = attributes
     end
 
     def schedule

data/lib/perfectsched/signal_queue.rb

@@ -1,7 +1,7 @@
 #
 # PerfectSched
 #
-# Copyright (C) 2012-2013 Sadayuki Furuhashi
+# Copyright (C) 2012 FURUHASHI Sadayuki
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.

data/lib/perfectsched/task.rb

@@ -1,7 +1,7 @@
 #
 # PerfectSched
 #
-# Copyright (C) 2012-2013 Sadayuki Furuhashi
+# Copyright (C) 2012 FURUHASHI Sadayuki
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.

data/lib/perfectsched/version.rb

@@ -1,3 +1,3 @@
 module PerfectSched
-  VERSION = "0.8.6"
+  VERSION = "0.8.7"
 end

data/lib/perfectsched/worker.rb

@@ -1,7 +1,7 @@
 #
 # PerfectSched
 #
-# Copyright (C) 2012-2013 Sadayuki Furuhashi
+# Copyright (C) 2012 FURUHASHI Sadayuki
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -35,19 +35,19 @@ module PerfectSched
     end
 
     def run
-      @log.info "PerfectSched #{VERSION}"
-
-      install_signal_handlers
-
-      @engine = Engine.new(@runner, load_config)
+      @sig = install_signal_handlers
       begin
-        until @finished
-          @engine.run
+        @engine = Engine.new(@runner, load_config)
+        begin
+          until @finished
+            @engine.run
+          end
+        ensure
+          @engine.shutdown
         end
       ensure
-        @engine.shutdown
+        @sig.shutdown
       end
-
       return nil
     rescue
       @log.error "#{$!.class}: #{$!}"

data/perfectsched.gemspec

@@ -10,7 +10,6 @@ Gem::Specification.new do |gem|
   gem.version     = PerfectSched::VERSION
   gem.authors     = ["Sadayuki Furuhashi"]
   gem.email       = "frsyuki@gmail.com"
-  gem.license     = "Apache 2.0"
   gem.has_rdoc    = false
   gem.files       = `git ls-files`.split("\n")
   gem.test_files  = `git ls-files -- {test,spec,features}/*`.split("\n")

data/spec/rdb_compat_backend_spec.rb

@@ -23,6 +23,7 @@ describe Backend::RDBCompatBackend do
     ts.should_not == nil
     t = ts[0]
     t.data.should == {'account_id'=>1}
+    t.type.should == 'maint_sched'
     t.key.should == 'maint_sched.1.do_hourly'
     t.next_time.should == 1339812000
   end
@@ -32,6 +33,7 @@ describe Backend::RDBCompatBackend do
     ts = backend.acquire(60, 1, {:now=>1339812060})
     t = ts[0]
     t.data.should == {}
+    t.type.should == 'merge'
     t.key.should == 'merge'
     t.next_time.should == 1339812000
   end

data/spec/schedule_collection_spec.rb

@@ -13,28 +13,29 @@ describe ScheduleCollection do
   end
 
   it 'succeess add' do
-    sc.add('sched01', {:cron=>'* * * * *', :timezone=>'UTC'})
+    sc.add('sched01', 't01', {:cron=>'* * * * *', :timezone=>'UTC'})
   end
 
   it 'fail duplicated add' do
-    sc.add('sched01', {:cron=>'* * * * *', :timezone=>'UTC'})
+    sc.add('sched01', 't01', {:cron=>'* * * * *', :timezone=>'UTC'})
 
     lambda {
-      sc.add('sched01', {:cron=>'* * * * *', :timezone=>'UTC'})
+      sc.add('sched01', 't01', {:cron=>'* * * * *', :timezone=>'UTC'})
     }.should raise_error AlreadyExistsError
 
     sc['sched01'].delete!
 
-    sc.add('sched01', {:cron=>'* * * * *', :timezone=>'UTC'})
+    sc.add('sched01', 't01', {:cron=>'* * * * *', :timezone=>'UTC'})
   end
 
   it 'acquire' do
     time = 1323820800  # 2011-12-14 00:00:00 UTC
 
-    s01 = sc.add('sched01', :cron=>"* * * * *", :data=>{'k'=>1}, :next_time=>time)
+    s01 = sc.add('sched01', 't01', :cron=>"* * * * *", :data=>{'k'=>1}, :next_time=>time)
 
     t01 = sc.poll(:alive_time=>120, :now=>time)
     t01.key.should == 'sched01'
+    t01.type.should == 't01'
     t01.cron.should == "* * * * *"
     t01.delay.should == 0
     t01.data.should == {'k'=>1}
@@ -47,6 +48,7 @@ describe ScheduleCollection do
 
     t04 = sc.poll(:alive_time=>120, :now=>time+60)
     t04.key.should == 'sched01'
+    t01.type.should == 't01'
     t04.cron.should == "* * * * *"
     t04.delay.should == 0
     t04.data.should == {'k'=>1}
@@ -56,29 +58,31 @@ describe ScheduleCollection do
   it 'timezone' do
     time = 1323820800  # 2011-12-14 00:00:00 UTC
 
-    s01 = sc.add('sched01', :cron=>"0 0 * * *", :next_time=>time-60, :timezone=>'UTC')
+    s01 = sc.add('sched01', 't01', :cron=>"0 0 * * *", :next_time=>time-60, :timezone=>'UTC')
     #s01.class.should == Schedule
     #s01.key.should == 'sched01'
 
-    s02 = sc.add('sched02', :cron=>"0 0 * * *", :next_time=>time-60, :timezone=>'Asia/Tokyo')
+    s02 = sc.add('sched02', 't01', :cron=>"0 0 * * *", :next_time=>time-60, :timezone=>'Asia/Tokyo')
     #s02.class.should == Schedule
     #s02.key.should == 'sched02'
 
     t01 = sc.poll(:alive_time=>86400, :now=>time)
     t01.class.should == Task
     t01.key.should == 'sched01'
+    t01.type.should == 't01'
     t01.scheduled_time.should == time
 
     t02 = sc.poll(:alive_time=>86400, :now=>time+54000)
     t02.class.should == Task
     t02.key.should == 'sched02'
+    t02.type.should == 't01'
     t02.scheduled_time.should == time+54000
   end
 
   it 'delay' do
     time = 1323820800  # 2011-12-14 00:00:00 UTC
 
-    s01 = sc.add('sched01', :cron=>"0 * * * *", :delay=>30, :next_time=>time, :timezone=>'UTC')
+    s01 = sc.add('sched01', 't01', :cron=>"0 * * * *", :delay=>30, :next_time=>time, :timezone=>'UTC')
 
     t01 = sc.poll(:alive_time=>86400, :now=>time)
     t01.should == nil
@@ -86,6 +90,7 @@ describe ScheduleCollection do
     t02 = sc.poll(:alive_time=>86400, :now=>time+30)
     t02.class.should == Task
     t02.key.should == 'sched01'
+    t02.type.should == 't01'
     t02.scheduled_time.should == time
     t02.delay.should == 30
 
@@ -97,84 +102,38 @@ describe ScheduleCollection do
     t04 = sc.poll(:alive_time=>86400, :now=>time+3630)
     t04.class.should == Task
     t04.key.should == 'sched01'
+    t04.type.should == 't01'
     t04.scheduled_time.should == time+3600
     t04.delay.should == 30
   end
 
-  it 'only_keys' do
-    time = 1323820800  # 2011-12-14 00:00:00 UTC
-
-    s01 = sc.add('sched01', :cron=>"0 * * * *", :delay=>0, :next_time=>time, :timezone=>'UTC')
-
-    t01 = sc.poll(:alive_time=>86400, :now=>time, :only_keys=>['sched02'])
-    t01.should == nil
-
-    s02 = sc.add('sched02', :cron=>"0 * * * *", :delay=>0, :next_time=>time, :timezone=>'UTC')
-
-    t02 = sc.poll(:alive_time=>86400, :now=>time, :only_keys=>['sched02'])
-    t02.class.should == Task
-    t02.key.should == 'sched02'
-    t02.scheduled_time.should == time
-    t02.delay.should == 0
-
-    t01 = sc.poll(:alive_time=>86400, :now=>time, :only_keys=>['sched02', 'sched01'])
-    t01.class.should == Task
-    t01.key.should == 'sched01'
-    t01.scheduled_time.should == time
-    t01.delay.should == 0
-  end
-
-  it 'update_data' do
-    time = 1323820800  # 2011-12-14 00:00:00 UTC
-
-    s01 = sc.add('sched01', :cron=>"* * * * *", :data=>{'k'=>1}, :next_time=>time)
-
-    t01 = sc.poll(:alive_time=>120, :now=>time)
-    t01.data.should == {'k'=>1}
-
-    t01.finish!(:update_data=>{'v'=>1})
-
-    t01 = sc.poll(:alive_time=>120, :now=>time+60)
-    t01.data.should == {'k'=>1, 'v'=>1}
-
-    t01.finish!
-
-    t01 = sc.poll(:alive_time=>120, :now=>time+60*2)
-    t01.data.should == {'k'=>1, 'v'=>1}
-
-    t01.finish!(:update_data=>{'k'=>2})
-
-    t01 = sc.poll(:alive_time=>120, :now=>time+60*3)
-    t01.data.should == {'k'=>2, 'v'=>1}
-  end
-
   it 'invalid cron format' do
     lambda {
-      sc.add('sched01', :cron=>'???')
+      sc.add('sched01', 't01', :cron=>'???')
     }.should raise_error ArgumentError
 
     lambda {
-      sc.add('sched01', :cron=>'* * * * * *')
+      sc.add('sched01', 't01', :cron=>'* * * * * *')
     }.should raise_error ArgumentError
   end
 
   it 'fail duplicated add' do
-    sc.add('sched01', :cron=>"0 * * * *")
+    sc.add('sched01', 't01', :cron=>"0 * * * *")
     lambda {
-      sc.add('sched01', :cron=>"0 * * * *")
+      sc.add('sched01', 't01', :cron=>"0 * * * *")
     }.should raise_error AlreadyExistsError
 
     sc['sched01'].delete!
 
-    sc.add('sched01', :cron=>"0 * * * *")
+    sc.add('sched01', 't01', :cron=>"0 * * * *")
   end
 
   it 'list' do
     time = 1323820800  # 2011-12-14 00:00:00 UTC
 
-    sc.add('sched01', :cron=>"0 * * * *", :next_time=>time, :delay=>1)
-    sc.add('sched02', :cron=>"0 * * * *", :next_time=>time, :delay=>2)
-    sc.add('sched03', :cron=>"0 * * * *", :next_time=>time, :delay=>3, :next_run_time=>time+3600)
+    sc.add('sched01', 't01', :cron=>"0 * * * *", :next_time=>time, :delay=>1)
+    sc.add('sched02', 't02', :cron=>"0 * * * *", :next_time=>time, :delay=>2)
+    sc.add('sched03', 't03', :cron=>"0 * * * *", :next_time=>time, :delay=>3, :next_run_time=>time+3600)
 
     a = []
     sc.list {|s|
@@ -185,6 +144,7 @@ describe ScheduleCollection do
     s01 = a.shift
     s01.class.should == ScheduleWithMetadata
     s01.key.should == 'sched01'
+    s01.type.should == 't01'
     s01.cron.should == '0 * * * *'
     s01.delay.should == 1
     s01.next_time.should == time
@@ -193,6 +153,7 @@ describe ScheduleCollection do
     s02 = a.shift
     s02.class.should == ScheduleWithMetadata
     s02.key.should == 'sched02'
+    s02.type.should == 't02'
     s02.cron.should == '0 * * * *'
     s02.delay.should == 2
     s02.next_time.should == time
@@ -201,6 +162,7 @@ describe ScheduleCollection do
     s03 = a.shift
     s03.class.should == ScheduleWithMetadata
     s03.key.should == 'sched03'
+    s03.type.should == 't03'
     s03.cron.should == '0 * * * *'
     s03.delay.should == 3
     s03.next_time.should == time

data/spec/worker_spec.rb

@@ -18,7 +18,7 @@ class TestHandler < PerfectSched::Application::Base
 end
 
 class TestApp < PerfectSched::Application::Dispatch
-  route 'key' => TestHandler
+  route 'test' => TestHandler
 end
 
 describe Worker do
@@ -43,7 +43,7 @@ describe Worker do
 
   it 'run' do
     TestHandler.any_instance.should_receive(:run).once
-    add('key', {:cron=>'* * * * *', :next_time=>Time.now.to_i-60})
+    add('key', 'test', {:cron=>'* * * * *', :next_time=>Time.now.to_i-60})
     sleep 2
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: perfectsched
 version: !ruby/object:Gem::Version
-  version: 0.8.6
+  version: 0.8.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-21 00:00:00.000000000 Z
+date: 2014-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cron-spec
@@ -155,8 +155,6 @@ files:
 - .gitignore
 - ChangeLog
 - Gemfile
-- LICENSE
-- NOTICE
 - README.md
 - Rakefile
 - bin/perfectsched
@@ -189,8 +187,7 @@ files:
 - spec/spec_helper.rb
 - spec/worker_spec.rb
 homepage: https://github.com/treasure-data/perfectsched
-licenses:
-- Apache 2.0
+licenses: []
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -203,7 +200,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3128811790321973671
+      hash: -4078006290607887990
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -212,7 +209,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3128811790321973671
+      hash: -4078006290607887990
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24

data/LICENSE

@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.

data/NOTICE

@@ -1,3 +0,0 @@
-PerfectSched
-https://github.com/treasure-data/perfectsched
-Copyright (C) 2012-2013 Sadayuki Furuhashi