rock-queue 0.3.1 → 0.3.2

data/Rakefile

@@ -7,14 +7,13 @@ $LOAD_PATH.unshift 'lib'
 require 'rock-queue/tasks'
 
 GEM = "rock-queue"
-GEM_VERSION = "0.3.1"
+GEM_VERSION = "0.3.2"
 SUMMARY = "A unified interface for various messaging queues"
-AUTHORS = ["Grzegorz Kazulak", "Wojtek Mach", "Piotr Chmolowski", "Daniel Chrusciak"]
+AUTHORS = ["Grzegorz Kazulak"]
 EMAIL = "gregorz.kazulak@gmail.com"
 HOMEPAGE = "http://github.com/grzegorzkazulak/rock-queue"
 
 begin
-  gem 'jeweler', '~> 1.4'
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
     gem.name = GEM
@@ -39,7 +38,6 @@ begin
     gem.extra_rdoc_files = ["LICENSE"]
   end
   Jeweler::GemcutterTasks.new
-  FileList['tasks/**/*.rake'].each { |task| import task }
 rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end

data/lib/rock-queue/active_record_helper.rb

@@ -22,12 +22,11 @@ module RockQueue
     
     module InstanceMethods 
       def async(method, *args)
-        RockQueue.push self.class.queue, self.class, id, method, *args
+        RockQueue.push(self.class.queue, self.class, id, method, *args)
       end
       
       def async_at(method, time_to_run_at, *args)
-        RockQueue.push_at(
-          self.class.queue, self.class, time_to_run_at, id, method, *args)
+        RockQueue.push_at(self.class, time_to_run_at, method, id, *args)
       end
     end 
   end

data/lib/rock-queue/adapters/beanstalkd.rb

@@ -29,7 +29,9 @@ module RockQueue
     end 
 
     def clear
-      system "killall beanstalkd"
+      kill_cmd = `which killall`.empty? ? "pkill" : "killall"
+      
+      system "#{kill_cmd} beanstalkd"
       system "beanstalkd -d -p #{@options[:port]}"
     end
 

data/lib/rock-queue/adapters/resque.rb

@@ -28,12 +28,14 @@ module RockQueue
     end
     
     # Push items to Resque queue to be picked up by the worker on specified time
-    def push_at(value, time_to_run_at ,*args)
+    def push_at(value, time_to_run_at, *args)
       if !defined?(value.queue)
         value.class_eval do 
           @queue = :default
         end
       end
+      
+      raise "resque_scheduler is required" unless Resque.respond_to?(:enqueue_at)
       Resque.enqueue_at time_to_run_at, value, args
     end    
 
@@ -41,7 +43,7 @@ module RockQueue
     def pop(queue)
       job = Resque.reserve(queue)
       [job.payload_class, job.args] if job   
-    end 
+    end
     
     # Register worker for web interface
     def register_worker(worker)

data/spec/active_record_helper_spec.rb

@@ -1,4 +1,5 @@
 require File.dirname(__FILE__) + '/spec_helper'
+require 'resque_scheduler'
 
 RockQueue.setup(
   :adapter => :resque,
@@ -15,9 +16,27 @@ describe "Object with ActiveRecordHelper" do
   it "class responds to .perform" do
     @post.class.perform([@post.id, :title]).should == "Test"
   end
+  
+  it "should respond to queue" do
+    @post.class.queue.should == :default
+  end
 
   it "calls a method asynchronously" do
     @post.async(:archive)
     RockQueue.pop(:default).should == [Post, [[@post.id, "archive"]]]
   end
+  
+  it "calls a method asynchronously at a given time" do
+    time = Time.now.to_i + 3600
+    
+    Resque.delayed_queue_schedule_size.should == 0
+    @post.async_at(:archive, time)
+    
+    Resque.delayed_queue_schedule_size.should == 1
+    Resque.next_item_for_timestamp(time).should == {
+      "args"  => [["archive", @post.id]],
+      "class" => "Post",
+      "queue" => "default"
+    }
+  end
 end

data/spec/notifiers_spec.rb

@@ -0,0 +1,15 @@
+require File.dirname(__FILE__) + '/spec_helper'
+
+require "mail"
+
+describe "Notifiers" do
+  it "registers an observer" do
+    notifiers = RockQueue::Notifiers.instance
+    notifier  = RockQueue::EmailNotifier.new({:from => "joe@localhost", :to   => "mike@localhost"})
+    
+    notifiers.count_observers.should == 0
+    notifiers.register(notifier)
+    notifiers.count_observers.should == 1
+    notifiers.delete_observers
+  end
+end

data/spec/resque_queue_spec.rb

@@ -1,5 +1,11 @@
 require File.dirname(__FILE__) + '/spec_helper'
 
+RockQueue.setup(
+  :adapter => :resque,
+  :server  => 'localhost',
+  :port    => 6379
+)
+
 describe "ResqueQueue" do
   before(:each) do
     @adapter = RockQueue::ResqueQueue.new(:server => 'localhost', :port => 6379)
@@ -7,4 +13,10 @@ describe "ResqueQueue" do
   end
 
   it_should_behave_like "RockQueue adapter"
+  
+  it "should register worker" do   
+    worker = RockQueue::Worker.new(:default)
+    @adapter.register_worker(worker)
+    Resque.redis.sismember(:workers, worker).should == true
+  end
 end

metadata

@@ -1,35 +1,29 @@
 --- !ruby/object:Gem::Specification 
 name: rock-queue
 version: !ruby/object:Gem::Version 
-  hash: 17
   prerelease: false
   segments: 
   - 0
   - 3
-  - 1
-  version: 0.3.1
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - Grzegorz Kazulak
-- Wojtek Mach
-- Piotr Chmolowski
-- Daniel Chrusciak
 autorequire: rock-queue
 bindir: bin
 cert_chain: []
 
-date: 2010-07-30 00:00:00 +02:00
+date: 2010-07-31 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 13
         segments: 
         - 1
         - 2
@@ -41,11 +35,9 @@ dependencies:
   name: resque
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 33
         segments: 
         - 1
         - 9
@@ -57,11 +49,9 @@ dependencies:
   name: mail
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 13
         segments: 
         - 2
         - 2
@@ -95,16 +85,6 @@ files:
 - lib/rock-queue/web.rb
 - lib/rock-queue/web/views/dashboard.erb
 - lib/rock-queue/worker.rb
-- spec/active_record_helper_spec.rb
-- spec/beanstalkd_spec.rb
-- spec/email_notifier_spec.rb
-- spec/fixtures.rb
-- spec/queue_object_spec.rb
-- spec/resque_queue_spec.rb
-- spec/rock_queue_spec.rb
-- spec/shared.rb
-- spec/spec_helper.rb
-- spec/worker_spec.rb
 has_rdoc: true
 homepage: http://github.com/grzegorzkazulak/rock-queue
 licenses: []
@@ -115,27 +95,23 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: A unified interface for various messaging queues
@@ -144,6 +120,7 @@ test_files:
 - spec/beanstalkd_spec.rb
 - spec/email_notifier_spec.rb
 - spec/fixtures.rb
+- spec/notifiers_spec.rb
 - spec/queue_object_spec.rb
 - spec/resque_queue_spec.rb
 - spec/rock_queue_spec.rb