resque-mongo 1.8.1 → 1.9.8.1

data/HISTORY.md

@@ -1,3 +1,73 @@
+## 1.9.8 (2010-07-20)
+
+* Bugfix: Worker.all should never return nil
+* monit example: Fixed Syntax Error and adding environment to the rake task
+* redis rake task: Fixed typo in copy command
+
+## 1.9.7 (2010-07-09)
+
+* Improved memory usage in Job.destroy
+* redis-namespace 0.7.0 now required
+* Bugfix: Reverted $0 changes
+* Web Bugfix: Payload-less failures in the web ui work
+
+## 1.9.6 (2010-06-22)
+
+* Bugfix: Rakefile logging works the same as all the other logging
+
+## 1.9.5 (2010-06-16)
+
+* Web Bugfix: Display the configured namespace on the stats page
+* Revert Bugfix: Make ps -o more cross platform friendly
+
+## 1.9.4 (2010-06-14)
+
+* Bugfix: Multiple failure backend gets exception information when created
+
+## 1.9.3 (2010-06-14)
+
+* Bugfix: Resque#queues always returns an array
+
+## 1.9.2 (2010-06-13)
+
+* Bugfix: Worker.all returning nil fix
+* Bugfix: Make ps -o more cross platform friendly
+
+## 1.9.1 (2010-06-04)
+
+* Less strict JSON dependency
+* Included HISTORY.md in gem
+
+## 1.9.0 (2010-06-04)
+
+* Redis 2 support
+* Depend on redis-namespace 0.5.0
+* Added Resque::VERSION constant (alias of Resque::Version)
+* Bugfix: Specify JSON dependency
+* Bugfix: Hoptoad plugin now works on 1.9
+
+## 1.8.5 (2010-05-18)
+
+* Bugfix: Be more liberal in which Redis clients we accept.
+
+## 1.8.4 (2010-05-18)
+
+* Try to resolve redis-namespace dependency issue
+
+## 1.8.3 (2010-05-17)
+
+* Depend on redis-rb ~> 1.0.7
+
+## 1.8.2 (2010-05-03)
+
+* Bugfix: Include "tasks/" dir in RubyGem
+
+## 1.8.1 (2010-04-29)
+
+* Bugfix: Multiple failure backend did not support requeue-ing failed jobs
+* Bugfix: Fix /failed when error has no backtrace
+* Bugfix: Add `Redis::DistRedis` as a valid client
+
 ## 1.8.0 (2010-04-07)
 
 * Jobs that never complete due to killed worker are now failed.

data/README.markdown

@@ -11,7 +11,12 @@ findAndModify that is only supported by 0.20+ version ofthe ruby mongo driver.
 
 Also, check your mongo version: 1.3.0 or higher
 
-[fnr]: http://www.mongodb.org/display/DOCS/findandmodify+Command 
+[fnr]: http://www.mongodb.org/display/DOCS/findandmodify+Command
+
+    gem install resque-mongo
+    # Rails integration, config/environment.rb
+    config.gem 'resque-mongo', :lib => 'resque'
+
 
 Resque
 ======
@@ -677,7 +682,7 @@ For a list of available plugins see
 
 If you'd like to write your own plugin, or want to customize Resque
 using hooks (such as `Resque.after_fork`), see
-[docs/HOOKS.md](http://github.com/defunkt/resque/blob/master/HOOKS.md).
+[docs/HOOKS.md](http://github.com/defunkt/resque/blob/master/docs/HOOKS.md).
 
 
 Namespaces

data/Rakefile

@@ -3,6 +3,15 @@ load 'tasks/redis.rake'
 $LOAD_PATH.unshift 'lib'
 require 'resque/tasks'
 
+def command?(command)
+  system("type #{command} > /dev/null 2>&1")
+end
+
+
+#
+# Tests
+#
+
 task :default => :test
 
 desc "Run tests"
@@ -20,46 +29,32 @@ task :kick do
   exec "kicker -e rake lib test"
 end
 
-task :install => [ 'redis:install', 'dtach:install' ]
 
-desc "Build a gem"
-task :gem => [ :test, :gemspec, :build ]
+#
+# Install
+#
 
-begin
-  require 'jeweler'
-  require 'resque/version'
+task :install => [ 'redis:install', 'dtach:install' ]
 
-  Jeweler::Tasks.new do |gemspec|
-    gemspec.name = "resque-mongo"
-    gemspec.summary = ""
-    gemspec.description = ""
-    gemspec.email = "yatiohi@ideopolis.gr"
-    gemspec.homepage = "http://github.com/ctrochalakis/resque-mongo"
-    gemspec.authors = ["Christos Trochalakis"]
-    gemspec.version = Resque::Version
 
-    gemspec.add_dependency "mongo", ">=0.20"
-    gemspec.add_dependency "vegas", ">=0.1.2"
-    gemspec.add_dependency "sinatra", ">=0.9.2"
-    gemspec.add_development_dependency "jeweler"
-  end
-rescue LoadError
-  puts "Jeweler not available. Install it with: "
-  puts "gem install jeweler"
-end
+#
+# Documentation
+#
 
 begin
   require 'sdoc_helpers'
 rescue LoadError
-  puts "sdoc support not enabled. Please gem install sdoc-helpers."
 end
 
 desc "Push a new version to Gemcutter"
-task :publish => [ :test, :gemspec, :build ] do
-  system "git tag v#{Resque::Version}"
-  system "git push origin v#{Resque::Version}"
-  system "git push origin master"
-  system "gem push pkg/resque-mongo-#{Resque::Version}.gem"
-  system "git clean -fd"
+task :publish do
+  require 'resque/version'
+
+  sh "gem build resque.gemspec"
+  sh "gem push resque-#{Resque::Version}.gem"
+  sh "git tag v#{Resque::Version}"
+  sh "git push origin v#{Resque::Version}"
+  sh "git push origin master"
+  sh "git clean -fd"
   exec "rake pages"
 end

data/lib/resque.rb

@@ -36,8 +36,6 @@ module Resque
       @stats = @db.collection('stats')
 
       add_indexes
-    else
-      raise "I don't know what to do with #{server.inspect}"
     end
   end
 
@@ -101,8 +99,8 @@ module Resque
   end
 
   # The `after_fork` hook will be run in the child process and is passed
-  # the current job. Any changes you make, therefor, will only live as
-  # long as the job currently being processes.
+  # the current job. Any changes you make, therefore, will only live as
+  # long as the job currently being processed.
   #
   # Call with a block to set the hook.
   # Call with no arguments to return the hook.
@@ -126,10 +124,10 @@ module Resque
   end
 
   def drop
-    @mongo.drop
-    @workers.drop
-    @failures.drop
-    @stats.drop
+    @mongo.drop if @mongo
+    @workers.drop if @workers
+    @failures.drop if @failures
+    @stats.drop if @stats
     @mongo = nil
   end
   
@@ -157,7 +155,7 @@ module Resque
     raise e
   end
 
-  # Returns an int representing the size of a queue.
+  # Returns an integer representing the size of a queue.
   # Queue name should be a string.
   def size(queue)
     mongo.find(:queue => queue).count
@@ -305,7 +303,8 @@ module Resque
       :workers   => workers.size.to_i,
       :working   => working.size,
       :failed    => Stat[:failed],
-      :servers   => ["#{@con.host}:#{@con.port}"]
+      :servers   => ["#{@con.host}:#{@con.port}"],
+      :environment  => ENV['RAILS_ENV'] || ENV['RACK_ENV'] || 'development'
     }
   end
 

data/lib/resque/failure/hoptoad.rb

@@ -83,7 +83,7 @@ module Resque
             x.url "http://github.com/defunkt/resque"
           end
           x.error do
-            x.class exception.class.name
+            x.tag! "class", exception.class.name
             x.message "#{exception.class.name}: #{exception.message}"
             x.backtrace do
               fill_in_backtrace_lines(x)
@@ -109,7 +109,7 @@ module Resque
       end
 
       def fill_in_backtrace_lines(x)
-        exception.backtrace.each do |unparsed_line|
+        Array(exception.backtrace).each do |unparsed_line|
           _, file, number, method = unparsed_line.match(INPUT_FORMAT).to_a
           x.line :file => file,:number => number
         end

data/lib/resque/failure/mongo.rb

@@ -9,7 +9,7 @@ module Resque
           :payload   => payload,
           :exception => exception.class.to_s,
           :error     => exception.to_s,
-          :backtrace => exception.backtrace,
+          :backtrace => Array(exception.backtrace),
           :worker    => worker.to_s,
           :queue     => queue
         }
@@ -25,11 +25,11 @@ module Resque
         all_failures = Resque.mongo_failures.find().sort([:natural, :desc]).skip(start).limit(count).to_a
         all_failures.size == 1 ? all_failures.first : all_failures
       end
-      
+
       def self.clear
         Resque.mongo_failures.remove
       end
-      
+
       def self.requeue(index)
         item = all(index)
         item['retried_at'] = Time.now.strftime("%Y/%m/%d %H:%M:%S")

data/lib/resque/failure/multiple.rb

@@ -3,23 +3,25 @@ module Resque
     # A Failure backend that uses multiple backends
     # delegates all queries to the first backend
     class Multiple < Base
-      
+
       class << self
         attr_accessor :classes
       end
-      
+
       def self.configure
         yield self
         Resque::Failure.backend = self
       end
-      
+
       def initialize(*args)
+        super
         @backends = self.class.classes.map {|klass| klass.new(*args)}
       end
+
       def save
         @backends.each(&:save)
       end
-      
+
       # The number of failures.
       def self.count
         classes.first.count
@@ -34,11 +36,15 @@ module Resque
       def self.url
         classes.first.url
       end
-      
+
       # Clear all failure objects
       def self.clear
         classes.first.clear
       end
+
+      def self.requeue(*args)
+        classes.first.requeue(*args)
+      end
     end
   end
 end

data/lib/resque/job.rb

@@ -141,8 +141,9 @@ module Resque
             else
               lambda do
                 job.send(hook, *job_args) do
-                  job.perform(*job_args)
+                  result = job.perform(*job_args)
                   job_was_performed = true
+                  result
                 end
               end
             end

data/lib/resque/server.rb

@@ -124,7 +124,7 @@ module Resque
         show page
       end
     end
-    
+
     post "/queues/:id/remove" do
       Resque.remove_queue(params[:id])
       redirect u('queues')
@@ -150,7 +150,7 @@ module Resque
       Resque::Failure.clear
       redirect u('failed')
     end
-    
+
     get "/failed/requeue/:index" do
       Resque::Failure.requeue(params[:index])
       if request.xhr?

data/lib/resque/server/test_helper.rb

@@ -11,7 +11,7 @@ module Resque
 
       def self.should_respond_with_success
         test "should respond with success" do
-          assert last_response.ok?
+          assert last_response.ok?, last_response.errors
         end 
       end 
     end

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

@@ -28,15 +28,19 @@
           </div>
         </dd>
         <dt>Class</dt>
-        <dd><code><%= job['payload']['class'] %></code></dd>
+        <dd><code><%= job['payload'] ? job['payload']['class'] : 'nil' %></code></dd>
         <dt>Arguments</dt>
-        <dd><pre><%=h show_args(job['payload']['args']) %></pre></dd>
+        <dd><pre><%=h job['payload'] ? show_args(job['payload']['args']) : 'nil' %></pre></dd>
         <dt>Exception</td>
         <dd><code><%= job['exception'] %></code></dd>
         <dt>Error</dt>
         <dd class='error'>
-          <a href="#" class="backtrace"><%= h(job['error']) %></a>
-          <pre style='display:none'><%=h job['backtrace'].join("\n") %></pre>
+          <% if job['backtrace'] %>
+            <a href="#" class="backtrace"><%= h(job['error']) %></a>
+            <pre style='display:none'><%=h job['backtrace'].join("\n") %></pre>
+          <% else %>
+            <%=h job['error'] %>
+          <% end %>
         </dd>
       </dl>
       <div class='r'>

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

@@ -31,7 +31,7 @@
 
 <div id="footer">
   <p>Powered by <a href="http://github.com/defunkt/resque">Resque</a> v<%=Resque::Version%></p>
-  <p>Connected to Redis on ... </p>
+  <p>Connected to Mongo on ... </p>
 </div>
 
 </body>

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

@@ -22,7 +22,7 @@
 
 <% elsif params[:id] == 'redis' %>
 
-  <h1><%= resque.redis.server %></h1>
+  <h1><%= resque.redis_id %></h1>
   <table class='stats'>
   <% for key, value in resque.redis.info.to_a.sort_by { |i| i[0].to_s } %>
     <tr>
@@ -39,7 +39,7 @@
 <% elsif params[:id] == 'keys' %>
 
   <h1>Keys owned by <%= resque %></h1>
-  <p class='sub'>(All keys are actually prefixed with "resque:")</p>
+  <p class='sub'>(All keys are actually prefixed with "<%= Resque.redis.namespace %>:")</p>
   <table class='stats'>
     <tr>
       <th>key</th>

data/lib/resque/tasks.rb

@@ -19,7 +19,7 @@ namespace :resque do
       abort "set QUEUE env var, e.g. $ QUEUE=critical,high rake resque:work"
     end
 
-    puts "*** Starting worker #{worker}"
+    worker.log "Starting worker #{worker}"
 
     worker.work(ENV['INTERVAL'] || 5) # interval, will block
   end

data/lib/resque/version.rb

@@ -1,3 +1,3 @@
 module Resque
-  Version = '1.8.1'
+  Version = VERSION = '1.9.8.1'
 end

data/lib/resque/worker.rb

@@ -24,7 +24,7 @@ module Resque
 
     # Returns an array of all worker objects.
     def self.all
-      mongo_workers.distinct(:worker).map { |worker| find(worker) }
+      mongo_workers.distinct(:worker).map { |worker| find(worker) }.compact
     end
 
     # Returns an array of all worker objects currently processing

data/tasks/redis.rake

@@ -93,7 +93,7 @@ namespace :redis do
     end
 
     %w(redis-benchmark redis-cli redis-server).each do |bin|
-      sh "cp /tmp/redis/#{bin} #{bin_dir}"
+      sh "cp /tmp/redis/src/#{bin} #{bin_dir}"
     end
 
     puts "Installed redis-benchmark, redis-cli and redis-server to #{bin_dir}"
@@ -105,8 +105,8 @@ namespace :redis do
   end
 
   task :make do
-    sh "cd /tmp/redis && make clean"
-    sh "cd /tmp/redis && make"
+    sh "cd /tmp/redis/src && make clean"
+    sh "cd /tmp/redis/src && make"
   end
 
   desc "Download package"