delayed_job 2.0.5 → 2.0.6

data/lib/delayed/backend/active_record.rb

@@ -30,10 +30,6 @@ module Delayed
         }
         named_scope :by_priority, :order => 'priority ASC, run_at ASC'
         
-        named_scope :locked_by_worker, lambda{|worker_name, max_run_time|
-          {:conditions => ['locked_by = ? AND locked_at > ?', worker_name, db_time_now - max_run_time]}
-        }
-                
         def self.after_fork
           ::ActiveRecord::Base.connection.reconnect!
         end
@@ -42,33 +38,15 @@ module Delayed
         def self.clear_locks!(worker_name)
           update_all("locked_by = null, locked_at = null", ["locked_by = ?", worker_name])
         end
-        
-        def self.jobs_available_to_worker(worker_name, max_run_time)
+
+        # Find a few candidate jobs to run (in case some immediately get locked by others).
+        def self.find_available(worker_name, limit = 5, max_run_time = Worker.max_run_time)
           scope = self.ready_to_run(worker_name, max_run_time)
           scope = scope.scoped(:conditions => ['priority >= ?', Worker.min_priority]) if Worker.min_priority
           scope = scope.scoped(:conditions => ['priority <= ?', Worker.max_priority]) if Worker.max_priority
-          scope.by_priority
-        end
-                
-        # Reserve a single job in a single update query.  This causes workers to serialize on the 
-        # database and avoids contention.
-        def self.reserve(worker, max_run_time = Worker.max_run_time)
-          affected_rows = 0
-          ::ActiveRecord::Base.silence do
-            affected_rows = update_all(["locked_at = ?, locked_by = ?", db_time_now, worker.name], jobs_available_to_worker(worker.name, max_run_time).scope(:find)[:conditions], :limit => 1)
-          end
-          
-          if affected_rows == 1
-            locked_by_worker(worker.name, max_run_time).first
-          else
-            nil
-          end
-        end
-        
-        # Find a few candidate jobs to run (in case some immediately get locked by others).
-        def self.find_available(worker_name, limit = 5, max_run_time = Worker.max_run_time)
+      
           ::ActiveRecord::Base.silence do
-            jobs_available_to_worker(worker_name, max_run_time).all(:limit => limit)
+            scope.by_priority.all(:limit => limit)
           end
         end
 

data/spec/backend/shared_backend_spec.rb

@@ -172,7 +172,7 @@ shared_examples_for 'a backend' do
       @job_copy_for_worker_2.lock_exclusively!(4.hours, 'worker2').should == false
     end
   end
-
+  
   describe "reserve" do
     before do
       Delayed::Worker.max_run_time = 2.minutes

data/spec/spec_helper.rb

@@ -20,7 +20,7 @@ Dir.glob("#{File.dirname(__FILE__)}/setup/*.rb") do |backend|
     require "setup/#{backend}"
     require "backend/#{backend}_job_spec"
     BACKENDS << backend.to_sym
-  rescue LoadError
+  rescue LoadError, Exception
     puts "Unable to load #{backend} backend! #{$!}"
   end
 end

metadata

@@ -1,169 +1,202 @@
 --- !ruby/object:Gem::Specification 
 name: delayed_job
 version: !ruby/object:Gem::Version 
-  hash: 5
   prerelease: false
   segments: 
   - 2
   - 0
-  - 5
-  version: 2.0.5
+  - 6
+  version: 2.0.6
 platform: ruby
 authors: 
+- Chris Gaffney
 - Brandon Keepers
 - "Tobias L\xC3\xBCtke"
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-12-01 00:00:00 -05:00
+date: 2011-01-20 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: daemons
-  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
   type: :runtime
+  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: rspec
-  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - <
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
+        - 2
         - 0
-        version: "0"
+        version: "2.0"
   type: :development
+  prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: sqlite3-ruby
-  prerelease: false
+  name: rake
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
   type: :development
+  prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: mongo_mapper
-  prerelease: false
+  name: rails
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - <
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
+        - 3
         - 0
-        version: "0"
+        version: "3.0"
   type: :development
+  prerelease: false
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: dm-core
-  prerelease: false
+  name: sqlite3
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
   type: :development
+  prerelease: false
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: dm-observer
-  prerelease: false
+  name: mysql
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
   type: :development
+  prerelease: false
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: dm-aggregates
-  prerelease: false
+  name: mongo_mapper
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
   type: :development
+  prerelease: false
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: dm-validations
-  prerelease: false
+  name: dm-core
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
   type: :development
+  prerelease: false
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  name: do_sqlite3
-  prerelease: false
+  name: dm-observer
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
   type: :development
+  prerelease: false
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
-  name: database_cleaner
-  prerelease: false
+  name: dm-aggregates
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
   type: :development
+  prerelease: false
   version_requirements: *id010
+- !ruby/object:Gem::Dependency 
+  name: dm-validations
+  requirement: &id011 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id011
+- !ruby/object:Gem::Dependency 
+  name: do_sqlite3
+  requirement: &id012 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id012
+- !ruby/object:Gem::Dependency 
+  name: database_cleaner
+  requirement: &id013 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id013
 description: |-
   Delayed_job (or DJ) encapsulates the common pattern of asynchronously executing longer tasks in the background. It is a direct extraction from Shopify where the job table is responsible for a multitude of core tasks.
   
   This gem is collectiveidea's fork (http://github.com/collectiveidea/delayed_job).
-email: tobi@leetsoft.com
+email: 
+- chris@collectiveidea.com
+- brandon@opensoul.org
 executables: []
 
 extensions: []
@@ -171,21 +204,8 @@ extensions: []
 extra_rdoc_files: 
 - README.textile
 files: 
-- .gitignore
-- .rvmrc
-- CHANGELOG
-- MIT-LICENSE
-- README.textile
-- Rakefile
-- VERSION
-- benchmarks.rb
 - contrib/delayed_job.monitrc
 - contrib/delayed_job_multiple.monitrc
-- delayed_job.gemspec
-- generators/delayed_job/delayed_job_generator.rb
-- generators/delayed_job/templates/migration.rb
-- generators/delayed_job/templates/script
-- init.rb
 - lib/delayed/backend/active_record.rb
 - lib/delayed/backend/base.rb
 - lib/delayed/backend/data_mapper.rb
@@ -198,7 +218,6 @@ files:
 - lib/delayed/tasks.rb
 - lib/delayed/worker.rb
 - lib/delayed_job.rb
-- rails/init.rb
 - recipes/delayed_job.rb
 - spec/backend/active_record_job_spec.rb
 - spec/backend/data_mapper_job_spec.rb
@@ -214,7 +233,8 @@ files:
 - spec/spec_helper.rb
 - spec/story_spec.rb
 - spec/worker_spec.rb
-- tasks/jobs.rake
+- MIT-LICENSE
+- README.textile
 has_rdoc: true
 homepage: http://github.com/collectiveidea/delayed_job
 licenses: []
@@ -232,7 +252,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 3581009540733593497
       segments: 
       - 0
       version: "0"
@@ -241,7 +261,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 3581009540733593497
       segments: 
       - 0
       version: "0"
@@ -253,8 +273,17 @@ signing_key:
 specification_version: 3
 summary: Database-backed asynchronous priority queue system -- Extracted from Shopify
 test_files: 
+- spec/backend/active_record_job_spec.rb
+- spec/backend/data_mapper_job_spec.rb
+- spec/backend/mongo_mapper_job_spec.rb
+- spec/backend/shared_backend_spec.rb
 - spec/delayed_method_spec.rb
 - spec/message_sending_spec.rb
 - spec/performable_method_spec.rb
+- spec/sample_jobs.rb
+- spec/setup/active_record.rb
+- spec/setup/data_mapper.rb
+- spec/setup/mongo_mapper.rb
+- spec/spec_helper.rb
 - spec/story_spec.rb
 - spec/worker_spec.rb

data/.gitignore

@@ -1,3 +0,0 @@
-.rvmrc
-*.gem
-*.swp

data/CHANGELOG

@@ -1,57 +0,0 @@
-2.0.5 - 2010-12-01
-* Added #reschedule_at hook on payload to determine when the job should be rescheduled [backported from 2.1]
-* Added --sleep-delay command line option [backported from 2.1]
-* Added 'delayed_job_server_role' Capistrano variable to allow delayed_job to run on its own worker server
-    set :delayed_job_server_role, :worker
-* Changed AR backend to reserve jobs using an UPDATE query to reduce worker contention [backported from 2.1]
-
-2.0.4 - 2010-11-14
-* Fix issue where dirty tracking prevented job from being properly unlocked
-* Add delayed_job_args variable for Capistrano recipe to allow configuration of started workers (e.g. "-n 2 --max-priority 10")
-* Added options to handle_asynchronously
-* Added Delayed::Worker.default_priority
-* Allow private methods to be delayed
-* Fixes for Ruby 1.9
-* Added -m command line option to start a monitor process
-* normalize logging in worker
-* Deprecate #send_later and #send_at in favor of new #delay method
-* Added @#delay@ to Object that allows you to delay any method and pass options:
-    options = {:priority => 19, :run_at => 5.minutes.from_now}
-    UserMailer.delay(options).deliver_confirmation(@user)
-
-2.0.3 - 2010-04-16
-
-* Fix initialization for Rails 2.x
-
-2.0.2 - 2010-04-08
-
-* Fixes to Mongo Mapper backend [ "14be7a24":http://github.com/collectiveidea/delayed_job/commit/14be7a24, "dafd5f46":http://github.com/collectiveidea/delayed_job/commit/dafd5f46, "54d40913":http://github.com/collectiveidea/delayed_job/commit/54d40913 ]
-* DataMapper backend performance improvements [ "93833cce":http://github.com/collectiveidea/delayed_job/commit/93833cce, "e9b1573e":http://github.com/collectiveidea/delayed_job/commit/e9b1573e, "37a16d11":http://github.com/collectiveidea/delayed_job/commit/37a16d11, "803f2bfa":http://github.com/collectiveidea/delayed_job/commit/803f2bfa ]
-* Fixed Delayed::Command to create tmp/pids directory [ "8ec8ca41":http://github.com/collectiveidea/delayed_job/commit/8ec8ca41 ]
-* Railtie to perform Rails 3 initialization [ "3e0fc41f":http://github.com/collectiveidea/delayed_job/commit/3e0fc41f ]
-* Added on_permanent_failure hook [ "d2f14cd6":http://github.com/collectiveidea/delayed_job/commit/d2f14cd6 ]
-
-2.0.1 - 2010-04-03
-* Bug fix for using ActiveRecord backend with daemon [martinbtt]
-
-2.0.0 - 2010-04-03
-* Multiple backend support (See README for more details)
-* Added MongoMapper backend [zbelzer, moneypools]
-* Added DataMapper backend [lpetre]
-* Reverse priority so the jobs table can be indexed. Lower numbers have higher priority. The default priority is 0, so increase it for jobs that are not important.
-* Move most of the heavy lifting from Job to Worker (#work_off, #reschedule, #run, #min_priority, #max_priority, #max_run_time, #max_attempts, #worker_name) [albus522]
-* Remove EvaledJob. Implement your own if you need this functionality.
-* Only use Time.zone if it is set. Closes #20
-* Fix for last_error recording when destroy_failed_jobs = false, max_attempts = 1
-* Implemented worker name_prefix to maintain dynamic nature of pid detection
-* Some Rails 3 compatibility fixes [fredwu]
-
-1.8.5 - 2010-03-15
-
-* Set auto_flushing=true on Rails logger to fix logging in production
-* Fix error message when trying to send_later on a method that doesn't exist
-* Don't use rails_env in capistrano if it's not set. closes #22
-* Delayed job should append to delayed_job.log not overwrite
-* Version bump to 1.8.5
-* fixing Time.now to be Time.zone.now if set to honor the app set local TimeZone
-* Replaced @Worker::SLEEP@, @Job::MAX_ATTEMPTS@, and @Job::MAX_RUN_TIME@ with class methods that can be overridden.

data/Rakefile

@@ -1,45 +0,0 @@
-# -*- encoding: utf-8 -*-
-begin
-  require 'jeweler'
-rescue LoadError
-  puts "Jeweler not available. Install it with: sudo gem install jeweler"
-  exit 1
-end
-
-Jeweler::Tasks.new do |s|
-  s.name     = "delayed_job"
-  s.summary  = "Database-backed asynchronous priority queue system -- Extracted from Shopify"
-  s.email    = "tobi@leetsoft.com"
-  s.homepage = "http://github.com/collectiveidea/delayed_job"
-  s.description = "Delayed_job (or DJ) encapsulates the common pattern of asynchronously executing longer tasks in the background. It is a direct extraction from Shopify where the job table is responsible for a multitude of core tasks.\n\nThis gem is collectiveidea's fork (http://github.com/collectiveidea/delayed_job)."
-  s.authors  = ["Brandon Keepers", "Tobias Lütke"]
-
-  s.has_rdoc = true
-  s.rdoc_options = ["--main", "README.textile", "--inline-source", "--line-numbers"]
-  s.extra_rdoc_files = ["README.textile"]
-
-  s.test_files = Dir['spec/*_spec.rb']
-
-  s.add_dependency "daemons"
-  s.add_development_dependency "rspec"
-  s.add_development_dependency "sqlite3-ruby"
-  s.add_development_dependency "mongo_mapper"
-  s.add_development_dependency "dm-core"
-  s.add_development_dependency "dm-observer"
-  s.add_development_dependency "dm-aggregates"
-  s.add_development_dependency "dm-validations"
-  s.add_development_dependency "do_sqlite3"
-  s.add_development_dependency "database_cleaner"
-end
-
-require 'spec/rake/spectask'
-desc 'Run the specs'
-Spec::Rake::SpecTask.new(:spec) do |t|
-  t.libs << 'lib'
-  t.pattern = 'spec/*_spec.rb'
-  t.verbose = false
-end
-
-task :spec => :check_dependencies
-task :default => :spec
-

data/VERSION

@@ -1 +0,0 @@
-2.0.5

data/benchmarks.rb

@@ -1,33 +0,0 @@
-$:.unshift(File.dirname(__FILE__) + '/lib')
-require 'rubygems'
-require 'logger'
-require 'delayed_job'
-require 'benchmark'
-
-RAILS_ENV = 'test'
-
-Delayed::Worker.logger = Logger.new('/dev/null')
-
-BACKENDS = []
-Dir.glob("#{File.dirname(__FILE__)}/spec/setup/*.rb") do |backend|
-  begin
-    backend = File.basename(backend, '.rb')
-    require "spec/setup/#{backend}"
-    BACKENDS << backend.to_sym
-  rescue LoadError
-    puts "Unable to load #{backend} backend! #{$!}"
-  end
-end
-
-
-Benchmark.bm(10) do |x|
-  BACKENDS.each do |backend|
-    require "spec/setup/#{backend}"
-    Delayed::Worker.backend = backend
-  
-    n = 10000
-    n.times { "foo".delay.length }
-
-    x.report(backend.to_s) { Delayed::Worker.new(:quiet => true).work_off(n) }
-  end  
-end

data/delayed_job.gemspec

@@ -1,119 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{delayed_job}
-  s.version = "2.0.5"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Brandon Keepers", "Tobias L\303\274tke"]
-  s.date = %q{2010-12-01}
-  s.description = %q{Delayed_job (or DJ) encapsulates the common pattern of asynchronously executing longer tasks in the background. It is a direct extraction from Shopify where the job table is responsible for a multitude of core tasks.
-
-This gem is collectiveidea's fork (http://github.com/collectiveidea/delayed_job).}
-  s.email = %q{tobi@leetsoft.com}
-  s.extra_rdoc_files = [
-    "README.textile"
-  ]
-  s.files = [
-    ".gitignore",
-     ".rvmrc",
-     "CHANGELOG",
-     "MIT-LICENSE",
-     "README.textile",
-     "Rakefile",
-     "VERSION",
-     "benchmarks.rb",
-     "contrib/delayed_job.monitrc",
-     "contrib/delayed_job_multiple.monitrc",
-     "delayed_job.gemspec",
-     "generators/delayed_job/delayed_job_generator.rb",
-     "generators/delayed_job/templates/migration.rb",
-     "generators/delayed_job/templates/script",
-     "init.rb",
-     "lib/delayed/backend/active_record.rb",
-     "lib/delayed/backend/base.rb",
-     "lib/delayed/backend/data_mapper.rb",
-     "lib/delayed/backend/mongo_mapper.rb",
-     "lib/delayed/command.rb",
-     "lib/delayed/message_sending.rb",
-     "lib/delayed/performable_method.rb",
-     "lib/delayed/railtie.rb",
-     "lib/delayed/recipes.rb",
-     "lib/delayed/tasks.rb",
-     "lib/delayed/worker.rb",
-     "lib/delayed_job.rb",
-     "rails/init.rb",
-     "recipes/delayed_job.rb",
-     "spec/backend/active_record_job_spec.rb",
-     "spec/backend/data_mapper_job_spec.rb",
-     "spec/backend/mongo_mapper_job_spec.rb",
-     "spec/backend/shared_backend_spec.rb",
-     "spec/delayed_method_spec.rb",
-     "spec/message_sending_spec.rb",
-     "spec/performable_method_spec.rb",
-     "spec/sample_jobs.rb",
-     "spec/setup/active_record.rb",
-     "spec/setup/data_mapper.rb",
-     "spec/setup/mongo_mapper.rb",
-     "spec/spec_helper.rb",
-     "spec/story_spec.rb",
-     "spec/worker_spec.rb",
-     "tasks/jobs.rake"
-  ]
-  s.homepage = %q{http://github.com/collectiveidea/delayed_job}
-  s.rdoc_options = ["--main", "README.textile", "--inline-source", "--line-numbers"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Database-backed asynchronous priority queue system -- Extracted from Shopify}
-  s.test_files = [
-    "spec/delayed_method_spec.rb",
-     "spec/message_sending_spec.rb",
-     "spec/performable_method_spec.rb",
-     "spec/story_spec.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::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<daemons>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, [">= 0"])
-      s.add_development_dependency(%q<sqlite3-ruby>, [">= 0"])
-      s.add_development_dependency(%q<mongo_mapper>, [">= 0"])
-      s.add_development_dependency(%q<dm-core>, [">= 0"])
-      s.add_development_dependency(%q<dm-observer>, [">= 0"])
-      s.add_development_dependency(%q<dm-aggregates>, [">= 0"])
-      s.add_development_dependency(%q<dm-validations>, [">= 0"])
-      s.add_development_dependency(%q<do_sqlite3>, [">= 0"])
-      s.add_development_dependency(%q<database_cleaner>, [">= 0"])
-    else
-      s.add_dependency(%q<daemons>, [">= 0"])
-      s.add_dependency(%q<rspec>, [">= 0"])
-      s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
-      s.add_dependency(%q<mongo_mapper>, [">= 0"])
-      s.add_dependency(%q<dm-core>, [">= 0"])
-      s.add_dependency(%q<dm-observer>, [">= 0"])
-      s.add_dependency(%q<dm-aggregates>, [">= 0"])
-      s.add_dependency(%q<dm-validations>, [">= 0"])
-      s.add_dependency(%q<do_sqlite3>, [">= 0"])
-      s.add_dependency(%q<database_cleaner>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<daemons>, [">= 0"])
-    s.add_dependency(%q<rspec>, [">= 0"])
-    s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
-    s.add_dependency(%q<mongo_mapper>, [">= 0"])
-    s.add_dependency(%q<dm-core>, [">= 0"])
-    s.add_dependency(%q<dm-observer>, [">= 0"])
-    s.add_dependency(%q<dm-aggregates>, [">= 0"])
-    s.add_dependency(%q<dm-validations>, [">= 0"])
-    s.add_dependency(%q<do_sqlite3>, [">= 0"])
-    s.add_dependency(%q<database_cleaner>, [">= 0"])
-  end
-end
-

data/generators/delayed_job/delayed_job_generator.rb

@@ -1,22 +0,0 @@
-class DelayedJobGenerator < Rails::Generator::Base
-  default_options :skip_migration => false
-  
-  def manifest
-    record do |m|
-      m.template 'script', 'script/delayed_job', :chmod => 0755
-      if !options[:skip_migration] && defined?(ActiveRecord)
-        m.migration_template "migration.rb", 'db/migrate',
-                             :migration_file_name => "create_delayed_jobs"
-      end
-    end
-  end
-  
-protected
-
-  def add_options!(opt)
-    opt.separator ''
-    opt.separator 'Options:'
-    opt.on("--skip-migration", "Don't generate a migration") { |v| options[:skip_migration] = v }
-  end
-  
-end

data/generators/delayed_job/templates/migration.rb

@@ -1,22 +0,0 @@
-class CreateDelayedJobs < ActiveRecord::Migration
-  def self.up
-    create_table :delayed_jobs, :force => true do |table|
-      table.integer  :priority, :default => 0      # Allows some jobs to jump to the front of the queue
-      table.integer  :attempts, :default => 0      # Provides for retries, but still fail eventually.
-      table.text     :handler                      # YAML-encoded string of the object that will do work
-      table.text     :last_error                   # reason for last failure (See Note below)
-      table.datetime :run_at                       # When to run. Could be Time.zone.now for immediately, or sometime in the future.
-      table.datetime :locked_at                    # Set when a client is working on this object
-      table.datetime :failed_at                    # Set when all retries have failed (actually, by default, the record is deleted instead)
-      table.string   :locked_by                    # Who is working on this object (if locked)
-      table.timestamps
-    end
-	
-    add_index :delayed_jobs, [:priority, :run_at], :name => 'delayed_jobs_priority'
-    add_index :delayed_jobs, :locked_by, :name => 'delayed_jobs_locked_by'
-  end
-  
-  def self.down
-    drop_table :delayed_jobs  
-  end
-end

data/generators/delayed_job/templates/script

@@ -1,5 +0,0 @@
-#!/usr/bin/env ruby
-
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'config', 'environment'))
-require 'delayed/command'
-Delayed::Command.new(ARGV).daemonize

data/init.rb

@@ -1 +0,0 @@
-require File.join(File.dirname(__FILE__), 'rails', 'init')

data/rails/init.rb

@@ -1,5 +0,0 @@
-require 'delayed_job'
-
-config.after_initialize do
-  Delayed::Worker.guess_backend
-end

data/tasks/jobs.rake

@@ -1 +0,0 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'delayed', 'tasks'))