navvy 0.2.0 → 0.2.1

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/generators/navvy/navvy_generator.rb

@@ -4,11 +4,11 @@ class NavvyGenerator < Rails::Generator::Base
       options = {
         :migration_file_name => 'create_jobs'
       }
-      
       m.migration_template 'migration.rb', 'db/migrate', options
+      m.file 'script', 'script/navvy', :chmod => 0755
     end
   end
-  
+
   def banner
     "Usage: #{$0} #{spec.name}"
   end

data/generators/navvy/templates/script

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'config', 'environment'))
+Navvy::Worker.daemonize

data/lib/generators/navvy_generator.rb

@@ -1,18 +1,24 @@
 require 'rails/generators/migration'
 class NavvyGenerator < Rails::Generators::Base
   include Rails::Generators::Migration
-  
+
   def self.source_root
     File.join(File.dirname(__FILE__), '..', '..', 'generators', 'navvy', 'templates')
   end
-  
+
   def install_navvy
     migration_template(
       'migration.rb',
       'db/migrate/create_navvy_table.rb'
     )
+
+    copy_file(
+      'script',
+      'script/navvy',
+      :chmod => 0755
+    )
   end
-  
+
   protected
     def next_migration_number(dirname) #:nodoc:
       "%.3d" % (current_migration_number(dirname) + 1)

data/lib/navvy/job.rb

@@ -0,0 +1,156 @@
+module Navvy
+  class Job
+    class << self
+      attr_writer :limit, :keep, :max_attempts
+    end
+
+    ##
+    # Limit of jobs to be fetched at once. Will use the value stored in
+    # Navvy.configuration (defaults to 100), or -- for backwards compatibility
+    # -- Navvy::Job.limit.
+    #
+    # @return [Integer] limit
+
+    def self.limit
+      @limit || Navvy.configuration.job_limit
+    end
+
+    ##
+    # If and how long the jobs should be kept. Will use the value stored in
+    # Navvy.configuration (defaults to false), or -- for backwards
+    # compatibility -- Navvy::Job.keep.
+    #
+    # @return [Fixnum, true, false] keep
+
+    def self.keep
+      @keep || Navvy.configuration.keep_jobs
+    end
+
+    ##
+    # How often should a job be retried? Will use the value stored in
+    # Navvy.configuration (defaults to 24), or -- for backwards compatibility
+    # -- Navvy::Job.max_attempts.
+    #
+    # @return [Fixnum] max_attempts
+
+    def self.max_attempts
+      @max_attempts || Navvy.configuration.max_attempts
+    end
+
+    ##
+    # Should the job be kept? Will calculate if the keeptime has passed if
+    # @keep is a Fixnum. Otherwise, it'll just return the @keep value since
+    # it's probably a boolean.
+    #
+    # @return [true, false] keep
+
+    def self.keep?
+      return (Time.now + self.keep) >= Time.now if self.keep.is_a? Fixnum
+      self.keep
+    end
+
+    ##
+    # Run the job. Will delete the Navvy::Job record and return its return
+    # value if it runs successfully unless Navvy::Job.keep is set. If a job
+    # fails, it'll call Navvy::Job#failed and pass the exception message.
+    # Failed jobs will _not_ get deleted.
+    #
+    # @example
+    #   job = Navvy::Job.next # finds the next available job in the queue
+    #   job.run               # runs the job and returns the job's return value
+    #
+    # @return [String] return value or exception message of the called method.
+
+    def run
+      begin
+        started
+        result = Kernel.const_get(object).send(method_name, *args)
+        Navvy::Job.keep? ? completed : destroy
+        result
+      rescue Exception => exception
+        failed(exception.message)
+      end
+    end
+
+    ##
+    # Retry the current job. Will add self to the queue again, giving the clone
+    # a parend_id equal to self.id. Also, the priority of the new job will be
+    # the same as its parent's and it'll set the :run_at date to N ** 4, where
+    # N is the times_failed count.
+    #
+    # @return [Navvy::Job] job the new job it created.
+
+    def retry
+      self.class.enqueue(
+        object,
+        method_name,
+        *(args << {
+          :job_options => {
+            :parent_id => parent_id || id,
+            :run_at => Time.now + times_failed ** 4,
+            :priority => priority
+          }
+        })
+      )
+    end
+
+    ##
+    # Check if the job has been run.
+    #
+    # @return [true, false] ran
+
+    def ran?
+      completed? || failed?
+    end
+
+    ##
+    # Check how long it took for a job to complete or fail.
+    #
+    # @return [Time, Integer] time the time it took.
+
+    def duration
+      ran? ? (completed_at || failed_at) - started_at : 0
+    end
+
+    ##
+    # Check if completed_at is set.
+    #
+    # @return [true, false] set?
+
+    def completed_at?
+      !completed_at.nil?
+    end
+
+    ##
+    # Check if failed_at is set.
+    #
+    # @return [true, false] set?
+
+    def failed_at?
+      !failed_at.nil?
+    end
+
+    ##
+    # Get the job arguments as an array.
+    #
+    # @return [array] arguments
+
+    def args
+      arguments.is_a?(Array) ? arguments : YAML.load(arguments)
+    end
+
+    ##
+    # Get the job status
+    #
+    # @return [:pending, :completed, :failed] status
+
+    def status
+      return :completed if completed?
+      return :failed if failed?
+      :pending
+    end
+
+    alias_method :completed?, :completed_at?
+    alias_method :failed?,    :failed_at?
+  end
+end

data/lib/navvy/job/active_record.rb

@@ -3,47 +3,6 @@ require 'active_record'
 
 module Navvy
   class Job < ActiveRecord::Base
-    class << self
-      attr_writer :limit, :keep, :max_attempts
-    end
-
-    ##
-    # Default limit of jobs to be fetched.
-    #
-    # @return [Integer] limit
-
-    def self.limit
-      @limit || Navvy.configuration.job_limit
-    end
-
-    ##
-    # If and how long the jobs should be kept.
-    #
-    # @return [Fixnum, true, false] keep
-
-    def self.keep
-      @keep || Navvy.configuration.keep_jobs
-    end
-
-    ##
-    # How often should a job be retried?
-    #
-    # @return [Fixnum] max_attempts
-
-    def self.max_attempts
-      @max_attempts || Navvy.configuration.max_attempts
-    end
-
-    ##
-    # Should the job be kept?
-    #
-    # @return [true, false] keep
-
-    def self.keep?
-      keep = (self.keep || false)
-      return keep.from_now >= Time.now if keep.is_a? Fixnum
-      keep
-    end
 
     ##
     # Add a job to the job queue.
@@ -115,31 +74,15 @@ module Navvy
     end
 
     ##
-    # Run the job. Will delete the Navvy::Job record and return its return
-    # value if it runs successfully unless Navvy::Job.keep is set. If a job
-    # fails, it'll update the Navvy::Job record to include the exception
-    # message it sent back and set the :failed_at date. Failed jobs never get
-    # deleted.
+    # Mark the job as started. Will set started_at to the current time.
     #
-    # @example
-    #   job = Navvy::Job.next # finds the next available job in the queue
-    #   job.run               # runs the job and returns the job's return value
-    #
-    # @return [String] return value of the called method.
+    # @return [true, false] update_attributes the result of the
+    # update_attributes call
 
-    def run
-      begin
-        update_attributes(:started_at => Time.now)
-        if args.empty?
-          result = object.constantize.send(method_name)
-        else
-          result = object.constantize.send(method_name, *args)
-        end
-        Navvy::Job.keep? ? completed : destroy
-        result
-      rescue Exception => exception
-        failed(exception.message)
-      end
+    def started
+      update_attributes({
+        :started_at =>  Time.now
+      })
     end
 
     ##
@@ -176,26 +119,6 @@ module Navvy
       )
     end
 
-    ##
-    # Retry the current job. Will add self to the queue again, giving the clone
-    # a parend_id equal to self.id.
-    #
-    # @return [true, false]
-
-    def retry
-      self.class.enqueue(
-        object,
-        method_name,
-        *(args << {
-          :job_options => {
-            :parent_id => parent_id || id,
-            :run_at => Time.now + times_failed ** 4,
-            :priority => priority
-          }
-        })
-      )
-    end
-
     ##
     # Check how many times the job has failed. Will try to find jobs with a
     # parent_id that's the same as self.id and count them
@@ -208,64 +131,7 @@ module Navvy
         :conditions => "(`id` = '#{i}' OR `parent_id` = '#{i}') AND `failed_at` IS NOT NULL"
       )
     end
-
-    ##
-    # Check if the job has been run.
-    #
-    # @return [true, false] ran
-
-    def ran?
-      completed? || failed?
-    end
-
-    ##
-    # Check how long it took for a job to complete or fail
-    #
-    # @return [Time, Integer] time the time it took
-
-    def duration
-      ran? ? (completed_at || failed_at) - started_at : 0
-    end
-
-    ##
-    # Check if completed_at is set
-    #
-    # @return [true, false] set?
-
-    def completed_at?
-      !completed_at.nil?
-    end
-
-    ##
-    # Check if failed_at is set
-    #
-    # @return [true, false] set?
-
-    def failed_at?
-      !failed_at.nil?
-    end
-
-    ##
-    # Get the job arguments as an array
-    #
-    # @return [array] arguments
-
-    def args
-      arguments.is_a?(Array) ? arguments : YAML.load(arguments)
-    end
-
-    ##
-    # Get the job status
-    #
-    # @return [:pending, :completed, :failed] status
-
-    def status
-      return :completed if completed?
-      return :failed if failed?
-      :pending
-    end
-
-    alias_method :completed?, :completed_at?
-    alias_method :failed?,    :failed_at?
   end
 end
+
+require File.expand_path(File.dirname(__FILE__) + '/../job')

data/lib/navvy/job/data_mapper.rb

@@ -4,9 +4,6 @@ require 'dm-core'
 module Navvy
   class Job
     include DataMapper::Resource
-    class << self
-      attr_writer :limit, :keep, :max_attempts
-    end
 
     property :id,            Serial
     property :object,        String
@@ -22,44 +19,6 @@ module Navvy
     property :completed_at,  Time
     property :failed_at,     Time
 
-    ##
-    # Default limit of jobs to be fetched.
-    #
-    # @return [Integer] limit
-
-    def self.limit
-      @limit || Navvy.configuration.job_limit
-    end
-
-    ##
-    # If and how long the jobs should be kept.
-    #
-    # @return [Fixnum, true, false] keep
-
-    def self.keep
-      @keep || Navvy.configuration.keep_jobs
-    end
-
-    ##
-    # How often should a job be retried?
-    #
-    # @return [Fixnum] max_attempts
-
-    def self.max_attempts
-      @max_attempts || Navvy.configuration.max_attempts
-    end
-
-    ##
-    # Should the job be kept?
-    #
-    # @return [true, false] keep
-
-    def self.keep?
-      keep = (self.keep || false)
-      return (Time.now + keep) >= Time.now if keep.is_a? Fixnum
-      keep
-    end
-
     ##
     # Add a job to the job queue.
     #
@@ -112,7 +71,7 @@ module Navvy
       )
     end
 
-    ##                     
+    ##
     # Clean up jobs that we don't need to keep anymore. If Navvy::Job.keep is
     # false it'll delete every completed job, if it's a timestamp it'll only
     # delete completed jobs that have passed their keeptime.
@@ -128,31 +87,24 @@ module Navvy
     end
 
     ##
-    # Run the job. Will delete the Navvy::Job record and return its return
-    # value if it runs successfully unless Navvy::Job.keep is set. If a job
-    # fails, it'll update the Navvy::Job record to include the exception
-    # message it sent back and set the :failed_at date. Failed jobs never get
-    # deleted.
+    # Deletes all jobs.
     #
-    # @example
-    #   job = Navvy::Job.next # finds the next available job in the queue
-    #   job.run               # runs the job and returns the job's return value
+    # @return [true, false] deleted?
+
+    def self.delete_all
+      Navvy::Job.all.destroy
+    end
+
+    ##
+    # Mark the job as started. Will set started_at to the current time.
     #
-    # @return [String] return value of the called method.
+    # @return [true, false] update_attributes the result of the
+    # update_attributes call
 
-    def run
-      begin
-        update(:started_at => Time.now)
-        if args.empty?
-          result = Kernel.const_get(object).send(method_name)
-        else
-          result = Kernel.const_get(object).send(method_name, *args)
-        end
-        Navvy::Job.keep? ? completed : destroy
-        result
-      rescue Exception => exception
-        failed(exception.message)
-      end
+    def started
+      update({
+        :started_at =>  Time.now
+      })
     end
 
     ##
@@ -190,26 +142,6 @@ module Navvy
       )
     end
 
-    ##
-    # Retry the current job. Will add self to the queue again, giving the clone
-    # a parend_id equal to self.id.
-    #
-    # @return [true, false]
-
-    def retry
-      self.class.enqueue(
-        object,
-        method_name,
-        *(args << {
-          :job_options => {
-            :parent_id => parent_id || id,
-            :run_at => Time.now + times_failed ** 4,
-            :priority => priority
-          }
-        })
-      )
-    end
-
     ##
     # Check how many times the job has failed. Will try to find jobs with a
     # parent_id that's the same as self.id and count them
@@ -222,64 +154,7 @@ module Navvy
         :conditions => ["(`id` = ? OR `parent_id` = ?) AND `failed_at` IS NOT NULL", i, i]
       ).count
     end
-
-    ##
-    # Check if the job has been run.
-    #
-    # @return [true, false] ran
-
-    def ran?
-      completed? || failed?
-    end
-
-    ##
-    # Check if completed_at is set
-    #
-    # @return [true, false] set?
-
-    def completed_at?
-      !completed_at.nil?
-    end
-
-    ##
-    # Check if failed_at is set
-    #
-    # @return [true, false] set?
-
-    def failed_at?
-      !failed_at.nil?
-    end
-
-    ##
-    # Check how long it took for a job to complete or fail
-    #
-    # @return [Time, Integer] time the time it took
-
-    def duration
-      ran? ? (completed_at || failed_at) - started_at : 0
-    end
-
-    ##
-    # Get the job arguments as an array
-    #
-    # @return [array] arguments
-
-    def args
-      arguments.is_a?(Array) ? arguments : YAML.load(arguments)
-    end
-
-    ##
-    # Get the job status
-    #
-    # @return [:pending, :completed, :failed] status
-
-    def status
-      return :completed if completed?
-      return :failed if failed?
-      :pending
-    end
-
-    alias_method :completed?, :completed_at?
-    alias_method :failed?,    :failed_at?
   end
 end
+
+require File.expand_path(File.dirname(__FILE__) + '/../job')

data/lib/navvy/job/mongo_mapper.rb

@@ -4,9 +4,6 @@ require 'mongo_mapper'
 module Navvy
   class Job
     include MongoMapper::Document
-    class << self
-      attr_writer :limit, :keep, :max_attempts
-    end
 
     key :object,        String
     key :method_name,   Symbol
@@ -21,44 +18,6 @@ module Navvy
     key :completed_at,  Time
     key :failed_at,     Time
 
-    ##
-    # Default limit of jobs to be fetched.
-    #
-    # @return [Integer] limit
-
-    def self.limit
-      @limit || Navvy.configuration.job_limit
-    end
-
-    ##
-    # If and how long the jobs should be kept.
-    #
-    # @return [Fixnum, true, false] keep
-
-    def self.keep
-      @keep || Navvy.configuration.keep_jobs
-    end
-
-    ##
-    # How often should a job be retried?
-    #
-    # @return [Fixnum] max_attempts
-
-    def self.max_attempts
-      @max_attempts || Navvy.configuration.max_attempts
-    end
-
-    ##
-    # Should the job be kept?
-    #
-    # @return [true, false] keep
-
-    def self.keep?
-      keep = (self.keep || false)
-      return keep.from_now >= Time.now if keep.is_a? Fixnum
-      keep
-    end
-
     ##
     # Add a job to the job queue.
     #
@@ -128,31 +87,15 @@ module Navvy
     end
 
     ##
-    # Run the job. Will delete the Navvy::Job record and return its return
-    # value if it runs successfully unless Navvy::Job.keep is set. If a job
-    # fails, it'll update the Navvy::Job record to include the exception
-    # message it sent back and set the :failed_at date. Failed jobs never get
-    # deleted.
+    # Mark the job as started. Will set started_at to the current time.
     #
-    # @example
-    #   job = Navvy::Job.next # finds the next available job in the queue
-    #   job.run               # runs the job and returns the job's return value
-    #
-    # @return [String] return value of the called method.
+    # @return [true, false] update_attributes the result of the
+    # update_attributes call
 
-    def run
-      begin
-        update_attributes(:started_at => Time.now)
-        if args.empty?
-          result = object.constantize.send(method_name)
-        else
-          result = object.constantize.send(method_name, *args)
-        end
-        Navvy::Job.keep? ? completed : destroy
-        result
-      rescue Exception => exception
-        failed(exception.message)
-      end
+    def started
+      update_attributes({
+        :started_at =>  Time.now
+      })
     end
 
     ##
@@ -189,26 +132,6 @@ module Navvy
       )
     end
 
-    ##
-    # Retry the current job. Will add self to the queue again, giving the clone
-    # a parend_id equal to self.id.
-    #
-    # @return [true, false]
-
-    def retry
-      self.class.enqueue(
-        object,
-        method_name,
-        *(args << {
-          :job_options => {
-            :parent_id => parent_id || id,
-            :run_at => Time.now + times_failed ** 4,
-            :priority => priority
-          }
-        })
-      )
-    end
-
     ##
     # Check how many times the job has failed. Will try to find jobs with a
     # parent_id that's the same as self.id and count them
@@ -222,46 +145,7 @@ module Navvy
         '$where' => "this._id == '#{i}' || this.parent_id == '#{i}'"
       )
     end
-
-    ##
-    # Check if the job has been run.
-    #
-    # @return [true, false] ran
-
-    def ran?
-      completed? || failed?
-    end
-
-    ##
-    # Check how long it took for a job to complete or fail
-    #
-    # @return [Time, Integer] time the time it took
-
-    def duration
-      ran? ? (completed_at || failed_at) - started_at : 0
-    end
-
-    ##
-    # Get the job arguments as an array
-    #
-    # @return [array] arguments
-
-    def args
-      arguments.is_a?(Array) ? arguments : YAML.load(arguments)
-    end
-
-    ##
-    # Get the job status
-    #
-    # @return [:pending, :completed, :failed] status
-
-    def status
-      return :completed if completed?
-      return :failed if failed?
-      :pending
-    end
-
-    alias_method :completed?, :completed_at?
-    alias_method :failed?,    :failed_at?
   end
 end
+
+require File.expand_path(File.dirname(__FILE__) + '/../job')

data/lib/navvy/job/sequel.rb

@@ -4,47 +4,6 @@ require 'yaml'
 
 module Navvy
   class Job < Sequel::Model
-    class << self
-      attr_writer :limit, :keep, :max_attempts
-    end
-
-    ##
-    # Default limit of jobs to be fetched.
-    #
-    # @return [Integer] limit
-
-    def self.limit
-      @limit || Navvy.configuration.job_limit
-    end
-
-    ##
-    # If and how long the jobs should be kept.
-    #
-    # @return [Fixnum, true, false] keep
-
-    def self.keep
-      @keep || Navvy.configuration.keep_jobs
-    end
-
-    ##
-    # How often should a job be retried?
-    #
-    # @return [Fixnum] max_attempts
-
-    def self.max_attempts
-      @max_attempts || Navvy.configuration.max_attempts
-    end
-
-    ##
-    # Should the job be kept?
-    #
-    # @return [true, false] keep
-
-    def self.keep?
-      keep = (self.keep || false)
-      return (Time.now + keep) >= Time.now if keep.is_a? Fixnum
-      keep
-    end
 
     ##
     # Add a job to the job queue.
@@ -108,27 +67,25 @@ module Navvy
     end
 
     ##
-    # Run the job. Will delete the Navvy::Job record and return its return
-    # value if it runs successfully unless Navvy::Job.keep is set. If a job
-    # fails, it'll update the Navvy::Job record to include the exception
-    # message it sent back and set the :failed_at date. Failed jobs never get
-    # deleted.
+    # Deletes all jobs.
     #
-    # @example
-    #   job = Navvy::Job.next # finds the next available job in the queue
-    #   job.run               # runs the job and returns the job's return value
+    # @return [Integer] amount the amount of jobs that were deleted
+
+    def self.delete_all
+      Navvy::Job.destroy
+    end
+
+
+    ##
+    # Mark the job as started. Will set started_at to the current time.
     #
-    # @return [String] return value of the called method.
+    # @return [true, false] update_attributes the result of the
+    # update_attributes call
 
-    def run
-      begin
-        update(:started_at => Time.now)
-        result = Kernel.const_get(object).send(method_name, *args)
-        Navvy::Job.keep? ? completed : destroy
-        result
-      rescue Exception => exception
-        failed(exception.message)
-      end
+    def started
+      update({
+        :started_at =>  Time.now
+      })
     end
 
     ##
@@ -165,26 +122,6 @@ module Navvy
       )
     end
 
-    ##
-    # Retry the current job. Will add self to the queue again, giving the clone
-    # a parend_id equal to self.id.
-    #
-    # @return [true, false]
-
-    def retry
-      self.class.enqueue(
-        object,
-        method_name,
-        *(args << {
-          :job_options => {
-            :parent_id => parent_id || id,
-            :run_at => Time.now + times_failed ** 4,
-            :priority => priority
-          }
-        })
-      )
-    end
-
     ##
     # Check how many times the job has failed. Will try to find jobs with a
     # parent_id that's the same as self.id and count them
@@ -197,64 +134,7 @@ module Navvy
         "(`id` == '#{i}' OR `parent_id` == '#{i}') AND `failed_at` IS NOT NULL"
       ).count
     end
-
-    ##
-    # Check if the job has been run.
-    #
-    # @return [true, false] ran
-
-    def ran?
-      completed? || failed?
-    end
-
-    ##
-    # Check how long it took for a job to complete or fail
-    #
-    # @return [Time, Integer] time the time it took
-
-    def duration
-      ran? ? (completed_at || failed_at) - started_at : 0
-    end
-
-    ##
-    # Check if completed_at is set
-    #
-    # @return [true, false] set?
-
-    def completed_at?
-      !completed_at.nil?
-    end
-
-    ##
-    # Check if failed_at is set
-    #
-    # @return [true, false] set?
-
-    def failed_at?
-      !failed_at.nil?
-    end
-
-    ##
-    # Get the job arguments as an array
-    #
-    # @return [array] arguments
-
-    def args
-      arguments.is_a?(Array) ? arguments : YAML.load(arguments)
-    end
-
-    ##
-    # Get the job status
-    #
-    # @return [:pending, :completed, :failed] status
-
-    def status
-      return :completed if completed?
-      return :failed if failed?
-      :pending
-    end
-
-    alias_method :completed?, :completed_at?
-    alias_method :failed?,    :failed_at?
   end
 end
+
+require File.expand_path(File.dirname(__FILE__) + '/../job')

data/lib/navvy/log.rb

@@ -65,9 +65,9 @@ module Navvy
       when :rails
         raise(
           LoggerNotFound,
-          'RAILS_DEFAULT_LOGGER could not be found. No logs were created.'
-        ) unless defined? RAILS_DEFAULT_LOGGER.info
-        RAILS_DEFAULT_LOGGER.info(message)
+          'Rails.logger could not be found. No logs were created.'
+        ) unless defined? Rails.logger.info
+        Rails.logger.info(message)
       end
     end
   end

data/lib/navvy/worker.rb

@@ -1,3 +1,6 @@
+require 'rubygems'
+require 'daemons'
+
 module Navvy
   class Worker
     class << self
@@ -12,7 +15,7 @@ module Navvy
     def self.sleep_time
       @sleep_time || Navvy.configuration.sleep_time
     end
-    
+
     ##
     # Start the worker.
 
@@ -46,5 +49,34 @@ module Navvy
         )
       end
     end
+
+    ##
+    # Daemonize the worker
+
+    def self.daemonize(*args)
+      if defined?(ActiveRecord)
+        # Sets ActiveRecord's logger to Navvy a new Logger instance
+        ActiveRecord::Base.logger = Logger.new(STDOUT)
+      end
+      
+      # If #daemonize does not receive any arguments, the options variable will
+      # contain an empty hash, and the ARGV of the environment will be used instead
+      # of the :ARGV options from Daemons#run_proc. However, if the *args param has been set
+      # this will be used instead of the environment's ARGV for the Daemons.
+      options = args.empty? ? {} : {:ARGV => args}
+      
+      # Finally, the directory store mode will be set to normal and the Daemons PID file
+      # will be stored inside tmp/pids of the application.
+      options.merge!({:dir_mode => :normal, :dir => 'tmp/pids'})
+      
+      # Ensures that the tmp/pids folder exists so that the process id file can properly be stored
+      %x(mkdir -p tmp/pids)
+      
+      # Runs the Navvy Worker inside a Daemon
+      Daemons.run_proc('navvy', options) do
+        Navvy::Worker.start
+      end
+    end
+      
   end
 end

data/navvy.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{navvy}
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jeff Kreeftmeijer"]
-  s.date = %q{2010-02-08}
+  s.date = %q{2010-02-10}
   s.description = %q{Simple background job processor inspired by delayed_job, but aiming for database agnosticism.}
   s.email = %q{jeff@kreeftmeijer.nl}
   s.extra_rdoc_files = [
@@ -25,9 +25,11 @@ Gem::Specification.new do |s|
      "VERSION",
      "generators/navvy/navvy_generator.rb",
      "generators/navvy/templates/migration.rb",
+     "generators/navvy/templates/script",
      "lib/generators/navvy_generator.rb",
      "lib/navvy.rb",
      "lib/navvy/configuration.rb",
+     "lib/navvy/job.rb",
      "lib/navvy/job/active_record.rb",
      "lib/navvy/job/data_mapper.rb",
      "lib/navvy/job/mongo_mapper.rb",

data/spec/job_spec.rb

@@ -1,7 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe 'Navvy::Job' do
-  
   describe '.keep?' do
     after(:each) do
       Navvy::Job.keep = false
@@ -9,26 +8,26 @@ describe 'Navvy::Job' do
         config.keep_jobs = false
       end
     end
-    
+
     describe 'when configured using Navvy::Job.keep=' do
       it 'should return false' do
         Navvy::Job.keep = false
         Navvy::Job.keep?.should == false
-      end 
+      end
 
       it 'should return true' do
         Navvy::Job.keep = true
         Navvy::Job.keep?.should == true
       end
-    end  
-    
+    end
+
     describe 'when configured with Navvy.configure' do
       it 'should return false' do
         Navvy.configure do |config|
           config.keep_jobs = false
         end
         Navvy::Job.keep?.should == false
-      end 
+      end
 
       it 'should return true' do
         Navvy.configure do |config|
@@ -38,7 +37,7 @@ describe 'Navvy::Job' do
       end
     end
   end
-  
+
   describe '.enqueue' do
     before(:each) do
       delete_all_jobs
@@ -177,6 +176,14 @@ describe 'Navvy::Job' do
     end
   end
 
+  describe '.delete_all' do
+    it 'should delete all jobs' do
+      3.times do; Navvy::Job.create; end
+      Navvy::Job.delete_all
+      job_count.should == 0
+    end
+  end
+
   describe '#run' do
     it 'should pass the arguments' do
       delete_all_jobs
@@ -242,6 +249,19 @@ describe 'Navvy::Job' do
     end
   end
 
+  describe '#started' do
+    before(:each) do
+      delete_all_jobs
+      Navvy::Job.enqueue(Cow, :speak)
+    end
+
+    it 'should update the jobs started_at date' do
+      jobs = Navvy::Job.next
+      jobs.first.started
+      jobs.first.started_at.should_not be_nil
+    end
+  end
+
   describe '#completed' do
     before(:each) do
       delete_all_jobs
@@ -388,19 +408,23 @@ describe 'Navvy::Job' do
 
       @failed_job.times_failed.should == 3
     end
-    
-     it 'should return 2 when having 1 failed and one pending child' do
-        Navvy::Job.create(
-          :failed_at => Time.now,
-          :parent_id => @failed_job.id
-        )
-        
-        Navvy::Job.create(
-          :parent_id => @failed_job.id
-        )
-        
-        @failed_job.times_failed.should == 2
-      end
+
+    it 'should return 2 when having 1 failed and one pending child' do
+      Navvy::Job.create(
+        :failed_at => Time.now,
+        :parent_id => @failed_job.id
+      )
+
+      Navvy::Job.create(
+        :parent_id => @failed_job.id
+      )
+
+      Navvy::Job.create(
+        :parent_id => @failed_job.id
+      )
+
+      @failed_job.times_failed.should == 2
+    end
 
     it 'should return 2 when having failed and having a failed parent' do
       failed_child =  Navvy::Job.create(

data/spec/log_spec.rb

@@ -13,9 +13,9 @@ describe Navvy::Log do
         lambda { Navvy::Log.info('123') }.should raise_error
       end
 
-      it 'should pass the log to RAILS_DEFAULT_LOGGER' do
+      it 'should pass the log to Rails.logger' do
         require File.expand_path(File.dirname(__FILE__) + '/setup/rails_default_logger')
-        RAILS_DEFAULT_LOGGER.should_receive(:info).with('123')
+        Rails.logger.should_receive(:info).with('123')
         Navvy::Log.info('123')
       end
     end
@@ -42,7 +42,7 @@ describe Navvy::Log do
       end
 
       it 'should pass the log to justlogging' do
-        RAILS_DEFAULT_LOGGER.should_receive(:info).with('123')
+        Rails.logger.should_receive(:info).with('123')
         Justlogging.should_receive(:log).with('123')
         Navvy::Log.info('123')
       end
@@ -54,7 +54,7 @@ describe Navvy::Log do
       end
 
       it 'should not log' do
-        RAILS_DEFAULT_LOGGER.should_not_receive(:info)
+        Rails.logger.should_not_receive(:info)
         Justlogging.should_not_receive(:log)
         Navvy::Log.info('123')
       end

data/spec/setup/rails_default_logger.rb

@@ -1,5 +1,9 @@
-class RailsLogger
-  def self.info(text);end
-end
+class Rails
+  def self.logger
+    Logger
+  end
 
-RAILS_DEFAULT_LOGGER = RailsLogger
+  class Logger
+    def self.info(text);end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: navvy
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Jeff Kreeftmeijer
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-08 00:00:00 +01:00
+date: 2010-02-10 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -80,9 +80,11 @@ files:
 - VERSION
 - generators/navvy/navvy_generator.rb
 - generators/navvy/templates/migration.rb
+- generators/navvy/templates/script
 - lib/generators/navvy_generator.rb
 - lib/navvy.rb
 - lib/navvy/configuration.rb
+- lib/navvy/job.rb
 - lib/navvy/job/active_record.rb
 - lib/navvy/job/data_mapper.rb
 - lib/navvy/job/mongo_mapper.rb