job_boss 0.5.5 → 0.5.7

data/lib/job_boss/config.rb

@@ -1,46 +1,48 @@
+require 'active_support/core_ext/string'
+
 module JobBoss
   class Config
     attr_accessor :application_root, :database_yaml_path, :log_path, :jobs_path, :sleep_interval, :employee_limit, :environment
 
     def parse_args(argv, options = {})
-      @application_root     = File.expand_path(options[:working_dir] || Dir.pwd)
-      @database_yaml_path   = 'config/database.yml'
-      @log_path             = 'log/job_boss.log'
-      @jobs_path            = 'app/jobs'
-      @sleep_interval       = 0.5
-      @employee_limit       = 4
-      @environment          = 'development'
+      @application_root     = File.expand_path(ENV['JB_APPLICATION_ROOT'] || options[:working_dir] || Dir.pwd)
+      @database_yaml_path   = ENV['JB_DATABASE_YAML_PATH'] || 'config/database.yml'
+      @log_path             = ENV['JB_LOG_PATH'] || 'log/job_boss.log'
+      @jobs_path            = ENV['JB_JOBS_PATH'] || 'app/jobs'
+      @sleep_interval       = ENV['JB_SLEEP_INTERVAL'].blank? ? 0.5 : ENV['JB_SLEEP_INTERVAL'].to_f
+      @employee_limit       = ENV['JB_EMPLOYEE_LIMIT'].blank? ? 4 : ENV['JB_EMPLOYEE_LIMIT'].to_i
+      @environment          = ENV['JB_ENVIRONMENT'] || 'development'
 
       require 'optparse'
 
       OptionParser.new do |opts|
         opts.banner = "Usage: job_boss [start|stop|restart|run|zap] [-- <options>]"
 
-        opts.on("-r", "--application-root PATH", "Path for the application root upon which other paths depend (defaults to .)") do |path|
+        opts.on("-r", "--application-root PATH", "Path for the application root upon which other paths depend (defaults to .)  Environment variable: JB_APPLICATION_ROOT") do |path|
           @application_root = File.expand_path(path)
         end
 
-        opts.on("-d", "--database-yaml PATH", "Path for database YAML (defaults to <application-root>/#{@database_yaml_path})") do |path|
+        opts.on("-d", "--database-yaml PATH", "Path for database YAML (defaults to <application-root>/#{@database_yaml_path}) Environment variable: JB_DATABASE_YAML_PATH") do |path|
           @database_yaml_path = path
         end
 
-        opts.on("-l", "--log-path PATH", "Path for log file (defaults to <application-root>/#{@log_path})") do |path|
+        opts.on("-l", "--log-path PATH", "Path for log file (defaults to <application-root>/#{@log_path}) Environment variable: JB_LOG_PATH") do |path|
           @log_path = path
         end
 
-        opts.on("-j", "--jobs-path PATH", "Path to folder with job classes (defaults to <application-root>/#{@jobs_path})") do |path|
+        opts.on("-j", "--jobs-path PATH", "Path to folder with job classes (defaults to <application-root>/#{@jobs_path}) Environment variable: JB_JOBS_PATH") do |path|
           @jobs_path = path
         end
 
-        opts.on("-e", "--environment ENV", "Environment to use in database YAML file (defaults to '#{@environment}')") do |env|
+        opts.on("-e", "--environment ENV", "Environment to use in database YAML file (defaults to '#{@environment}') Environment variable: JB_ENVIRONMENT") do |env|
           @environment = env
         end
 
-        opts.on("-s", "--sleep-interval INTERVAL", Integer, "Number of seconds for the boss to sleep between checks of the queue (default #{@sleep_interval})") do |interval|
+        opts.on("-s", "--sleep-interval INTERVAL", Integer, "Number of seconds for the boss to sleep between checks of the queue (default #{@sleep_interval}) Environment variable: JB_SLEEP_INTERVAL") do |interval|
           @sleep_interval = interval
         end
 
-        opts.on("-c", "--employee-limit LIMIT", Integer, "Maximum number of employees (default 4)") do |limit|
+        opts.on("-c", "--employee-limit LIMIT", Integer, "Maximum number of employees (default 4) Environment variable: JB_EMPLOYEE_LIMIT") do |limit|
           @employee_limit = limit
         end
       end.parse!(argv)

data/lib/job_boss/job.rb

@@ -12,9 +12,9 @@ module JobBoss
     scope :completed, where('completed_at IS NOT NULL')
 
     # Method used by the boss to dispatch an employee
-    def dispatch
+    def dispatch(boss)
       mark_as_started
-      Boss.logger.info "Dispatching Job ##{self.id}"
+      boss.logger.info "Dispatching Job ##{self.id}"
 
       pid = fork do
         ActiveRecord::Base.connection.reconnect!
@@ -29,7 +29,7 @@ module JobBoss
           self.update_attribute(:result, value)
         rescue Exception => exception
           mark_exception(exception)
-          Boss.logger.error "Error running job ##{self.id}!"
+          boss.logger.error "Error running job ##{self.id}!"
         ensure
           until mark_as_completed
             sleep(1)

data/lib/job_boss/queuer.rb

@@ -2,6 +2,7 @@ module JobBoss
   class Queuer
     def method_missing(method_id, *args)
       require 'active_support'
+      require 'job_boss/job'
 
       method_name = method_id.id2name
 

data/test/test_helper.rb

@@ -52,7 +52,7 @@ class ActiveSupport::TestCase
     end
   end
 
-  def start_daemon(options)
+  def start_daemon(options = {})
     clean_app_environment
 
     stop_daemon

data/test/unit/daemon_test.rb

@@ -1,29 +1,56 @@
 require 'test_helper'
 
 class DaemonTest < ActiveSupport::TestCase
-  test "daemon options" do
+  test "Basic startup/shutdown" do
     start_daemon(:application_root => @app_root_path)
 
     wait_for_file(@log_path)
 
-    assert File.read(@log_path).match('INFO -- : Job Boss started')
+    log_output = File.read(@log_path)
+    assert log_output.match("INFO -- : Started ActiveRecord connection in 'development' environment from database YAML: #{@db_yaml_path}")
+    assert log_output.match('INFO -- : Job Boss started')
+    assert log_output.match('INFO -- : Employee limit: 4')
+    
 
     stop_daemon
+  end
+
+  test "Startup/shutdown with environment variables" do
+    ENV['JB_APPLICATION_ROOT'] = @app_root_path
+    ENV['JB_EMPLOYEE_LIMIT'] = '2'
+    start_daemon
 
+    wait_for_file(@log_path)
 
+    log_output = File.read(@log_path)
+    assert log_output.match("INFO -- : Started ActiveRecord connection in 'development' environment from database YAML: #{@db_yaml_path}")
+    assert log_output.match('INFO -- : Job Boss started')
+    assert log_output.match('INFO -- : Employee limit: 2')
+
+    stop_daemon
+
+    ENV['JB_APPLICATION_ROOT'] = nil
+    ENV['JB_EMPLOYEE_LIMIT'] = nil
+  end
+
+  test "Startup with different command line options" do
     custom_log_path = File.join('log', 'loggity.log')
     full_custom_log_path = File.join(@app_root_path, custom_log_path)
 
-    start_daemon(:application_root => @app_root_path, :log_path => custom_log_path, :environment => 'production')
+    ENV['JB_EMPLOYEE_LIMIT'] = '2' # Make sure application setting overrides environment variable
+    start_daemon(:application_root => @app_root_path, :log_path => custom_log_path, :environment => 'production', :employee_limit => 3)
     wait_for_file(full_custom_log_path)
 
-    assert File.read(full_custom_log_path).match('INFO -- : Job Boss started')
+    log_output = File.read(full_custom_log_path)
+    assert log_output.match("INFO -- : Started ActiveRecord connection in 'production' environment from database YAML: #{@db_yaml_path}")
+    assert log_output.match('INFO -- : Job Boss started')
+    assert log_output.match('INFO -- : Employee limit: 3')
     assert File.exist?(File.join(@app_root_path, 'db', 'production.sqlite3'))
 
     restart_daemon
 
     stop_daemon
 
-
+    ENV['JB_EMPLOYEE_LIMIT'] = nil
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 5
-  - 5
-  version: 0.5.5
+  - 7
+  version: 0.5.7
 platform: ruby
 authors: 
 - Brian Underwood
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-11 00:00:00 -05:00
+date: 2010-12-12 00:00:00 -05:00
 default_executable: job_boss
 dependencies: 
 - !ruby/object:Gem::Dependency