perfectsched 0.7.0 → 0.7.1

data/ChangeLog

@@ -1,5 +1,11 @@
 
-== 2011-09-03 version 0.7.0
+== 2011-09-16 version 0.7.1
 
-* Initial release
+* Supports to read multiple configuration files
+* Fixed command-line launcher
+
+
+== 2011-09-02 version 0.7.0
+
+* First release
 

data/lib/perfectsched/backend/simpledb.rb

@@ -5,8 +5,7 @@ module PerfectSched
 class SimpleDBBackend < Backend
   def initialize(key_id, secret_key, domain)
     super()
-    gem "aws-sdk"
-    require 'aws'
+    require 'aws-sdk'
     @consistent_read = false
 
     @db = AWS::SimpleDB.new(

data/lib/perfectsched/command/perfectsched.rb

@@ -103,7 +103,7 @@ begin
   type ||= :run
 
   case type
-  case :add
+  when :add
     if ARGV.length != 2
       usage nil
     end
@@ -184,7 +184,7 @@ conf[:timeout] ||= 60
 conf[:poll_interval] ||= 1
 
 # backend
-bconf = yaml['backend']
+bconf = conf[:backend]
 if domain = bconf['simpledb']
   require 'perfectsched/backend/simpledb'
   key_id = bconf['aws_key_id'] || ENV['AWS_ACCESS_KEY_ID']
@@ -205,21 +205,23 @@ else
 end
 
 # queue
-bconf = yaml['queue']
-if domain = bconf['simpledb']
-  require 'perfectqueue/backend/simpledb'
-  key_id = bconf['aws_key_id'] || ENV['AWS_ACCESS_KEY_ID']
-  secret_key = bconf['aws_secret_key'] || ENV['AWS_SECRET_ACCESS_KEY']
-  queue = PerfectQueue::SimpleDBBackend.new(key_id, secret_key, domain)
-
-elsif uri = bconf['database']
-  require 'perfectqueue/backend/rdb'
-  table = bconf['table'] || "perfectqueue"
-  queue = PerfectQueue::RDBBackend.new(uri, table)
+make_queue = Proc.new do
+  bconf = conf[:queue]
+  if domain = bconf['simpledb']
+    require 'perfectqueue/backend/simpledb'
+    key_id = bconf['aws_key_id'] || ENV['AWS_ACCESS_KEY_ID']
+    secret_key = bconf['aws_secret_key'] || ENV['AWS_SECRET_ACCESS_KEY']
+    queue = PerfectQueue::SimpleDBBackend.new(key_id, secret_key, domain)
+
+  elsif uri = bconf['database']
+    require 'perfectqueue/backend/rdb'
+    table = bconf['table'] || "perfectqueue"
+    queue = PerfectQueue::RDBBackend.new(uri, table)
 
-else
-  $stderr.puts "Invalid configuration file: queue section is required"
-  exit 1
+  else
+    $stderr.puts "Invalid configuration file: queue section is required"
+    exit 1
+  end
 end
 
 require 'logger'
@@ -313,6 +315,7 @@ when :run
     log.level = Logger::INFO
   end
 
+  queue = make_queue.call
   engine = PerfectSched::Engine.new(backend, queue, log, conf)
 
   trap :INT do

data/lib/perfectsched/version.rb

@@ -1,5 +1,5 @@
 module PerfectSched
 
-VERSION = '0.7.0'
+VERSION = '0.7.1'
 
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: perfectsched
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: false
   segments: 
   - 0
   - 7
-  - 0
-  version: 0.7.0
+  - 1
+  version: 0.7.1
 platform: ruby
 authors: 
 - Sadayuki Furuhashi
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-03 00:00:00 +09:00
+date: 2011-09-16 00:00:00 +09:00
 default_executable: perfectsched
 dependencies: 
 - !ruby/object:Gem::Dependency