resque 1.2.3 → 1.3.0

data/.gitignore

@@ -1,2 +1,3 @@
 *.gemspec
 pkg
+nbproject

data/CONTRIBUTORS

@@ -0,0 +1,14 @@
+* Chris Wanstrath
+* John Barnette
+* Adam Cooke
+* Rob Hanlon
+* Jason Amster
+* jgeiger
+* Aaron Quint
+* Ben VandenBos
+* PJ Hyett
+* Arthur Zapparoli
+* Simon Rozet
+* Brian P O'Rourke
+* Dave Hoover
+* Michael Dwan

data/HISTORY.md

@@ -1,3 +1,15 @@
+## 1.3.0 (2010-01-11)
+
+* Use Vegas for resque-web
+* Web Bugfix: Show proper date/time value for failed_at on Failures
+* Web Bugfix: Make the / route more flexible
+* Add Resque::Server.tabs array (so plugins can add their own tabs)
+* Start using [Semantic Versioning](http://semver.org/)
+
+## 1.2.4 (2009-12-15)
+
+* Web Bugfix: fix key links on stat page
+
 ## 1.2.3 (2009-12-15)
 
 * Bugfix: Fixed `rand` seeding in child processes.

data/README.markdown

@@ -722,6 +722,8 @@ Meta
 * Chat: <irc://irc.freenode.net/resque>
 * Gems: <http://gemcutter.org/gems/resque>
 
+This project uses [Semantic Versioning][sv].
+
 
 Author
 ------
@@ -731,3 +733,4 @@ Chris Wanstrath :: chris@ozmm.org :: @defunkt
 [0]: http://github.com/blog/542-introducing-resque
 [1]: http://help.github.com/forking/
 [2]: http://github.com/defunkt/resque/issues
+[sv]: http://semver.org/

data/Rakefile

@@ -40,6 +40,8 @@ begin
 
     gemspec.add_dependency "redis"
     gemspec.add_dependency "redis-namespace"
+    gemspec.add_dependency "vegas", ">=0.1.2"
+    gemspec.add_dependency "sinatra", ">=0.9.2"
     gemspec.add_development_dependency "jeweler"
   end
 rescue LoadError

data/bin/resque-web

@@ -1,44 +1,18 @@
 #!/usr/bin/env ruby
 
-__DIR__ = File.expand_path(File.dirname(__FILE__))
+$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
+begin
+  require 'vegas'
+rescue LoadError
+  require 'rubygems'
+  require 'vegas'
+end  
+require 'resque/server'
 
-if `which rackup`.empty?
-  abort "** Can't find `rackup` in PATH."
-end
 
-if ARGV.include?('-h')
-  puts <<-usage
-Usage: resque-web [ruby options] [rack options] [resque config]
-
-Starts a Resque front-end by way of `rackup`.
-
-Ruby options:
-  -e, --eval LINE          evaluate a LINE of code
-  -d, --debug              set debugging flags (set $DEBUG to true)
-  -w, --warn               turn warnings on for your script
-  -I, --include PATH       specify $LOAD_PATH (may be used more than once)
-  -r, --require LIBRARY    require the library, before executing your script
-Rack options:
-  -s, --server SERVER      serve using SERVER (webrick/mongrel)
-  -o, --host HOST          listen on HOST (default: 0.0.0.0)
-  -p, --port PORT          use PORT (default: 9292)
-  -E, --env ENVIRONMENT    use ENVIRONMENT for defaults (default: development)
-  -D, --daemonize          run daemonized in the background
-  -P, --pid FILE           file to store PID (default: rack.pid)
-Common options:
-  -h, --help               Show this message
-      --version            Show version
-usage
-else
-  if !ENV['RESQUECONFIG']&&ARGV[-1]&&ARGV[-1][0]!=?-&&(ARGV[-2]?ARGV[-2][0]!=?-:true)
-    if File.file?(file = File.expand_path(ARGV[-1]))
-      ARGV.delete_at(-1)
-      ENV['RESQUECONFIG'] = file
-    else
-      abort "** Can't find #{file}"
-    end
-  end
-
-  ARGV.push File.expand_path(File.dirname(__FILE__) + "/../config.ru")
-  exec "rackup", *ARGV
-end
+Vegas::Runner.new(Resque::Server, 'resque-web', {
+  :before_run => lambda {|v|
+    path = (ENV['RESQUECONFIG'] || v.args.first).strip
+    load path if path
+  }
+})

data/config.ru

@@ -1,13 +1,13 @@
 #!/usr/bin/env ruby
 require 'logger'
 
-$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/lib')
+$LOAD_PATH.unshift ::File.expand_path(::File.dirname(__FILE__) + '/lib')
 require 'resque/server'
 
 # Set the RESQUECONFIG env variable if you've a `resque.rb` or similar
 # config file you want loaded on boot.
-if ENV['RESQUECONFIG'] && File.exists?(File.expand_path(ENV['RESQUECONFIG']))
-  load File.expand_path(ENV['RESQUECONFIG'])
+if ENV['RESQUECONFIG'] && ::File.exists?(::File.expand_path(ENV['RESQUECONFIG']))
+  load ::File.expand_path(ENV['RESQUECONFIG'])
 end
 
 use Rack::ShowExceptions

data/deps.rip

@@ -2,4 +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.2
 rake

data/lib/resque/failure/redis.rb

@@ -5,7 +5,7 @@ module Resque
     class Redis < Base
       def save
         data = {
-          :failed_at => Time.now.to_s,
+          :failed_at => Time.now.strftime("%Y/%m/%d %H:%M:%S"),
           :payload   => payload,
           :error     => exception.to_s,
           :backtrace => exception.backtrace,

data/lib/resque/server.rb

@@ -41,6 +41,10 @@ module Resque
         "<li #{class_if_current(dname)}><a href='#{url dname}'>#{name}</a></li>"
       end
 
+      def tabs
+        Resque::Server.tabs
+      end
+
       def redis_get_size(key)
         case Resque.redis.type(key)
         when 'none'
@@ -102,7 +106,7 @@ module Resque
     end
 
     # to make things easier on ourselves
-    get "/" do
+    get "/?" do
       redirect url(:overview)
     end
 
@@ -170,5 +174,9 @@ module Resque
     def resque
       Resque
     end
+
+    def self.tabs
+      @tabs ||= ["Overview", "Working", "Failed", "Queues", "Workers", "Stats"]
+    end
   end
 end

data/lib/resque/server/views/layout.erb

@@ -11,12 +11,9 @@
 <body>
   <div class="header">
     <ul class='nav'>
-      <%= tab "Overview" %>
-      <%= tab "Working" %>
-      <%= tab "Failed" %>
-      <%= tab "Queues" %>
-      <%= tab "Workers" %>
-      <%= tab "Stats" %>
+      <% tabs.each do |tab_name| %>
+        <%= tab tab_name %>
+      <% end %>
     </ul>
   </div>
   

data/lib/resque/server/views/stats.erb

@@ -35,7 +35,7 @@
     </tr>
   <% end %>
   </table>
-  
+
 <% elsif params[:id] == 'keys' %>
 
   <h1>Keys owned by <%= resque %></h1>
@@ -49,7 +49,7 @@
   <% for key in resque.keys.sort %>
     <tr>
       <th>
-        <a href="/stats/keys/<%= key %>"><%= key %></a>
+        <a href="<%=u "/stats/keys/#{key}" %>"><%= key %></a>
       </th>
       <td><%= resque.redis.type key %></td>
       <td><%= redis_get_size key %></td>

data/lib/resque/version.rb

@@ -1,3 +1,3 @@
 module Resque
-  Version = '1.2.3'
+  Version = '1.3.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: resque
 version: !ruby/object:Gem::Version 
-  version: 1.2.3
+  version: 1.3.0
 platform: ruby
 authors: 
 - Chris Wanstrath
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-15 00:00:00 -08:00
+date: 2010-01-11 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,6 +32,26 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: vegas
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.1.2
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: sinatra
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.9.2
+    version: 
 - !ruby/object:Gem::Dependency 
   name: jeweler
   type: :development
@@ -55,6 +75,7 @@ extra_rdoc_files:
 files: 
 - .gitignore
 - .kick
+- CONTRIBUTORS
 - HISTORY.md
 - LICENSE
 - README.markdown