job_boss 0.2 → 0.4

data/lib/migrate.rb

@@ -8,11 +8,13 @@ class CreateJobs < ActiveRecord::Migration
       t.datetime :cancelled_at
       t.datetime :completed_at
       t.string :status
+
+      t.string :error_class
       t.string :error_message
       t.text :error_backtrace
 
       t.string :employee_host
-      t.string :employee_pid
+      t.integer :employee_pid
 
       t.timestamps
     end

data/test/app_root/app/jobs/math_jobs.rb

@@ -0,0 +1,5 @@
+class MathJobs
+    def is_prime?(i)
+        ('1' * i) !~ /^1?$|^(11+?)\1+$/
+    end
+end

data/test/app_root/app/jobs/sleep_jobs.rb

@@ -0,0 +1,9 @@
+class SleepJobs
+  def sleep_for(time)
+    sleep(time)
+  end
+
+  def do_not_never_sleep
+    raise ArgumentError, "I can't not do that, Dave."
+  end
+end

data/test/app_root/app/jobs/string_jobs.rb

@@ -0,0 +1,5 @@
+class StringJobs
+  def concatenate(*args)
+    [args.join, args.size]
+  end
+end

data/test/app_root/config/database.yml

@@ -0,0 +1,22 @@
+# SQLite version 3.x
+#   gem install sqlite3-ruby (not necessary on OS X Leopard)
+development:
+  adapter: sqlite3
+  database: test/app_root/db/development.sqlite3
+  pool: 5
+  timeout: 10000
+
+# Warning: The database defined as "test" will be erased and
+# re-generated from your development database when you run "rake".
+# Do not set this db to the same as development or production.
+test:
+  adapter: sqlite3
+  database: test/app_root/db/test.sqlite3
+  pool: 5
+  timeout: 10000
+
+production:
+  adapter: sqlite3
+  database: test/app_root/db/production.sqlite3
+  pool: 5
+  timeout: 10000

data/test/test_helper.rb

@@ -0,0 +1,113 @@
+require 'rubygems'
+require 'test/unit'
+require 'sqlite3'
+
+require 'fileutils'
+FileUtils.cd(File.expand_path('../..', __FILE__))
+
+require 'active_support'
+
+class ActiveSupport::TestCase
+  # Add more helper methods to be used by all tests here...
+
+  setup :setup_paths
+  teardown :clean_app_environment
+  teardown :stop_daemon
+
+  def setup_paths
+    @app_root_path = File.join('test', 'app_root')
+    @db_path = File.join(@app_root_path, 'db')
+    @log_path = File.join(@app_root_path, 'log', 'job_boss.log')
+    @db_yaml_path = File.join(@app_root_path, 'config', 'database.yml')
+  end
+
+  def clean_app_environment
+    Dir.glob(File.join(@db_path, '*')).each {|path| File.unlink(path) }
+    Dir.glob(File.join(@app_root_path, 'log', '*')).each {|path| File.unlink(path) }
+  end
+
+  def assert_pid_running(pid, message="")
+    full_message = build_message(message, "PID <?> expected to be running.", pid)
+    assert_block(full_message) do
+      begin
+        Process.kill(0, pid.to_i)
+        true
+      rescue
+        false
+      end
+    end
+  end
+
+  def assert_pid_not_running(pid, message="")
+    full_message = build_message(message, "PID <?> expected to not be running.", pid)
+    assert_block(full_message) do
+      begin
+        Process.kill(0, pid.to_i)
+        false
+      rescue
+        true
+      end
+    end
+  end
+
+  def start_daemon(options)
+    clean_app_environment
+
+    stop_daemon
+
+    option_string = options.collect do |key, value|
+      '--' + key.to_s.gsub('_', '-') + " " + value.to_s
+    end
+
+    output = `bin/job_boss start -- #{option_string.join(' ')}`
+
+    @daemon_pid = get_pid_from_startup(output)
+
+    assert_pid_running(@daemon_pid)
+
+    @daemon_pid
+  end
+
+  def get_pid_from_startup(output)
+    output.match(/job_boss: process with pid (\d+) started./)[1].to_i
+  end
+
+  def wait_for_file(file_path, timeout = 5)
+    i = 0
+    until File.exist?(file_path)
+      sleep(1)
+
+      raise "File failed to appear!" if i > timeout
+      i += 1
+    end
+  end
+
+  def wait_until_job_assigned(job, wait_interval = 0.5)
+    until job.assigned?
+      sleep(wait_interval)
+      job.reload
+    end
+  end
+
+  def stop_daemon
+    `bin/job_boss stop`
+
+    # Give the daemon a bit of time to stop
+#    sleep(0.5)
+    assert_pid_not_running(@daemon_pid) if @daemon_pid
+  end
+
+  def restart_daemon
+    assert_pid_running(@daemon_pid)
+
+    output = `bin/job_boss restart`
+
+    # Give the daemon a bit of time to stop
+#    sleep(0.5)
+    assert_pid_not_running(@daemon_pid)
+
+    @daemon_pid = get_pid_from_startup(output)
+
+    assert_pid_running(@daemon_pid)
+  end
+end

data/test/unit/daemon_test.rb

@@ -0,0 +1,29 @@
+require 'test_helper'
+
+class DaemonTest < ActiveSupport::TestCase
+  test "daemon options" do
+    start_daemon(:application_root => @app_root_path)
+
+    wait_for_file(@log_path)
+
+    assert File.read(@log_path).match('INFO -- : Job Boss started')
+
+    stop_daemon
+
+
+    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')
+    wait_for_file(full_custom_log_path)
+
+    assert File.read(full_custom_log_path).match('INFO -- : Job Boss started')
+    assert File.exist?(File.join(@app_root_path, 'db', 'production.sqlite3'))
+
+    restart_daemon
+
+    stop_daemon
+
+
+  end
+end

data/test/unit/job_test.rb

@@ -0,0 +1,73 @@
+require 'test_helper'
+require 'active_record'
+require 'job_boss/boss'
+require 'job_boss/job'
+Dir.glob('test/app_root/app/jobs/*_jobs.rb').each {|lib| require lib }
+
+class DaemonTest < ActiveSupport::TestCase
+  test "job queuing" do
+    start_daemon(:application_root => @app_root_path)
+
+    wait_for_file(@log_path)
+
+    config = YAML.load(File.read(@db_yaml_path))
+
+    ActiveRecord::Base.establish_connection(config['development'])
+
+    # Test returning results from a number of jobs
+    jobs = (0..10).collect do |i|
+      JobBoss::Boss.queue.math.is_prime?(i)
+    end
+
+    JobBoss::Job.wait_for_jobs(jobs)
+
+    assert_equal 11, JobBoss::Job.completed.count
+
+    JobBoss::Job.result_hash(jobs).each do |args, result|
+      assert_equal MathJobs.new.is_prime?(args.first), result
+    end
+
+
+    # Test functions with multiple arguments and a complex return value (an Array in this case)
+    job = JobBoss::Boss.queue.string.concatenate('test', 'of', 'concatenation')
+    JobBoss::Job.wait_for_jobs(job)
+    assert_equal 12, JobBoss::Job.completed.count
+
+    assert_equal ['testofconcatenation', 3], job.result
+
+    assert job.time_taken > 0
+    assert_nil job.error
+
+
+    # Test cancelling of a job
+    job = JobBoss::Boss.queue.sleep.sleep_for(10)
+
+    wait_until_job_assigned(job)
+
+    assert_pid_running(job.employee_pid)
+
+    job.cancel
+
+    sleep(2)
+
+    assert_pid_not_running(job.employee_pid)
+
+    job.reload
+    assert job.cancelled?
+    assert_not_nil job.cancelled_at
+
+
+
+    # Test raising of errors
+    job = JobBoss::Boss.queue.sleep.do_not_never_sleep
+    JobBoss::Job.wait_for_jobs(job)
+    job.reload
+
+    error = job.error
+    assert_equal ArgumentError, error.class
+    assert_equal "I can't not do that, Dave.", error.message
+    assert_equal Array, error.backtrace.class
+
+    stop_daemon
+  end
+end

metadata

@@ -4,8 +4,8 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
-  version: "0.2"
+  - 4
+  version: "0.4"
 platform: ruby
 authors: 
 - Brian Underwood
@@ -13,7 +13,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-26 00:00:00 -05:00
+date: 2010-11-28 00:00:00 -05:00
 default_executable: job_boss
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -43,7 +43,7 @@ dependencies:
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: daemons
+  name: daemons-mikehale
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -55,6 +55,19 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: sqlite3-ruby
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id004
 description: job_boss allows you to queue jobs which are unqueued by a "Job Boss" daemon and handed off to workers to process
 email: 
 - ml+job_boss@semi-sentient.com
@@ -68,49 +81,49 @@ files:
 - README.markdown
 - Rakefile
 - bin/job_boss
-- doc/ActiveRecord.html
-- doc/ActiveRecord/Base.html
+- doc/ActiveSupport.html
+- doc/ActiveSupport/TestCase.html
 - doc/CreateJobs.html
+- doc/DaemonTest.html
 - doc/JobBoss.html
 - doc/JobBoss/Boss.html
 - doc/JobBoss/Config.html
 - doc/JobBoss/Job.html
 - doc/JobBoss/Queuer.html
-- doc/Mongrel.html
-- doc/Mongrel/HttpServer.html
-- doc/Passenger.html
-- doc/Passenger/Railz.html
-- doc/Passenger/Railz/RequestHandler.html
-- doc/PhusionPassenger.html
-- doc/PhusionPassenger/Rack.html
-- doc/PhusionPassenger/Rack/RequestHandler.html
-- doc/PhusionPassenger/Railz.html
-- doc/PhusionPassenger/Railz/RequestHandler.html
+- doc/MathJobs.html
 - doc/Rakefile.html
-- doc/Spawn.html
-- doc/Spawn/SpawnId.html
+- doc/SleepJobs.html
+- doc/StringJobs.html
 - doc/bin/job_boss.html
 - doc/created.rid
 - doc/index.html
 - doc/lib/job_boss/boss_rb.html
 - doc/lib/job_boss/capistrano_rb.html
-- doc/lib/job_boss/configuror_rb.html
+- doc/lib/job_boss/config_rb.html
 - doc/lib/job_boss/job_rb.html
 - doc/lib/job_boss/queuer_rb.html
 - doc/lib/migrate_rb.html
 - doc/rdoc.css
-- doc/vendor/spawn/CHANGELOG.html
-- doc/vendor/spawn/LICENSE.html
-- doc/vendor/spawn/init_rb.html
-- doc/vendor/spawn/lib/patches_rb.html
-- doc/vendor/spawn/lib/spawn_rb.html
+- doc/test/app_root/app/jobs/math_jobs_rb.html
+- doc/test/app_root/app/jobs/sleep_jobs_rb.html
+- doc/test/app_root/app/jobs/string_jobs_rb.html
+- doc/test/test_helper_rb.html
+- doc/test/unit/daemon_test_rb.html
+- doc/test/unit/job_test_rb.html
 - job_boss.gemspec
 - lib/job_boss/boss.rb
 - lib/job_boss/capistrano.rb
-- lib/job_boss/configuror.rb
+- lib/job_boss/config.rb
 - lib/job_boss/job.rb
 - lib/job_boss/queuer.rb
 - lib/migrate.rb
+- test/app_root/app/jobs/math_jobs.rb
+- test/app_root/app/jobs/sleep_jobs.rb
+- test/app_root/app/jobs/string_jobs.rb
+- test/app_root/config/database.yml
+- test/test_helper.rb
+- test/unit/daemon_test.rb
+- test/unit/job_test.rb
 has_rdoc: true
 homepage: http://github.com/cheerfulstoic/job_boss
 licenses: []
@@ -147,5 +160,11 @@ rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Asyncronous, parallel job processing
-test_files: []
-
+test_files: 
+- test/app_root/app/jobs/math_jobs.rb
+- test/app_root/app/jobs/sleep_jobs.rb
+- test/app_root/app/jobs/string_jobs.rb
+- test/app_root/config/database.yml
+- test/test_helper.rb
+- test/unit/daemon_test.rb
+- test/unit/job_test.rb