job_boss 0.7.14 → 0.7.15

data/bin/job_boss

@@ -27,7 +27,7 @@ Daemons.run_proc('job_boss', daemons_options) do
   boss = JobBoss::Boss.new
 
   if File.exist?('config/environment.rb')
-    boss.logger.info "Requiring 'config/environment.rb'"
+#    boss.logger.info "Requiring 'config/environment.rb'"
     require 'config/environment'
   end
 

data/job_boss.gemspec

@@ -4,7 +4,7 @@ $:.unshift lib unless $:.include?(lib)
 
 Gem::Specification.new do |s|
   s.name        = "job_boss"
-  s.version     = '0.7.14'
+  s.version     = '0.7.15'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Brian Underwood"]
   s.email       = ["ml+job_boss@semi-sentient.com"]

data/lib/job_boss/boss.rb

@@ -106,7 +106,7 @@ module JobBoss
 
     # Waits until there is at least one available employee and then returns count
     def wait_for_available_employees
-      until (employee_count = available_employees) > 0 && Job.pending.count > 0
+      until (employee_count = available_employees) > 0
         sleep(config.sleep_interval)
       end
 

data/lib/job_boss/job.rb

@@ -177,7 +177,7 @@ module JobBoss
       # sleep_interval specifies polling period
       def wait_for_jobs(jobs = nil, sleep_interval = 0.5)
         at_exit do
-          Job.not_completed.find(jobs).each(&:cancel)
+          Job.not_completed.where('id in (?)', jobs).cancel
         end
 
         jobs = get_jobs(jobs)

data/test/test_helper.rb

@@ -16,7 +16,8 @@ class ActiveSupport::TestCase
   teardown :stop_daemon
 
   def setup_paths
-    @job_boss_bin_path = File.expand_path('../../bin/job_boss', __FILE__)
+    @job_boss_path = File.expand_path('../..')
+    @job_boss_bin_path = File.expand_path(File.join(@job_boss_path, 'bin/job_boss'), __FILE__)
     @app_root_path = File.expand_path('../app_root', __FILE__)
     @db_path = File.join(@app_root_path, 'db')
     @log_path = File.join(@app_root_path, 'log', 'job_boss.log')
@@ -25,7 +26,14 @@ class ActiveSupport::TestCase
 
   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) }
+
+    log_files = Dir.glob(File.join(@app_root_path, 'log', '*'))
+    log_files.each do |path|
+#      File.open('test/' + File.basename(path), 'w') {|f| f << '' }
+
+      File.open(File.join(@job_boss_path, 'test', File.basename(path)), 'a') {|f| f << File.read(path) }
+      File.unlink(path)
+    end
   end
 
   def assert_pid_running(pid, message="")
@@ -89,6 +97,19 @@ class ActiveSupport::TestCase
       sleep(wait_interval)
       job.reload
     end
+#    wait_until(30) do
+#      job.reload
+#      job.assigned?
+#    end
+  end
+
+  def wait_until(timeout, wait_interval = 0.5)
+    require 'timeout'
+    Timeout::timeout(5) do
+      until yield
+        sleep(wait_interval)
+      end
+    end
   end
 
   def stop_daemon

data/test/unit/daemon_test.rb

@@ -7,9 +7,9 @@ class DaemonTest < ActiveSupport::TestCase
     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: 4')
+    assert_match "INFO -- : Started ActiveRecord connection in 'development' environment from database YAML: #{@db_yaml_path}", log_output
+    assert_match 'INFO -- : Job Boss started', log_output
+    assert_match 'INFO -- : Employee limit: 4', log_output
     
 
     stop_daemon

data/test/unit/job_test.rb

@@ -7,7 +7,7 @@ Dir.chdir('test/app_root')
 Dir.glob('app/jobs/*_jobs.rb').each {|lib| require lib }
 Dir.glob('app/models/*.rb').each {|lib| require lib }
 
-class DaemonTest < ActiveSupport::TestCase
+class JobTest < ActiveSupport::TestCase
   test "job queuing" do
     start_daemon(:application_root => @app_root_path)
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: job_boss
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 7
-  - 14
-  version: 0.7.14
+  - 15
+  version: 0.7.15
 platform: ruby
 authors: 
 - Brian Underwood
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-01 00:00:00 -04:00
+date: 2011-04-02 00:00:00 -04:00
 default_executable: job_boss
 dependencies: 
 - !ruby/object:Gem::Dependency