resque_admin 1.0.4 → 1.0.5

data/lib/resque_admin/server.rb

@@ -9,7 +9,7 @@ if defined? Encoding
   Encoding.default_external = Encoding::UTF_8
 end
 
-module Resque
+module ResqueAdmin
   class Server < Sinatra::Base
     require 'resque_admin/server/helpers'
 
@@ -61,40 +61,40 @@ module Resque
       end
 
       def tabs
-        Resque::Server.tabs
+        ResqueAdmin::Server.tabs
       end
 
       def url_prefix
-        Resque::Server.url_prefix
+        ResqueAdmin::Server.url_prefix
       end
 
       def redis_get_size(key)
-        case Resque.redis.type(key)
+        case ResqueAdmin.redis.type(key)
         when 'none'
           []
         when 'list'
-          Resque.redis.llen(key)
+          ResqueAdmin.redis.llen(key)
         when 'set'
-          Resque.redis.scard(key)
+          ResqueAdmin.redis.scard(key)
         when 'string'
-          Resque.redis.get(key).length
+          ResqueAdmin.redis.get(key).length
         when 'zset'
-          Resque.redis.zcard(key)
+          ResqueAdmin.redis.zcard(key)
         end
       end
 
       def redis_get_value_as_array(key, start=0)
-        case Resque.redis.type(key)
+        case ResqueAdmin.redis.type(key)
         when 'none'
           []
         when 'list'
-          Resque.redis.lrange(key, start, start + 20)
+          ResqueAdmin.redis.lrange(key, start, start + 20)
         when 'set'
-          Resque.redis.smembers(key)[start..(start + 20)]
+          ResqueAdmin.redis.smembers(key)[start..(start + 20)]
         when 'string'
-          [Resque.redis.get(key)]
+          [ResqueAdmin.redis.get(key)]
         when 'zset'
-          Resque.redis.zrange(key, start, start + 20)
+          ResqueAdmin.redis.zrange(key, start, start + 20)
         end
       end
 
@@ -113,7 +113,7 @@ module Resque
       def worker_hosts!
         hosts = Hash.new { [] }
 
-        Resque.workers.each do |worker|
+        ResqueAdmin.workers.each do |worker|
           host, _ = worker.to_s.split(':')
           hosts[host] += [worker.to_s]
         end
@@ -146,9 +146,9 @@ module Resque
     def show(page, layout = true)
       response["Cache-Control"] = "max-age=0, private, must-revalidate"
       begin
-        erb page.to_sym, {:layout => layout}, :resque => Resque
+        erb page.to_sym, {:layout => layout}, :resque => ResqueAdmin
       rescue Errno::ECONNREFUSED
-        erb :error, {:layout => false}, :error => "Can't connect to Redis! (#{Resque.redis_id})"
+        erb :error, {:layout => false}, :error => "Can't connect to Redis! (#{ResqueAdmin.redis_id})"
       end
     end
 
@@ -184,71 +184,71 @@ module Resque
     end
 
     post "/queues/:id/remove" do
-      Resque.remove_queue(params[:id])
+      ResqueAdmin.remove_queue(params[:id])
       redirect u('queues')
     end
 
     get "/failed/?" do
-      if Resque::Failure.url
-        redirect Resque::Failure.url
+      if ResqueAdmin::Failure.url
+        redirect ResqueAdmin::Failure.url
       else
         show :failed
       end
     end
 
     get "/failed/:queue" do
-      if Resque::Failure.url
-        redirect Resque::Failure.url
+      if ResqueAdmin::Failure.url
+        redirect ResqueAdmin::Failure.url
       else
         show :failed
       end
     end
 
     post "/failed/clear" do
-      Resque::Failure.clear
+      ResqueAdmin::Failure.clear
       redirect u('failed')
     end
 
     post "/failed/:queue/clear" do
-      Resque::Failure.clear params[:queue]
+      ResqueAdmin::Failure.clear params[:queue]
       redirect u('failed')
     end
 
     post "/failed/requeue/all" do
-      Resque::Failure.requeue_all
+      ResqueAdmin::Failure.requeue_all
       redirect u('failed')
     end
 
     post "/failed/:queue/requeue/all" do
-      Resque::Failure.requeue_queue Resque::Failure.job_queue_name(params[:queue])
+      ResqueAdmin::Failure.requeue_queue ResqueAdmin::Failure.job_queue_name(params[:queue])
       redirect redirect_url_path("/failed/#{params[:queue]}")
     end
 
     get "/failed/requeue/:index/?" do
-      Resque::Failure.requeue(params[:index])
+      ResqueAdmin::Failure.requeue(params[:index])
       if request.xhr?
-        return Resque::Failure.all(params[:index])['retried_at']
+        return ResqueAdmin::Failure.all(params[:index])['retried_at']
       else
         redirect u('failed')
       end
     end
 
     get "/failed/:queue/requeue/:index/?" do
-      Resque::Failure.requeue(params[:index], params[:queue])
+      ResqueAdmin::Failure.requeue(params[:index], params[:queue])
       if request.xhr?
-        return Resque::Failure.all(params[:index],1,params[:queue])['retried_at']
+        return ResqueAdmin::Failure.all(params[:index],1,params[:queue])['retried_at']
       else
         redirect url_path("/failed/#{params[:queue]}")
       end
     end
 
     get "/failed/remove/:index/?" do
-      Resque::Failure.remove(params[:index])
+      ResqueAdmin::Failure.remove(params[:index])
       redirect u('failed')
     end
 
     get "/failed/:queue/remove/:index/?" do
-      Resque::Failure.remove(params[:index], params[:queue])
+      ResqueAdmin::Failure.remove(params[:index], params[:queue])
       redirect url_path("/failed/#{params[:queue]}")
     end
 
@@ -265,7 +265,7 @@ module Resque
     end
 
     get "/stats.txt/?" do
-      info = Resque.info
+      info = ResqueAdmin.info
 
       stats = []
       stats << "resque.pending=#{info[:pending]}"
@@ -274,8 +274,8 @@ module Resque
       stats << "resque.workers=#{info[:workers]}"
       stats << "resque.working=#{info[:working]}"
 
-      Resque.queues.each do |queue|
-        stats << "queues.#{queue}=#{Resque.size(queue)}"
+      ResqueAdmin.queues.each do |queue|
+        stats << "queues.#{queue}=#{ResqueAdmin.size(queue)}"
       end
 
       content_type 'text/html'
@@ -283,7 +283,7 @@ module Resque
     end
 
     def resque
-      Resque
+      ResqueAdmin
     end
 
     def self.tabs

data/lib/resque_admin/stat.rb

@@ -1,4 +1,4 @@
-module Resque
+module ResqueAdmin
   # The stat subsystem. Used to keep track of integer counts.
   #
   #   Get a stat:  Stat[name]
@@ -10,7 +10,7 @@ module Resque
     
     # Direct access to the Redis instance.
     def redis
-      Resque.redis
+      ResqueAdmin.redis
     end
     alias :data_store :redis
 

data/lib/resque_admin/tasks.rb

@@ -5,13 +5,13 @@
 namespace :resque do
   task :setup
 
-  desc "Start a Resque worker"
+  desc "Start a ResqueAdmin worker"
   task :work => [ :preload, :setup ] do
     require 'resque_admin'
 
     begin
-      worker = Resque::Worker.new
-    rescue Resque::NoQueueError
+      worker = ResqueAdmin::Worker.new
+    rescue ResqueAdmin::NoQueueError
       abort "set QUEUE env var, e.g. $ QUEUE=critical,high rake resque:work"
     end
 
@@ -20,7 +20,7 @@ namespace :resque do
     worker.work(ENV['INTERVAL'] || 5) # interval, will block
   end
 
-  desc "Start multiple Resque workers. Should only be used in dev mode."
+  desc "Start multiple ResqueAdmin workers. Should only be used in dev mode."
   task :workers do
     threads = []
 
@@ -61,10 +61,10 @@ namespace :resque do
       require 'resque_admin'
       require 'resque_admin/failure/redis'
 
-      warn "Sorting #{Resque::Failure.count} failures..."
-      Resque::Failure.each(0, Resque::Failure.count) do |_, failure|
-        data = Resque.encode(failure)
-        Resque.redis.rpush(Resque::Failure.failure_queue_name(failure['queue']), data)
+      warn "Sorting #{ResqueAdmin::Failure.count} failures..."
+      ResqueAdmin::Failure.each(0, ResqueAdmin::Failure.count) do |_, failure|
+        data = ResqueAdmin.encode(failure)
+        ResqueAdmin.redis.rpush(ResqueAdmin::Failure.failure_queue_name(failure['queue']), data)
       end
       warn "done!"
     end

data/lib/resque_admin/thread_signal.rb

@@ -1,4 +1,4 @@
-class Resque::ThreadSignal
+class ResqueAdmin::ThreadSignal
   def initialize
     @mutex = Mutex.new
     @signaled = false

data/lib/resque_admin/version.rb

@@ -1,3 +1,3 @@
-module Resque
-  Version = VERSION = '1.0.4'
+module ResqueAdmin
+  Version = VERSION = '1.0.5'
 end

data/lib/resque_admin/worker.rb

@@ -2,8 +2,8 @@ require 'time'
 require 'set'
 require 'redis/distributed'
 
-module Resque
-  # A Resque Worker processes jobs. On platforms that support fork(2),
+module ResqueAdmin
+  # A ResqueAdmin Worker processes jobs. On platforms that support fork(2),
   # the worker will fork off a child to process each job. This ensures
   # a clean slate when beginning the next job and cuts down on gradual
   # memory growth as well as low level failures.
@@ -11,9 +11,9 @@ module Resque
   # It also ensures workers are always listening to signals from you,
   # their master, and can react accordingly.
   class Worker
-    include Resque::Helpers
-    extend Resque::Helpers
-    include Resque::Logging
+    include ResqueAdmin::Helpers
+    extend ResqueAdmin::Helpers
+    include ResqueAdmin::Logging
 
     @@all_heartbeat_threads = []
     def self.kill_all_heartbeat_threads
@@ -22,12 +22,12 @@ module Resque
     end
 
     def redis
-      Resque.redis
+      ResqueAdmin.redis
     end
     alias :data_store :redis
 
     def self.redis
-      Resque.redis
+      ResqueAdmin.redis
     end
 
     def self.data_store
@@ -37,12 +37,12 @@ module Resque
     # Given a Ruby object, returns a string suitable for storage in a
     # queue.
     def encode(object)
-      Resque.encode(object)
+      ResqueAdmin.encode(object)
     end
 
     # Given a string, returns a Ruby object.
     def decode(object)
-      Resque.decode(object)
+      ResqueAdmin.decode(object)
     end
 
     attr_accessor :term_timeout
@@ -200,7 +200,7 @@ module Resque
     end
 
     def glob_match(pattern)
-      Resque.queues.select do |queue|
+      ResqueAdmin.queues.select do |queue|
         File.fnmatch?(pattern, queue)
       end.sort
     end
@@ -313,7 +313,7 @@ module Resque
     def reserve
       queues.each do |queue|
         log_with_severity :debug, "Checking #{queue}"
-        if job = Resque.reserve(queue)
+        if job = ResqueAdmin.reserve(queue)
           log_with_severity :debug, "Found job on #{queue}"
           return job
         end
@@ -489,7 +489,7 @@ module Resque
 
         if heartbeat
           seconds_since_heartbeat = (now - Time.parse(heartbeat)).to_i
-          seconds_since_heartbeat > Resque.prune_interval
+          seconds_since_heartbeat > ResqueAdmin.prune_interval
         else
           false
         end
@@ -499,12 +499,12 @@ module Resque
     def start_heartbeat
       remove_heartbeat
 
-      @heartbeat_thread_signal = Resque::ThreadSignal.new
+      @heartbeat_thread_signal = ResqueAdmin::ThreadSignal.new
 
       @heartbeat_thread = Thread.new do
         loop do
           heartbeat!
-          signaled = @heartbeat_thread_signal.wait_for_signal(Resque.heartbeat_interval)
+          signaled = @heartbeat_thread_signal.wait_for_signal(ResqueAdmin.heartbeat_interval)
           break if signaled
         end
       end
@@ -579,7 +579,7 @@ module Resque
     #
     # This is a form of garbage collection. If a server is killed by a
     # hard shutdown, power failure, or something else beyond our
-    # control, the Resque workers will not die gracefully and therefore
+    # control, the ResqueAdmin workers will not die gracefully and therefore
     # will leave stale state information in Redis.
     #
     # By checking the current Redis state against the actual
@@ -598,7 +598,7 @@ module Resque
         # If the worker hasn't ever sent a heartbeat, we won't remove it since
         # the first heartbeat is sent before the worker is registred it means
         # that this is a worker that doesn't support heartbeats, e.g., another
-        # client library or an older version of Resque. We won't touch these.
+        # client library or an older version of ResqueAdmin. We won't touch these.
         if all_workers_with_expired_heartbeats.include?(worker)
           log_with_severity :info, "Pruning dead worker: #{worker}"
           worker.unregister_worker(PruneDeadWorkerDirtyExit.new(worker.to_s))
@@ -632,7 +632,7 @@ module Resque
 
     # Runs a named hook, passing along any arguments.
     def run_hook(name, *args)
-      return unless hooks = Resque.send(name)
+      return unless hooks = ResqueAdmin.send(name)
       return if name == :before_first_fork && @before_first_fork_hook_ran
       msg = "Running #{name} hooks"
       msg << " with #{args.inspect}" if args.any?
@@ -808,7 +808,7 @@ module Resque
       tasklist_output.split($/).select { |line| line =~ /^PID:/}.collect{ |line| line.gsub /PID:\s+/, '' }
     end
 
-    # Find Resque worker pids on Linux and OS X.
+    # Find ResqueAdmin worker pids on Linux and OS X.
     #
     def linux_worker_pids
       `ps -A -o pid,command | grep -E "[r]esque:work|[r]esque:\sStarting|[r]esque-[0-9]" | grep -v "resque-web"`.split("\n").map do |line|
@@ -816,7 +816,7 @@ module Resque
       end
     end
 
-    # Find Resque worker pids on Solaris.
+    # Find ResqueAdmin worker pids on Solaris.
     #
     # Returns an Array of string pids of all the other workers on this
     # machine. Useful when pruning dead workers on startup.
@@ -824,7 +824,7 @@ module Resque
       `ps -A -o pid,comm | grep "[r]uby" | grep -v "resque-web"`.split("\n").map do |line|
         real_pid = line.split(' ')[0]
         pargs_command = `pargs -a #{real_pid} 2>/dev/null | grep [r]esque | grep -v "resque-web"`
-        if pargs_command.split(':')[1] == " resque-#{Resque::Version}"
+        if pargs_command.split(':')[1] == " resque-#{ResqueAdmin::Version}"
           real_pid
         end
       end.compact
@@ -834,7 +834,7 @@ module Resque
     # Procline is always in the format of:
     #   RESQUE_PROCLINE_PREFIXresque-VERSION: STRING
     def procline(string)
-      $0 = "#{ENV['RESQUE_PROCLINE_PREFIX']}resque-#{Resque::Version}: #{string}"
+      $0 = "#{ENV['RESQUE_PROCLINE_PREFIX']}resque-#{ResqueAdmin::Version}: #{string}"
       log_with_severity :debug, $0
     end
 
@@ -857,10 +857,10 @@ module Resque
 
     def verbose=(value);
       if value && !very_verbose
-        Resque.logger.formatter = VerboseFormatter.new
-        Resque.logger.level = Logger::INFO
+        ResqueAdmin.logger.formatter = VerboseFormatter.new
+        ResqueAdmin.logger.level = Logger::INFO
       elsif !value
-        Resque.logger.formatter = QuietFormatter.new
+        ResqueAdmin.logger.formatter = QuietFormatter.new
       end
 
       @verbose = value
@@ -868,13 +868,13 @@ module Resque
 
     def very_verbose=(value)
       if value
-        Resque.logger.formatter = VeryVerboseFormatter.new
-        Resque.logger.level = Logger::DEBUG
+        ResqueAdmin.logger.formatter = VeryVerboseFormatter.new
+        ResqueAdmin.logger.level = Logger::DEBUG
       elsif !value && verbose
-        Resque.logger.formatter = VerboseFormatter.new
-        Resque.logger.level = Logger::INFO
+        ResqueAdmin.logger.formatter = VerboseFormatter.new
+        ResqueAdmin.logger.level = Logger::INFO
       else
-        Resque.logger.formatter = QuietFormatter.new
+        ResqueAdmin.logger.formatter = QuietFormatter.new
       end
 
       @very_verbose = value

data/lib/resque_admin.rb

@@ -23,7 +23,7 @@ require 'resque_admin/thread_signal'
 
 require 'resque_admin/vendor/utf8_util'
 
-module Resque
+module ResqueAdmin
   include Helpers
   extend self
 
@@ -122,15 +122,15 @@ module Resque
       end
       namespace ||= :resque
 
-      @data_store = Resque::DataStore.new(Redis::Namespace.new(namespace, :redis => redis))
+      @data_store = ResqueAdmin::DataStore.new(Redis::Namespace.new(namespace, :redis => redis))
     when Redis::Namespace
-      @data_store = Resque::DataStore.new(server)
-    when Resque::DataStore
+      @data_store = ResqueAdmin::DataStore.new(server)
+    when ResqueAdmin::DataStore
       @data_store = server
     when Hash
-      @data_store = Resque::DataStore.new(Redis::Namespace.new(:resque, :redis => Redis.new(server)))
+      @data_store = ResqueAdmin::DataStore.new(Redis::Namespace.new(:resque, :redis => Redis.new(server)))
     else
-      @data_store = Resque::DataStore.new(Redis::Namespace.new(:resque, :redis => server))
+      @data_store = ResqueAdmin::DataStore.new(Redis::Namespace.new(:resque, :redis => server))
     end
   end
 
@@ -238,14 +238,14 @@ module Resque
   end
 
   def to_s
-    "Resque Client connected to #{redis_id}"
+    "ResqueAdmin Client connected to #{redis_id}"
   end
 
   attr_accessor :inline
 
-  # If 'inline' is true Resque will call #perform method inline
-  # without queuing it into Redis and without any Resque callbacks.
-  # The 'inline' is false Resque jobs will be put in queue regularly.
+  # If 'inline' is true ResqueAdmin will call #perform method inline
+  # without queuing it into Redis and without any ResqueAdmin callbacks.
+  # The 'inline' is false ResqueAdmin jobs will be put in queue regularly.
   alias :inline? :inline
 
   #
@@ -255,7 +255,7 @@ module Resque
   # Pushes a job onto a queue. Queue name should be a string and the
   # item should be any JSON-able Ruby object.
   #
-  # Resque works generally expect the `item` to be a hash with the following
+  # ResqueAdmin works generally expect the `item` to be a hash with the following
   # keys:
   #
   #   class - The String name of the job to run.
@@ -264,7 +264,7 @@ module Resque
   #
   # Example
   #
-  #   Resque.push('archive', :class => 'Archive', :args => [ 35, 'tar' ])
+  #   ResqueAdmin.push('archive', :class => 'Archive', :args => [ 35, 'tar' ])
   #
   # Returns nothing
   def push(queue, item)
@@ -291,7 +291,7 @@ module Resque
   # start is the item to begin, count is how many items to return.
   #
   # To get the 3rd page of a 30 item, paginatied list one would use:
-  #   Resque.peek('my_list', 59, 30)
+  #   ResqueAdmin.peek('my_list', 59, 30)
   def peek(queue, start = 0, count = 1)
     results = data_store.peek_in_queue(queue,start,count)
     if count == 1
@@ -312,7 +312,7 @@ module Resque
     end
   end
 
-  # Returns an array of all known Resque queues as strings.
+  # Returns an array of all known ResqueAdmin queues as strings.
   def queues
     data_store.queue_names
   end
@@ -343,7 +343,7 @@ module Resque
   # If either of those conditions are met, it will use the value obtained
   # from performing one of the above operations to determine the queue.
   #
-  # If no queue can be inferred this method will raise a `Resque::NoQueueError`
+  # If no queue can be inferred this method will raise a `ResqueAdmin::NoQueueError`
   #
   # Returns true if the job was queued, nil if the job was rejected by a
   # before_enqueue hook.
@@ -388,10 +388,10 @@ module Resque
   # If either of those conditions are met, it will use the value obtained
   # from performing one of the above operations to determine the queue.
   #
-  # If no queue can be inferred this method will raise a `Resque::NoQueueError`
+  # If no queue can be inferred this method will raise a `ResqueAdmin::NoQueueError`
   #
   # If no args are given, this method will dequeue *all* jobs matching
-  # the provided class. See `Resque::Job.destroy` for more
+  # the provided class. See `ResqueAdmin::Job.destroy` for more
   # information.
   #
   # Returns the number of jobs destroyed.
@@ -399,10 +399,10 @@ module Resque
   # Example:
   #
   #   # Removes all jobs of class `UpdateNetworkGraph`
-  #   Resque.dequeue(GitHub::Jobs::UpdateNetworkGraph)
+  #   ResqueAdmin.dequeue(GitHub::Jobs::UpdateNetworkGraph)
   #
   #   # Removes all jobs of class `UpdateNetworkGraph` with matching args.
-  #   Resque.dequeue(GitHub::Jobs::UpdateNetworkGraph, 'repo:135325')
+  #   ResqueAdmin.dequeue(GitHub::Jobs::UpdateNetworkGraph, 'repo:135325')
   #
   # This method is considered part of the `stable` API.
   def dequeue(klass, *args)
@@ -428,7 +428,7 @@ module Resque
       (klass.respond_to?(:queue) and klass.queue)
   end
 
-  # This method will return a `Resque::Job` object or a non-true value
+  # This method will return a `ResqueAdmin::Job` object or a non-true value
   # depending on whether a job can be obtained. You should pass it the
   # precise name of a queue: case matters.
   #
@@ -437,11 +437,11 @@ module Resque
     Job.reserve(queue)
   end
 
-  # Validates if the given klass could be a valid Resque job
+  # Validates if the given klass could be a valid ResqueAdmin job
   #
-  # If no queue can be inferred this method will raise a `Resque::NoQueueError`
+  # If no queue can be inferred this method will raise a `ResqueAdmin::NoQueueError`
   #
-  # If given klass is nil this method will raise a `Resque::NoClassError`
+  # If given klass is nil this method will raise a `ResqueAdmin::NoClassError`
   def validate(klass, queue = nil)
     queue ||= queue_from_class(klass)
 
@@ -472,7 +472,7 @@ module Resque
   # A shortcut to unregister_worker
   # useful for command line tool
   def remove_worker(worker_id)
-    worker = Resque::Worker.find(worker_id)
+    worker = ResqueAdmin::Worker.find(worker_id)
     worker.unregister_worker
   end
 
@@ -494,7 +494,7 @@ module Resque
     }
   end
 
-  # Returns an array of all known Resque keys in Redis. Redis' KEYS operation
+  # Returns an array of all known ResqueAdmin keys in Redis. Redis' KEYS operation
   # is O(N) for the keyspace, so be careful - this can be slow for big databases.
   def keys
     data_store.all_resque_keys
@@ -574,5 +574,5 @@ module Resque
 end
 
 # Log to STDOUT by default
-Resque.logger           = MonoLogger.new(STDOUT)
-Resque.logger.formatter = Resque::QuietFormatter.new
+ResqueAdmin.logger           = MonoLogger.new(STDOUT)
+ResqueAdmin.logger.formatter = ResqueAdmin::QuietFormatter.new

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: resque_admin
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Chris Wanstrath
@@ -83,7 +83,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 description: |2
-      Resque is a Redis-backed Ruby library for creating background jobs,
+      ResqueAdmin is a Redis-backed Ruby library for creating background jobs,
       placing those jobs on multiple queues, and processing them later.
 
       Background jobs can be any Ruby class or module that responds to
@@ -91,7 +91,7 @@ description: |2
       jobs or you can create new classes specifically to do work. Or, you
       can do both.
 
-      Resque is heavily inspired by DelayedJob (which rocks) and is
+      ResqueAdmin is heavily inspired by DelayedJob (which rocks) and is
       comprised of three parts:
 
       * A Ruby library for creating, querying, and processing jobs
@@ -187,5 +187,5 @@ rubyforge_project:
 rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
-summary: Resque is a Redis-backed queueing system.
+summary: ResqueAdmin is a Redis-backed queueing system.
 test_files: []