job_boss 0.7.7 → 0.7.8

data/bin/job_boss

@@ -24,9 +24,21 @@ Daemons.run_proc('job_boss', daemons_options) do
 
   Dir.chdir(JobBoss::Boss.config.application_root)
 
-  require 'config/environment' if File.exist?('config/environment.rb')
-
   boss = JobBoss::Boss.new
 
+  if File.exist?('config/environment.rb')
+    boss.logger.info "Requiring 'config/environment.rb'"
+    require 'config/environment'
+  end
+
+  at_exit do
+    puts "Test puts"
+    boss.logger.info "Before boss.stop"
+    boss.stop
+    boss.logger.info "After boss.stop"
+    boss = JobBoss::Boss.new
+    boss.logger.info "test log!!!!!!!"
+  end
+
   boss.start
 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.7'
+  s.version     = '0.7.8'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Brian Underwood"]
   s.email       = ["ml+job_boss@semi-sentient.com"]

data/lib/job_boss/batch.rb

@@ -37,7 +37,7 @@ module JobBoss
 
     # Allow calling of Job class methods from a batch which will be called
     # on in the scope of the jobs for the batch
-    # Examples: wait_for_jobs, result_hash, time_taken, completed_percent
+    # Examples: wait_for_jobs, result_hash, time_taken, completed_percent, cancelled?
     def method_missing(sym, *args, &block)
       jobs.send(sym, *args, &block)
     end

data/lib/job_boss/boss.rb

@@ -75,10 +75,6 @@ module JobBoss
 
       require_job_classes
 
-      Signal.trap("HUP") do
-        stop
-      end
-
       at_exit do
         stop if Process.pid == BOSS_PID
       end

data/lib/job_boss/job.rb

@@ -173,7 +173,7 @@ module JobBoss
       # Will cause the process to sleep until all specified jobs have completed
       # sleep_interval specifies polling period
       def wait_for_jobs(jobs = nil, sleep_interval = 0.5)
-        Signal.trap("HUP") do
+        at_exit do
           jobs.each(&:cancel)
         end
 
@@ -211,6 +211,14 @@ module JobBoss
         end
       end
 
+      def cancelled?(jobs = nil)
+        if jobs
+          count = Job.where('id in (?)', jobs).where('cancelled_at IS NULL').count
+
+          !(count > 0)
+        end
+      end
+
       # Given a time object
       # Delete all jobs which were completed earlier than that time
       def delete_jobs_before(time)
@@ -225,7 +233,7 @@ private
     end
 
     def mark_as_cancelled
-      update_attributes(:cancelled_at => Time.now)
+      update_attributes(:cancelled_at => Time.now, :completed_at => Time.now, :status => 'cancelled')
     end
 
     def mark_employee

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: job_boss
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 7
-  - 7
-  version: 0.7.7
+  - 8
+  version: 0.7.8
 platform: ruby
 authors: 
 - Brian Underwood
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-07 00:00:00 -05:00
+date: 2011-03-24 00:00:00 -04:00
 default_executable: job_boss
 dependencies: 
 - !ruby/object:Gem::Dependency