sidetiq 0.6.3 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c946fd72cae8f96d3079762cfe6f113e7c2eab2
-  data.tar.gz: 50e1c485a7d3f8d1947b6c15b7fe2d386cf6e44d
+  metadata.gz: ff59c4f9d4067f32642ac4019cc6e6088872df0a
+  data.tar.gz: e6fb56f9534239737a223688f1d6aaecc7612768
 SHA512:
-  metadata.gz: 0d51d953cdbd0ac1ec2543561258ef77f2d657de4bb84232d3f7a0a70e90d189c914f65aea5a54543a3d806e94278f9e2b17217301a85021ed91c3413a65dcc2
-  data.tar.gz: f3ca33fb55398a6c55289dfaf436a53de17c189723619e902be0c78770a6f5066dc12fd4f3b3b820431dc052d4219c1aabdfd4947ddd7cfa661f4959aad34da3
+  metadata.gz: b456e00b3e2029efe157f97b651a7b81202dd06d541a42914ef7a7e74d151f4a50721c33f34722827dc82058bdc30a34645b1f6f49f5d80fcaa1d722b0faf813
+  data.tar.gz: 52c1849c10644ea17f4ffcc93d37185f86b3e16adba947f6e888b57b1df27bced24434c53809460f899e7016159a1fa07c85ae7833439c6b792b58d52194b7a6

data/.travis.yml

@@ -6,8 +6,7 @@ branches:
 services:
   - redis-server
 rvm:
-  - 2.0.0
-  - 2.1.1
+  - 2.3.0
   - jruby-19mode
   - rbx-19mode
   - ruby-head
@@ -18,17 +17,9 @@ jdk:
   - oraclejdk7
 matrix:
   exclude:
-    - rvm: 2.1.1
+    - rvm: 2.3.0
       jdk: openjdk7
-    - rvm: 2.1.1
-      jdk: openjdk6
-    - rvm: 2.0.0
-      jdk: openjdk7
-    - rvm: 2.0.0
-      jdk: openjdk6
-    - rvm: 1.9.3
-      jdk: openjdk7
-    - rvm: 1.9.3
+    - rvm: 2.3.0
       jdk: openjdk6
     - rvm: rbx-19mode
       jdk: openjdk7

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+0.7.0
+-----
+
+- Display the runtime of each job on the history page
+  [allenan]
+- Use Time.current instead of Time.now in rails apps to
+  respect configured timezone [effektz]
+- Handle csrf_tag [kcdragon]
+- Celluloid update related fixes [sfroehler]
+- Updated gem dependencies
+
 0.6.3
 -----
 

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2012-2013, Tobias Svensson <tob@tobiassvensson.co.uk>
+Copyright (c) 2012-2016, Tobias Svensson <tob@tobiassvensson.co.uk>
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

data/examples/config.ru

@@ -11,4 +11,6 @@ Sidekiq.configure_client do |config|
   config.redis = { :size => 1 }
 end
 
+use Rack::Session::Cookie, :secret => "some unique secret string here"
+
 run Sidekiq::Web

data/lib/sidetiq.rb

@@ -7,7 +7,7 @@ require 'time'
 # gems
 require 'ice_cube'
 require 'sidekiq'
-require 'celluloid'
+require 'celluloid/current'
 
 # internal
 require 'sidetiq/config'

data/lib/sidetiq/clock.rb

@@ -57,7 +57,7 @@ module Sidetiq
     #
     # Returns a Time instance.
     def gettime
-      Sidetiq.config.utc ? Time.now.utc : Time.now
+      Sidetiq.config.utc ? Time.now.utc : (Time.respond_to?(:current) ? Time.current : Time.now)
     end
   end
 end

data/lib/sidetiq/middleware/history.rb

@@ -13,6 +13,7 @@ module Sidetiq
 
       def call_with_sidetiq_history(worker, msg, queue)
         entry = new_history_entry
+        start_time = Time.now
 
         yield
       rescue StandardError => e
@@ -23,6 +24,7 @@ module Sidetiq
 
         raise e
       ensure
+        entry[:runtime] = (Time.now - start_time)
         save_entry_for_worker(entry, worker)
       end
 
@@ -33,7 +35,8 @@ module Sidetiq
           exception: "",
           backtrace: "",
           node: "#{Socket.gethostname}:#{Process.pid}-#{Thread.current.object_id}",
-          timestamp: Time.now.iso8601
+          timestamp: Time.now.iso8601,
+          runtime: ""
         }
       end
 

data/lib/sidetiq/supervisor.rb

@@ -1,6 +1,6 @@
 module Sidetiq
-  class Supervisor < Celluloid::SupervisionGroup
-    supervise Sidetiq::Actor::Clock, as: :sidetiq_clock
+  class Supervisor < Celluloid::Supervision::Container
+    supervise type: Sidetiq::Actor::Clock, as: :sidetiq_clock
 
     if Sidekiq.server?
       if handler_pool_size = Sidetiq.config.handler_pool_size
@@ -47,4 +47,3 @@ module Sidetiq
     end
   end
 end
-

data/lib/sidetiq/version.rb

@@ -5,10 +5,10 @@ module Sidetiq
     MAJOR = 0
 
     # Public: Sidetiq minor version number.
-    MINOR = 6
+    MINOR = 7
 
     # Public: Sidetiq patch level.
-    PATCH = 3
+    PATCH = 0
 
     # Public: Sidetiq version suffix.
     SUFFIX = nil

data/lib/sidetiq/views/history.erb

@@ -17,6 +17,7 @@
         <thead>
           <th style="width: 10%">Status</th>
           <th style="width: 20%">Timestamp</th>
+          <th style="width: 10%">Runtime</th>
           <th>Details</th>
         </thead>
 
@@ -25,6 +26,7 @@
         <tr class="<%= 'error' if entry[:status] == 'failure' %>">
           <td><%= entry[:status].capitalize %></td>
           <td><%= Time.parse(entry[:timestamp]).strftime("%m/%d/%Y %I:%M:%S%p") %></td>
+          <td><%= entry[:runtime].round(3) %> s</td>
           <td>
             <% if entry[:status] == 'failure' %>
             <a class="backtrace" href="#" onclick="$(this).next().toggle(); return false">

data/lib/sidetiq/views/locks.erb

@@ -36,6 +36,7 @@
           </td>
             <td>
               <form action="<%= "#{root_path}sidetiq/#{meta.key}/unlock" %>" method="post">
+                <%= csrf_tag %>
                 <input class="btn btn-danger btn-small" type="submit" name="trigger" value="Unlock" data-confirm="Are you sure you want remove this lock?" />
               </form>
             </td>

data/lib/sidetiq/views/sidetiq.erb

@@ -37,6 +37,7 @@
             </td>
             <td>
               <form action="<%= "#{root_path}sidetiq/#{worker.name}/trigger" %>" method="post">
+                <%= csrf_tag %>
                 <input class="btn btn-danger btn-small" type="submit" name="trigger" value="Trigger" data-confirm="Are you sure you want to trigger this job?" />
               </form>
             </td>

data/sidetiq.gemspec

@@ -19,9 +19,9 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.extensions    = []
 
-  gem.add_dependency 'sidekiq',   '>= 3.0.0'
-  gem.add_dependency 'celluloid', '>= 0.14.1'
-  gem.add_dependency 'ice_cube',  '0.11.1'
+  gem.add_dependency 'sidekiq',   '>= 4.0.0'
+  gem.add_dependency 'celluloid', '>= 0.17.3'
+  gem.add_dependency 'ice_cube',  '~> 0.13.2'
 
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'sinatra'

data/test/helper.rb

@@ -1,3 +1,5 @@
+ENV['RACK_ENV'] ||= 'test'
+
 if RUBY_PLATFORM != "java"
   require 'coveralls'
   Coveralls.wear!

data/test/test_history.rb

@@ -23,6 +23,7 @@ class TestHistory < Sidetiq::TestCase
 
     refute_empty actual[:node]
     refute_empty actual[:timestamp]
+    assert actual[:runtime] > 0
   end
 
   def test_failure
@@ -47,6 +48,7 @@ class TestHistory < Sidetiq::TestCase
 
     refute_empty actual[:node]
     refute_empty actual[:timestamp]
+    assert actual[:runtime] > 0
   end
 
   def middlewared

data/test/test_sidetiq.rb

@@ -22,7 +22,7 @@ class TestSidetiq < Sidetiq::TestCase
     client = Sidekiq::Client.new
     SimpleWorker.perform_at(Time.local(2011, 1, 1, 1))
     hash = SimpleWorker.jobs.first
-    client.push_old(hash.merge("at" => hash["enqueued_at"]))
+    client.push_old(hash.merge("at" => hash["created_at"]))
 
     scheduled = Sidetiq.scheduled
 
@@ -39,7 +39,7 @@ class TestSidetiq < Sidetiq::TestCase
     client = Sidekiq::Client.new
     SimpleWorker.perform_at(Time.local(2011, 1, 1, 1))
     hash = SimpleWorker.jobs.first
-    client.push_old(hash.merge("at" => hash["enqueued_at"]))
+    client.push_old(hash.merge("at" => hash["created_at"]))
 
     assert_equal 1, Sidetiq.scheduled(SimpleWorker).length
     assert_equal 0, Sidetiq.scheduled(ScheduledWorker).length
@@ -52,11 +52,11 @@ class TestSidetiq < Sidetiq::TestCase
     client = Sidekiq::Client.new
     SimpleWorker.perform_at(Time.local(2011, 1, 1, 1))
     hash = SimpleWorker.jobs.first
-    client.push_old(hash.merge("at" => hash["enqueued_at"]))
+    client.push_old(hash.merge("at" => hash["created_at"]))
 
     ScheduledWorker.perform_at(Time.local(2011, 1, 1, 1))
     hash = ScheduledWorker.jobs.first
-    client.push_old(hash.merge("at" => hash["enqueued_at"]))
+    client.push_old(hash.merge("at" => hash["created_at"]))
 
     jobs = []
     Sidetiq.scheduled { |job| jobs << job }
@@ -126,4 +126,3 @@ class TestSidetiq < Sidetiq::TestCase
     end
   end
 end
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidetiq
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.7.0
 platform: ruby
 authors:
 - Tobias Svensson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-24 00:00:00.000000000 Z
+date: 2016-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: celluloid
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.14.1
+        version: 0.17.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.14.1
+        version: 0.17.3
 - !ruby/object:Gem::Dependency
   name: ice_cube
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.1
+        version: 0.13.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.1
+        version: 0.13.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -223,7 +223,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Recurring jobs for Sidekiq
@@ -248,3 +248,4 @@ test_files:
 - test/test_version.rb
 - test/test_web.rb
 - test/test_worker.rb
+has_rdoc: