Permalink
Browse files

Merge pull request #20 from TheHiveProjects/master

Solumate Support on Heroku
  • Loading branch information...
2 parents ff1492d + e15e659 commit d4ae0916d198fa8734556f638838079c804b6eeb @erwaller erwaller committed Mar 5, 2012
Showing with 4 additions and 4 deletions.
  1. +1 −1 lib/soulmate.rb
  2. +3 −3 soulmate.gemspec
View
@@ -23,7 +23,7 @@ def redis=(url)
def redis
@redis ||= (
- url = URI(@redis_url || "redis://127.0.0.1:6379/0")
+ url = URI(@redis_url || ENV["REDIS_URL"] || "redis://127.0.0.1:6379/0")
::Redis.new({
:host => url.host,
View
@@ -67,7 +67,7 @@ Gem::Specification.new do |s|
s.add_runtime_dependency(%q<redis>, [">= 2.0"])
s.add_runtime_dependency(%q<vegas>, [">= 0.1.0"])
s.add_runtime_dependency(%q<sinatra>, [">= 1.0"])
- s.add_runtime_dependency(%q<json>, ["~> 1.4.6"])
+ s.add_runtime_dependency(%q<json>, [">= 1.4.6"])
else
s.add_dependency(%q<redis>, ["~> 2.1.1"])
s.add_dependency(%q<multi_json>, ["~> 1.0.3"])
@@ -81,7 +81,7 @@ Gem::Specification.new do |s|
s.add_dependency(%q<redis>, [">= 2.0"])
s.add_dependency(%q<vegas>, [">= 0.1.0"])
s.add_dependency(%q<sinatra>, [">= 1.0"])
- s.add_dependency(%q<json>, ["~> 1.4.6"])
+ s.add_dependency(%q<json>, [">= 1.4.6"])
end
else
s.add_dependency(%q<redis>, ["~> 2.1.1"])
@@ -96,7 +96,7 @@ Gem::Specification.new do |s|
s.add_dependency(%q<redis>, [">= 2.0"])
s.add_dependency(%q<vegas>, [">= 0.1.0"])
s.add_dependency(%q<sinatra>, [">= 1.0"])
- s.add_dependency(%q<json>, ["~> 1.4.6"])
+ s.add_dependency(%q<json>, [">= 1.4.6"])
end
end

0 comments on commit d4ae091

Please sign in to comment.