remove rails 2 support. delayed_job 2.1 will only support Rails 3

ivanvanderbyl · Sep 6, 2010 · b9b38f6 · b9b38f6
1 parent 77b0482
commit b9b38f6
Show file tree

Hide file tree

Showing 8 changed files with 2 additions and 57 deletions.
diff --git a/delayed_job.gemspec b/delayed_job.gemspec
@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
 This gem is collectiveidea's fork (http://github.com/collectiveidea/delayed_job)."
   s.email             = 'brandon@collectiveidea.com'
   s.extra_rdoc_files  = 'README.textile'
-  s.files             = Dir.glob('{contrib,generators,lib,rails,recipes,spec,tasks}/**/*') +
+  s.files             = Dir.glob('{contrib,lib,recipes,spec}/**/*') +
                         %w(init.rb MIT-LICENSE README.textile)
   s.homepage          = 'http://github.com/collectiveidea/delayed_job'
   s.rdoc_options      = ["--main", "README.textile", "--inline-source", "--line-numbers"]

diff --git a/generators/delayed_job/delayed_job_generator.rb b/generators/delayed_job/delayed_job_generator.rb
diff --git a/generators/delayed_job/templates/migration.rb b/generators/delayed_job/templates/migration.rb
diff --git a/generators/delayed_job/templates/script b/generators/delayed_job/templates/script
diff --git a/init.rb b/init.rb
diff --git a/lib/delayed_job.rb b/lib/delayed_job.rb
@@ -5,7 +5,7 @@
 require File.dirname(__FILE__) + '/delayed/yaml_ext'
 require File.dirname(__FILE__) + '/delayed/backend/base'
 require File.dirname(__FILE__) + '/delayed/worker'
-require File.dirname(__FILE__) + '/delayed/railtie' if defined?(::Rails::Railtie)
+require File.dirname(__FILE__) + '/delayed/railtie'
 
 Object.send(:include, Delayed::MessageSending)   
 Module.send(:include, Delayed::MessageSending::ClassMethods)
diff --git a/rails/init.rb b/rails/init.rb
diff --git a/tasks/jobs.rake b/tasks/jobs.rake