rock-queue 0.3.0 → 0.3.1

data/Rakefile

@@ -7,56 +7,49 @@ $LOAD_PATH.unshift 'lib'
 require 'rock-queue/tasks'
 
 GEM = "rock-queue"
-GEM_VERSION = "0.3.0"
-AUTHOR = "Grzegorz Kazulak"
+GEM_VERSION = "0.3.1"
+SUMMARY = "A unified interface for various messaging queues"
+AUTHORS = ["Grzegorz Kazulak", "Wojtek Mach", "Piotr Chmolowski", "Daniel Chrusciak"]
 EMAIL = "gregorz.kazulak@gmail.com"
 HOMEPAGE = "http://github.com/grzegorzkazulak/rock-queue"
-SUMMARY = "A unified interface for various messaging queues"
- 
-spec = Gem::Specification.new do |s|
-  s.name = GEM
-  s.version = GEM_VERSION
-  s.platform = Gem::Platform::RUBY
-  s.has_rdoc = true
-  s.extra_rdoc_files = ["LICENSE"]
-  s.summary = SUMMARY
-  s.description = s.summary
-  s.author = AUTHOR
-  s.email = EMAIL
-  s.homepage = HOMEPAGE
-  
-  s.require_path = 'lib'
-  s.autorequire = GEM
-  s.files = %w(LICENSE Rakefile) + Dir.glob("{lib,specs}/**/*")
-end
- 
-Rake::GemPackageTask.new(spec) do |pkg|
-  pkg.gem_spec = spec
+
+begin
+  gem 'jeweler', '~> 1.4'
+  require 'jeweler'
+  Jeweler::Tasks.new do |gem|
+    gem.name = GEM
+    gem.version = GEM_VERSION
+    gem.summary = SUMMARY
+    gem.description = SUMMARY
+    gem.email = EMAIL
+    gem.homepage = HOMEPAGE
+    gem.authors = AUTHORS
+    
+    # Dependencies
+    gem.add_development_dependency "rspec", ">= 1.2.9"
+    gem.add_dependency "resque", ">= 1.9.9"
+    gem.add_dependency "mail", ">= 2.2.5"
+    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
+    
+    gem.require_path = 'lib'
+    gem.autorequire = GEM
+    gem.files = %w(LICENSE Rakefile) + Dir.glob("{lib,specs}/**/*")
+    gem.platform = Gem::Platform::RUBY
+    gem.has_rdoc = true
+    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
- 
+
 task :default => :spec 
  
 desc "install the gem locally"
 task :install => [:package] do
   sh %{sudo gem install pkg/#{GEM}-#{GEM_VERSION}}
 end
- 
-desc "create a gemspec file"
-task :make_spec do
-  File.open("#{GEM}.gemspec", "w") do |file|
-    file.puts spec.to_ruby
-  end
-end
- 
-desc "Run tests"
-task :test do
-  # Don't use the rake/testtask because it loads a new
-  # Ruby interpreter - we want to run tests with the current
-  # `rake` so our library manager still works
-  Dir['test/*_test.rb'].each do |f|
-    require f
-  end
-end
 
 desc "Run all examples" 
 Spec::Rake::SpecTask.new('spec') do |t|
@@ -71,3 +64,13 @@ Spec::Rake::SpecTask.new('spec:rcov') do |t|
   t.spec_files = FileList['spec/**/*_spec.rb']
   t.rcov_opts = ['--exclude spec,/home']
 end
+
+require 'rake/rdoctask'
+Rake::RDocTask.new do |rdoc|
+  version = File.exist?('VERSION') ? File.read('VERSION') : ""
+
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title = "rock-queue #{version}"
+  rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end

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

@@ -29,7 +29,7 @@ module RockQueue
     end 
 
     def clear
-      system "pkill beanstalkd"
+      system "killall beanstalkd"
       system "beanstalkd -d -p #{@options[:port]}"
     end
 

data/spec/active_record_helper_spec.rb

@@ -0,0 +1,23 @@
+require File.dirname(__FILE__) + '/spec_helper'
+
+RockQueue.setup(
+  :adapter => :resque,
+  :server  => 'localhost',
+  :port    => 6379
+)
+
+describe "Object with ActiveRecordHelper" do
+  before(:each) do
+    @post = Post.create(:title => "Test")
+    RockQueue.clear
+  end
+
+  it "class responds to .perform" do
+    @post.class.perform([@post.id, :title]).should == "Test"
+  end
+
+  it "calls a method asynchronously" do
+    @post.async(:archive)
+    RockQueue.pop(:default).should == [Post, [[@post.id, "archive"]]]
+  end
+end

data/spec/beanstalkd_spec.rb

@@ -0,0 +1,10 @@
+require File.dirname(__FILE__) + '/spec_helper'
+
+describe "Beanstalkd" do
+  before(:each) do
+    @adapter = RockQueue::Beanstalkd.new(:server => 'localhost', :port => 11300)
+    @adapter.clear
+  end
+
+  it_should_behave_like "RockQueue adapter"
+end

data/spec/email_notifier_spec.rb

@@ -0,0 +1,29 @@
+require File.dirname(__FILE__) + '/spec_helper'
+
+require 'mail'
+
+describe "EmailNotifier" do
+  before do
+    config = {
+      :from => "joe@localhost",
+      :to   => "mike@localhost"
+    }
+    @notifier = RockQueue::EmailNotifier.new(config)
+
+    Mail.defaults do
+      delivery_method :test
+    end
+  end
+
+  it "sends an email" do
+    err = nil
+    begin
+      raise Exception, "Failure"
+    rescue Exception => e
+      err = e
+    end
+    @notifier.update(err)
+    email = Mail::TestMailer.deliveries.first
+    email.subject.should == "Processing error - 'Failure'"
+  end
+end

data/spec/fixtures.rb

@@ -0,0 +1,40 @@
+require 'active_record'
+
+ActiveRecord::Base.establish_connection(
+  :adapter => 'sqlite3',
+  :database => ':memory:'
+)
+
+class Post < ActiveRecord::Base
+  include RockQueue::ActiveRecordHelper
+
+  def archive
+    @archived = true
+  end
+
+  def archived?
+    @archived == true
+  end
+end
+
+ActiveRecord::Schema.define(:version => 1) do
+  create_table :posts do |t|
+    t.string :title
+  end
+end
+
+Post.create!(:title => "Post 1")
+Post.create!(:title => "Post 2")
+Post.create!(:title => "Post 3")
+Post.create!(:title => "Post 4")
+
+class TestJob
+  def self.perform
+  end
+end
+
+class BadJob
+  def self.perform
+    fail
+  end
+end

data/spec/queue_object_spec.rb

@@ -0,0 +1,32 @@
+require File.dirname(__FILE__) + '/spec_helper'
+
+describe "QueueObject" do
+  before(:each) do
+    @qo = RockQueue::QueueObject.new(nil, [])
+  end
+
+  it "should have no fails" do
+    @qo.fails.should be_empty
+  end
+
+  it "returns 1 as sleep time" do
+    @qo.get_sleep_time.should == 1
+  end
+
+  describe "after 2 fails" do
+    before(:each) do
+      2.times { @qo.add_fail Exception.new("Failure") }
+    end
+
+    it "returns 4 as sleep time" do
+      @qo.get_sleep_time.should == 4
+    end
+
+    it "sends a notification after another fail" do
+      notifiers_mock = mock("Notifiers")
+      notifiers_mock.should_receive(:notify)
+      RockQueue::Notifiers.stub(:instance).and_return(notifiers_mock)
+      @qo.add_fail Exception.new("Failure")
+    end
+  end
+end

data/spec/resque_queue_spec.rb

@@ -0,0 +1,10 @@
+require File.dirname(__FILE__) + '/spec_helper'
+
+describe "ResqueQueue" do
+  before(:each) do
+    @adapter = RockQueue::ResqueQueue.new(:server => 'localhost', :port => 6379)
+    @adapter.clear
+  end
+
+  it_should_behave_like "RockQueue adapter"
+end

data/spec/rock_queue_spec.rb

@@ -0,0 +1,33 @@
+require File.dirname(__FILE__) + '/spec_helper'
+
+describe "RockQueue" do
+  it "should setup Resque adapter" do
+    RockQueue.setup :adapter => :resque,
+                    :server => 'localhost',
+                    :port => 6379
+    RockQueue.adapter.kind_of? RockQueue::ResqueQueue
+  end
+
+  it "should setup Beanstalkd adapter" do
+    RockQueue.setup :adapter => :beanstalkd,
+                    :server => 'localhost',
+                    :port => 11300
+    RockQueue.adapter.kind_of? RockQueue::Beanstalkd
+  end
+
+  it "should setup DelayedJob adapter" do
+    RockQueue.setup :adapter => :delayed_job
+    RockQueue.adapter.kind_of? RockQueue::DelayedJob
+  end
+
+  it "should fail with unsupported adapter" do
+    lambda {
+      RockQueue.setup :adapter => :bad
+    }.should raise_error
+  end
+
+  it "should fail whe not connected" do
+    RockQueue.disconnect
+    lambda { RockQueue.adapter }.should raise_error
+  end
+end

data/spec/shared.rb

@@ -0,0 +1,37 @@
+shared_examples_for "RockQueue adapter" do
+  it "pushes a job" do
+    @adapter.push(:default, TestJob, 1).should_not be_nil
+  end
+
+  it "pops a job" do
+    @adapter.push(:default, TestJob, 1)
+    @adapter.pop(:default).should == [TestJob, [1]]
+  end
+
+  it "returns number of jobs in queue" do
+    @adapter.push(:queue1, TestJob, 1)
+    @adapter.push(:queue1, TestJob, 2)
+    @adapter.push(:queue2, TestJob, 3)
+
+    @adapter.size(:queue1).should == 2
+    @adapter.size(:queue2).should == 1
+  end
+
+  it "clears job queues" do
+    @adapter.push(:queue1, TestJob, 1)
+    @adapter.push(:queue1, TestJob, 2)
+    @adapter.clear
+    @adapter.queues.should == [:default]
+  end
+
+  it "always have default queue" do
+    @adapter.clear
+    @adapter.queues.should == [:default]
+  end
+
+  it "returns queue names" do
+    @adapter.push(:queue1, TestJob, 1)
+    @adapter.push(:queue2, TestJob, 2)
+    @adapter.queues.should == [:default, :queue1, :queue2]
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,7 @@
+$:.push File.join(File.dirname(__FILE__), '..', 'lib')
+
+require 'rubygems'
+require 'rock-queue'
+
+require File.dirname(__FILE__) + '/fixtures'
+require File.dirname(__FILE__) + '/shared'

data/spec/worker_spec.rb

@@ -0,0 +1,64 @@
+require File.dirname(__FILE__ ) + '/spec_helper'
+
+describe "Worker" do
+  before(:each) do
+    RockQueue.setup :adapter => :resque,
+                    :server  => 'localhost',
+                    :port    => 6379
+    RockQueue.clear
+  end
+
+  it "processes default queue when no is specified" do
+    @worker = RockQueue::Worker.new
+    @worker.queues.should == [:default]
+  end
+
+  it "works" do
+    @worker = RockQueue::Worker.new(:default)
+    post_mock = mock("Post")
+
+    Post.stub!(:find).and_return(post_mock)
+    RockQueue.push :default, Post, 1, :archive
+    post_mock.should_receive(:archive)
+    @worker.work(0)
+  end
+
+  it "should retry a failed job 3 times" do
+    RockQueue.push :default, BadJob
+    @worker = RockQueue::Worker.new(:default)
+    @worker.work(0)
+  end
+
+  it "processes multiple jobs" do
+    RockQueue.push :default, TestJob
+    RockQueue.push :default, TestJob
+    RockQueue.push :default, TestJob
+
+    @worker = RockQueue::Worker.new(:default)
+    @worker.work(0)
+    RockQueue.size(:default).should == 0
+  end
+
+  it "works on multiple queues" do
+    RockQueue.push :queue1, TestJob
+    RockQueue.push :queue1, TestJob
+    RockQueue.push :queue2, TestJob
+
+    @worker = RockQueue::Worker.new(:queue1, :queue2)
+    @worker.work(0)
+    RockQueue.size(:queue1).should == 0
+    RockQueue.size(:queue2).should == 0
+  end
+
+  it "works on all queues" do
+    RockQueue.push :queue1, TestJob
+    RockQueue.push :queue2, TestJob
+    RockQueue.push :queue3, TestJob
+
+    @worker = RockQueue::Worker.new("*")
+    @worker.work(0)
+    RockQueue.size(:queue1).should == 0
+    RockQueue.size(:queue2).should == 0
+    RockQueue.size(:queue3).should == 0
+  end
+end

metadata

@@ -1,23 +1,74 @@
 --- !ruby/object:Gem::Specification 
 name: rock-queue
 version: !ruby/object:Gem::Version 
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Grzegorz Kazulak
+- Wojtek Mach
+- Piotr Chmolowski
+- Daniel Chrusciak
 autorequire: rock-queue
 bindir: bin
 cert_chain: []
 
-date: 2010-05-28 00:00:00 +02:00
+date: 2010-07-30 00:00:00 +02:00
 default_executable: 
-dependencies: []
-
+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
+        - 9
+        version: 1.2.9
+  type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: resque
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 33
+        segments: 
+        - 1
+        - 9
+        - 9
+        version: 1.9.9
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: mail
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 2
+        - 2
+        - 5
+        version: 2.2.5
+  type: :runtime
+  version_requirements: *id003
 description: A unified interface for various messaging queues
 email: gregorz.kazulak@gmail.com
 executables: []
@@ -29,50 +80,73 @@ extra_rdoc_files:
 files: 
 - LICENSE
 - Rakefile
+- lib/rock-queue.rb
 - lib/rock-queue/active_record_helper.rb
 - lib/rock-queue/adapters/beanstalkd.rb
 - lib/rock-queue/adapters/delayed_job.rb
 - lib/rock-queue/adapters/resque.rb
 - lib/rock-queue/config.rb
 - lib/rock-queue/errors.rb
+- lib/rock-queue/notifiers.rb
 - lib/rock-queue/notifiers/abstract_notifier.rb
 - lib/rock-queue/notifiers/email_notifier.rb
-- lib/rock-queue/notifiers.rb
 - lib/rock-queue/queue_object.rb
 - lib/rock-queue/tasks.rb
-- lib/rock-queue/web/views/dashboard.erb
 - lib/rock-queue/web.rb
+- lib/rock-queue/web/views/dashboard.erb
 - lib/rock-queue/worker.rb
-- lib/rock-queue.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: []
 
 post_install_message: 
-rdoc_options: []
-
+rdoc_options: 
+- --charset=UTF-8
 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.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A unified interface for various messaging queues
-test_files: []
-
+test_files: 
+- 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