sidetiq 0.3.6 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1df64df09fdf5d7e87b13410a3a8b39c325fd70a
-  data.tar.gz: 43e79f2eb7c71065ba27f54cf8e36924c8575250
+  metadata.gz: cd23a1f597a8ea9f38f1a7d978c25aacb9881278
+  data.tar.gz: 38857c20bd446738e877befb5357da050d317f7b
 SHA512:
-  metadata.gz: 3b11cd2d90c41504bd9914ca3058cc242c9d4819d4d8550348e2326d85aaacbcf9293f02f5ac01b058be6b222f94eedbca5bafeba76c3cc231e168c1d63a964c
-  data.tar.gz: c5b583be6d96c52e8494bc790c406f5d06cd84e0e0b643e0ca14ef9eae1dc36b5e858cfde858a2e8891d3c11bb18d2982f4018370beba0451cccd54f1171930d
+  metadata.gz: 4f3b2ac3341c8a3fa3f4b38ca192a8ff234f066d2fae8ebd2b0012393ca0fc418da7b64603caec2bf1aabf8fbed61200326fda4c74d0b6c3ac1422fa0fbc6c6f
+  data.tar.gz: 6024d079bea833aeef1d2b803bb32ed2f2dfe9108333bdaa6a9558ab28a07c3b67c52a38f5f34980ed4de29c4f988b50f78ed87a82b79481b3f57330f900639f

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+0.3.7
+-----
+
+- Bump Sidekiq dependency to ~> 2.14.0.
+- Use ERB templates instead of slim.
+- Don't check if `Sidekiq::Web.tabs` is an Array in Sidetiq::Web.
+- Fix Ruby parser warnings in web.rb.
+- Move development dependencies from Gemfile to gemspec.
+- Use coveralls instead of simplecov.
+
 0.3.6
 -----
 

data/Gemfile

@@ -1,16 +1,4 @@
 source 'https://rubygems.org'
 
-group :development do
-  gem 'rake'
-  gem 'sinatra', require: false
-  gem 'slim', require: false
-end
-
-group :test do
-  gem 'simplecov'
-  gem 'mocha'
-  gem 'rack-test'
-end
-
 gemspec
 

data/README.md

@@ -3,6 +3,8 @@ Sidetiq
 
 [![Build Status](https://travis-ci.org/tobiassvn/sidetiq.png)](https://travis-ci.org/tobiassvn/sidetiq)
 [![Dependency Status](https://gemnasium.com/tobiassvn/sidetiq.png)](https://gemnasium.com/tobiassvn/sidetiq)
+[![Coverage Status](https://coveralls.io/repos/tobiassvn/sidetiq/badge.png)](https://coveralls.io/r/tobiassvn/sidetiq)
+[![Code Climate](https://codeclimate.com/github/tobiassvn/sidetiq.png)](https://codeclimate.com/github/tobiassvn/sidetiq)
 
 Recurring jobs for [Sidekiq](http://mperham.github.com/sidekiq/).
 

data/lib/sidetiq/version.rb

@@ -8,7 +8,7 @@ module Sidetiq
     MINOR = 3
 
     # Public: Sidetiq patch level.
-    PATCH = 6
+    PATCH = 7
 
     # Public: String representation of the current Sidetiq version.
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')

data/lib/sidetiq/views/sidetiq.erb

@@ -0,0 +1,35 @@
+<header class="row">
+  <div class="span5">
+    <h3>Recurring Jobs</h3>
+  </div>
+</header>
+
+<% if @schedules.length > 0 %>
+  <table class="table table-striped table-bordered table-white" style="width: 100%; margin: 0; table-layout:fixed;">
+    thead
+    <thead>
+      <th style="width: 50%">Worker</th>
+      <th style="width: 20%">Queue</th>
+      <th style="width: 20%">Next Run</th>
+      <th style="width: 10%">Actions</th>
+    </thead>
+    <% @schedules.each do |worker, schedule| %>
+      <tr>
+        <td>
+          <a href="<%= "#{root_path}sidetiq/#{worker.name}" %>"><%= worker.name %></a>
+        <td><%= worker.get_sidekiq_options["queue"] %></td>
+        <td>
+          <%= relative_time(schedule.next_occurrence(@time)) %>
+        </td>
+        <td>
+          <form action="<%= "#{root_path}sidetiq/#{worker.name}/trigger" %>" method="post">
+            <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>
+      </tr>
+    <% end %>
+  </table>
+<% else %>
+  <div class="alert alert-success">No recurring jobs found.</div>
+<% end %>
+

data/lib/sidetiq/views/sidetiq_details.erb

@@ -0,0 +1,49 @@
+<header class="row">
+  <div class="span5">
+    <h3>Recurring Job: <%= @worker.name %></h3>
+  </div>
+</header>
+
+<% if (recurrences = @schedule.recurrence_rules).length > 0 %>
+  <table class="table table-striped table-bordered table-white" style="width: 100%; margin: 0; table-layout:fixed;">
+    <thead>
+      <th>Recurrences</th>
+    </thead>
+    <% recurrences.each do |rule| %>
+      <tr>
+        <td><%= rule.to_s %></td>
+      </tr>
+    <% end %>
+  </table>
+<% end %>
+
+<br />
+
+<% if (exceptions = @schedule.exception_rules).length > 0 %>
+  <table class="table table-striped table-bordered table-white" style="width: 100%; margin: 0; table-layout:fixed;">
+    <thead>
+      <th>Exceptions</th>
+    </thead>
+    <% exceptions.each do |rule| %>
+      <tr>
+        <td><%= rule.to_s %></td>
+      </tr>
+    <% end %>
+  </table>
+<% end %>
+
+<br />
+
+<table class="table table-striped table-bordered table-white" style="width: 100%; margin: 0; table-layout:fixed;">
+  <thead>
+    <th style="width: 25%">Next 10 runs</th>
+    <th style="width: 75%" />
+  <% @schedule.next_occurrences(10, @time).each do |time| %>
+    <tr>
+      <td><time><%= time.getutc %></time></td>
+      <td><%= relative_time(time) %></td>
+    </tr>
+  <% end %>
+</table>
+
+<br />

data/lib/sidetiq/web.rb

@@ -18,7 +18,7 @@ module Sidetiq
       app.get "/sidetiq" do
         @schedules = sidetiq_schedules
         @time = sidetiq_clock.gettime
-        slim File.read(File.join(VIEWS, 'sidetiq.slim'))
+        erb File.read(File.join(VIEWS, 'sidetiq.erb'))
       end
 
       app.get "/sidetiq/:name" do
@@ -26,18 +26,18 @@ module Sidetiq
 
         @time = sidetiq_clock.gettime
 
-        @worker, @schedule = sidetiq_schedules.select do |worker, schedule|
+        @worker, @schedule = sidetiq_schedules.select do |worker, _|
           worker.name == name
         end.flatten
 
-        slim File.read(File.join(VIEWS, 'sidetiq_details.slim'))
+        erb File.read(File.join(VIEWS, 'sidetiq_details.erb'))
       end
 
       app.post "/sidetiq/:name/trigger" do
         halt 404 unless (name = params[:name])
 
-        worker, _ = sidetiq_schedules.select do |worker, schedule|
-          worker.name == name
+        worker, _ = sidetiq_schedules.select do |w, _|
+          w.name == name
         end.flatten
 
         worker.perform_async
@@ -49,10 +49,5 @@ module Sidetiq
 end
 
 Sidekiq::Web.register(Sidetiq::Web)
-
-if Sidekiq::Web.tabs.is_a?(Array)
-  Sidekiq::Web.tabs << "sidetiq"
-else
-  Sidekiq::Web.tabs["Sidetiq"] = "sidetiq"
-end
+Sidekiq::Web.tabs["Sidetiq"] = "sidetiq"
 

data/sidetiq.gemspec

@@ -19,6 +19,15 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.extensions    = []
 
-  gem.add_dependency 'sidekiq',  '~> 2.13.0'
+  gem.add_dependency 'sidekiq',  '~> 2.14.0'
   gem.add_dependency 'ice_cube', '~> 0.11.0'
+
+  gem.add_development_dependency 'rake'
+  gem.add_development_dependency 'sinatra'
+  gem.add_development_dependency 'mocha'
+  gem.add_development_dependency 'rack-test'
+
+  if RUBY_PLATFORM != "java"
+    gem.add_development_dependency 'coveralls'
+  end
 end

data/test/helper.rb

@@ -1,6 +1,6 @@
-if ENV["COVERAGE"]
-  require 'simplecov'
-  SimpleCov.start { add_filter "/test/" }
+if RUBY_PLATFORM != "java"
+  require 'coveralls'
+  Coveralls.wear!
 end
 
 require 'minitest/autorun'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidetiq
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors:
 - Tobias Svensson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-13 00:00:00.000000000 Z
+date: 2013-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.13.0
+        version: 2.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.13.0
+        version: 2.14.0
 - !ruby/object:Gem::Dependency
   name: ice_cube
   requirement: !ruby/object:Gem::Requirement
@@ -38,6 +38,76 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.11.0
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Recurring jobs for Sidekiq
 email:
 - tob@tobiassvensson.co.uk
@@ -61,8 +131,8 @@ files:
 - lib/sidetiq/schedulable.rb
 - lib/sidetiq/schedule.rb
 - lib/sidetiq/version.rb
-- lib/sidetiq/views/sidetiq.slim
-- lib/sidetiq/views/sidetiq_details.slim
+- lib/sidetiq/views/sidetiq.erb
+- lib/sidetiq/views/sidetiq_details.erb
 - lib/sidetiq/web.rb
 - sidetiq.gemspec
 - test/fixtures/backfill_worker.rb

data/lib/sidetiq/views/sidetiq.slim

@@ -1,24 +0,0 @@
-header.row
-  .span5
-    h3 Recurring Jobs
-
-- if @schedules.length > 0
-  table class="table table-striped table-bordered table-white" style="width: 100%; margin: 0; table-layout:fixed;"
-    thead
-      th style="width: 50%" Worker
-      th style="width: 20%" Queue
-      th style="width: 20%" Next Run
-      th style="width: 10%" Actions
-    - @schedules.each do |worker, schedule|
-      tr
-        td
-          a href="#{root_path}sidetiq/#{worker.name}"= worker.name
-        td= worker.get_sidekiq_options['queue']
-        td
-          == relative_time(schedule.next_occurrence(@time))
-        td
-          form action="#{root_path}sidetiq/#{worker.name}/trigger" method="post"
-            input.btn.btn-danger.btn-small type="submit" name="trigger" value="Trigger" data-confirm="Are you sure you want to trigger this job?"
-- else
-  .alert.alert-success No recurring jobs found.
-

data/lib/sidetiq/views/sidetiq_details.slim

@@ -1,40 +0,0 @@
-header.row
-  .span5
-    h3
-      ' Recurring Job:
-      = @worker.name
-
-- if (recurrences = @schedule.recurrence_rules).length > 0
-  table class="table table-striped table-bordered table-white" style="width: 100%; margin: 0; table-layout:fixed;"
-    thead
-      th Recurrences
-    - recurrences.each do |rule|
-      tr
-        td
-          = rule.to_s
-
-br
-
-- if (exceptions = @schedule.exception_rules).length > 0
-  table class="table table-striped table-bordered table-white" style="width: 100%; margin: 0; table-layout:fixed;"
-    thead
-      th Exceptions
-    - exceptions.each do |rule|
-      tr
-        td
-          = rule.to_s
-
-br
-
-table class="table table-striped table-bordered table-white" style="width: 100%; margin: 0; table-layout:fixed;"
-  thead
-    th style="width: 25%" Next 10 runs
-    th style="width: 75%"
-  - @schedule.next_occurrences(10, @time).each do |time|
-    tr
-      td
-        time= time.getutc
-      td
-        == relative_time(time)
-
-br