Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fix activesupport dependency specification

  • Loading branch information...
commit aba20b9b5ee38a3580946c4fe0ace2c87ec0b963 1 parent ebf70f0
@sferik sferik authored
View
8 Gemfile
@@ -1,6 +1,6 @@
source 'https://rubygems.org'
-gem 'rake'
+gem 'rake'
platforms :ruby do
gem 'sqlite3'
@@ -12,11 +12,11 @@ platforms :jruby do
end
group :test do
- gem 'activerecord', '>= 3.0'
- gem 'actionmailer', '>= 3.0'
+ gem 'activerecord', ['>= 3.0', '< 4.1']
+ gem 'actionmailer', ['>= 3.0', '< 4.1']
+ gem 'coveralls', :require => false
gem 'rspec', '>= 2.11'
gem 'simplecov', :require => false
- gem 'coveralls', :require => false
end
gemspec
View
2  contrib/delayed_job_multiple.monitrc
@@ -4,7 +4,7 @@
# 1. copy to /var/www/apps/{app_name}/shared/delayed_job.monitrc
# 2. replace {app_name} as appropriate
# you might also need to change the program strings to
-# "/bin/su - {username} -c '/usr/bin/env ...'"
+# "/bin/su - {username} -c '/usr/bin/env ...'"
# to load your shell environment.
#
# 3. add this to your /etc/monit/monitrc
View
2  delayed_job.gemspec
@@ -1,7 +1,7 @@
# -*- encoding: utf-8 -*-
Gem::Specification.new do |spec|
- spec.add_dependency 'activesupport', '>= 3.0'
+ spec.add_dependency 'activesupport', ['>= 3.0', '< 4.1']
spec.authors = ["Brandon Keepers", "Brian Ryckbost", "Chris Gaffney", "David Genord II", "Erik Michaels-Ober", "Matt Griffin", "Steve Richert", "Tobias Lütke"]
spec.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."
spec.email = ['brian@collectiveidea.com']
View
2  lib/delayed/message_sending.rb
@@ -9,7 +9,7 @@
module Delayed
if ActiveSupport::VERSION::MAJOR == 4
klass = ActiveSupport::ProxyObject
- else
+ else
klass = ActiveSupport::BasicObject
end
View
2  lib/delayed/recipes.rb
@@ -31,7 +31,7 @@ def args
def roles
fetch(:delayed_job_server_role, :app)
end
-
+
def delayed_job_command
fetch(:delayed_job_command, "script/delayed_job")
end

1 comment on commit aba20b9

@baash05

This change has made it so pushes to heroku with pre-existing GEM files; are rejected. Some aspect of a working GEM file has been invalidated. Please arrange for a some comments to be added to help people (like me) correct the issue.. Thank you.

Bundler could not find compatible versions for gem "delayed_job":
In Gemfile:
delayed_job_active_record (>= 0) ruby depends on
delayed_job (= 3.0.0.pre) ruby
delayed_job (4.0.0.beta1)

Please sign in to comment.
Something went wrong with that request. Please try again.