sidekiq-scheduler 0.4.1 → 0.6

data/test/schedule_test.rb

@@ -1,10 +1,6 @@
 require 'test_helper'
 
-class ScheduleTest < MiniTest::Unit::TestCase
-  #class ScheduleManager
-  #  extend SidekiqScheduler::ScheduleManager
-  #end
-
+class ScheduleTest < Minitest::Test
 
   describe 'SidekiqScheduler::Schedule' do
     it 'schedule= sets the schedule' do

data/test/test_helper.rb

@@ -1,8 +1,11 @@
-require 'minitest/unit'
+require 'simplecov'
+SimpleCov.start
+
+require 'minitest/autorun'
 require 'minitest/pride'
 require 'minitest/autorun'
 require 'sidekiq-scheduler'
-require 'mocha'
+require 'mocha/setup'
 require 'multi_json'
 require 'mock_redis'
 
@@ -19,14 +22,15 @@ Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 
 require 'sidekiq/redis_connection'
 
-#Setup redis mock to avoid having a dependency
-# with redis server during tests
-$redis = ConnectionPool.new(:timeout => 1, :size => 1) { MockRedis.new }
-Sidekiq.redis = $redis
-
 class MiniTest::Spec
   before :each do
-    $redis.with_connection { |conn| conn.flushdb }
+    redis = MockRedis.new
+    client = Object.new
+
+    redis.stubs(:client).returns(client)
+    client.stubs(:location).returns('MockRedis')
+
+    Sidekiq::RedisConnection.stubs(:create).returns(ConnectionPool.new({}) { redis })
   end
 end
 
@@ -43,4 +47,4 @@ end
 class SomeRealClass
   include Sidekiq::Worker
   sidekiq_options :queue => :some_real_queue
-end
+end

metadata

@@ -1,36 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-scheduler
 version: !ruby/object:Gem::Version
-  version: 0.4.1
-  prerelease: 
+  version: '0.6'
 platform: ruby
 authors:
 - Morton Jonuschat
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-07 00:00:00.000000000 Z
+date: 2014-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.12.0
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rufus-scheduler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,15 +48,27 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: multi_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
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -70,7 +76,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -78,7 +83,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -86,7 +90,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -94,7 +97,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -102,7 +104,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -110,7 +111,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -118,7 +118,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -126,7 +125,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mock_redis
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -134,7 +132,20 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  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
@@ -148,71 +159,56 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- MIT-LICENSE
+- README.md
+- Rakefile
 - bin/sidekiq-scheduler
-- lib/sidekiq-scheduler/client.rb
+- lib/sidekiq-scheduler.rb
+- lib/sidekiq-scheduler/capistrano.rb
 - lib/sidekiq-scheduler/cli.rb
 - lib/sidekiq-scheduler/manager.rb
-- lib/sidekiq-scheduler/capistrano.rb
 - lib/sidekiq-scheduler/schedule.rb
-- lib/sidekiq-scheduler/worker.rb
-- lib/sidekiq-scheduler/version.rb
 - lib/sidekiq-scheduler/testing.rb
-- lib/sidekiq-scheduler.rb
-- lib/tasks/sidekiq-scheduler_tasks.rake
+- lib/sidekiq-scheduler/version.rb
 - lib/sidekiq/scheduler.rb
-- MIT-LICENSE
-- Rakefile
-- README.md
-- test/support/direct_worker.rb
-- test/support/my_worker.rb
+- lib/tasks/sidekiq-scheduler_tasks.rake
+- test/cli_test.rb
 - test/config.yml
-- test/manager_test.rb
 - test/fake_env.rb
-- test/test_helper.rb
 - test/lib/sidekiq/scheduler_test.rb
-- test/cli_test.rb
-- test/testing_test.rb
 - test/schedule_test.rb
-- test/client_test.rb
+- test/support/direct_worker.rb
+- test/support/my_worker.rb
+- test/test_helper.rb
 homepage: https://github.com/yabawock/sidekiq-scheduler
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -363015005747774647
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -363015005747774647
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Light weight job scheduling extension for Sidekiq
 test_files:
-- test/support/direct_worker.rb
+- test/schedule_test.rb
 - test/support/my_worker.rb
-- test/config.yml
-- test/manager_test.rb
-- test/fake_env.rb
+- test/support/direct_worker.rb
 - test/test_helper.rb
 - test/lib/sidekiq/scheduler_test.rb
+- test/fake_env.rb
+- test/config.yml
 - test/cli_test.rb
-- test/testing_test.rb
-- test/schedule_test.rb
-- test/client_test.rb

data/lib/sidekiq-scheduler/client.rb

@@ -1,87 +0,0 @@
-require 'sidekiq-scheduler/worker'
-require 'sidekiq/client'
-
-module SidekiqScheduler
-  module Client
-    # Example usage:
-    # Sidekiq::Client.delayed_push('my_queue', Time.now + 600, 'class' => MyWorker, 'args' => ['foo', 1, :bat => 'bar'])
-    def delayed_push(queue=nil, timestamp, item)
-      raise(ArgumentError, "Message must be a Hash of the form: { 'class' => SomeClass, 'args' => ['bob', 1, :foo => 'bar'] }") unless item.is_a?(Hash)
-      raise(ArgumentError, "Message must include a class and set of arguments: #{item.inspect}") if !item['class'] || !item['args']
-
-      timestamp = timestamp.to_i
-
-      item['queue'] = queue.to_s if queue
-      item['class'] = item['class'].to_s if !item['class'].is_a?(String)
-
-      # Add item to the list for this timestamp
-      Sidekiq.redis { |r| r.rpush("delayed:#{timestamp}", MultiJson.encode(item)) }
-
-      # Add timestamp to zset. Score and value are based on the timestamp
-      # as querying will be based on that
-      Sidekiq.redis { |r| r.zadd('delayed_queue_schedule', timestamp, timestamp) }
-    end
-
-    def remove_scheduler_queue(timestamp)
-      key = "delayed:#{timestamp}"
-      if 0 == Sidekiq.redis { |r| r.llen(key) }
-        Sidekiq.redis { |r| r.del(key) }
-        Sidekiq.redis { |r| r.zrem('delayed_queue_schedule', timestamp) }
-      end
-    end
-
-    # Example usage:
-    # Sidekiq::Client.remove_all_delayed(MyWorker, 'foo', 1, :bat => 'bar')
-    #
-    # Returns the number of jobs removed
-    #
-    # This method can be very expensive since it needs to scan
-    # through the delayed queues of all timestamps
-    def remove_all_delayed(klass, *args)
-      remove_all_delayed_from_queue(nil, klass, *args)
-    end
-
-    # Example usage:
-    # Sidekiq::Client.remove_all_delayed('foo', MyWorker, 'foo', 1, :bat => 'bar')
-    #
-    # Returns the number of jobs removed
-    #
-    # This method can be very expensive since it needs to scan
-    # through the delayed queues of all timestamps
-    def remove_all_delayed_from_queue(queue, klass, *args)
-      count = 0
-      item = {'class' => klass.to_s, 'args' => args}
-      item['queue'] = queue.to_s if queue
-      search = MultiJson.encode(item)
-      Array(Sidekiq.redis { |r| r.keys("delayed:*") }).each do |key|
-        count += Sidekiq.redis { |r| r.lrem(key, 0, search) }
-      end
-      count
-    end
-
-    # Example usage:
-    # Sidekiq::Client.remove_delayed(Time.now + 600, MyWorker, 'foo', 1, :bat => 'bar')
-    #
-    # Returns the number of jobs removed
-    def remove_delayed(timestamp, klass, *args)
-      remove_delayed_from_queue(nil, timestamp, klass, *args)
-    end
-
-
-    # Example usage:
-    # Sidekiq::Client.remove_delayed('foo', Time.now + 600, MyWorker, 'foo', 1, :bat => 'bar')
-    #
-    # Returns the number of jobs removed
-    def remove_delayed_from_queue(queue, timestamp, klass, *args)
-      timestamp = timestamp.to_i
-      item = {'class' => klass.to_s, 'args' => args}
-      item['queue'] = queue.to_s if queue
-      search = MultiJson.encode(item)
-      count = Sidekiq.redis { |r| r.lrem("delayed:#{timestamp}", 0, search) }
-      remove_scheduler_queue(timestamp)
-      count
-    end
-  end
-end
-
-  Sidekiq::Client.send(:extend, SidekiqScheduler::Client)

data/lib/sidekiq-scheduler/worker.rb

@@ -1,26 +0,0 @@
-require 'sidekiq-scheduler/client'
-require 'sidekiq/worker'
-
-module SidekiqScheduler
-  module Worker
-    module ClassMethods
-      def perform_at(timestamp, *args)
-        Sidekiq::Client.delayed_push(timestamp, 'class' => self.name, 'args' => args)
-      end
-
-      def perform_in(seconds_from_now, *args)
-        Sidekiq::Client.delayed_push(Time.now + seconds_from_now, 'class' => self.name, 'args' => args)
-      end
-
-      def remove_delayed(*args)
-        Sidekiq::Client.remove_all_delayed(self.name, *args)
-      end
-
-      def remove_delayed_from_timestamp(timestamp, *args)
-        Sidekiq::Client.remove_delayed(timestamp, self.name, *args)
-      end
-    end
-  end
-end
-
-Sidekiq::Worker::ClassMethods.send(:include, SidekiqScheduler::Worker::ClassMethods)

data/test/client_test.rb

@@ -1,136 +0,0 @@
-require 'test_helper'
-require 'timecop'
-
-class ClientTest < MiniTest::Unit::TestCase
-  describe 'with real redis' do
-    before do
-      Sidekiq.redis = Sidekiq::RedisConnection.create(:url => 'redis://localhost/15', :namespace => 'testy')
-      Sidekiq.redis {|c| c.flushdb }
-    end
-
-    it 'removes scheduled messages and returns count' do
-      Sidekiq::Client.delayed_push(1331284491, 'class' => 'Foo', 'args' => [1, 2])
-      assert_equal 1, Sidekiq::Client.remove_all_delayed('Foo', 1, 2)
-    end
-
-    it 'removes scheduled messages for a queue and returns count' do
-      Sidekiq::Client.delayed_push('foo', 1331284491, 'class' => 'Foo', 'args' => [1, 2])
-      assert_equal 1, Sidekiq::Client.remove_all_delayed_from_queue('foo', 'Foo', 1, 2)
-    end
-
-    it 'removes only selected scheduled messages' do
-      Sidekiq::Client.delayed_push(1331284491, 'class' => 'Foo', 'args' => [1, 2])
-      Sidekiq::Client.delayed_push(1331284491, 'class' => 'Foo', 'args' => [3, 4])
-      Sidekiq::Client.delayed_push(1331284491, 'class' => 'Foo', 'args' => [3, 4])
-      Sidekiq::Client.delayed_push(1331284491, 'class' => 'Foo', 'args' => [5, 6])
-      assert_equal 0, Sidekiq::Client.remove_all_delayed('Foo')
-    end
-
-    it 'removes messages in different timestamp queues' do
-      Sidekiq::Client.delayed_push(1331284491, 'class' => 'Foo', 'args' => [1, 2])
-      Sidekiq::Client.delayed_push(1331284492, 'class' => 'Foo', 'args' => [3, 4])
-      Sidekiq::Client.delayed_push(1331284493, 'class' => 'Foo', 'args' => [3, 4])
-      Sidekiq::Client.delayed_push(1331284493, 'class' => 'Foo', 'args' => [5, 6])
-      assert_equal 2, Sidekiq::Client.remove_all_delayed('Foo', 3, 4)
-    end
-
-    it 'handles removed_delayed from a worker' do
-      Sidekiq::Client.delayed_push(1331284491, 'class' => 'MyWorker', 'args' => [1, 2])
-      Sidekiq::Client.delayed_push(1331284492, 'class' => 'MyWorker', 'args' => [3, 4])
-      Sidekiq::Client.delayed_push(1331284493, 'class' => 'MyWorker', 'args' => [3, 4])
-      Sidekiq::Client.delayed_push(1331284493, 'class' => 'MyWorker', 'args' => [5, 6])
-      assert_equal 2, MyWorker.remove_delayed(3, 4)
-    end
-
-    it 'removes messages from specified timestamp' do
-      Sidekiq::Client.delayed_push(1331284491, 'class' => 'Foo', 'args' => [1, 2])
-      Sidekiq::Client.delayed_push(1331284492, 'class' => 'Foo', 'args' => [1, 2])
-      assert_equal 1, Sidekiq::Client.remove_delayed(1331284491, 'Foo', 1, 2)
-      assert_equal 1, Sidekiq.redis { |c| c.llen('delayed:1331284492') }
-    end
-
-    it 'removes messages from a worker for a specified timestamp' do
-      Sidekiq::Client.delayed_push(1331284491, 'class' => 'MyWorker', 'args' => [1, 2])
-      Sidekiq::Client.delayed_push(1331284492, 'class' => 'MyWorker', 'args' => [1, 2])
-      assert_equal 1, MyWorker.remove_delayed_from_timestamp(1331284491, 1, 2)
-      assert_equal 1, Sidekiq.redis { |c| c.llen('delayed:1331284492') }
-    end
-
-    it 'removes messages for a queue from specified timestamp' do
-      Sidekiq::Client.delayed_push('foo', 1331284491, 'class' => 'Foo', 'args' => [1, 2])
-      Sidekiq::Client.delayed_push('foo', 1331284492, 'class' => 'Foo', 'args' => [1, 2])
-      assert_equal 1, Sidekiq::Client.remove_delayed_from_queue('foo', 1331284491, 'Foo', 1, 2)
-      assert_equal 1, Sidekiq.redis { |c| c.llen('delayed:1331284492') }
-    end
-
-    it 'removes nothing if no message is found' do
-      assert_equal 0, Sidekiq::Client.remove_delayed(1331284491, 'Foo', 3, 4)
-    end
-
-    it 'removes only messages with matching arguments' do
-      Sidekiq::Client.delayed_push(1331284491, 'class' => 'Foo', 'args' => [1, 2])
-      Sidekiq::Client.delayed_push(1331284491, 'class' => 'Foo', 'args' => [3, 2])
-      assert_equal 0, Sidekiq::Client.remove_delayed(1331284491, 'Foo', 3, 4)
-      assert_equal 2, Sidekiq.redis { |c| c.llen('delayed:1331284491') }
-    end
-
-    it 'removes empty scheduler queues' do
-      Sidekiq::Client.delayed_push(1331284491, 'class' => 'Foo', 'args' => [1, 2])
-      assert_equal 1, Sidekiq::Client.remove_delayed(1331284491, 'Foo', 1, 2)
-      assert !Sidekiq.redis { |c| c.exists('delayed:1331284491') }
-      assert_equal 0, Sidekiq.redis { |c| c.zcard('delayed_scheduler_queue') }
-    end
-  end
-
-  describe 'redis calls' do
-    before do
-      @redis = MiniTest::Mock.new
-      def @redis.multi; yield; end
-      def @redis.set(*); true; end
-      def @redis.sadd(*); true; end
-      def @redis.srem(*); true; end
-      def @redis.get(*); nil; end
-      def @redis.del(*); nil; end
-      def @redis.incrby(*); nil; end
-      def @redis.setex(*); nil; end
-      def @redis.expire(*); true; end
-      def @redis.with_connection; yield self; end
-      def @redis.with; yield self; end
-      Sidekiq.instance_variable_set(:@redis, @redis)
-    end
-
-    it 'pushes delayed messages to redis' do
-      @redis.expect :rpush, 1, ['delayed:1661284491', String]
-      @redis.expect :zadd, 1, ['delayed_queue_schedule', 1661284491, 1661284491]
-      Sidekiq::Client.delayed_push('foo', 1661284491, 'class' => 'Foo', 'args' => [1, 2])
-      @redis.verify
-    end
-
-    it 'removes empty scheduler queues' do
-      @redis.expect :llen, 0, ['delayed:1331284491']
-      @redis.expect :zrem, 1, ['delayed_queue_schedule', 1331284491]
-      Sidekiq::Client.remove_scheduler_queue(1331284491)
-      @redis.verify
-    end
-
-    it 'handles perform_at' do
-
-      #@redis.expect :rpush, 1, ['delayed:1331284491', String]
-      @redis.expect :zadd, 1, ['schedule', "1331284491.0", String]
-      MyWorker.perform_at(1331284491, 1, 2)
-
-      @redis.verify
-    end
-
-    it 'handles perform_in' do
-
-      Timecop.freeze(Time.now) do
-        timestamp = Time.now + 30
-        #@redis.expect :rpush, 1, ["delayed:#{timestamp.to_i}", String]
-        @redis.expect :zadd, 1, ['schedule', "#{timestamp.to_f}", String]
-        MyWorker.perform_in(30, 1, 2)
-        @redis.verify
-      end
-    end
-  end
-end