sidekiq-cron 0.1.7 → 0.1.8

data/VERSION

@@ -1 +1 @@
-0.1.7
+0.1.8

data/lib/sidekiq/cron/job.rb

@@ -48,6 +48,7 @@ module Sidekiq
       #enque cron job to queue
       def enque! time = Time.now
         @last_run_time = time
+        @last_enqueue_time = time
 
         Sidekiq::Client.push(@message.is_a?(String) ? Sidekiq.load_json(@message) : @message)
 
@@ -158,7 +159,7 @@ module Sidekiq
       end
 
       attr_accessor :name, :cron, :klass, :args, :message
-      attr_reader   :last_run_time
+      attr_reader   :last_run_time, :last_enqueue_time
 
       def initialize input_args = {}
         args = input_args.stringify_keys
@@ -174,6 +175,7 @@ module Sidekiq
 
         #set last run time
         @last_run_time = Time.parse(args['last_run_time'].to_s) rescue Time.now
+        @last_enqueue_time = Time.parse(args['last_enqueue_time'].to_s) rescue nil
 
         #get right arguments for job
         @args = args["args"].nil? ? [] : parse_args( args["args"] )
@@ -247,6 +249,7 @@ module Sidekiq
           message: @message.is_a?(String) ? @message : Sidekiq.dump_json(@message || {}),
           status: @status,
           last_run_time: @last_run_time,
+          last_enqueue_time: @last_enqueue_time,
         }
       end
 

data/lib/sidekiq/cron/locales/de.yml

@@ -0,0 +1,12 @@
+de:
+  Job: Job
+  Cron: Cron
+  CronJobs: Cronjobs
+  EnqueueNow: In Warteschlange
+  AreYouSureDeleteCronJob: Sind Sie sicher, dass sie den Cronjob %{job} löschen wollen?
+  NoCronJobsFound: "Keine Cronjobs gefunden"
+  Enable: Aktivieren
+  Disable: Deaktivieren
+  'Last enque': Eingereiht
+  disabled: deaktiviert
+  enabled: aktiviert

data/lib/sidekiq/cron/locales/en.yml

@@ -5,3 +5,8 @@ en:
   EnqueueNow: Enqueue Now
   AreYouSureDeleteCronJob: Are you sure you want to delete the %{job} cron job?
   NoCronJobsFound: "No cron jobs found"
+  Enable: Enabled
+  Disable: Disable
+  'Last enque': Last enqueued
+  disabled: disabled
+  enabled: enabled

data/lib/sidekiq/cron/poller.rb

@@ -34,7 +34,7 @@ module Sidekiq
               end
             end
 
-          rescue => ex
+          rescue Exception => ex
             # Most likely a problem with redis networking.
             # Punt and try again at the next interval
             logger.error ex.message

data/lib/sidekiq/cron/views/cron.erb

@@ -1,28 +1,28 @@
 <header class='row'>
-  <div class='span5'>
+  <div class='span5 col-sm-5'>
     <h3><%=t 'CronJobs' %></h3>
   </div>
 </header>
 <% if @cron_jobs.size > 0 %>
 
-  <table class="table table-hover table-bordered table-striped">
+  <table class="table table-hover table-bordered table-striped table-white">
     <thead>
       <th><%= t('Status') %></th>
       <th><%= t('Name') %></th>
       <th><%= t('Cron') %></th>
       <th><%= t('Last enque') %></th>
       <th><%= t('Arguments') %></th>
-      <th width="253px"><%= t('Actions')%></th>
+      <th width="280"><%= t('Actions')%></th>
     </thead>
 
     <tbody>
       <% @cron_jobs.sort{|a,b| a.sort_name <=> b.sort_name }.each_with_index do |job, index| %>
         <% style = "#{job.status == 'disabled' ? "background: #ecc": ""}" %>
         <tr>
-          <td style="<%= style %>"><%= job.status %></td>
+          <td style="<%= style %>"><%= t job.status %></td>
           <td style="<%= style %>"><%= job.name %></td>
           <td style="<%= style %>"><b><%= job.cron.gsub(" ", "&nbsp;") %></b></td>
-          <td style="<%= style %>"><%= relative_time(job.last_run_time) %></td>
+          <td style="<%= style %>"><%= job.last_enqueue_time ? relative_time(job.last_enqueue_time) : "-" %></td>
           <td style="<%= style %>">
             <% if job.message and job.message.to_s.size > 100 %>
               <button data-toggle="collapse" data-target=".worker_<%= index %>" class="btn btn-xs"><%= t('ShowAll')%></button>

data/lib/sidekiq/cron/views/cron.slim

@@ -21,7 +21,7 @@ header.row
         td[style="#{style}"]= job.name
         td[style="#{style}"]
           b == job.cron.gsub(" ", " ")
-        td[style="#{style}"]== relative_time(job.last_run_time)
+        td[style="#{style}"]== job.last_enqueue_time ? relative_time(job.last_enqueue_time) : "-"
         td[style="#{style}"]
           - if job.message and job.message.to_s.size > 100
             button data-toggle="collapse" data-target=".worker_#{index}" class="btn btn-mini" = t('ShowAll')

data/sidekiq-cron.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "sidekiq-cron"
-  s.version = "0.1.7"
+  s.version = "0.1.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ondrej Bartas"]
-  s.date = "2013-11-05"
+  s.date = "2013-11-29"
   s.description = "Enables to set jobs to be run in specified time (using CRON notation)"
   s.email = "ondrej@bartas.cz"
   s.extra_rdoc_files = [
@@ -31,6 +31,7 @@ Gem::Specification.new do |s|
     "lib/sidekiq/cron.rb",
     "lib/sidekiq/cron/job.rb",
     "lib/sidekiq/cron/launcher.rb",
+    "lib/sidekiq/cron/locales/de.yml",
     "lib/sidekiq/cron/locales/en.yml",
     "lib/sidekiq/cron/poller.rb",
     "lib/sidekiq/cron/views/cron.erb",

data/test/unit/web_extesion_test.rb

@@ -40,6 +40,7 @@ class CronWebExtensionTest < Test::Unit::TestCase
     should 'display cron web with cron jobs table' do
       Sidekiq::Cron::Job.create(@args)
       get '/cron'
+      assert_equal 200, last_response.status
       refute last_response.body.include?('No cron jobs found')
       assert last_response.body.include?('table')
       assert last_response.body.include?("TestNameOfCronJob")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-cron
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-05 00:00:00.000000000 Z
+date: 2013-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -273,6 +273,7 @@ files:
 - lib/sidekiq/cron.rb
 - lib/sidekiq/cron/job.rb
 - lib/sidekiq/cron/launcher.rb
+- lib/sidekiq/cron/locales/de.yml
 - lib/sidekiq/cron/locales/en.yml
 - lib/sidekiq/cron/poller.rb
 - lib/sidekiq/cron/views/cron.erb
@@ -298,7 +299,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3162312327206843445
+      hash: -1914216490910981092
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: