thehenster-resque-scheduler 1.0.6 → 1.0.7

data/Rakefile

@@ -37,6 +37,7 @@ begin
     gemspec.version = ResqueScheduler::Version
 
     gemspec.add_dependency "resque", ">= 1.5.0"
+    gemspec.add_dependency "active_support"
     gemspec.add_dependency "rufus-scheduler"
     gemspec.add_development_dependency "jeweler"
     gemspec.add_development_dependency "mocha"

data/lib/resque/scheduler.rb

@@ -93,7 +93,7 @@ module Resque
         klass_name = config['class'] || config[:class]
         params = args.nil? ? [] : Array(args)
         queue = config['queue'] || config[:queue] || Resque.queue_from_class(constantize(klass_name))
-        if config[:just_once]
+        if (config[:just_once] || config['just_once'])
           Resque::Job.destroy(queue, klass_name, *params)
         end
         Resque::Job.create(queue, klass_name, *params)

data/lib/resque_scheduler/server.rb

@@ -1,13 +1,12 @@
-
 # Extend Resque::Server to add tabs
 module ResqueScheduler
   
   module Server
-
+        
     def self.included(base)
 
       base.class_eval do
-
+        
         helpers do
           def format_time(t)
             t.strftime("%Y-%m-%d %H:%M:%S")
@@ -16,8 +15,40 @@ module ResqueScheduler
           def queue_from_class_name(class_name)
             Resque.queue_from_class(Resque.constantize(class_name))
           end
-        end
+          
+          def distance_of_time_in_words(from_time, to_time = 0, include_seconds = false)
+            from_time = from_time.to_time if from_time.respond_to?(:to_time)
+            to_time = to_time.to_time if to_time.respond_to?(:to_time)
+            distance_in_minutes = (((to_time - from_time).abs)/60).round
+            distance_in_seconds = ((to_time - from_time).abs).round
+
+            case distance_in_minutes
+              when 0..1
+                return (distance_in_minutes == 0) ? 'less than a minute' : '1 minute' unless include_seconds
+                case distance_in_seconds
+                  when 0..4   then 'less than 5 seconds'
+                  when 5..9   then 'less than 10 seconds'
+                  when 10..19 then 'less than 20 seconds'
+                  when 20..39 then 'half a minute'
+                  when 40..59 then 'less than a minute'
+                  else             '1 minute'
+                end
 
+              when 2..44           then "#{distance_in_minutes} minutes"
+              when 45..89          then 'about 1 hour'
+              when 90..1439        then "about #{(distance_in_minutes.to_f / 60.0).round} hours"
+              when 1440..2879      then '1 day'
+              when 2880..43199     then "#{(distance_in_minutes / 1440).round} days"
+              when 43200..86399    then 'about 1 month'
+              when 86400..525599   then "#{(distance_in_minutes / 43200).round} months"
+              when 525600..1051199 then 'about 1 year'
+              else                      "over #{(distance_in_minutes / 525600).round} years"
+            end
+          end
+        end
+        
+        require 'active_support'
+        
         get "/schedule" do
           # Is there a better way to specify alternate template locations with sinatra?
           erb File.read(File.join(File.dirname(__FILE__), 'server/views/scheduler.erb'))
@@ -29,6 +60,10 @@ module ResqueScheduler
           redirect url("/overview")
         end
         
+        get "/processes" do
+          erb File.read(File.join(File.dirname(__FILE__), 'server/views/processes.erb'))
+        end
+        
         get "/delayed" do
           # Is there a better way to specify alternate template locations with sinatra?
           erb File.read(File.join(File.dirname(__FILE__), 'server/views/delayed.erb'))
@@ -45,6 +80,7 @@ module ResqueScheduler
 
     Resque::Server.tabs << 'Schedule'
     Resque::Server.tabs << 'Delayed'
+    Resque::Server.tabs << 'Processes'
 
   end
   

data/lib/resque_scheduler/server/views/processes.erb

@@ -0,0 +1,10 @@
+<h1>Resque Processes</h1>
+
+<p class='intro'>
+  The list below contains all processes matching 'resque' but does not include 'grep'.
+</p>
+
+
+<p>
+	<%= %x(ps aux | grep resque).split("\n").delete_if{|s| s.include?('grep') }.join("<br />") %>
+</p>

data/lib/resque_scheduler/server/views/scheduler.erb

@@ -11,11 +11,14 @@
     <th>Name</th>
     <th>Description</th>
     <th>Cron</th>
+		<th>Next Run</th>
     <th>Class</th>
     <th>Queue</th>
+		<th>Just Once</th>
     <th>Arguments</th>
   </tr>
-  <% Resque.schedule.each do |name, config| %>
+	<% ary = Resque.schedule.to_a.sort{|a,b| a['name'] <=> b['name'] } %>
+  <% ary.each do |name, config| %>
     <tr>
       <td>
         <form action="<%= url "/schedule/requeue" %>" method="post">
@@ -26,8 +29,10 @@
       <td><%= h name %></td>
       <td><%= h config['description'] %></td>
       <td style="white-space:nowrap"><%= h config['cron'] %></td>
+			<td><%= distance_of_time_in_words(Time.now, Rufus::CronLine.new(config['cron']).next_time, true) %><br /><span style="color:#888;font-size:85%;"><%= (Rufus::CronLine.new(config['cron']).next_time) %></span></td>
       <td><%= h config['class'] %></td>
       <td><%= h config['queue'] || queue_from_class_name(config['class']) %></td>
+			<td><%= h config['just_once'].inspect %></td>
       <td><%= h config['args'].inspect %></td>
     </tr>
   <% end %>

data/lib/resque_scheduler/version.rb

@@ -1,3 +1,3 @@
 module ResqueScheduler
-  Version = '1.0.6'
+  Version = '1.0.7'
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 6
-  version: 1.0.6
+  - 7
+  version: 1.0.7
 platform: ruby
 authors: 
 - Ben VandenBos
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-29 00:00:00 +01:00
+date: 2010-03-30 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,7 +32,7 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rufus-scheduler
+  name: active_support
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
@@ -44,7 +44,7 @@ dependencies:
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: jeweler
+  name: rufus-scheduler
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
@@ -53,10 +53,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
+  type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: mocha
+  name: jeweler
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
@@ -67,6 +67,18 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: mocha
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id005
 description: |-
   Light weight job scheduling on top of Resque.
     Adds methods enqueue_at/enqueue_in to schedule jobs in the future.
@@ -90,6 +102,7 @@ files:
 - lib/resque_scheduler/server.rb
 - lib/resque_scheduler/server/views/delayed.erb
 - lib/resque_scheduler/server/views/delayed_timestamp.erb
+- lib/resque_scheduler/server/views/processes.erb
 - lib/resque_scheduler/server/views/scheduler.erb
 - lib/resque_scheduler/tasks.rb
 - lib/resque_scheduler/version.rb