navvy 0.2.5 → 0.3.0

data/README.textile

@@ -1,16 +1,18 @@
 h1. Navvy
 
-Navvy is a simple Ruby background job processor inspired by "delayed_job":http://github.com/tobi/delayed_job, but aiming for database agnosticism. Currently Navvy supports ActiveRecord, MongoMapper, Sequel and DataMapper but it's extremely easy to write an adapter for your favorite ORM. Besides plain Ruby (1.8 & 1.9) it completely supports Rails Edge.
+Navvy is a simple Ruby background job processor inspired by "delayed_job":http://github.com/tobi/delayed_job, but aiming for database agnosticism. Currently Navvy supports ActiveRecord, MongoMapper, Sequel, DataMapper and Mongoid but it's extremely easy to write an adapter for your favorite ORM.
+
+Navvy doesn't depend on Rails, it's a pure Ruby library. There are generators for Rails 2 and Rails 3, though.
 
 ??“Navvy is a shorter form of navigator (UK) or navigational engineer (USA) and is particularly applied to describe the manual labourers working on major civil engineering projects. The term was coined in the late 18th century in Britain when numerous canals were being built, which were also sometimes known as "navigations". Canal navvies typically worked with shovels, pickaxes and barrows.”?? - "Wikipedia":http://en.wikipedia.org/wiki/Navvy
 
 h2. Using Navvy
 
-There are some "Installation Guide":http://wiki.github.com/jeffkreeftmeijer/navvy/installation (even for "Rails 3":http://wiki.github.com/jeffkreeftmeijer/navvy/installation-on-rails-edge) and a "Getting Started Guide":http://wiki.github.com/jeffkreeftmeijer/navvy/getting-started to put you on the right track. Any questions? Don't hesitate to "ask":http://github.com/inbox/new/jeffkreeftmeijer.
+Check out the "Installation Guide":http://wiki.github.com/jeffkreeftmeijer/navvy/installation and the "Getting Started Guide":http://wiki.github.com/jeffkreeftmeijer/navvy/getting-started to get up and running. If you have any questions or problems, don't hesitate to "ask":http://github.com/inbox/new/jeffkreeftmeijer.
 
 h2. Contributing
 
-Found any issues? Have a great idea? Want to help? Great! Create an issue "issue":http://github.com/jeffkreeftmeijer/navvy/issues for it, or even better; "fork the project":http://github.com/jeffkreeftmeijer/navvy/fork. Pull requests are always welcome. :)
+Found an issue? Have a great idea? Want to help? Great! Create an issue "issue":http://github.com/jeffkreeftmeijer/navvy/issues for it, "ask":http://github.com/inbox/new/jeffkreeftmeijer, or even better; fork the project and fix the problem yourself. Pull requests are always welcome. :)
 
 h2. License
 

data/generators/navvy/navvy_generator.rb

@@ -1,14 +1,19 @@
 class NavvyGenerator < Rails::Generator::Base
+  default_options :orm => 'active_record'
+
   def manifest
     record do |m|
-      options = {
-        :migration_file_name => 'create_jobs'
-      }
-      m.migration_template 'migration.rb', 'db/migrate', options
-      m.file 'script', 'script/navvy', :chmod => 0755
+      m.migration_template "#{options[:orm]}_migration.rb", 'db/migrate', {:migration_file_name => 'create_jobs'}
     end
   end
 
+  def add_options!(opt)
+    opt.separator ''
+    opt.separator 'Options:'
+    opt.on('--active_record', 'Generate a migration file for ActiveRecord. (default)') { options[:orm] = 'active_record' }
+    opt.on('--sequel', 'Generate a migration file for Sequel.') { options[:orm] = 'sequel' }
+  end
+
   def banner
     "Usage: #{$0} #{spec.name}"
   end

data/generators/navvy/templates/sequel_migration.rb

@@ -0,0 +1,23 @@
+Sequel.migration do
+  up do
+    create_table(:jobs) do
+      primary_key :id, :type => Integer
+      String    :object
+      String    :method_name
+      String    :arguments, :text => true
+      Integer   :priority, :default => 0
+      String    :return
+      String    :exception
+      Integer   :parent_id
+      DateTime  :created_at
+      DateTime  :run_at
+      DateTime  :started_at
+      DateTime  :completed_at
+      DateTime  :failed_at
+    end
+  end
+
+  down do
+    drop_table(:jobs)
+  end
+end

data/lib/generators/navvy_generator.rb

@@ -2,21 +2,27 @@ require 'rails/generators/migration'
 class NavvyGenerator < Rails::Generators::Base
   include Rails::Generators::Migration
 
+  class_option :active_record,
+    :desc => 'Generate a migration file for ActiveRecord. (default)',
+    :type => 'boolean'
+
+  class_option :sequel,
+    :desc => 'Generate a migration file for Sequel.',
+    :type => 'boolean'
+
   def self.source_root
     File.join(File.dirname(__FILE__), '..', '..', 'generators', 'navvy', 'templates')
   end
 
   def install_navvy
     migration_template(
-      'migration.rb',
+      "#{orm}_migration.rb",
       'db/migrate/create_jobs.rb'
     )
+  end
 
-    copy_file(
-      'script',
-      'script/navvy',
-      :chmod => 0755
-    )
+  def orm
+    options[:sequel] ? 'sequel' : 'active_record'
   end
 
   protected

data/lib/navvy.rb

@@ -1,16 +1,20 @@
 require File.expand_path(File.dirname(__FILE__) + '/navvy/worker')
-require File.expand_path(File.dirname(__FILE__) + '/navvy/log')
+require File.expand_path(File.dirname(__FILE__) + '/navvy/logger')
 require File.expand_path(File.dirname(__FILE__) + '/navvy/configuration')
 
 module Navvy
   class << self
     attr_writer :configuration
   end
-  
+
+  def self.logger
+    @logger || Navvy.configuration.logger
+  end
+
   def self.configuration
     @configuration ||= Configuration.new
   end
-    
+
   def self.configure
     yield(self.configuration)
   end

data/lib/navvy/configuration.rb

@@ -1,15 +1,13 @@
 module Navvy
   class Configuration
-    attr_accessor :job_limit, :keep_jobs, :logger, :quiet, :sleep_time,
-      :max_attempts
-    
+    attr_accessor :job_limit, :keep_jobs, :logger, :sleep_time, :max_attempts
+
     def initialize
       @job_limit =    100
       @keep_jobs =    false
-      @logger =       nil
-      @quiet =        false
+      @logger =       Navvy::Logger.new
       @sleep_time =   5
       @max_attempts = 25
     end
   end
-end
+end

data/lib/navvy/job.rb

@@ -152,14 +152,14 @@ module Navvy
 
     alias_method :completed?, :completed_at?
     alias_method :failed?,    :failed_at?
-	
+
 	private
-		
+
 		##
 		# Turn a constant with potential namespacing into an object
 		#
 		# @return [Class] class
-		
+
 		def constantize(str)
 			names = str.split('::')
 			names.shift if names.empty? || names.first.empty?

data/lib/navvy/job/active_record.rb

@@ -1,4 +1,3 @@
-require 'rubygems'
 require 'active_record'
 
 module Navvy

data/lib/navvy/job/data_mapper.rb

@@ -1,4 +1,3 @@
-require 'rubygems'
 require 'dm-core'
 
 module Navvy

data/lib/navvy/job/mongo_mapper.rb

@@ -1,4 +1,3 @@
-require 'rubygems'
 require 'mongo_mapper'
 
 module Navvy

data/lib/navvy/job/mongoid.rb

@@ -0,0 +1,139 @@
+require 'mongoid'
+
+module Navvy
+  class Job
+    include Mongoid::Document
+    include Mongoid::Timestamps
+
+    field :object,        :type => String
+    field :method_name,   :type => String
+    field :arguments,     :type => String
+    field :priority,      :type => Integer, :default => 0
+    field :return,        :type => String
+    field :exception,     :type => String
+    field :parent_id,     :type => String
+    field :created_at,    :type => Time
+    field :run_at,        :type => Time
+    field :started_at,    :type => Time
+    field :completed_at,  :type => Time
+    field :failed_at,     :type => Time
+
+    index [[:priority, Mongo::DESCENDING]]
+    index [[:created_at, Mongo::ASCENDING]]
+
+    ##
+    # Add a job to the job queue.
+    #
+    # @param [Object] object the object you want to run a method from
+    # @param [Symbol, String] method_name the name of the method you want to
+    # run
+    # @param [*] arguments optional arguments you want to pass to the method
+    #
+    # @return [true, false]
+
+    def self.enqueue(object, method_name, *args)
+      options = {}
+      if args.last.is_a?(Hash)
+        options = args.last.delete(:job_options) || {}
+        args.pop if args.last.empty?
+      end
+
+      create(
+        :object =>      object.to_s,
+        :method_name => method_name.to_sym,
+        :arguments =>   args.to_yaml,
+        :priority =>    options[:priority] || 0,
+        :parent_id =>   options[:parent_id],
+        :run_at =>      options[:run_at] || Time.now
+      )
+    end
+
+    ##
+    # Find the next available jobs in the queue. This will not include failed
+    # jobs (where :failed_at is not nil) and jobs that should run in the future
+    # (where :run_at is greater than the current time).
+    #
+    # @param [Integer] limit the limit of jobs to be fetched. Defaults to
+    # Navvy::Job.limit
+    #
+    # @return [array, nil] the next available jobs in an array or nil if no
+    # jobs were found.
+
+    def self.next(limit = self.limit)
+      where(:failed_at => nil).
+        where(:completed_at => nil).
+        where(:run_at.lte => Time.now).
+        order_by([[:priority, :desc], [:created_at, :asc]]).
+        limit(limit).to_a
+    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.
+    #
+    # @return [true, false] delete_all the result of the delete_all call
+
+    def self.cleanup
+      if keep.is_a? Fixnum
+        destroy_all(:conditions => { :completed_at.lte => keep.ago })
+      else
+        destroy_all(:conditions => { :completed_at.ne => nil }) unless keep?
+      end
+    end
+
+    ##
+    # Mark the job as started. Will set started_at to the current time.
+    #
+    # @return [true, false] update_attributes the result of the
+    # update_attributes call
+
+    def started
+      update_attributes(:started_at =>  Time.now)
+    end
+
+    ##
+    # Mark the job as completed. Will set completed_at to the current time and
+    # optionally add the return value if provided.
+    #
+    # @param [String] return_value the return value you want to store.
+    #
+    # @return [true, false] update_attributes the result of the
+    # update_attributes call
+
+    def completed(return_value = nil)
+      update_attributes(:completed_at => Time.now, :return => return_value)
+    end
+
+    ##
+    # Mark the job as failed. Will set failed_at to the current time and
+    # optionally add the exception message if provided. Also, it will retry
+    # the job unless max_attempts has been reached.
+    #
+    # @param [String] exception the exception message you want to store.
+    #
+    # @return [true, false] update_attributes the result of the
+    # update_attributes call
+
+    def failed(message = nil)
+      self.retry unless times_failed >= self.class.max_attempts
+      update_attributes(:failed_at => Time.now, :exception => message)
+    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
+    #
+    # @return [Integer] count the amount of times the job has failed
+
+    def times_failed
+      i = parent_id || id
+      self.class.
+        where(:failed_at.ne => nil).
+        where("this._id == '#{i}' || this.parent_id == '#{i}'").
+        count
+    end
+  end
+end
+
+require File.expand_path(File.dirname(__FILE__) + '/../job')

data/lib/navvy/job/sequel.rb

@@ -1,4 +1,3 @@
-require 'rubygems'
 require 'sequel'
 require 'yaml'
 
@@ -48,7 +47,7 @@ module Navvy
     def self.next(limit = self.limit)
       filter(
             (:run_at <= Time.now),
-            {:failed_at    => nil, 
+            {:failed_at    => nil,
              :completed_at => nil}
       ).order(:priority.desc, :created_at).first(limit)
     end

data/lib/navvy/logger.rb

@@ -0,0 +1,38 @@
+require 'logger'
+
+module Navvy
+  class Logger < Logger
+    ##
+    # Create a new logger. Works like Logger from Ruby's standard library, but
+    # defaults to STDOUT instead of failing. You can pass a filename to log to.
+    #
+    # @param [String] logdev a filename to log to, defaults to STDOUT
+    #
+    # @example
+    #   logger = Navvy::Logger.new
+    #   logger = Navvy::Logger.new('~/file.log')
+
+    def initialize(logdev = STDOUT)
+      super logdev
+    end
+
+    ##
+    # Send colored logs to the logger. Will only colorize output sent to
+    # STDOUT and will call the regular info method when writing to file.
+    #
+    # @param [String] message the message you want to log
+    # @param [String] color the color code you want to use to color your
+    # message
+    #
+    # @example
+    #   logger = Navvy::Logger.new
+    #   logger.colorized_info "I'm green!", 32
+
+    def colorized_info(message, color)
+      unless @logdev.filename
+        return info("\e[#{color}m#{message}\e[0m")
+      end
+      info(message)
+    end
+  end
+end

data/lib/navvy/tasks.rb

@@ -1,11 +1,11 @@
 task :environment
- 
+
 namespace :navvy do
   desc "Clear the Navvy queue."
   task :clear => :environment do
     Navvy::Job.delete_all
   end
- 
+
   desc "Start a Navvy worker."
   task :work => :environment do
     Navvy::Worker.start

data/lib/navvy/worker.rb

@@ -1,6 +1,3 @@
-require 'rubygems'
-require 'daemons'
-
 module Navvy
   class Worker
     class << self
@@ -20,15 +17,15 @@ module Navvy
     # Start the worker.
 
     def self.start
-      Navvy::Log.info '*** Starting ***'
-      trap('TERM') { Navvy::Log.info '*** Exiting ***'; $exit = true }
-      trap('INT')  { Navvy::Log.info '*** Exiting ***'; $exit = true }
+      Navvy.logger.info '*** Starting ***'
+      trap('TERM') { Navvy.logger.info '*** Exiting ***'; $exit = true }
+      trap('INT')  { Navvy.logger.info '*** Exiting ***'; $exit = true }
 
       loop do
         fetch_and_run_jobs
 
         if $exit
-          Navvy::Log.info '*** Cleaning up ***'
+          Navvy.logger.info '*** Cleaning up ***'
           Navvy::Job.cleanup
           break
         end
@@ -42,41 +39,12 @@ module Navvy
     def self.fetch_and_run_jobs
       Job.next.each do |job|
         result = job.run
-        Navvy::Log.info(
+        Navvy.logger.colorized_info(
           "* #{job.object.to_s}.#{job.method_name}" <<
           "(#{job.args.join(', ')}) => #{(job.exception || result).to_s}",
           job.failed? ? 31 : 32
         )
       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/spec/configuration_spec.rb

@@ -5,81 +5,64 @@ describe Navvy::Configuration do
     Navvy.configure do |config|
       config.job_limit =  100
       config.keep_jobs =  false
-      config.logger =     nil
-      config.quiet =      true
+      config.logger =     Navvy::Logger.new('/dev/null')
       config.sleep_time = 5
     end
   end
-  
+
   it 'should have a job limit of 100 by default' do
     Navvy::Job.limit.should == 100
   end
-  
+
   it 'should set the job limit' do
     Navvy.configure do |config|
       config.job_limit = 10
     end
-    
+
     Navvy::Job.limit.should == 10
   end
-  
+
   it 'should have keep_jobs off by default' do
     Navvy::Job.keep.should == false
   end
-  
+
   it 'should set keep_jobs' do
     Navvy.configure do |config|
       config.keep_jobs = 10
     end
-    
+
     Navvy::Job.keep.should == 10
   end
-  
-  it 'should not have a logger by default' do
-    Navvy::Log.logger.should == nil
-  end
-  
-  it 'should set the keep_jobs' do
-    Navvy.configure do |config|
-      config.logger = :rails
-    end
-    
-    Navvy::Log.logger.should == :rails
-  end
-  
-  it 'should be quiet in the specs' do
-    Navvy::Log.quiet.should == true
-  end
-  
-  it 'should turn quiet off' do
+
+  it 'should set the logger' do
     Navvy.configure do |config|
-      config.quiet = false
+      config.logger = Navvy::Logger.new
     end
-    
-    Navvy::Log.quiet.should == false
+
+    Navvy.logger.instance_variable_get(:@logdev).filename.should == nil
   end
-  
+
   it 'should have a default sleep time of 5' do
     Navvy::Worker.sleep_time.should == 5
   end
-  
+
   it 'should turn quiet off' do
     Navvy.configure do |config|
       config.sleep_time = 10
     end
-    
+
     Navvy::Worker.sleep_time.should == 10
   end
-  
+
   it 'should have a default max_attempts of 25' do
     Navvy::Job.max_attempts.should == 25
   end
-  
+
   it 'should set max_attempts to 15' do
     Navvy.configure do |config|
       config.max_attempts = 15
-    end                       
-    
+    end
+
     Navvy::Job.max_attempts.should == 15
   end
-end
+end

data/spec/job_spec.rb

@@ -40,7 +40,7 @@ describe 'Navvy::Job' do
 
   describe '.enqueue' do
     before(:each) do
-      delete_all_jobs
+      Navvy::Job.delete_all
     end
 
     it 'should enqueue a job' do
@@ -91,7 +91,7 @@ describe 'Navvy::Job' do
 
   describe '.next' do
     before(:each) do
-      delete_all_jobs
+      Navvy::Job.delete_all
       Navvy::Job.create(
         :object =>      'Cow',
         :method_name => :last,
@@ -122,7 +122,7 @@ describe 'Navvy::Job' do
 
     it 'should find the next 10 available jobs' do
       jobs = Navvy::Job.next
-      jobs.count.should == 100
+      jobs.length.should == 100
       jobs.each do |job|
         job.should be_instance_of Navvy::Job
         job.method_name.to_s.should == 'speak'
@@ -130,18 +130,18 @@ describe 'Navvy::Job' do
     end
 
     it 'should find the next 2 available jobs' do
-      Navvy::Job.next(2).count.should == 2
+      Navvy::Job.next(2).length.should == 2
     end
 
     it 'should find the next 4 available jobs' do
       Navvy::Job.limit = 4
-      Navvy::Job.next.count.should == 4
+      Navvy::Job.next.length.should == 4
     end
   end
 
   describe '.cleanup' do
     before(:each) do
-      delete_all_jobs
+      Navvy::Job.delete_all
       Navvy::Job.create(
         :object =>        'Cow',
         :method_name =>   :speak,
@@ -186,7 +186,7 @@ describe 'Navvy::Job' do
 
   describe '#run' do
     it 'should pass the arguments' do
-      delete_all_jobs
+      Navvy::Job.delete_all
       job = Navvy::Job.enqueue(Cow, :name, 'Betsy')
       Cow.should_receive(:name).with('Betsy')
       job.run
@@ -194,7 +194,7 @@ describe 'Navvy::Job' do
 
     describe 'when everything goes well' do
       before(:each) do
-        delete_all_jobs
+        Navvy::Job.delete_all
         Navvy::Job.enqueue(Cow, :speak)
         Navvy::Job.keep = false
       end
@@ -235,7 +235,7 @@ describe 'Navvy::Job' do
 
     describe 'when a job fails' do
       before(:each) do
-        delete_all_jobs
+        Navvy::Job.delete_all
         Navvy::Job.enqueue(Cow, :broken)
       end
 
@@ -251,7 +251,7 @@ describe 'Navvy::Job' do
 
   describe '#started' do
     before(:each) do
-      delete_all_jobs
+      Navvy::Job.delete_all
       Navvy::Job.enqueue(Cow, :speak)
     end
 
@@ -264,7 +264,7 @@ describe 'Navvy::Job' do
 
   describe '#completed' do
     before(:each) do
-      delete_all_jobs
+      Navvy::Job.delete_all
       Navvy::Job.enqueue(Cow, :speak)
     end
 
@@ -283,7 +283,7 @@ describe 'Navvy::Job' do
 
   describe '#failed' do
     before(:each) do
-      delete_all_jobs
+      Navvy::Job.delete_all
       Navvy::Job.enqueue(Cow, :speak)
     end
 
@@ -323,7 +323,7 @@ describe 'Navvy::Job' do
 
   describe '#retry' do
     before(:each) do
-      delete_all_jobs
+      Navvy::Job.delete_all
     end
 
     it 'should enqueue a child for the failed job' do
@@ -388,7 +388,7 @@ describe 'Navvy::Job' do
 
   describe '#times_failed' do
     before(:each) do
-      delete_all_jobs
+      Navvy::Job.delete_all
       @failed_job = Navvy::Job.create(
         :failed_at => Time.now
       )

data/spec/logger_spec.rb

@@ -0,0 +1,23 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe Navvy::Logger do
+  describe '#colorized_info' do
+    describe 'when logging to STDOUT' do
+      it 'should use the provided colors' do
+        logger = Navvy::Logger.new
+        logger.should_not_receive(:info).with('colors!')
+        logger.should_receive(:info).with("\e[32mcolors!\e[0m")
+        logger.colorized_info 'colors!', 32
+      end
+    end
+
+    describe 'when logging to a file' do
+      it 'should not use the provided colors' do
+        logger = Navvy::Logger.new('/dev/null')
+        logger.should_receive(:info).with('colors!')
+        logger.should_not_receive(:info).with("\e[32mcolors!\e[0m")
+        logger.colorized_info 'colors!', 32
+      end
+    end
+  end
+end

data/spec/setup/active_record.rb

@@ -1,5 +1,4 @@
 require File.expand_path(File.dirname(__FILE__) + '/../../lib/navvy/job/active_record')
-require 'rubygems'
 
 ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => '/tmp/navvy_test.sqlite')
 

data/spec/setup/mongoid.rb

@@ -0,0 +1,9 @@
+require 'mongoid'
+
+Mongoid.configure do |config|
+  name = "navvy_test"
+  config.allow_dynamic_fields = false
+  config.master = Mongo::Connection.new.db(name)
+end
+
+require File.expand_path(File.dirname(__FILE__) + '/../../lib/navvy/job/mongoid')

data/spec/setup/sequel.rb

@@ -1,4 +1,3 @@
-require 'rubygems'
 require 'sequel'
 
 Sequel.sqlite('/tmp/navvy_test.sqlite')

data/spec/spec_helper.rb

@@ -7,16 +7,6 @@ require 'spec/autorun'
 Spec::Runner.configure do |config|
 end
 
-def delete_all_jobs
-  if defined? Navvy::Job.delete_all
-    Navvy::Job.delete_all
-  elsif defined? Navvy::Job.all.destroy
-    Navvy::Job.all.destroy
-  else
-    Navvy::Job.delete
-  end
-end
-
 def job_count
   if defined? Navvy::Job.count
     Navvy::Job.count
@@ -50,7 +40,3 @@ module Animals
 		end
 	end
 end
-
-Navvy.configure do |config|
-  config.quiet = true
-end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 5
-  version: 0.2.5
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Jeff Kreeftmeijer
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-29 00:00:00 +02:00
+date: 2010-06-28 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -45,97 +45,49 @@ dependencies:
         version: 0.5.2
   type: :development
   version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: sequel
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 8
-        - 0
-        version: 3.8.0
-  type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: sqlite3-ruby
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 2
-        - 5
-        version: 1.2.5
-  type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: daemons
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 10
-        version: 1.0.10
-  type: :runtime
-  version_requirements: *id005
 description: Simple background job processor inspired by delayed_job, but aiming for database agnosticism.
 email: jeff@kreeftmeijer.nl
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- LICENSE
-- README.textile
+extra_rdoc_files: []
+
 files: 
-- .document
-- .gitignore
-- LICENSE
-- README.textile
-- Rakefile
-- VERSION
 - generators/navvy/navvy_generator.rb
-- generators/navvy/templates/migration.rb
-- generators/navvy/templates/script
+- generators/navvy/templates/active_record_migration.rb
+- generators/navvy/templates/sequel_migration.rb
 - 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
+- lib/navvy/job/mongoid.rb
 - lib/navvy/job/sequel.rb
-- lib/navvy/log.rb
+- lib/navvy/job.rb
+- lib/navvy/logger.rb
 - lib/navvy/tasks.rb
 - lib/navvy/worker.rb
-- navvy.gemspec
+- lib/navvy.rb
 - spec/configuration_spec.rb
 - spec/job_spec.rb
-- spec/log_spec.rb
+- spec/logger_spec.rb
 - spec/setup/active_record.rb
 - spec/setup/data_mapper.rb
-- spec/setup/justlogging.rb
 - spec/setup/mongo_mapper.rb
-- spec/setup/rails_default_logger.rb
+- spec/setup/mongoid.rb
 - spec/setup/sequel.rb
 - spec/spec_helper.rb
 - spec/worker_spec.rb
+- README.textile
+- LICENSE
 has_rdoc: true
 homepage: http://github.com/jeffkreeftmeijer/navvy
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -159,15 +111,5 @@ rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Simple background job processor inspired by delayed_job, but aiming for database agnosticism.
-test_files: 
-- spec/configuration_spec.rb
-- spec/job_spec.rb
-- spec/log_spec.rb
-- spec/setup/active_record.rb
-- spec/setup/data_mapper.rb
-- spec/setup/justlogging.rb
-- spec/setup/mongo_mapper.rb
-- spec/setup/rails_default_logger.rb
-- spec/setup/sequel.rb
-- spec/spec_helper.rb
-- spec/worker_spec.rb
+test_files: []
+

data/.document

@@ -1,5 +0,0 @@
-README.rdoc
-lib/**/*.rb
-bin/*
-features/**/*.feature
-LICENSE

data/.gitignore

@@ -1,8 +0,0 @@
-*.sw?
-.DS_Store
-.yardoc
-coverage
-rdoc
-doc
-pkg
-tmp

data/Rakefile

@@ -1,67 +0,0 @@
-require 'rubygems'
-require 'rake'
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "navvy"
-    gem.summary = %Q{Simple background job processor inspired by delayed_job, but aiming for database agnosticism.}
-    gem.description = %Q{Simple background job processor inspired by delayed_job, but aiming for database agnosticism.}
-    gem.email = "jeff@kreeftmeijer.nl"
-    gem.homepage = "http://github.com/jeffkreeftmeijer/navvy"
-    gem.authors = ["Jeff Kreeftmeijer"]
-
-    gem.add_development_dependency "rspec",                 ">= 1.2.9"
-    gem.add_development_dependency "yard",                  ">= 0.5.2"
-    gem.add_development_dependency "sequel",                ">= 3.8.0"
-    gem.add_development_dependency "sqlite3-ruby",          ">= 1.2.5"
-    gem.add_dependency             "daemons",               ">= 1.0.10"
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
-end
-
-require 'spec/rake/spectask'
-
-task :spec do
-  ['spec:active_record', 'spec:mongo_mapper', 'spec:sequel', 'spec:data_mapper'].each do |spec|
-    Rake::Task[spec].invoke
-  end
-end
-
-namespace :spec do
-  Spec::Rake::SpecTask.new(:active_record) do |spec|
-    spec.spec_files = FileList['spec/setup/active_record.rb', 'spec/*_spec.rb']
-  end
-
-  Spec::Rake::SpecTask.new(:mongo_mapper) do |spec|
-    spec.spec_files = FileList['spec/setup/mongo_mapper.rb', 'spec/*_spec.rb']
-  end
-
-  Spec::Rake::SpecTask.new(:sequel) do |spec|
-    spec.spec_files = FileList['spec/setup/sequel.rb', 'spec/*_spec.rb']
-  end
-
-  Spec::Rake::SpecTask.new(:data_mapper) do |spec|
-    spec.spec_files = FileList['spec/setup/data_mapper.rb', 'spec/*_spec.rb']
-  end
-end
-
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
-end
-
-task :spec => :check_dependencies
-task :default => :spec
-
-begin
-  require 'yard'
-  YARD::Rake::YardocTask.new
-rescue LoadError
-  task :yardoc do
-    abort "YARD is not available. In order to run yardoc, you must: sudo gem install yard"
-  end
-end

data/VERSION

@@ -1 +0,0 @@
-0.2.5

data/generators/navvy/templates/script

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

data/lib/navvy/log.rb

@@ -1,74 +0,0 @@
-module Navvy
-  class Log  
-    class << self
-      attr_writer :logger
-      attr_accessor :quiet
-    end
-    
-    class LoggerNotFound < StandardError; end
-
-    ##
-    # Default logger
-    #
-    # @return [Symbol, nil] logger
-
-    def self.logger
-      @logger || Navvy.configuration.logger
-    end
-
-    ##
-    # Be quiet?
-    #
-    # @return [true, false] quiet
-
-    def self.quiet
-      @quiet || Navvy.configuration.quiet
-    end
-
-    ##
-    # Pass a log to the logger. It will check if self.logger is an array. If it
-    # is, it'll loop through it and log to every logger. If it's not, it'll
-    # just log once.
-    #
-    # @param [String] message the message you want to log
-    # @param [Integer] color an optional color code to use in the terminal
-    # output
-
-    def self.info(message, color = nil)
-      if logger.is_a? Array
-        logger.each do |logger|
-          write(logger, message, color)
-        end
-      else
-        write(logger, message, color)
-      end
-    end
-    
-    ##
-    # Actually write the log to the logger. It'll check self.logger and use
-    # that to define a logger
-    #
-    # @param [Symbol] logger the logger you want to use
-    # @param [String] message the message you want to log
-    # @param [Integer] color an optional color code to use in the terminal
-    # output
-    
-    def self.write(logger, message, color = nil)
-      puts "\e[#{color}m#{message}\e[0m" unless quiet
-      case logger
-      when :justlogging
-        raise(
-          LoggerNotFound,
-          'JustLogging could not be found. No logs were created.'
-        ) unless defined? Justlogging.log
-        Justlogging.log(message)  
-      when :rails
-        raise(
-          LoggerNotFound,
-          'Rails.logger could not be found. No logs were created.'
-        ) unless defined? Rails.logger.info
-        Rails.logger.info(message)
-      end
-    end
-  end
-end

data/navvy.gemspec

@@ -1,96 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{navvy}
-  s.version = "0.2.5"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Jeff Kreeftmeijer"]
-  s.date = %q{2010-05-29}
-  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 = [
-    "LICENSE",
-     "README.textile"
-  ]
-  s.files = [
-    ".document",
-     ".gitignore",
-     "LICENSE",
-     "README.textile",
-     "Rakefile",
-     "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",
-     "lib/navvy/job/sequel.rb",
-     "lib/navvy/log.rb",
-     "lib/navvy/tasks.rb",
-     "lib/navvy/worker.rb",
-     "navvy.gemspec",
-     "spec/configuration_spec.rb",
-     "spec/job_spec.rb",
-     "spec/log_spec.rb",
-     "spec/setup/active_record.rb",
-     "spec/setup/data_mapper.rb",
-     "spec/setup/justlogging.rb",
-     "spec/setup/mongo_mapper.rb",
-     "spec/setup/rails_default_logger.rb",
-     "spec/setup/sequel.rb",
-     "spec/spec_helper.rb",
-     "spec/worker_spec.rb"
-  ]
-  s.homepage = %q{http://github.com/jeffkreeftmeijer/navvy}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
-  s.summary = %q{Simple background job processor inspired by delayed_job, but aiming for database agnosticism.}
-  s.test_files = [
-    "spec/configuration_spec.rb",
-     "spec/job_spec.rb",
-     "spec/log_spec.rb",
-     "spec/setup/active_record.rb",
-     "spec/setup/data_mapper.rb",
-     "spec/setup/justlogging.rb",
-     "spec/setup/mongo_mapper.rb",
-     "spec/setup/rails_default_logger.rb",
-     "spec/setup/sequel.rb",
-     "spec/spec_helper.rb",
-     "spec/worker_spec.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
-      s.add_development_dependency(%q<yard>, [">= 0.5.2"])
-      s.add_development_dependency(%q<sequel>, [">= 3.8.0"])
-      s.add_development_dependency(%q<sqlite3-ruby>, [">= 1.2.5"])
-      s.add_runtime_dependency(%q<daemons>, [">= 1.0.10"])
-    else
-      s.add_dependency(%q<rspec>, [">= 1.2.9"])
-      s.add_dependency(%q<yard>, [">= 0.5.2"])
-      s.add_dependency(%q<sequel>, [">= 3.8.0"])
-      s.add_dependency(%q<sqlite3-ruby>, [">= 1.2.5"])
-      s.add_dependency(%q<daemons>, [">= 1.0.10"])
-    end
-  else
-    s.add_dependency(%q<rspec>, [">= 1.2.9"])
-    s.add_dependency(%q<yard>, [">= 0.5.2"])
-    s.add_dependency(%q<sequel>, [">= 3.8.0"])
-    s.add_dependency(%q<sqlite3-ruby>, [">= 1.2.5"])
-    s.add_dependency(%q<daemons>, [">= 1.0.10"])
-  end
-end

data/spec/log_spec.rb

@@ -1,63 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-
-class LoggerNotFound < StandardError; end
-
-describe Navvy::Log do
-  describe '.info' do
-    describe 'when using the rails default logger' do
-      before do
-        Navvy::Log.logger = :rails
-      end
-
-      it 'should raise an error when the logger can not be found' do
-        lambda { Navvy::Log.info('123') }.should raise_error
-      end
-
-      it 'should pass the log to Rails.logger' do
-        require File.expand_path(File.dirname(__FILE__) + '/setup/rails_default_logger')
-        Rails.logger.should_receive(:info).with('123')
-        Navvy::Log.info('123')
-      end
-    end
-
-    describe 'when using justlogging' do
-      before do
-        Navvy::Log.logger = :justlogging
-      end
-
-      it 'should raise an error when the logger can not be found' do
-        lambda { Navvy::Log.info('123') }.should raise_error
-      end
-
-      it 'should pass the log to justlogging' do
-        require File.expand_path(File.dirname(__FILE__) + '/setup/justlogging')
-        Justlogging.should_receive(:log).with('123')
-        Navvy::Log.info('123')
-      end
-    end
-
-    describe 'when using both the rails default logger and justlogging' do
-      before do
-        Navvy::Log.logger = [:rails, :justlogging]
-      end
-
-      it 'should pass the log to justlogging' do
-        Rails.logger.should_receive(:info).with('123')
-        Justlogging.should_receive(:log).with('123')
-        Navvy::Log.info('123')
-      end
-    end
-
-    describe 'when not using any logger' do
-      before do
-        Navvy::Log.logger = nil
-      end
-
-      it 'should not log' do
-        Rails.logger.should_not_receive(:info)
-        Justlogging.should_not_receive(:log)
-        Navvy::Log.info('123')
-      end
-    end
-  end
-end

data/spec/setup/justlogging.rb

@@ -1,3 +0,0 @@
-class Justlogging
-  def self.log(text);end
-end

data/spec/setup/rails_default_logger.rb

@@ -1,9 +0,0 @@
-class Rails
-  def self.logger
-    Logger
-  end
-
-  class Logger
-    def self.info(text);end
-  end
-end