sidekiq-scheduler 0.1.2 → 0.2.0

data/bin/sidekiq-scheduler

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 begin
-  require 'sidekiq-scheduler'
+  require 'sidekiq-scheduler/cli'
 rescue LoadError
   # Better way to do this in dev?
   dir = File.expand_path(File.dirname(__FILE__) + '/../lib') 
@@ -10,7 +10,7 @@ rescue LoadError
 end
 
 begin
-  cli = Sidekiq::CLI.new
+  cli = Sidekiq::CLI.instance
   cli.parse
   cli.run
 rescue => e

data/lib/sidekiq-scheduler.rb

@@ -1,4 +1,3 @@
-require 'sidekiq-scheduler/cli'
 require 'sidekiq-scheduler/client'
-require 'sidekiq-scheduler/manager'
+require 'sidekiq-scheduler/worker'
 require 'sidekiq-scheduler/version'

data/lib/sidekiq-scheduler/client.rb

@@ -15,18 +15,18 @@ module SidekiqScheduler
       item['class'] = item['class'].to_s if !item['class'].is_a?(String)
 
       # Add item to the list for this timestamp
-      Sidekiq.redis.rpush("delayed:#{timestamp}", MultiJson.encode(item))
+      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.zadd('delayed_queue_schedule', timestamp, timestamp)
+      Sidekiq.redis { |r| r.zadd('delayed_queue_schedule', timestamp, timestamp) }
     end
 
     def remove_scheduler_queue(timestamp)
       key = "delayed:#{timestamp}"
-      if 0 == Sidekiq.redis.llen(key)
-        Sidekiq.redis.del(key)
-        Sidekiq.redis.zrem('delayed_queue_schedule', 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
 
@@ -53,8 +53,8 @@ module SidekiqScheduler
       item = {'class' => klass.to_s, 'args' => args}
       item['queue'] = queue.to_s if queue
       search = MultiJson.encode(item)
-      Array(Sidekiq.redis.keys("delayed:*")).each do |key|
-        count += Sidekiq.redis.lrem(key, 0, search)
+      Array(Sidekiq.redis { |r| r.keys("delayed:*") }).each do |key|
+        count += Sidekiq.redis { |r| r.lrem(key, 0, search) }
       end
       count
     end
@@ -77,7 +77,7 @@ module SidekiqScheduler
       item = {'class' => klass.to_s, 'args' => args}
       item['queue'] = queue.to_s if queue
       search = MultiJson.encode(item)
-      count = Sidekiq.redis.lrem("delayed:#{timestamp}", 0, search)
+      count = Sidekiq.redis { |r| r.lrem("delayed:#{timestamp}", 0, search) }
       remove_scheduler_queue(timestamp)
       count
     end

data/lib/sidekiq-scheduler/manager.rb

@@ -16,7 +16,7 @@ module SidekiqScheduler
     include Celluloid
 
     def initialize(options={})
-      logger.info "Booting sidekiq scheduler #{SidekiqScheduler::VERSION} with Redis at #{redis.client.location}"
+      logger.info "Booting sidekiq scheduler #{SidekiqScheduler::VERSION} with Redis at #{redis { |r| r.client.location} }"
       logger.debug { options.inspect }
       @enabled = options[:scheduler]
       @resolution = options[:resolution] || 5
@@ -37,14 +37,16 @@ module SidekiqScheduler
     private
 
     def clear_scheduled_work
-      queues = redis.zrange('delayed_queue_schedule', 0, -1).to_a
-      redis.del(*queues.map { |t| "delayed:#{t}" }) unless queues.empty?
-      redis.del('delayed_queue_schedule')
+      redis do |conn|
+        queues = conn.zrange('delayed_queue_schedule', 0, -1).to_a
+        conn.del(*queues.map { |t| "delayed:#{t}" }) unless queues.empty?
+        conn.del('delayed_queue_schedule')
+      end
     end
 
     def find_scheduled_work(timestamp)
       loop do
-        break logger.debug("Finished processing queue for timestamp #{timestamp}") unless msg = redis.lpop("delayed:#{timestamp}")
+        break logger.debug("Finished processing queue for timestamp #{timestamp}") unless msg = redis { |r| r.lpop("delayed:#{timestamp}") }
         item = MultiJson.decode(msg)
         queue = item.delete('queue')
         Sidekiq::Client.push(queue, item)
@@ -53,7 +55,7 @@ module SidekiqScheduler
     end
 
     def find_next_timestamp
-      timestamp = redis.zrangebyscore('delayed_queue_schedule', '-inf', Time.now.to_i, :limit => [0, 1])
+      timestamp = redis { |r| r.zrangebyscore('delayed_queue_schedule', '-inf', Time.now.to_i, :limit => [0, 1]) }
       if timestamp.is_a?(Array)
         timestamp = timestamp.first
       end

data/lib/sidekiq-scheduler/version.rb

@@ -1,3 +1,3 @@
 module SidekiqScheduler
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 end

data/test/cli_test.rb

@@ -5,7 +5,7 @@ require 'tempfile'
 class CliTest < MiniTest::Unit::TestCase
   describe 'with cli' do
     before do
-      @cli = new_cli
+      @cli = Sidekiq::CLI.instance
     end
 
     describe 'with config file' do
@@ -17,17 +17,5 @@ class CliTest < MiniTest::Unit::TestCase
         assert_equal 30, Sidekiq.options[:resolution]
       end
     end
-
-    def new_cli
-      cli = Sidekiq::CLI.new
-      def cli.die(code)
-        @code = code
-      end
-
-      def cli.valid?
-        !@code
-      end
-      cli
-    end
   end
 end

data/test/client_test.rb

@@ -95,6 +95,7 @@ class ClientTest < MiniTest::Unit::TestCase
       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
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-scheduler
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-14 00:00:00.000000000 Z
+date: 2012-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
-  requirement: &70095698629680 !ruby/object:Gem::Requirement
+  requirement: &70191338909220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.9.0
   type: :runtime
   prerelease: false
-  version_requirements: *70095698629680
+  version_requirements: *70191338909220
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70095698629040 !ruby/object:Gem::Requirement
+  requirement: &70191338907400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70095698629040
+  version_requirements: *70191338907400
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &70095698628560 !ruby/object:Gem::Requirement
+  requirement: &70191338906080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70095698628560
+  version_requirements: *70191338906080
 description: Light weight job scheduling extension for Sidekiq that adds support for
   queueing items in the future.
 email:
@@ -88,7 +88,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3002219408512225865
+      hash: -2828118743753619564
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -97,7 +97,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3002219408512225865
+      hash: -2828118743753619564
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.17