sidetiq 0.3.7 → 0.4.0.rc1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidetiq
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.4.0.rc1
 platform: ruby
 authors:
 - Tobias Svensson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-27 00:00:00.000000000 Z
+date: 2013-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -24,6 +24,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.14.0
+- !ruby/object:Gem::Dependency
+  name: celluloid
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.14.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.14.1
 - !ruby/object:Gem::Dependency
   name: ice_cube
   requirement: !ruby/object:Gem::Requirement
@@ -38,6 +52,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.11.0
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +122,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 5.0.7
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 5.0.7
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -122,33 +164,56 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- examples/simple.rb
+- examples/Procfile
+- examples/config.ru
+- examples/server.rb
+- examples/workers/failing.rb
+- examples/workers/simple.rb
 - lib/sidetiq.rb
+- lib/sidetiq/actor.rb
+- lib/sidetiq/actor/clock.rb
+- lib/sidetiq/actor/handler.rb
+- lib/sidetiq/api.rb
 - lib/sidetiq/clock.rb
 - lib/sidetiq/config.rb
-- lib/sidetiq/lock.rb
-- lib/sidetiq/middleware.rb
+- lib/sidetiq/handler.rb
+- lib/sidetiq/lock/meta_data.rb
+- lib/sidetiq/lock/redis.rb
+- lib/sidetiq/lock/watcher.rb
+- lib/sidetiq/logging.rb
+- lib/sidetiq/middleware/history.rb
 - lib/sidetiq/schedulable.rb
 - lib/sidetiq/schedule.rb
+- lib/sidetiq/supervisor.rb
 - lib/sidetiq/version.rb
+- lib/sidetiq/views/_home_nav.erb
+- lib/sidetiq/views/_worker_nav.erb
+- lib/sidetiq/views/assets/styles.css
+- lib/sidetiq/views/history.erb
+- lib/sidetiq/views/locks.erb
+- lib/sidetiq/views/schedule.erb
 - lib/sidetiq/views/sidetiq.erb
-- lib/sidetiq/views/sidetiq_details.erb
 - lib/sidetiq/web.rb
 - sidetiq.gemspec
+- tasks/bundler.task
+- tasks/minitest.task
 - test/fixtures/backfill_worker.rb
 - test/fixtures/last_and_scheduled_ticks_worker.rb
 - test/fixtures/last_tick_worker.rb
+- test/fixtures/optional_arguments_worker.rb
 - test/fixtures/scheduled_worker.rb
 - test/fixtures/simple_worker.rb
 - test/fixtures/splat_args_worker.rb
 - test/helper.rb
 - test/test_clock.rb
 - test/test_config.rb
-- test/test_lock.rb
-- test/test_middleware.rb
+- test/test_history.rb
+- test/test_lock_meta_data.rb
+- test/test_lock_redis.rb
 - test/test_schedule.rb
 - test/test_sidetiq.rb
 - test/test_version.rb
+- test/test_watcher.rb
 - test/test_web.rb
 - test/test_worker.rb
 homepage: http://github.com/tobiassvn/sidetiq
@@ -166,9 +231,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.3
@@ -179,16 +244,19 @@ test_files:
 - test/fixtures/backfill_worker.rb
 - test/fixtures/last_and_scheduled_ticks_worker.rb
 - test/fixtures/last_tick_worker.rb
+- test/fixtures/optional_arguments_worker.rb
 - test/fixtures/scheduled_worker.rb
 - test/fixtures/simple_worker.rb
 - test/fixtures/splat_args_worker.rb
 - test/helper.rb
 - test/test_clock.rb
 - test/test_config.rb
-- test/test_lock.rb
-- test/test_middleware.rb
+- test/test_history.rb
+- test/test_lock_meta_data.rb
+- test/test_lock_redis.rb
 - test/test_schedule.rb
 - test/test_sidetiq.rb
 - test/test_version.rb
+- test/test_watcher.rb
 - test/test_web.rb
 - test/test_worker.rb

data/examples/simple.rb

@@ -1,22 +0,0 @@
-# Run with `sidekiq -r /path/to/simple.rb`
-
-require 'sidekiq'
-require 'sidetiq'
-
-Sidekiq.options[:poll_interval] = 1
-
-Sidekiq.configure_server do |config|
-  Sidetiq::Clock.start!
-end
-
-class MyWorker
-  include Sidekiq::Worker
-  include Sidetiq::Schedulable
-
-  recurrence { secondly }
-
-  def perform(*args)
-    Sidekiq.logger.info "#perform"
-  end
-end
-

data/lib/sidetiq/lock.rb

@@ -1,63 +0,0 @@
-module Sidetiq
-  class Lock # :nodoc: all
-    attr_reader :key, :timeout
-
-    OWNER = "#{Socket.gethostname}:#{Process.pid}"
-
-    def initialize(key, timeout = Sidetiq.config.lock_expire)
-      @key  = key.kind_of?(Class) ? "sidetiq:#{key.name}:lock" : "sidetiq:#{key}:lock"
-      @timeout   = timeout
-    end
-
-    def synchronize
-      Sidekiq.redis do |redis|
-        if lock(redis)
-          Sidetiq.logger.debug "Sidetiq::Clock lock #{key}"
-
-          begin
-            yield redis
-          ensure
-            unlock(redis)
-            Sidetiq.logger.debug "Sidetiq::Clock unlock #{key}"
-          end
-        end
-      end
-    end
-
-    private
-
-    def lock(redis)
-      acquired = false
-
-      watch(redis, key) do
-        if !redis.exists(key)
-          acquired = !!redis.multi do |multi|
-            multi.psetex(key, timeout, OWNER)
-          end
-        end
-      end
-
-      acquired
-    end
-
-    def unlock(redis)
-      watch(redis, key) do
-        if redis.get(key) == OWNER
-          redis.multi do |multi|
-            multi.del(key)
-          end
-        end
-      end
-    end
-
-    def watch(redis, *args)
-      redis.watch(*args)
-
-      begin
-        yield
-      ensure
-        redis.unwatch
-      end
-    end
-  end
-end

data/lib/sidetiq/middleware.rb

@@ -1,23 +0,0 @@
-module Sidetiq
-  class Middleware
-    def initialize
-      @clock = Sidetiq::Clock.instance
-    end
-
-    def call(*args)
-      # Restart the clock if the thread died.
-      if !@clock.ticking?
-        Sidetiq.logger.warn "Sidetiq::Clock thread died. Restarting..."
-        @clock.start!
-      end
-      yield
-    end
-  end
-end
-
-Sidekiq.configure_server do |config|
-  config.server_middleware do |chain|
-    chain.add Sidetiq::Middleware
-  end
-end
-

data/lib/sidetiq/views/sidetiq_details.erb

@@ -1,49 +0,0 @@
-<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/test/test_lock.rb

@@ -1,30 +0,0 @@
-require_relative 'helper'
-
-class TestLock < Sidetiq::TestCase
-  def test_locking
-    lock_name = SecureRandom.hex(8)
-    key = SecureRandom.hex(8)
-
-    Sidekiq.redis do |redis|
-      redis.set(key, 0)
-
-      5.times.map do
-        Thread.start do
-          locked(lock_name) do |r|
-            sleep 0.1
-            r.incr(key)
-          end
-        end
-      end.each(&:join)
-
-      assert_equal "1", redis.get(key)
-    end
-  end
-
-  def locked(lock_name)
-    Sidetiq::Lock.new(lock_name).synchronize do |redis|
-      yield redis
-    end
-  end
-end
-

data/test/test_middleware.rb

@@ -1,18 +0,0 @@
-require_relative 'helper'
-
-class TestMiddleware < Sidetiq::TestCase
-  def middleware
-    Sidetiq::Middleware.new
-  end
-
-  def test_restarts_clock
-    clock.stubs(:ticking?).returns(false)
-    clock.expects(:start!).once
-    middleware.call {}
-
-    clock.stubs(:ticking?).returns(true)
-    clock.expects(:start!).never
-    middleware.call {}
-  end
-end
-