tootsie 0.9.1 → 0.9.2

data/README.md

@@ -210,14 +210,14 @@ Installation
 Running
 =======
 
-Create a configuration under `config`, eg. `config/development.yml`:
+Create a configuration, eg. `tootsie.conf`:
 
     --- 
       aws_access_key_id: <your Amazon key>
       aws_secret_access_key: <your Amazon secret>
       sqs_queue_name: tootsie
 
-Start the task manager with `bin/tootsie_task_manager start`. You can specify the number of workers with `-n`.
+Start the task manager with `tootsie_task_manager -c tootsie.conf start`.
 
 To run the web service, you will need a Rack-compatible web server, such as Unicorn or Thin. To start with Thin on port 9090:
 

data/bin/tootsie_task_manager

@@ -3,31 +3,24 @@
 $:.unshift(File.expand_path('../../lib', __FILE__))
 require 'tootsie'
 
-environment = ENV['RACK_ENV']
-environment ||= :development
-
 num_workers = 4
-logger = nil
+config_path = nil
+log_target = 'syslog'
 
 ARGV.options do |opts|
   opts.banner = "Usage: #{File.basename($0)} [OPTIONS] [start | stop | restart | status]"
   opts.separator ""
-  opts.on("-e", "--environment=env", String, 
-    "Environment to run in (default: #{environment})") do |value| 
-    environment = value
-  end
   opts.on("-n", "--num-workers=WORKERS", Integer,
     "Specify number of workers to fork (defaults to #{num_workers}.") do |value|
     num_workers = [1, value.to_i].max
   end
+  opts.on("-c", "--config=PATH", String,
+    "Specify configuration path.") do |value|
+    config_path = value
+  end
   opts.on("-l TARGET", "--logger TARGET", String,
     "Log to TARGET, which is either a file name or 'syslog'.") do |value|
-    if value == 'syslog'
-      require 'syslog_logger'
-      logger = SyslogLogger.new('tootsie')
-    else
-      logger = Logger.new(value)
-    end
+    log_target = value
   end
   opts.on("-h", "--help", "Show this help message.") do
     puts opts
@@ -40,6 +33,18 @@ ARGV.options do |opts|
   end
 end
 
+unless config_path
+  abort 'Configuration file not specified.'
+end
+config_path = File.expand_path(config_path)
+
+case log_target
+  when 'syslog'
+    logger = SyslogLogger.new('tootsie')
+  else
+    logger = Logger.new(log_target)
+end
+
 controller = Tootsie::Daemon.new(
   :root => File.join(File.dirname(__FILE__), "/.."),
   :pid_file => File.join(File.dirname(__FILE__), "/../tmp/task_manager.pid"),
@@ -54,10 +59,8 @@ controller.on_spawn do
     Signal.trap('TERM') do
       exit(2)
     end
-    app = Tootsie::Application.new(
-      :environment => environment,
-      :logger => controller.logger)
-    app.configure!
+    app = Tootsie::Application.new(:logger => controller.logger)
+    app.configure!(config_path)
     begin
       app.task_manager.run!
     rescue SystemExit, Interrupt

data/lib/tootsie/application.rb

@@ -1,19 +1,15 @@
-require 's3'
-require 'sqs'
-
 module Tootsie
     
   class Application
     
     def initialize(options = {})
       @@instance = self
-      @environment = options[:environment] || :development
       @logger = options[:logger] || Logger.new($stderr)
       @configuration = Configuration.new
     end
     
-    def configure!
-      @configuration.load_from_file(File.join(Dir.pwd, "config/#{@environment}.yml"))
+    def configure!(config_path)
+      @configuration.load_from_file(config_path)
       @queue = Tootsie::SqsQueue.new(@configuration.sqs_queue_name, sqs_service)
       @task_manager = TaskManager.new(@queue)
     end
@@ -35,9 +31,7 @@ module Tootsie
         @@instance
       end
     end
-    
-    attr_accessor :environment
-    
+        
     attr_reader :configuration
     attr_reader :task_manager
     attr_reader :queue

data/lib/tootsie/version.rb

@@ -1,3 +1,3 @@
 module Tootsie
-  VERSION = '0.9.1'
+  VERSION = '0.9.2'
 end

data/lib/tootsie.rb

@@ -1,4 +1,8 @@
 require 'active_support/core_ext/hash'
+require 'syslog_logger'
+require 's3'
+require 'sqs'
+require 'yaml'
 
 require 'tootsie/application'
 require 'tootsie/client'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tootsie
 version: !ruby/object:Gem::Version 
-  hash: 57
+  hash: 63
   prerelease: 
   segments: 
   - 0
   - 9
-  - 1
-  version: 0.9.1
+  - 2
+  version: 0.9.2
 platform: ruby
 authors: 
 - Alexander Staubo