bumping versions for redis compat

bin/noah-watcher

@@ -81,10 +81,10 @@ EventMachine.run do
   r = EventMachine::Hiredis.connect(ENV["REDIS_URL"])
   r.errback{|x| LOGGER.error("Unable to connect to redis: #{x}")}
   LOGGER.info("Attaching to Redis Pubsub")
-  r.psubscribe("*")
-  r.on(:pmessage) do |pattern, event, message|
+  proc = Proc.new{ |event, message|
     noah.reread_watchers if event =~ /^\/\/noah\/watchers\/.*/
     noah.broker("#{event}|#{message}") unless noah.watchers == 0
-  end
+  }
+  r.pubsub.psubscribe("*", proc)
 
 end

noah.gemspec

@@ -21,41 +21,37 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency("eventmachine", ["> 1.0.0.beta.3"])
-  s.add_dependency("em-http-request", ["1.0.0.beta.4"])
-  s.add_dependency("redis", ["= 2.2.0"])
+  s.add_dependency("eventmachine", "1.0.0.beta.4")
+  s.add_dependency("em-http-request", "1.0.0.beta.4")
+  s.add_dependency("cookiejar")
+  s.add_dependency("redis", "= 2.2.0")
   s.add_dependency("nest", "= 1.1.0")
   s.add_dependency("rack", "= 1.3.4")
   s.add_dependency("tilt", "= 1.3.3")
   s.add_dependency("sinatra", "= 1.3.1")
   s.add_dependency("rack-protection", "= 1.1.4")
-  #s.add_dependency("rack", ["= 1.2.2"])
-  #s.add_dependency("tilt", ["= 1.2.2"])
-  #s.add_dependency("sinatra", ["= 1.2.3"])
-  s.add_dependency("ohm", ["= 0.1.3"])
-  s.add_dependency("ohm-contrib", ["= 0.1.1"])
-  s.add_dependency("haml", ["= 3.0.25"])
-  s.add_dependency("vegas", ["= 0.1.8"])
-  s.add_dependency("guid", ["= 0.1.1"])
-  s.add_dependency("slop", ["= 2.1.0"])
+  s.add_dependency("ohm", "= 0.1.3")
+  s.add_dependency("ohm-contrib", "= 0.1.1")
+  s.add_dependency("haml", "= 3.0.25")
+  s.add_dependency("vegas", "= 0.1.8")
+  s.add_dependency("guid", "= 0.1.1")
+  s.add_dependency("slop", "= 2.1.0")
+  s.add_dependency("hiredis", "0.4.5")
+  s.add_dependency("cs-em-hiredis", "0.1.2")
 
 
   if RUBY_PLATFORM =~ /java/
     s.add_dependency("jruby-openssl")
     s.add_dependency("json")
-    s.add_development_dependency("warbler", ["= 1.2.1"])
+    s.add_development_dependency("warbler", "= 1.2.1")
   else
-    s.add_dependency("hiredis", ["= 0.3.1"])
     s.add_dependency("yajl-ruby") 
-    s.add_dependency("SystemTimer") if RUBY_VERSION =~ /1.8/
     s.add_dependency("thin")
   end
 
-  s.add_development_dependency("diff-lcs", ["= 1.1.2"])
-  s.add_development_dependency("sinatra-reloader", ["= 0.5.0"])
-  s.add_development_dependency("rspec", ["~> 2.5"])
-#  s.add_development_dependency("rcov", ["= 0.9.9"])
+  s.add_development_dependency("diff-lcs", "= 1.1.2")
+  s.add_development_dependency("sinatra-reloader", "= 0.5.0")
+  s.add_development_dependency("rspec", "~> 2.5")
   s.add_development_dependency("rack-test", "= 0.6.1")
-#  s.add_development_dependency("rack-test", ["= 0.5.7"])
-  s.add_development_dependency("rake", ["= 0.8.7"])
+  s.add_development_dependency("rake", "= 0.8.7")
 end