From 429ace61b514d1c2d4ae992b68530db30af28716 Mon Sep 17 00:00:00 2001
From: Aaron Quint <aaron@quirkey.com>
Date: Tue, 29 Dec 2009 12:34:50 +0800
Subject: [PATCH] Fix issue where resque-web was not correctly eval'ing config
 [Closes #25]

Requires an upgrade of the vegas gem.
---
 Rakefile       |  2 +-
 bin/resque-web | 12 +++---------
 deps.rip       |  2 +-
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/Rakefile b/Rakefile
index 587cf4be1..92db1e3ac 100644
--- a/Rakefile
+++ b/Rakefile
@@ -40,7 +40,7 @@ begin
 
     gemspec.add_dependency "redis"
     gemspec.add_dependency "redis-namespace"
-    gemspec.add_dependency "vegas", ">=0.1.1"
+    gemspec.add_dependency "vegas", ">=0.1.2"
     gemspec.add_dependency "sinatra", ">=0.9.2"
     gemspec.add_development_dependency "jeweler"
   end
diff --git a/bin/resque-web b/bin/resque-web
index 6b9ffe896..6271548a3 100755
--- a/bin/resque-web
+++ b/bin/resque-web
@@ -1,20 +1,14 @@
 #!/usr/bin/env ruby
 
 $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
+require 'rubygems'
 require 'vegas'
 require 'resque/server'
 
 
 Vegas::Runner.new(Resque::Server, 'resque-web', {
-  :resque_config => lambda {|v| 
+  :before_run => lambda {|v|
     path = (ENV['RESQUECONFIG'] || v.args.first).strip
-    if path && path != '' && path = File.expand_path(path)
-      if File.file?(path)
-        load path
-      else 
-        abort "** Can't find #{path}"
-      end
-    end
-    path
+    v.load_config_file(path) if path
   }
 })
\ No newline at end of file
diff --git a/deps.rip b/deps.rip
index c7dddb643..75c87d820 100644
--- a/deps.rip
+++ b/deps.rip
@@ -2,5 +2,5 @@ git://github.com/ezmobius/redis-rb.git eed200ad
 git://github.com/brianmario/yajl-ruby.git 0.6.3
 git://github.com/sinatra/sinatra.git 0.9.4
 git://github.com/rack/rack.git 1.0
-git://github.com/quirkey/vegas.git v0.1.1
+git://github.com/quirkey/vegas.git v0.1.2
 rake