Merge branch 'defunkt' into distributed

.travis.yml

@@ -0,0 +1,5 @@
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - jruby
+  - rbx-2.0

Gemfile

@@ -8,5 +8,5 @@ group :test do
   gem "mocha", "~> 0.9.7"
   gem "leftright", :platforms => :mri_18
   gem "yajl-ruby", "~>0.8.2", :platforms => :mri
-  gem "json", "~>1.5.3", :platforms => :jruby
+  gem "json", "~>1.5.3", :platforms => [:jruby, :rbx]
 end

HISTORY.md

@@ -1,3 +1,16 @@
+## 1.18.5 (2011-08-24)
+
+* Added support for Travis CI
+* Bugfix: preload only happens in production Rails environment
+
+## 1.18.4 (2011-08-23)
+
+* Bugfix: preload task depends on setup
+
+## 1.18.3 (2011-08-23)
+
+* Bugfix: Fix preloading on Rails 3.x.
+
 ## 1.18.2 (2011-08-19)
 
 * Fix RAILS_ROOT deprecation warning

lib/resque/tasks.rb

@@ -41,8 +41,8 @@
   end
 
   # Preload app files if this is Rails
-  task :preload do
-    if defined? Rails
+  task :preload => :setup do
+    if defined?(Rails) && Rails.env == 'production'
       Dir["#{Rails.root}/app/**/*.rb"].each do |file|
         require file
       end

lib/resque/version.rb

@@ -1,3 +1,3 @@
 module Resque
-  Version = VERSION = '1.18.2'
+  Version = VERSION = '1.18.5'
 end