resque_admin-scheduler 1.1.7 → 1.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 504a3f974c00e057d1301dd2d9569258cf077b6b
-  data.tar.gz: 674a66930efa2d6c88ff6af4152935eae7bc2bd9
+  metadata.gz: 3e5a8a61a51bbfee69f4abb2faa779f948658bce
+  data.tar.gz: 8f9e774b9ab0a1339274f4ca7d3de16664ab911d
 SHA512:
-  metadata.gz: e0eee0df86a771ff90aa2cf510e70af2bad988c80cabc5689e34d27ab25a81c018cb540c209acbef7ce58e3daf34cb81bf19cc98bb32922cd8db7f58cb261013
-  data.tar.gz: 9b781e8d53530107b8afc51e5abe7ccb89f42c5763a6d67413bc13f3b3b847e75332cd999d379213c873b2ebc687287710def25a2dc0a2f3471bfd7a2498f16b
+  metadata.gz: 526b76d3436f2ea29b0a0d7ca0e2ed99ccca16f368e163412f3ec77290bd0578ff8c8f7e5f41f173570b507d9ec4415e44d1f00f036b6553fc628ac7d563c3d8
+  data.tar.gz: 743b74596da7a6d8e38486797f662fb18a124aae67f4b014973c319b3b51cf2ad54f143a1fe0bec71253fb2ffb862931a7d7bd176998296d0b464f7289c71bb8

data/lib/resque_admin-scheduler.rb

@@ -1,4 +1,4 @@
 # vim:fileencoding=utf-8
-require_relative 'resque_admin/scheduler'
+require_relative 'resque/scheduler'
 
 ResqueAdmin.extend ResqueAdmin::Scheduler::Extension

data/lib/resque_admin/scheduler.rb

@@ -9,10 +9,10 @@ require_relative 'scheduler/failure_handler'
 
 module ResqueAdmin
   module Scheduler
-    autoload :Cli, 'resque_admin/scheduler/cli'
-    autoload :Extension, 'resque_admin/scheduler/extension'
-    autoload :Util, 'resque_admin/scheduler/util'
-    autoload :VERSION, 'resque_admin/scheduler/version'
+    autoload :Cli, 'resque/scheduler/cli'
+    autoload :Extension, 'resque/scheduler/extension'
+    autoload :Util, 'resque/scheduler/util'
+    autoload :VERSION, 'resque/scheduler/version'
 
     private
 
@@ -38,8 +38,8 @@ module ResqueAdmin
         # trap signals
         register_signal_handlers
 
-        # Quote from the resque_admin/worker.
-        # Fix buffering so we can `rake resque_admin:scheduler > scheduler.log` and
+        # Quote from the resque/worker.
+        # Fix buffering so we can `rake resque:scheduler > scheduler.log` and
         # get output from the child in there.
         $stdout.sync = true
         $stderr.sync = true
@@ -238,7 +238,7 @@ module ResqueAdmin
                 job_config[:queue] ||
                 ResqueAdmin.queue_from_class(klass)
         # Support custom job classes like those that inherit from
-        # ResqueAdmin::JobWithStatus (resque_admin-status)
+        # ResqueAdmin::JobWithStatus (resque-status)
         job_klass = job_config['custom_job_class']
         if job_klass && job_klass != 'ResqueAdmin::Job'
           # The custom job class API must offer a static "scheduled" method. If
@@ -440,7 +440,7 @@ module ResqueAdmin
       end
 
       def internal_name
-        "resque_admin-scheduler-#{ResqueAdmin::Scheduler::VERSION}"
+        "resque-scheduler-#{ResqueAdmin::Scheduler::VERSION}"
       end
     end
   end

data/lib/resque_admin/scheduler/cli.rb

@@ -20,9 +20,9 @@ module ResqueAdmin
 
     class Cli
       BANNER = <<-EOF.gsub(/ {6}/, '')
-      Usage: resque_admin-scheduler [options]
+      Usage: resque-scheduler [options]
 
-      Runs a resque_admin scheduler process directly (rather than via rake).
+      Runs a resque scheduler process directly (rather than via rake).
 
       EOF
       OPTIONS = [

data/lib/resque_admin/scheduler/delaying_extensions.rb

@@ -25,7 +25,7 @@ module ResqueAdmin
         return false unless plugin.run_before_schedule_hooks(klass, *args)
 
         if ResqueAdmin.inline? || timestamp.to_i < Time.now.to_i
-          # Just create the job and let resque_admin perform it right away with
+          # Just create the job and let resque perform it right away with
           # inline.  If the class is a custom job class, call self#scheduled
           # on it. This allows you to do things like
           # ResqueAdmin.enqueue_at(timestamp, CustomJobClass, :opt1 => val1).

data/lib/resque_admin/scheduler/locking.rb

@@ -2,7 +2,7 @@
 
 # ### Locking the scheduler process
 #
-# There are two places in resque_admin-scheduler that need to be synchonized in order
+# There are two places in resque-scheduler that need to be synchonized in order
 # to be able to run redundant scheduler processes while ensuring jobs don't get
 # queued multiple times when the master process changes.
 #
@@ -23,7 +23,7 @@
 # should remain the master as long as it can rather than a simple SETNX which
 # would result in the master roll being passed around frequently.
 #
-# Locking Scheme: Each resque_admin-scheduler process attempts to get the master lock
+# Locking Scheme: Each resque-scheduler process attempts to get the master lock
 # via SETNX.  Once obtained, it sets the expiration for 3 minutes
 # (configurable).  The master process continually updates the timeout on the
 # lock key to be 3 minutes in the future in it's loop(s) (see `run`) and when

data/lib/resque_admin/scheduler/logger_builder.rb

@@ -51,7 +51,7 @@ module ResqueAdmin
 
       def text_formatter
         proc do |severity, datetime, _progname, msg|
-          "resque_admin-scheduler: [#{severity}] #{datetime.iso8601}: #{msg}\n"
+          "resque-scheduler: [#{severity}] #{datetime.iso8601}: #{msg}\n"
         end
       end
 
@@ -59,7 +59,7 @@ module ResqueAdmin
         proc do |severity, datetime, progname, msg|
           require 'json'
           JSON.dump(
-            name: 'resque_admin-scheduler',
+            name: 'resque-scheduler',
             progname: progname,
             level: severity,
             timestamp: datetime.iso8601,

data/lib/resque_admin/scheduler/scheduling_extensions.rb

@@ -19,7 +19,7 @@ module ResqueAdmin
       # Hash keys can be anything and are used to describe and reference
       # the scheduled job. If the "class" argument is missing, the key
       # is used implicitly as "class" argument - in the "MakeTea" example,
-      # "MakeTea" is used both as job name and resque_admin worker class.
+      # "MakeTea" is used both as job name and resque worker class.
       #
       # Any jobs that were in the old schedule, but are not
       # present in the new schedule, will be removed.
@@ -30,7 +30,7 @@ module ResqueAdmin
       # usage for valid syntax. If :cron is present it will take precedence
       # over :every.
       #
-      # :class must be a resque_admin worker class. If it is missing, the job name
+      # :class must be a resque worker class. If it is missing, the job name
       # (hash key) will be used as :class.
       #
       # :args can be any yaml which will be converted to a ruby literal and

data/lib/resque_admin/scheduler/server.rb

@@ -66,7 +66,7 @@ module ResqueAdmin
           config_args = config['args'] || config[:args] || {}
           config_args = config_args.merge(submitted_args)
 
-          # Insert the args hash into config and queue the resque_admin job
+          # Insert the args hash into config and queue the resque job
           config = config.merge('args' => config_args)
           ResqueAdmin::Scheduler.enqueue_from_config(config)
           redirect u('/overview')

data/lib/resque_admin/scheduler/server/views/delayed.erb

@@ -1,5 +1,5 @@
 <h1>Delayed Jobs</h1>
-<%- size = resque_admin.delayed_queue_schedule_size %>
+<%- size = resque.delayed_queue_schedule_size %>
 
 <%= scheduler_view :search_form, layout: false %>
 
@@ -25,7 +25,7 @@
     <th>Args</th>
     <th>All schedules</th>
   </tr>
-  <% resque_admin.delayed_queue_peek(start, 20).each do |timestamp| %>
+  <% resque.delayed_queue_peek(start, 20).each do |timestamp| %>
     <tr>
       <td>
         <form action="<%= u "/delayed/queue_now" %>" method="post">
@@ -34,8 +34,8 @@
         </form>
       </td>
       <td><a href="<%= u "delayed/#{timestamp}" %>"><%= format_time(Time.at(timestamp)) %></a></td>
-      <td><%= delayed_timestamp_size = resque_admin.delayed_timestamp_size(timestamp) %></td>
-      <% job = resque_admin.delayed_timestamp_peek(timestamp, 0, 1).first %>
+      <td><%= delayed_timestamp_size = resque.delayed_timestamp_size(timestamp) %></td>
+      <% job = resque.delayed_timestamp_peek(timestamp, 0, 1).first %>
       <td>
         <% if job && delayed_timestamp_size == 1 %>
           <%= h(job['class']) %>

data/lib/resque_admin/scheduler/server/views/delayed_timestamp.erb

@@ -2,14 +2,14 @@
 
 <h1>Delayed jobs scheduled for <%= format_time(Time.at(timestamp)) %></h1>
 
-<p class='sub'>Showing <%= start = params[:start].to_i %> to <%= start + 20 %> of <b><%=size = resque_admin.delayed_timestamp_size(timestamp)%></b> jobs</p>
+<p class='sub'>Showing <%= start = params[:start].to_i %> to <%= start + 20 %> of <b><%=size = resque.delayed_timestamp_size(timestamp)%></b> jobs</p>
 
 <table class='jobs'>
   <tr>
     <th>Class</th>
     <th>Args</th>
   </tr>
-  <% jobs = resque_admin.delayed_timestamp_peek(timestamp, start, 20) %>
+  <% jobs = resque.delayed_timestamp_peek(timestamp, start, 20) %>
   <% jobs.each do |job| %>
     <tr>
       <td class='class'><%= job['class'] %></td>

data/lib/resque_admin/scheduler/tasks.rb

@@ -3,7 +3,7 @@
 require 'resque_admin/tasks'
 require 'resque_admin-scheduler'
 
-namespace :resque_admin do
+namespace :resque do
   task :setup
 
   def scheduler_cli
@@ -20,6 +20,6 @@ namespace :resque_admin do
 
   task :scheduler_setup do
     scheduler_cli.parse_options
-    Rake::Task['resque_admin:setup'].invoke unless scheduler_cli.pre_setup
+    Rake::Task['resque:setup'].invoke unless scheduler_cli.pre_setup
   end
 end

data/lib/resque_admin/scheduler/util.rb

@@ -3,10 +3,10 @@
 module ResqueAdmin
   module Scheduler
     class Util
-      # In order to upgrade to resque_admin(1.25) which has deprecated following
+      # In order to upgrade to resque(1.25) which has deprecated following
       # methods, we just added these usefull helpers back to use in ResqueAdmin
       # Scheduler.  refer to:
-      # https://github.com/resque_admin/resque_admin-scheduler/pull/273
+      # https://github.com/resque/resque-scheduler/pull/273
 
       def self.constantize(camel_cased_word)
         camel_cased_word = camel_cased_word.to_s

data/lib/resque_admin/scheduler/version.rb

@@ -2,6 +2,6 @@
 
 module ResqueAdmin
   module Scheduler
-    VERSION = '1.1.7'.freeze
+    VERSION = '1.1.8'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: resque_admin-scheduler
 version: !ruby/object:Gem::Version
-  version: 1.1.7
+  version: 1.1.8
 platform: ruby
 authors:
 - Chris Wanstrath